deferred_associations 0.5.8 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 868bf45a163b6381d3c286bf65251e0b3e6235f6
-  data.tar.gz: 1e12fb0d5b42f22ce07a12f01fe3fab812508779
+  metadata.gz: 36ea01ec9f183372ada7f082fcfedae522768719
+  data.tar.gz: dce7549d0c83be9d0c4e05bc17c939c769d445e9
 SHA512:
-  metadata.gz: 99860be2db82c21a509355252729c0f4b716d1b99e46d2c2203feba4053dc1cc93a758a46d0725fd639c72aaddbe76104f3825e275a5e815bf2e98bdfb46149f
-  data.tar.gz: 216aebba563c6374607036215dec3ee3bc55f1a7d9ccf3863f9cc9aa4c8327571696998567594d05b219df6455ed9888d186e94e334f7b4e18f0a9284fa6926e
+  metadata.gz: d215d8fbdde1bdd5c7011521e3bd86e7f48ae9f10177977f3e8ef1eec412db2ed3cb566e02fde7356a5b9407ad43dc88d1cdbe1e41f3cfe8971c4a9fc6809a15
+  data.tar.gz: 537f53870f1ab7baa2de4d06552971c9465c0cf376d4208b6528529ae02b3dfdfc7cd368cb54b2995c198613291f15fb8f61e1aaa57d8889b9115aa6f7ae87e8

data/CHANGELOG

@@ -1,3 +1,21 @@
+0.6.3
+=====
+* Revert Changes form 0.6.1/0.6.2
+  - Keeping track of all array changes would be very clumsy, especially when dealling with :pop, :keep_if, :<< and so
+  on and so forth.
+  - The application has to deal with it for itself
+
+0.6.2
+=====
+* Changes hash include the name of the association instead of their ids ("people" instead of "person_ids")
+* Changes hash (and updated_at field) is only set, if the association is really changed
+
+0.6.1
+=====
+* setting an association will now result in model.changed? to be true.
+  Also model.changes will include the old attribute key with the old value.
+  This allows the :autosave option on associated objects to work correctly.
+
 0.5.8
 =====
 * fix preloading of HABTM associations in ActiveRecord >= 4.0

data/Readme.markdown

@@ -11,35 +11,42 @@ How to install
 Usage
 =====
 
-    class Room < ActiveRecord::Base
-      has_and_belongs_to_many_with_deferred_save :people
-      has_many_with_deferred_save :tables
-
-      validate :usage
-      before_save :check_change
-
-      def usage
-        if people.size > 30
-          errors.add :people, "There are too many people in this room"
-        end
-        if tables.size > 15
-          errors.add :tables, "There are too many tables in this room"
-        end
-        # Neither people nor tables are saved to the database, if a validation error is added
-      end
-
-      def check_change
-        # you can check, if there were changes to the association
-        if people != people_without_deferred_save
-          self.updated_at = Time.now.utc
-        end
-      end
+```ruby
+class Room < ActiveRecord::Base
+  has_and_belongs_to_many_with_deferred_save :people
+  has_many_with_deferred_save :tables
+
+  validate :usage
+  before_save :check_change
+
+  def usage
+    if people.size > 30
+      errors.add :people, "There are too many people in this room"
     end
+    if tables.size > 15
+      errors.add :tables, "There are too many tables in this room"
+    end
+    # Neither people nor tables are saved to the database, if a validation error is added
+  end
+
+  def check_change
+    # you can check, if there were changes to the association
+    if people != people_without_deferred_save
+      self.update_some_relation_data(people)
+    end
+    
+    # you can also use the rails-internal changes hash
+    if changes.include?("people")
+      self.do_stuff!
+    end
+  end
+end
+```
 
 Compatibility
 =============
 
-Tested with Rails 2.3.18, 3.2.22, 4.1.14, 4.2.5 on Ruby 1.9.3, 2.2.4, 2.3.0 and JRuby 1.7, JRuby 9.0.5.0
+Tested with Rails 2.3.18, 3.2.22, 4.1.14, 4.2.5 on Ruby 1.9.3, 2.2.4, 2.3.1 and JRuby 1.7, JRuby 9.1.0.0
 
 Note, that Rails 3.2.14 associations are partly broken under JRuby cause of https://github.com/rails/rails/issues/11595
 You'll need to upgrade activerecord-jdbc-adapter to >= 1.3.0.beta1, if you want to use this combination.
@@ -47,21 +54,45 @@ You'll need to upgrade activerecord-jdbc-adapter to >= 1.3.0.beta1, if you want
 Gotchas
 =======
 
-Be aware, that the habtm association objects sometimes asks the database instead of giving you the data directly from the array. So you can get something
+1. Be aware, that the habtm association objects sometimes asks the database instead of giving you the data directly from the array. So you can get something
 like
 
+    ```ruby
     room = Room.create
     room.people << Person.create
     room.people.first # => nil, since the DB doesn't have the association saved yet
+    ```
 
-
-Also it is good to know, that the array you set to an association is stored there directly, so after setting a list, the typical association
+2. Also it is good to know, that the array you set to an association is stored there directly, so after setting a list, the typical association
 methods are not working:
 
+    ```ruby
     room = Room.create
     room.people.klass   # => Person
     room.people = [Person.first]
     room.people.klass   # => undefined method klass for #Array:0x007fa3b9efc2c0`
+    ```
+    
+3. If the association is changed, it's name is stored in the changes hash. Therefore, updated_at of the containing record will be set on the next update.
+   If an association is updated with the same array again, if will not be marked as changed. But if the order is changed, it will be marked!
+   
+   ```ruby
+   people = [Person.create, Person.create]
+   room = Room.create
+   room.people = [people.first, people.second]
+   room.changed? # => true
+   room.save!
+   
+   room.people = [people.first, people.second]
+   room.changed? # => false
+   room.save!
+   room.updated_at # => is still the same as above
+   
+   room.people = [people.second, people.first]
+   room.changed? # => true
+   room.save!
+   room.updated_at # => got touched!
+   ```
 
 Bugs
 ====

data/VERSION

@@ -1 +1 @@
-0.5.8
+0.6.3

data/bin/run_all_specs

@@ -0,0 +1,25 @@
+#!/bin/sh
+
+DIR=`pwd`
+
+if [[ $DIR == *bin ]]; then
+ cd ..
+fi
+
+echo "Your ruby version: "
+echo `ruby -v`
+
+ls -c gemfiles/*.gemfile | while read line
+do
+
+  echo "Run Spec for gemfile: $line"
+  export BUNDLE_GEMFILE=$line
+  bundle install
+  bundle exec rspec
+  echo ""
+  echo ""
+  echo ""
+  echo "========="
+done
+
+unset BUNDLE_GEMFILE

data/deferred_associations.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = 'deferred_associations'
-  s.version = '0.5.8'
+  s.version = '0.6.3'
 
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.authors = ['Martin Koerner', 'Tyler Rick', 'Alessio Caiazza']
-  s.date = '2016-03-08'
+  s.date = '2016-05-13'
   s.description = "Makes ActiveRecord defer/postpone saving the records you add to an habtm (has_and_belongs_to_many) or has_many\n                       association until you call model.save, allowing validation in the style of normal attributes. Additionally you\n                       can check inside before_save filters, if the association was altered."
   s.email = 'martin.koerner@objectfab.de'
   s.licenses = 'MIT'
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
     'VERSION',
     'deferred_associations.gemspec',
     'init.rb',
+    'bin/run_all_specs',
     'lib/array_to_association_wrapper.rb',
     'lib/deferred_associations.rb',
     'lib/has_and_belongs_to_many_with_deferred_save.rb',

data/lib/has_and_belongs_to_many_with_deferred_save.rb

@@ -79,10 +79,11 @@ module ActiveRecord
 
           send "use_original_collection_reader_behavior_for_#{collection_name}=", true
           send("initialize_unsaved_#{collection_name}") if send("unsaved_#{collection_name}").nil?
+
+          # vv This is where the actual save occurs vv
           send "#{collection_name}_without_deferred_save=", send("unsaved_#{collection_name}")
-          # /\ This is where the actual save occurs.
-          send "use_original_collection_reader_behavior_for_#{collection_name}=", false
 
+          send "use_original_collection_reader_behavior_for_#{collection_name}=", false
           true
         end
         after_save "do_#{collection_name}_save!"

data/lib/has_many_with_deferred_save.rb

@@ -3,6 +3,7 @@ module ActiveRecord
     module ClassMethods
       def has_many_with_deferred_save(*args)
         collection_name = args[0].to_s
+        collection_singular_ids = "#{collection_name.singularize}_ids"
 
         return if method_defined?("#{collection_name}_with_deferred_save")
 
@@ -14,18 +15,19 @@ module ActiveRecord
 
         after_save "hmwds_update_#{collection_name}"
 
-        define_obj_setter    collection_name
+        define_obj_setter    collection_name, collection_singular_ids
         define_obj_getter    collection_name
-        define_id_setter     collection_name
-        define_id_getter     collection_name
+        define_id_setter     collection_name, collection_singular_ids
+        define_id_getter     collection_name, collection_singular_ids
 
         define_update_method collection_name
         define_reload_method collection_name
       end
 
-      def define_obj_setter(collection_name)
+      def define_obj_setter(collection_name, collection_singular_ids)
         define_method("#{collection_name}_with_deferred_save=") do |objs|
           instance_variable_set "@hmwds_temp_#{collection_name}", objs || []
+          attribute_will_change!(collection_name) if objs != send("#{collection_name}_without_deferred_save")
         end
 
         method_name = "#{collection_name}="
@@ -56,10 +58,9 @@ module ActiveRecord
         alias_method_chain collection_name, :deferred_save
       end
 
-      def define_id_setter(collection_name)
+      def define_id_setter(collection_name, collection_singular_ids)
         # only needed for ActiveRecord >= 3.0
         if ActiveRecord::VERSION::STRING >= '3'
-          collection_singular_ids = "#{collection_name.singularize}_ids"
           define_method "#{collection_singular_ids}_with_deferred_save=" do |ids|
             ids = Array.wrap(ids).reject(&:blank?)
             new_values = send("#{collection_name}_without_deferred_save").klass.find(ids)
@@ -69,8 +70,7 @@ module ActiveRecord
         end
       end
 
-      def define_id_getter(collection_name)
-        collection_singular_ids = "#{collection_name.singularize}_ids"
+      def define_id_getter(collection_name, collection_singular_ids)
         define_method "#{collection_singular_ids}_with_deferred_save" do
           send(collection_name).map { |e| e[:id] }
         end

data/spec/db/schema.rb

@@ -15,6 +15,7 @@ ActiveRecord::Schema.define(version: 1) do
   create_table 'rooms', force: true do |t|
     t.column 'name',              :string
     t.column 'maximum_occupancy', :integer
+    t.column 'updated_at',        :datetime
   end
 
   create_table 'doors_rooms', id: false, force: true do |t|
@@ -35,4 +36,9 @@ ActiveRecord::Schema.define(version: 1) do
     t.column 'name', :string
     t.column 'table_id', :integer
   end
+
+  create_table 'windows', force: true do |t|
+    t.column 'name', :string
+    t.column 'room_id', :integer
+  end
 end

data/spec/models/room.rb

@@ -13,15 +13,13 @@ class Room < ActiveRecord::Base
   has_many_with_deferred_save :tables
   has_many_with_deferred_save :chairs, through: :tables # TODO: test compatibility with through associations
 
-  has_and_belongs_to_many_with_deferred_save :doors
-  has_many_with_deferred_save :tables
 
   before_save :diff_after_module
 
   validate :people_count
 
   def people_count
-    errors.add :people, 'This room has reached its maximum occupancy' if people.size > maximum_occupancy
+    errors.add :people, 'This room has reached its maximum occupancy' if maximum_occupancy && people.size > maximum_occupancy
   end
 
   # Just in case they try to bypass our new accessor and call people_without_deferred_save directly...

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deferred_associations
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.6.3
 platform: ruby
 authors:
 - Martin Koerner
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -54,6 +54,7 @@ files:
 - CHANGELOG
 - Readme.markdown
 - VERSION
+- bin/run_all_specs
 - deferred_associations.gemspec
 - init.rb
 - lib/array_to_association_wrapper.rb