wip

Author: catmando

release-notes/1.0.alpha1.7.md

@@ -17,7 +17,7 @@
 ### Security
 
 ### Added
-+ [#116](https://github.com/hyperstack-org/hyperstack/issues/396) ActiveRecord `where` implemented
++ [#116](https://github.com/hyperstack-org/hyperstack/issues/116) ActiveRecord `where` implemented
 
 
 ### Fixed

ruby/hyper-model/lib/reactive_record/active_record/public_columns_hash.rb

@@ -6,39 +6,38 @@ module ActiveRecord
   # adds method to get the HyperMesh public column types
   # this works because the public folder is currently required to be eager loaded.
   class Base
+    @@hyper_stack_public_columns_hash_mutex = Mutex.new
     def self.public_columns_hash
-      return @public_columns_hash if @public_columns_hash && Rails.env.production?
-      files = []
-      Hyperstack.public_model_directories.each do |dir|
-        dir_length = Rails.root.join(dir).to_s.length + 1
-        Dir.glob(Rails.root.join(dir, '**', '*.rb')).each do |file|
-          require_dependency(file) # still the file is loaded to make sure for development and test env
-          files << file[dir_length..-4]
+      @@hyper_stack_public_columns_hash_mutext.synchronize do
+        return @public_columns_hash if @public_columns_hash && Rails.env.production?
+        files = []
+        Hyperstack.public_model_directories.each do |dir|
+          dir_length = Rails.root.join(dir).to_s.length + 1
+          Dir.glob(Rails.root.join(dir, '**', '*.rb')).each do |file|
+            require_dependency(file) # still the file is loaded to make sure for development and test env
+            files << file[dir_length..-4]
+          end
         end
-      end
-      @public_columns_hash = {}
-      # descendants only works for already loaded models!
-      descendants.each do |model|
-        if files.include?(model.name.underscore) && model.name.underscore != 'application_record'
-          @public_columns_hash[model.name] = model.columns_hash rescue nil # why rescue?
+        @public_columns_hash = {}
+        # descendants only works for already loaded models!
+        descendants.each do |model|
+          if files.include?(model.name.underscore) && model.name.underscore != 'application_record'
+            @public_columns_hash[model.name] = model.columns_hash rescue nil # why rescue?
+          end
         end
-        # begin
-        #   @public_columns_hash[model.name] = model.columns_hash if model.table_name
-        # rescue Exception => e
-        #   binding.pry
-        #   @public_columns_hash = nil
-        #   raise $!, "Could not read 'columns_hash' for #{model}: #{$!}", $!.backtrace
-        # end if files.include?(model.name.underscore) && model.name.underscore != 'application_record'
+        @public_columns_hash
       end
-      @public_columns_hash
     end
 
+    @@hyper_stack_public_columns_hash_as_json_mutex = Mutex.new
     def self.public_columns_hash_as_json
-      return @public_columns_hash_json if @public_columns_hash_json && Rails.env.production?
-      pch = public_columns_hash
-      return @public_columns_hash_json if @prev_public_columns_hash == pch
-      @prev_public_columns_hash = pch
-      @public_columns_hash_json = pch.to_json
+      @@hyper_stack_public_columns_hash_as_json_mutex.synchronize do
+        return @public_columns_hash_json if @public_columns_hash_json && Rails.env.production?
+        pch = public_columns_hash
+        return @public_columns_hash_json if @prev_public_columns_hash == pch
+        @prev_public_columns_hash = pch
+        @public_columns_hash_json = pch.to_json
+      end
     end
   end
 end