reactive-record 0.7.9 → 0.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 870be529a755c9588ae0f02b65dd10ee67c8d21b
-  data.tar.gz: 561c75ec7f9243d9ae106b733aa5356f57e93829
+  metadata.gz: f87f4c7dd6020944c3ae979759a058f28c5fc5b2
+  data.tar.gz: f169ab4179b0ef77f3ba0c38257bf09d69e3fd07
 SHA512:
-  metadata.gz: 5c502888fcd4ef5ea988a3a20a639b4d2bf3b3bdf4df0248b479162772b8ab073d234004697e79b0d121b6eb25209412344401ba1c4b0a0a1ef20cca98aa9f33
-  data.tar.gz: 57f3139aeaaab187cd2c30dbae45884a44920a7b6162679e02e573fd99f2074933a7c4b24da87969f9a967fb86d442a04242154c8b2702141ec8f553fe16ed82
+  metadata.gz: 872a3fb5c181c87913f4db432e093a84126e69959b408b3c68e4a5585680eb0aa4cf8965286968b92619ac83f4ea1b94cadbf149b6a6abf2079e2f97309182bf
+  data.tar.gz: 4117a18f6141462ccf5af5bc8e8dde69df493577fbd46c10e03e8c7f9ed710eeb8ecf477653199989ebf3d5dcd587aa2af1471d34605a056024bbfcb12b6775a

data/lib/reactive-record.rb

@@ -1,6 +1,7 @@
 if RUBY_ENGINE == 'opal'
   
   require "reactive-ruby"
+  require "reactive_record/active_record/error"
   require "reactive_record/server_data_cache"
   require "reactive_record/active_record/reactive_record/while_loading"
   require "reactive_record/active_record/reactive_record/isomorphic_base"

data/lib/reactive_record/active_record/error.rb

@@ -0,0 +1,22 @@
+module ActiveModel
+  
+  class Error
+    
+    attr_reader :messages
+    
+    def initialize(msgs = {})
+      @messages = msgs || {}
+      @messages.each { |attribute, messages| @messages[attribute] = messages.uniq }
+    end
+    
+    def [](attribute)
+      messages[attribute]
+    end
+    
+    def empty?
+      messages.empty?
+    end
+    
+  end
+  
+end

data/lib/reactive_record/active_record/instance_methods.rb

@@ -77,6 +77,10 @@ module ActiveRecord
       @backing_record.new?
     end
     
+    def errors
+      @backing_record.errors
+    end
+    
   end
   
 end

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

@@ -208,12 +208,18 @@ module ReactiveRecord
       end
       false
     end
+    
+    
+    def errors
+      @errors ||= ActiveModel::Error.new
+    end
   
     def sync!(hash = {})  # does NOT notify (see saved! for notification)
       @attributes.merge! hash
       @synced_attributes = @attributes.dup
       @synced_attributes.each { |key, value| @synced_attributes[key] = value.dup_for_sync if value.is_a? Collection }
       @saving = false
+      @errors = nil
       self
     end
   
@@ -228,6 +234,7 @@ module ReactiveRecord
         @ar_instance.send("#{attribute}=", @synced_attributes[attribute])
       end
       @attributes.delete_if { |attribute, value| !@synced_attributes.has_key?(attribute) }
+      @errors = nil
     end
     
     def saving! 
@@ -235,9 +242,10 @@ module ReactiveRecord
       @saving = true
     end
     
-    def saved!(failed = nil)  # sets saving to false AND notifies
+    def saved!(errors = nil)  # sets saving to false AND notifies
       @saving = false
-      React::State.set_state(self, self, :saved) unless data_loading? or failed
+      React::State.set_state(self, self, :saved) unless data_loading? or errors
+      @errors = ActiveModel::Error.new(errors)
       self
     end
     

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

@@ -242,25 +242,28 @@ module ReactiveRecord
           promise = Promise.new
 
           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
+
             if response.json[:success]
-              response.json[:saved_models].each do |item|
-                internal_id, klass, attributes = item
-                backing_records[internal_id].sync!(attributes)
-              end
+              response.json[:saved_models].each { | item | backing_records[item[0]].sync!(item[2]) }
             else
-              backing_records.each { |item| backing_records[item[0]].saved! false }
+              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 |model|
-                log("  Model: #{model[1]}  Attributes: #{model[2]}  Errors: #{model[3]}", :error) if model[3]
+              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
-            
-            yield response.json[:success], response.json[:message], response.json[:saved_models]  if block
+
+            yield response.json[:success], response.json[:message], response.json[:models]  if block
             promise.resolve response.json
             
-            backing_records.each { |item| backing_records[item[0]].saved! } if response.json(:success)
-            
+            backing_records.each { |id, record| record.saved! } if response.json(:success)
+          rescue Exception => e
+            puts "whahhh #{e}"
+          end
           end
           promise
         else
@@ -329,7 +332,7 @@ module ReactiveRecord
             unless model.frozen? 
               saved = model.check_permission_with_acting_user(acting_user, new_models.include?(model) ? :create_permitted? : :update_permitted?).save
               has_errors ||= !saved
-              [reactive_record_id, model.class.name, model.attributes, (saved ? nil : model.errors.full_messages)]
+              [reactive_record_id, model.class.name, model.attributes, (saved ? nil : model.errors.messages)]
             end
           end.compact
           

data/lib/reactive_record/server_data_cache.rb

@@ -211,7 +211,11 @@ module ReactiveRecord
           def as_hash(children = [@ar_object])
             if @parent
               if method == "*"
-                @parent.as_hash({@ar_object.id => children})
+                if @ar_object.is_a? Array  # this happens when a scope is empty there is test case, but
+                  @parent.as_hash({})      # does it work for all edge cases?  
+                else
+                  @parent.as_hash({@ar_object.id => children})
+                end
               elsif @ar_object.class < ActiveRecord::Base and children.is_a? Hash
                 @parent.as_hash({method => children.merge({
                   :id => [@ar_object.id], 

data/lib/reactive_record/version.rb

@@ -1,3 +1,3 @@
 module ReactiveRecord
-  VERSION = "0.7.9"
+  VERSION = "0.7.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reactive-record
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.7.10
 platform: ruby
 authors:
 - Mitch VanDuyn
@@ -155,6 +155,7 @@ files:
 - lib/reactive_record/active_record/associations.rb
 - lib/reactive_record/active_record/base.rb
 - lib/reactive_record/active_record/class_methods.rb
+- lib/reactive_record/active_record/error.rb
 - lib/reactive_record/active_record/instance_methods.rb
 - lib/reactive_record/active_record/reactive_record/base.rb
 - lib/reactive_record/active_record/reactive_record/collection.rb