reactive-record 0.7.36 → 0.7.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71c7a7abb7ea51cdb5f5139725724b0a1cd773fd
-  data.tar.gz: c1d222084866c7aa0f8b3f77d495825b504f3e35
+  metadata.gz: b36c2c16110af0053cb7aae2d944d968f53874f7
+  data.tar.gz: 2d2c5b526e8f1fa9e95573abcd582c841141071e
 SHA512:
-  metadata.gz: 0332dfa333ea3344e970d4b37c24a1ff9703823c5f53c645754de0b815a4254655f5da7dc15b3c0dbbd33b8adc522815395e6871d4eb61b826f9d16d5034125a
-  data.tar.gz: 1262dc1375cbbc0f423dde4d4e181bc69b2c44acad615944fd8833cd29efac2f6cb5d2338daa6f8b12b017cac75f4a93dd5b78cebdf0c032b5ec382c4e84177b
+  metadata.gz: 3efaf62ea05058f8324d078aadc0f72ab40e8da49574767321705458337cb46307cd89117352d454bbc18d3d28c881f96cc3569d59f2dc3b469ef338e76ff53f
+  data.tar.gz: 4f3ee324e78faad0e77b5d2647a8025267608784a79e13cc85b81b5b21fb13a85e714115933f71dc58abdf1388684410e24ef0d90e33f73c5c5e3aa43edd76f1

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

@@ -371,154 +371,148 @@ module ReactiveRecord
       end
 
       def self.save_records(models, associations, acting_user, validate, save)
-
-        ReactiveRecord::Pry.rescue do
-          begin
-
-            reactive_records = {}
-            vectors = {}
-            new_models = []
-            saved_models = []
-            dont_save_list = []
-
-            models.each do |model_to_save|
-              attributes = model_to_save[:attributes]
-              model = Object.const_get(model_to_save[:model])
-              id = attributes.delete(model.primary_key) if model.respond_to? :primary_key # if we are saving existing model primary key value will be present
-              vector = model_to_save[:vector]
-              vector = [vector[0].constantize] + vector[1..-1].collect do |method|
-                if method.is_a?(Array) and method.first == "find_by_id"
-                  ["find", method.last]
-                else
-                  method
+        reactive_records = {}
+        vectors = {}
+        new_models = []
+        saved_models = []
+        dont_save_list = []
+
+        models.each do |model_to_save|
+          attributes = model_to_save[:attributes]
+          model = Object.const_get(model_to_save[:model])
+          id = attributes.delete(model.primary_key) if model.respond_to? :primary_key # if we are saving existing model primary key value will be present
+          vector = model_to_save[:vector]
+          vector = [vector[0].constantize] + vector[1..-1].collect do |method|
+            if method.is_a?(Array) and method.first == "find_by_id"
+              ["find", method.last]
+            else
+              method
+            end
+          end
+          reactive_records[model_to_save[:id]] = vectors[vector] = record = find_record(model, id, vector, save)
+          if record and record.respond_to?(:id) and record.id
+            # we have an already exising activerecord model
+            keys = record.attributes.keys
+            attributes.each do |key, value|
+              if keys.include? key
+                record[key] = value
+              elsif !value.nil? and aggregation = record.class.reflect_on_aggregation(key.to_sym) and !(aggregation.klass < ActiveRecord::Base)
+                aggregation.mapping.each_with_index do |pair, i|
+                  record[pair.first] = value[i]
                 end
+              elsif record.respond_to? "#{key}="
+                record.send("#{key}=",value)
+              else
+                # TODO once reading schema.rb on client is implemented throw an error here
               end
-              reactive_records[model_to_save[:id]] = vectors[vector] = record = find_record(model, id, vector, save)
-              if record and record.respond_to?(:id) and record.id
-                # we have an already exising activerecord model
-                keys = record.attributes.keys
-                attributes.each do |key, value|
-                  if keys.include? key
-                    record[key] = value
-                  elsif !value.nil? and aggregation = record.class.reflect_on_aggregation(key.to_sym) and !(aggregation.klass < ActiveRecord::Base)
-                    aggregation.mapping.each_with_index do |pair, i|
-                      record[pair.first] = value[i]
-                    end
-                  elsif record.respond_to? "#{key}="
-                    record.send("#{key}=",value)
-                  else
-                    # TODO once reading schema.rb on client is implemented throw an error here
-                  end
-                end
-              elsif record
-                # either the model is new, or its not even an active record model
-                dont_save_list << record unless save
-                keys = record.attributes.keys
-                attributes.each do |key, value|
-                  if keys.include? key
-                    record[key] = value
-                  elsif !value.nil? and aggregation = record.class.reflect_on_aggregation(key) and !(aggregation.klass < ActiveRecord::Base)
-                    aggregation.mapping.each_with_index do |pair, i|
-                      record[pair.first] = value[i]
-                    end
-                  elsif key.to_s != "id" and record.respond_to?("#{key}=")  # server side methods can get included and we won't be able to write them...
-                    # for example if you have a server side method foo, that you "get" on a new record, then later that value will get sent to the server
-                    # we should track better these server side methods so this does not happen
-                    record.send("#{key}=",value)
-                  end
+            end
+          elsif record
+            # either the model is new, or its not even an active record model
+            dont_save_list << record unless save
+            keys = record.attributes.keys
+            attributes.each do |key, value|
+              if keys.include? key
+                record[key] = value
+              elsif !value.nil? and aggregation = record.class.reflect_on_aggregation(key) and !(aggregation.klass < ActiveRecord::Base)
+                aggregation.mapping.each_with_index do |pair, i|
+                  record[pair.first] = value[i]
                 end
-                new_models << record
+              elsif key.to_s != "id" and record.respond_to?("#{key}=")  # server side methods can get included and we won't be able to write them...
+                # for example if you have a server side method foo, that you "get" on a new record, then later that value will get sent to the server
+                # we should track better these server side methods so this does not happen
+                record.send("#{key}=",value)
               end
             end
+            new_models << record
+          end
+        end
 
-            #puts "!!!!!!!!!!!!!!attributes updated"
-            ActiveRecord::Base.transaction do
-              associations.each do |association|
-                parent = reactive_records[association[:parent_id]]
-                next unless parent
-                #parent.instance_variable_set("@reactive_record_#{association[:attribute]}_changed", true) remove this????
-                if parent.class.reflect_on_aggregation(association[:attribute].to_sym)
-                  #puts ">>>>>>AGGREGATE>>>> #{parent.class.name}.send('#{association[:attribute]}=', #{reactive_records[association[:child_id]]})"
-                  aggregate = reactive_records[association[:child_id]]
-                  dont_save_list << aggregate
-                  current_attributes = parent.send(association[:attribute]).attributes
-                  #puts "current parent attributes = #{current_attributes}"
-                  new_attributes = aggregate.attributes
-                  #puts "current child attributes = #{new_attributes}"
-                  merged_attributes = current_attributes.merge(new_attributes) { |k, current_attr, new_attr| aggregate.send("#{k}_changed?") ? new_attr : current_attr}
-                  #puts "merged attributes = #{merged_attributes}"
-                  aggregate.assign_attributes(merged_attributes)
-                  #puts "aggregate attributes after merge = #{aggregate.attributes}"
-                  parent.send("#{association[:attribute]}=", aggregate)
-                  #puts "updated  is frozen? #{aggregate.frozen?}, parent attributes = #{parent.send(association[:attribute]).attributes}"
-                elsif parent.class.reflect_on_association(association[:attribute].to_sym).nil?
-                  raise "Missing association :#{association[:attribute]} for #{parent.class.name}.  Was association defined on opal side only?"
-                elsif parent.class.reflect_on_association(association[:attribute].to_sym).collection?
-                  #puts ">>>>>>>>>> #{parent.class.name}.send('#{association[:attribute]}') << #{reactive_records[association[:child_id]]})"
-                  dont_save_list.delete(parent)
-                  if false and parent.new?
-                    parent.send("#{association[:attribute]}") << reactive_records[association[:child_id]] if parent.new?
-                    #puts "updated"
-                  else
-                    #puts "skipped"
-                  end
-                else
-                  #puts ">>>>ASSOCIATION>>>> #{parent.class.name}.send('#{association[:attribute]}=', #{reactive_records[association[:child_id]]})"
-                  parent.send("#{association[:attribute]}=", reactive_records[association[:child_id]])
-                  dont_save_list.delete(parent)
-                  #puts "updated"
-                end
-              end if associations
-
-              #puts "!!!!!!!!!!!!associations updated"
-
-              has_errors = false
-
-              #puts "ready to start saving... dont_save_list = #{dont_save_list}"
-
-              saved_models = reactive_records.collect do |reactive_record_id, model|
-                #puts "saving rr_id: #{reactive_record_id} model.object_id: #{model.object_id} frozen? <#{model.frozen?}>"
-                if model and (model.frozen? or dont_save_list.include?(model) or model.changed.include?(model.class.primary_key))
-                  # the above check for changed including the private key happens if you have an aggregate that includes its own id
-                  #puts "validating frozen model #{model.class.name} #{model} (reactive_record_id = #{reactive_record_id})"
-                  valid = model.valid?
-                  #puts "has_errors before = #{has_errors}, validate= #{validate}, !valid= #{!valid}  (validate and !valid) #{validate and !valid}"
-                  has_errors ||= (validate and !valid)
-                  #puts "validation complete errors = <#{!valid}>, #{model.errors.messages} has_errors #{has_errors}"
-                  [reactive_record_id, model.class.name, model.attributes,  (valid ? nil : model.errors.messages)]
-                elsif model and (!model.id or model.changed?)
-                  #puts "saving #{model.class.name} #{model} (reactive_record_id = #{reactive_record_id})"
-                  saved = model.check_permission_with_acting_user(acting_user, new_models.include?(model) ? :create_permitted? : :update_permitted?).save(validate: validate)
-                  has_errors ||= !saved
-                  messages = model.errors.messages if (validate and !saved) or (!validate and !model.valid?)
-                  #puts "saved complete errors = <#{!saved}>, #{messages} has_errors #{has_errors}"
-                  [reactive_record_id, model.class.name, model.attributes, messages]
-                end
-              end.compact
+        #puts "!!!!!!!!!!!!!!attributes updated"
+        ActiveRecord::Base.transaction do
+          associations.each do |association|
+            parent = reactive_records[association[:parent_id]]
+            next unless parent
+            #parent.instance_variable_set("@reactive_record_#{association[:attribute]}_changed", true) remove this????
+            if parent.class.reflect_on_aggregation(association[:attribute].to_sym)
+              #puts ">>>>>>AGGREGATE>>>> #{parent.class.name}.send('#{association[:attribute]}=', #{reactive_records[association[:child_id]]})"
+              aggregate = reactive_records[association[:child_id]]
+              dont_save_list << aggregate
+              current_attributes = parent.send(association[:attribute]).attributes
+              #puts "current parent attributes = #{current_attributes}"
+              new_attributes = aggregate.attributes
+              #puts "current child attributes = #{new_attributes}"
+              merged_attributes = current_attributes.merge(new_attributes) { |k, current_attr, new_attr| aggregate.send("#{k}_changed?") ? new_attr : current_attr}
+              #puts "merged attributes = #{merged_attributes}"
+              aggregate.assign_attributes(merged_attributes)
+              #puts "aggregate attributes after merge = #{aggregate.attributes}"
+              parent.send("#{association[:attribute]}=", aggregate)
+              #puts "updated  is frozen? #{aggregate.frozen?}, parent attributes = #{parent.send(association[:attribute]).attributes}"
+            elsif parent.class.reflect_on_association(association[:attribute].to_sym).nil?
+              raise "Missing association :#{association[:attribute]} for #{parent.class.name}.  Was association defined on opal side only?"
+            elsif parent.class.reflect_on_association(association[:attribute].to_sym).collection?
+              #puts ">>>>>>>>>> #{parent.class.name}.send('#{association[:attribute]}') << #{reactive_records[association[:child_id]]})"
+              dont_save_list.delete(parent)
+              if false and parent.new?
+                parent.send("#{association[:attribute]}") << reactive_records[association[:child_id]] if parent.new?
+                #puts "updated"
+              else
+                #puts "skipped"
+              end
+            else
+              #puts ">>>>ASSOCIATION>>>> #{parent.class.name}.send('#{association[:attribute]}=', #{reactive_records[association[:child_id]]})"
+              parent.send("#{association[:attribute]}=", reactive_records[association[:child_id]])
+              dont_save_list.delete(parent)
+              #puts "updated"
+            end
+          end if associations
+
+          #puts "!!!!!!!!!!!!associations updated"
+
+          has_errors = false
+
+          #puts "ready to start saving... dont_save_list = #{dont_save_list}"
+
+          saved_models = reactive_records.collect do |reactive_record_id, model|
+            #puts "saving rr_id: #{reactive_record_id} model.object_id: #{model.object_id} frozen? <#{model.frozen?}>"
+            if model and (model.frozen? or dont_save_list.include?(model) or model.changed.include?(model.class.primary_key))
+              # the above check for changed including the private key happens if you have an aggregate that includes its own id
+              #puts "validating frozen model #{model.class.name} #{model} (reactive_record_id = #{reactive_record_id})"
+              valid = model.valid?
+              #puts "has_errors before = #{has_errors}, validate= #{validate}, !valid= #{!valid}  (validate and !valid) #{validate and !valid}"
+              has_errors ||= (validate and !valid)
+              #puts "validation complete errors = <#{!valid}>, #{model.errors.messages} has_errors #{has_errors}"
+              [reactive_record_id, model.class.name, model.attributes,  (valid ? nil : model.errors.messages)]
+            elsif model and (!model.id or model.changed?)
+              #puts "saving #{model.class.name} #{model} (reactive_record_id = #{reactive_record_id})"
+              saved = model.check_permission_with_acting_user(acting_user, new_models.include?(model) ? :create_permitted? : :update_permitted?).save(validate: validate)
+              has_errors ||= !saved
+              messages = model.errors.messages if (validate and !saved) or (!validate and !model.valid?)
+              #puts "saved complete errors = <#{!saved}>, #{messages} has_errors #{has_errors}"
+              [reactive_record_id, model.class.name, model.attributes, messages]
+            end
+          end.compact
 
-              raise "Could not save all models" if has_errors
+          raise "Could not save all models" if has_errors
 
-              if save
+          if save
 
-                {success: true, saved_models: saved_models }
+            {success: true, saved_models: saved_models }
 
-              else
+          else
 
-                vectors.each { |vector, model| model.reload unless model.nil? or model.new_record? or model.frozen? }
-                vectors
+            vectors.each { |vector, model| model.reload unless model.nil? or model.new_record? or model.frozen? }
+            vectors
 
-              end
+          end
 
-            end
+        end
 
-          rescue Exception => e
-            ReactiveRecord::Pry.rescued(e)
-            if save
-              {success: false, saved_models: saved_models, message: e}
-            else
-              {}
-            end
-          end
+      rescue Exception => e
+        ReactiveRecord::Pry.rescued(e)
+        if save
+          {success: false, saved_models: saved_models, message: e}
+        else
+          {}
         end
       end
 
@@ -567,25 +561,20 @@ module ReactiveRecord
     else
 
       def self.destroy_record(model, id, vector, acting_user)
-
-        ReactiveRecord::Pry.rescue do
-          begin
-            model = Object.const_get(model)
-            record = if id
-              model.find(id)
-            else
-              ServerDataCache.new(acting_user, {})[*vector]
-            end
+        model = Object.const_get(model)
+        record = if id
+          model.find(id)
+        else
+          ServerDataCache.new(acting_user, {})[*vector]
+        end
 
 
-            record.check_permission_with_acting_user(acting_user, :destroy_permitted?).destroy
-            {success: true, attributes: {}}
+        record.check_permission_with_acting_user(acting_user, :destroy_permitted?).destroy
+        {success: true, attributes: {}}
 
-          rescue Exception => e
-            ReactiveRecord::Pry.rescued(e)
-            {success: false, record: record, message: e}
-          end
-        end
+      rescue Exception => e
+        ReactiveRecord::Pry.rescued(e)
+        {success: false, record: record, message: e}
       end
     end
   end

data/lib/reactive_record/pry.rb

@@ -2,16 +2,10 @@ module ReactiveRecord
 
   module Pry
 
-    def self.rescue(&block)
-      if defined? PryRescue
-        ::Pry::rescue &block
-      else
-        block.call
-      end
-    end
-
     def self.rescued(e)
-      ::Pry::rescued(e) if defined?(PryRescue) && !e.is_a?(ReactiveRecord::AccessViolation)
+      if defined?(PryRescue) && e.instance_variable_defined?(:@rescue_bindings) && !e.is_a?(ReactiveRecord::AccessViolation)
+        ::Pry::rescued(e)
+      end
     end
 
   end

data/lib/reactive_record/version.rb

@@ -1,3 +1,3 @@
 module ReactiveRecord
-  VERSION = "0.7.36"
+  VERSION = "0.7.37"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reactive-record
 version: !ruby/object:Gem::Version
-  version: 0.7.36
+  version: 0.7.37
 platform: ruby
 authors:
 - Mitch VanDuyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-16 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails