ar-ondemand 1.0.5 → 1.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzFmMGZjYTQyODc2ZDY5ZGFiNzUxYTYyYTVlYzc4ZGZhNGFiMjIwZg==
+    Yzk3YzYxMjU4NmM2MzQ2MDczNWRmM2JjMDkwYzQ1ZTQ3M2E4OWMzMg==
   data.tar.gz: !binary |-
-    MDc4YWY1NjE1YzdhMjM0Njg4NjEyNjgzN2VhNzg5ODdiN2JlZDIxYg==
+    OGQyZDMxNDY3Zjg1YWVmMDcwNDgwNzYwOWQ0NTk0MjkyOTM0MjQ0Ng==
 SHA512:
   metadata.gz: !binary |-
-    NDFhMTAxMWY5OTc5OTEwODRiMzY2MjI1MTg2Y2FhOWZjODRhMTJiOGU0ZjRi
-    MTgzOGM4OTQzOTBkNjM4ZTM3ZDdlZDk2NWYwYjA0NTY0ZjMzNDE0NjY5MzA4
-    NDJlNDAwOTU2YjA5OWEyNTc3MWU1MGZkYjljNjk4YmRmZDBiMGM=
+    NmY1YzAzZjI4MDY5MThhMjc5NjVjZmFiOTE0YjIyMTVlNjE0ZTRhZmM5ZDFi
+    MDVjMGIzNDRkZDJhMjkxMjcwNzY2NjI0MTg1MjBkZDIxZTcxYjJhOWE5ZDcx
+    Y2IxZmFmZDc3NDQ0YWVjYWZkM2E1ZjNmMjU4NThlYjdhNTA2MjM=
   data.tar.gz: !binary |-
-    NzM3YWMyMDM5ZjdiM2Q1ZjhjZjMwMDk2MmJmY2I0ZTkzNTZkZjcxODYzOGFk
-    MjAzZDk2MjFlZWQyMWFkNTc0ZmY2NmM2ZWIzOTI3ZjY3YzJjZTU4ZjQwOWYz
-    ZmI3YTA2OTcyODI1ZmEzZjgyNTM0NjlhMzE2ZDgxMzI4NjY1NGE=
+    ZGM5NzJhYTlhZDg0NGJhNWNjNGRmYzQ2YTc5NTc3Y2ZkYmE4NWI5MTQ0OGE4
+    MThhZTk1NzgyYjc1Njc5OTI5YTA0MjhkODQ0YTAyYzJjOTRlNTA4YWFjYTU0
+    N2E1OWYwM2IyY2FmMTZiZTdhNzkyNWQ5OGQyN2M0OTM0ZTE3ZjQ=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ar-ondemand (1.0.5)
+    ar-ondemand (1.1.0)
       activerecord (>= 3.2)
       activesupport (>= 3.2)
 

data/lib/ar-ondemand/for_reading.rb

@@ -9,7 +9,14 @@ module ActiveRecord
 
       # Ripped from the find_in_batches function, but customized to return an ::ActiveRecord::OnDemand::ResultSet
       def for_reading(options = {})
-        return query(self) if options.empty?
+        if options.empty?
+          res = query_for_reading(self)
+          if block_given?
+            yield res
+            return
+          end
+          return res
+        end
 
         relation = self
 

data/lib/ar-ondemand/on_demand.rb

@@ -10,8 +10,8 @@ module ActiveRecord
       def initialize(model, results, key_column, defaults)
         super(model, results)
 
-        raise "Key column cannot be blank." if key_column.blank?
-        raise "Defaults cannot be empty." if defaults.empty?
+        raise 'Key column cannot be blank.' if key_column.blank?
+        raise 'Defaults cannot be empty.' if defaults.empty?
 
         @key_column = key_column.to_s
         @defaults = defaults
@@ -26,16 +26,30 @@ module ActiveRecord
       end
 
       def [](key)
-        raise "Search key cannot be blank." if key.blank?
+        raise 'Search key cannot be blank.' if key.blank?
         rec = @results.rows.find { |x| x[@key_index] == key }
         if rec.nil?
-          if @has_any_assets
-            args = @defaults.values + [key]
-            @model.unscoped.send(@find_by_method, *args)
-          else
-            @new_params[@key_column.to_sym] = key
-            @model.new @new_params
+          rec = if @has_any_assets
+                  args = @defaults.values + [key]
+                  @model.unscoped.send(@find_by_method, *args)
+                else
+                  @new_params[@key_column.to_sym] = key
+                  @model.new @new_params
+                end
+
+          unless rec.persisted?
+            # These are not getting initialized for some reason, so set using what is passed in
+            @defaults.each_pair do |k, v|
+              meth = k.to_s
+              rec.send("#{meth[0...-3]}=", v) if meth.end_with? '_id'
+            end
+            # This helps prevent a lookup into the db when we know there couldn't be any data yet
+            @model.reflections.select { |_, v| v.macro == :has_and_belongs_to_many }.keys.each do |r|
+              rec.send("#{r}=", [])
+            end
           end
+
+          rec
         else
           ::ActiveRecord::OnDemand::Record.new convert_to_hash(rec), @model, @defaults
         end

data/lib/ar-ondemand/record.rb

@@ -19,15 +19,26 @@ module ActiveRecord
         key = meth.to_s
         if @record.include? key
           @changes.include?(key) ? @changes[key] : @record[key]
-        elsif key.end_with?('=') && @record.include?(key[0...-1])
+        elsif key.end_with?('=') && (@record.include?(key[0...-1]) || @record.include?("#{key[0...-1]}_id"))
           raise ActiveRecord::ReadOnlyRecord if is_readonly?
           key = key[0...-1]
           unless key == 'id'
-            if @record[key] != args[0]
-              return if @record[key] == 1 && args[0] == true
-              return if @record[key] == 0 && args[0] == false
-              return if args[0].is_a?(Time) && !@record[key].blank? && @record[key].to_time.to_i == args[0].to_i
-              @changes[key] = args[0]
+            val = args[0]
+            passing_in_model = false
+            # Support `model.foo_bar=<instance>` along with `model.foo_bar_id=<int>`
+            if @record.include?("#{key}_id")
+              passing_in_model = true
+              key_model = key
+              key = "#{key}_id"
+              val_model = val
+              val = val.id unless val.nil?
+            end
+            if @record[key] != val
+              return if @record[key] == 1 && val == true
+              return if @record[key] == 0 && val == false
+              return if val.is_a?(Time) && !@record[key].blank? && @record[key].to_time.to_i == val.to_i
+              @changes[key] = val
+              @changes[key_model] = val_model if passing_in_model
             else
               # If they changed it, then reverted back, remove from @changes
               @changes.delete key
@@ -54,7 +65,6 @@ module ActiveRecord
       def save
         raise ActiveRecord::ReadOnlyRecord if is_readonly?
         return nil if @changes.empty?
-        # logger.debug "Loading model to store changes: #{@changes}"
         rec = @model.allocate.init_with('attributes' => @record)
         @changes.each_pair do |key, val|
           next if key == 'id'

data/lib/ar-ondemand/version.rb

@@ -1,3 +1,3 @@
 module ArOnDemand
-  VERSION = '1.0.5'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar-ondemand
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Steve Frank
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: ActiveRecord On-demand