reactive-record 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cedb48995b7ce8ff657d9219b89de03a708cbe13
-  data.tar.gz: 848a09867b41cf9dbaaca1660fe451179ce79928
+  metadata.gz: 8548152ff489f1a0eb74a6eb0acbe08bcf94acb0
+  data.tar.gz: 2f6578db7396a607c8b3e61bea163fb55c5699c9
 SHA512:
-  metadata.gz: 0ac3263bac093e1e702d072bfe6fc1c1d8a8be9e3f162f2097f8df1832cf4938c71a94a1f30c539bb1da5795b4a23e480eb2391da5b56fe9199d195484575927
-  data.tar.gz: 50831135ec14dc12423379e089b491e4868db815fab7cf65b7564e1155babaa7563aeebdba717248b7ea181b06cb290cfc01a758b171b9209c9b187b13307fc1
+  metadata.gz: daab93265cb69a09597a46ed12cafda5975abdba0ac6eddb82b74123448ced47ee3d39b889d9ad7fc28ddf85bc7999ff73db8fd69b7fe76b9ce540571b51132a
+  data.tar.gz: e5ea4f5e44394b9103636a3b0081b7671caea1b90ab8627a5ba9b66976bcaaab212819da3e56aa3739a7903ef5cc1b98ddfb5fbbb7c1904ab6d9693241bef628

data/lib/reactive_record/active_record/associations.rb

@@ -24,13 +24,18 @@ module ActiveRecord
         owner_class.reflect_on_all_associations << self
         @owner_class = owner_class
         @macro =       macro
+        @options =     options
         @klass_name =  options[:class_name] || (collection? && name.camelize.gsub(/s$/,"")) || name.camelize
+        if @klass_name < ActiveRecord::Base
+          @klass = @klass_name
+          @klass_name = @klass_name.name
+        end rescue nil
         @association_foreign_key = options[:foreign_key] || (macro == :belongs_to && "#{name}_id") || "#{@owner_class.name.underscore}_id"
         @attribute =   name
       end
       
       def inverse_of
-        unless @inverse_of
+        unless @options[:through] or @inverse_of
           inverse_association = klass.reflect_on_all_associations.detect { | association | association.association_foreign_key == @association_foreign_key }
           raise "Association #{@owner_class}.#{attribute} (foreign_key: #{@association_foreign_key}) has no inverse in #{@klass_name}" unless inverse_association
           @inverse_of = inverse_association.attribute

data/lib/reactive_record/active_record/class_methods.rb

@@ -62,11 +62,20 @@ module ActiveRecord
     end
     
     def scope(name, body)
-      singleton_class.send(:define_method, name) { ReactiveRecord::Collection.new(self, nil, nil, self, name) }
+      singleton_class.send(:define_method, name) do
+        ReactiveRecord::Base.class_scopes(self)[name] ||= ReactiveRecord::Collection.new(self, nil, nil, self, name) 
+      end
+      singleton_class.send(:define_method, "#{name}=") do |collection| 
+        ReactiveRecord::Base.class_scopes(self)[name] = collection
+      end
     end
     
     def all
-      ReactiveRecord::Collection.new(self, nil, nil, self, "all")
+      ReactiveRecord::Base.class_scopes(self)[:all] ||= ReactiveRecord::Collection.new(self, nil, nil, self, "all")
+    end
+    
+    def all=(collection)
+      ReactiveRecord::Base.class_scopes(self)[:all] = collection
     end
         
     [:belongs_to, :has_many, :has_one].each do |macro| 

data/lib/reactive_record/active_record/reactive_record/base.rb

@@ -48,6 +48,10 @@ module ReactiveRecord
       ServerDataCache.load_from_json(json, target)
       @data_loading = false
     end
+    
+    def self.class_scopes(model)
+      @class_scopes[model.base_class]
+    end
   
     def self.find(model, attribute, value) 
       # will return the unique record with this attribute-value pair
@@ -165,7 +169,7 @@ module ReactiveRecord
               attributes[attribute].attributes[inverse_of] = nil if attributes[attribute]
               value.attributes[inverse_of] = @ar_instance 
               React::State.set_state(value.instance_variable_get(:@backing_record), inverse_of, @ar_instance) unless data_loading?
-            else
+            elsif attributes[attribute]
               attributes[attribute].attributes[inverse_of] = nil
             end
           end

data/lib/reactive_record/active_record/reactive_record/collection.rb

@@ -3,10 +3,6 @@ module ReactiveRecord
   class Collection
     
     def initialize(target_klass, owner = nil, association = nil, *vector)
-      if association and (association.macro != :has_many or association.klass != target_klass)
-        message = "unimplemented association #{owner} :#{association.macro} #{association.attribute}"
-        `console.error(#{message})`
-      end
       @owner = owner  # can be nil if this is an outer most scope
       @association = association
       @target_klass = target_klass

data/lib/reactive_record/active_record/reactive_record/isomorphic_base.rb

@@ -11,6 +11,7 @@ module ReactiveRecord
         @server_data_cache = ReactiveRecord::ServerDataCache.new
       else
         @records = Hash.new { |hash, key| hash[key] = [] }
+        @class_scopes = Hash.new { |hash, key| hash[key] = {} }
         if on_opal_client? 
           @pending_fetches = []
           @last_fetch_at = Time.now
@@ -152,12 +153,16 @@ module ReactiveRecord
         last_fetch_at = @last_fetch_at
         pending_fetches = @pending_fetches.uniq
         log(["Server Fetching: %o", pending_fetches.to_n])
+        start_time = Time.now
         HTTP.post(`window.ReactiveRecordEnginePath`, payload: {pending_fetches: pending_fetches}).then do |response|
+          fetch_time = Time.now
+          log("       Fetched in:   #{(fetch_time-start_time).to_i}s")
           begin
             ReactiveRecord::Base.load_from_json(response.json)
           rescue Exception => e
             log("Exception raised while loading json from server: #{e}", :error)
           end
+          log("       Processed in: #{(Time.now-fetch_time).to_i}s")
           log(["       Returned: %o", response.json.to_n])
           ReactiveRecord.run_blocks_to_load
           ReactiveRecord::WhileLoading.loaded_at last_fetch_at

data/lib/reactive_record/server_data_cache.rb

@@ -95,9 +95,10 @@ module ReactiveRecord
       if RUBY_ENGINE != 'opal'
       
         def [](*vector)
-          vector.inject(CacheItem.new(@cache, vector[0])) { |cache_item, method| cache_item.apply_method method }
+          root = CacheItem.new(@cache, vector[0])
+          vector[1..-1].inject(root) { |cache_item, method| cache_item.apply_method method if cache_item }
           vector[0] = vector[0].constantize
-          new_items = @cache.select { | cache_item | cache_item.vector == vector}
+          new_items = @cache.select { | cache_item | cache_item.root == root}
           @requested_cache_items += new_items
           new_items.last.value if new_items.last
         end
@@ -128,6 +129,7 @@ module ReactiveRecord
 
           attr_reader :vector
           attr_reader :record_chain
+          attr_reader :root
 
           def value 
             @ar_object
@@ -138,7 +140,10 @@ module ReactiveRecord
           end
           
           def self.new(db_cache, klass)
-            return existing if existing = db_cache.detect { |cached_item| cached_item.vector == [klass] }
+            klass_constant = klass.constantize
+            if existing = db_cache.detect { |cached_item| cached_item.vector == [klass_constant] }
+              return existing
+            end
             super
           end
 
@@ -149,18 +154,25 @@ module ReactiveRecord
             @ar_object = klass
             @record_chain = []
             @parent = nil
+            @root = self
             db_cache << self
           end
           
           def apply_method_to_cache(method, &block)
             @db_cache.inject(nil) do | representative, cache_item |
               if cache_item.vector == vector
-                cache_item.clone.instance_eval do
-                  @vector = @vector + [method]  # don't push it on since you need a new vector!
-                  @ar_object = yield cache_item
-                  @db_cache << self
-                  @parent = cache_item
-                  self
+                begin
+                  new_ar_object = yield cache_item
+                  cache_item.clone.instance_eval do
+                    @vector = @vector + [method]  # don't push it on since you need a new vector!
+                    @ar_object = new_ar_object
+                    @db_cache << self
+                    @parent = cache_item
+                    @root = cache_item.root
+                    self
+                  end
+                rescue
+                  representative
                 end
               else
                 representative
@@ -185,10 +197,13 @@ module ReactiveRecord
               else
                 apply_method_to_cache(method) {[]}
               end
-            elsif @ar_object.respond_to? [*method].first  
-              apply_method_to_cache(method) { |cache_item| cache_item.value.send(*method)  rescue nil } # rescue in case we are on a nil association
-            else
-              self
+            else # @ar_object.respond_to? [*method].first 
+              puts "apply #{method} to #{@vector}" 
+              r = apply_method_to_cache(method) { |cache_item| cache_item.value.send(*method) }# rescue nil } # rescue in case we are on a nil association
+              puts "representative method = #{r}"
+              r
+            #else
+             # self
             end
           end
           
@@ -196,7 +211,7 @@ module ReactiveRecord
             if @parent
               if method == "*"
                 @parent.as_hash({@ar_object.id => children})
-              elsif @ar_object.class < ActiveRecord::Base 
+              elsif @ar_object.class < ActiveRecord::Base and children.is_a? Hash
                 @parent.as_hash({method => children.merge({
                   :id => [@ar_object.id], 
                   @ar_object.class.inheritance_column => [@ar_object[@ar_object.class.inheritance_column]],
@@ -216,31 +231,31 @@ module ReactiveRecord
       end
               
       def self.load_from_json(tree, target = nil)
-        tree.delete("*all") if tree["*"]
+        ignore_all = nil
         tree.each do |method, value|
           method = JSON.parse(method) rescue method
           new_target = nil
           if !target
             load_from_json(value, Object.const_get(method))
           elsif method == "*all"
-            target.replace value.collect { |id| target.proxy_association.klass.find(id) }
+            target.replace value.collect { |id| target.proxy_association.klass.find(id) } unless ignore_all
           elsif method.is_a? Integer or method =~ /^[0-9]+$/
-            new_target = target.proxy_association.klass.find(method) 
-            target << new_target
+            ignore_all = true
+            target << (new_target = target.proxy_association.klass.find(method))
           elsif method.is_a? Array
-            new_target = target.send *method
+            new_target = target.send *method unless value.is_a? Array # value is an array if scope returns nil
           elsif value.is_a? Array
             target.send "#{method}=", value.first
           elsif value.is_a? Hash and value[:id] and value[:id].first
             new_target = target.class.reflect_on_association(method).klass.find(value[:id].first)
             target.send "#{method}=", new_target
           else
-            new_target = target.send *method
-            (new_target = target.send "#{method}=", new_target) rescue nil # this can happen for example if you say TodoItems.all
+            new_target = target.send("#{method}=", target.send(method)) 
           end
           load_from_json(value, new_target) if new_target
         end
         target.save if target.respond_to? :save 
+
       end
       
       

data/lib/reactive_record/version.rb

@@ -1,3 +1,3 @@
 module ReactiveRecord
-  VERSION = "0.7.5"
+  VERSION = "0.7.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reactive-record
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Mitch VanDuyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-21 00:00:00.000000000 Z
+date: 2015-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails