reactive-record 0.7.11 → 0.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06aea49de3ad2b4cecc3fd5361411b9caaa9f8c1
-  data.tar.gz: ac539741bf1817ffccdac4fb2a05be56a9a73575
+  metadata.gz: 20ba896842b898324934f9ede8523629f9ea8ca8
+  data.tar.gz: 1ca9086a7a22e06608995599e5e66145b939c43f
 SHA512:
-  metadata.gz: 9bc27fd3212e4384b081582bcd7a020fa8de5e33e45cdf02222d46a978ca5e8adf60d2c42b123cef47505d1a923662809a5e9fe70c547b8cb776be2323abf4cf
-  data.tar.gz: ca69357ef64c353040b7fd18498e25369a3e940edd128d120896a9474a30b00148ae05463de692021e5f0cf88bd0063804d0a0da653d1bf2bb972c50beaaee5e
+  metadata.gz: b36afcbffd5e424ccb005cf321d3f830df588c259e198f3b7dc465b62476d7687761c4486f54e6ddc43b2bdb0b7fb51d8835c0b2c90d5c2609f178782abf1341
+  data.tar.gz: 77b1454fb5434af9d1b69ee4763eb1ed5e25b302117f889a0e9d3986c8c525fc50e711138bb5880a2bb6e5cd4ca40e8a3f9b5937b712b3b44e14ecd5a0139729

data/lib/reactive-record.rb

@@ -16,6 +16,27 @@ if RUBY_ENGINE == 'opal'
   
 else
   
+  module ::ActiveRecord
+    module Core
+      module ClassMethods
+        def inherited(child_class) 
+          begin
+            file = Rails.root.join('app','models',"#{child_class.name.underscore}.rb").to_s rescue nil
+            begin 
+              require file 
+            rescue LoadError
+            end
+            # from active record:
+            child_class.initialize_find_by_cache
+          rescue 
+          end
+          super
+        end
+      end
+    end
+  end
+  
+  
   require "opal"
   require "reactive_record/version"
   require "reactive_record/permissions"

data/lib/reactive_record/active_record/class_methods.rb

@@ -81,7 +81,7 @@ module ActiveRecord
     [:belongs_to, :has_many, :has_one].each do |macro| 
       define_method(macro) do |*args| # is this a bug in opal?  saying name, scope=nil, opts={} does not work!
         name = args.first
-        opts = args.last
+        opts = (args.count > 1 and args.last.is_a? Hash) ? args.last : {}
         Associations::AssociationReflection.new(base_class, macro, name, opts)
       end
     end
@@ -92,7 +92,7 @@ module ActiveRecord
 
     [
       "table_name=", "before_validation", "with_options", "validates_presence_of", "validates_format_of", 
-      "accepts_nested_attributes_for", "after_create", "before_save", "before_destroy", "where", "validate", 
+      "accepts_nested_attributes_for", "before_create", "after_create", "before_save", "after_save", "before_destroy", "where", "validate", 
       "attr_protected", "validates_numericality_of", "default_scope", "has_attached_file", "attr_accessible",
       "serialize"
     ].each do |method|
@@ -107,11 +107,11 @@ module ActiveRecord
         param
       elsif param.is_a? Hash
         if opt == :validate_only
-          ReactiveRecord::Base.infer_type_from_hash(self, param) == self
+          klass = ReactiveRecord::Base.infer_type_from_hash(self, param)
+          klass == self or klass < self
         else
           target = find(param[primary_key])
-          param.each { |key, value| param[key] = [value] }
-          ReactiveRecord::Base.load_from_json(param, target)
+          ReactiveRecord::Base.load_from_json(Hash[param.collect { |key, value| [key, [value]] }], target)
           target
         end
       else

data/lib/reactive_record/active_record/error.rb

@@ -13,6 +13,10 @@ module ActiveModel
       messages[attribute]
     end
     
+    def delete(attribute)
+      messages.delete(attribute)
+    end
+    
     def empty?
       messages.empty?
     end

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

@@ -64,9 +64,6 @@ module ReactiveRecord
       model = model.base_class
       # already have a record with this attribute-value pair?
       record = @records[model].detect { |record| record.attributes[attribute] == value}
-      if !record and attribute == 'id' and !@disabled_debugging
-       # `debugger`
-      end
       unless record
         # if not, and then the record may be loaded, but not have this attribute set yet,
         # so find the id of of record with the attribute-value pair, and see if that is loaded.
@@ -244,8 +241,13 @@ module ReactiveRecord
     
     def saved!(errors = nil)  # sets saving to false AND notifies
       @saving = false
-      React::State.set_state(self, self, :saved) unless data_loading? or errors
       @errors = ActiveModel::Error.new(errors)
+      if errors
+        #errors.each { |attribute, error| React::State.set_state(self, attribute, attributes[attribute]) }
+        React::State.set_state(self, self, :errors)
+      elsif !data_loading? 
+        React::State.set_state(self, self, :saved)
+      end
       self
     end
     

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

@@ -245,27 +245,27 @@ module ReactiveRecord
 
           HTTP.post(`window.ReactiveRecordEnginePath`+"/save", payload: {models: models, associations: associations}).then do |response|
             begin
-            response.json[:models] = response.json[:saved_models].collect do |item|
-              backing_records[item[0]].ar_instance
-            end
+              response.json[:models] = response.json[:saved_models].collect do |item|
+                backing_records[item[0]].ar_instance
+              end
 
-            if response.json[:success]
-              response.json[:saved_models].each { | item | backing_records[item[0]].sync!(item[2]) }
-            else
-              response.json[:saved_models].each { | item | backing_records[item[0]].saved! item[3] }
-              log("Reactive Record Save Failed: #{response.json[:message]}", :error) 
-              response.json[:saved_models].each do | item |
-                log("  Model: #{item[1]}[#{item[0]}]  Attributes: #{item[2]}  Errors: #{item[3]}", :error) if item[3]
+              if response.json[:success]
+                response.json[:saved_models].each { | item | backing_records[item[0]].sync!(item[2]) }
+              else
+                response.json[:saved_models].each { | item | backing_records[item[0]].saved! item[3] }
+                log("Reactive Record Save Failed: #{response.json[:message]}", :error) 
+                response.json[:saved_models].each do | item |
+                  log("  Model: #{item[1]}[#{item[0]}]  Attributes: #{item[2]}  Errors: #{item[3]}", :error) if item[3]
+                end
               end
-            end
 
-            yield response.json[:success], response.json[:message], response.json[:models]  if block
-            promise.resolve response.json
+              yield response.json[:success], response.json[:message], response.json[:models]  if block
+              promise.resolve response.json
             
-            backing_records.each { |id, record| record.saved! } if response.json(:success)
-          rescue Exception => e
-            puts "whahhh #{e}"
-          end
+              backing_records.each { |id, record| record.saved! } if response.json[:success]
+            rescue Exception => e
+              puts "Save Failed: #{e}"
+            end
           end
           promise
         else

data/lib/reactive_record/version.rb

@@ -1,3 +1,3 @@
 module ReactiveRecord
-  VERSION = "0.7.11"
+  VERSION = "0.7.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reactive-record
 version: !ruby/object:Gem::Version
-  version: 0.7.11
+  version: 0.7.12
 platform: ruby
 authors:
 - Mitch VanDuyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2015-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails