embeds_many 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba71f51a1cc397e9552e7df72bd48f850f6b94f1
-  data.tar.gz: d2a3a9e1d58f919d9151203c1a742f2cb30046be
+  metadata.gz: 3283d364282e4492da35bb5ab7ceb436641cebc1
+  data.tar.gz: e3b66d7c419d5c3ddd44c3d190a6d96b5ef74757
 SHA512:
-  metadata.gz: 6f28e15a662b00e961dd31a3fc2cd3dafc0e02d4542c7f70244d6338dac273122e518de8a15098f1e63ba2f1230fc15c6d0a3baa91f5df8434310c2c3c04babb
-  data.tar.gz: d348e086153200946b6e644ca9c047c1f2784f7770ecf9a0361b3ce68061638ef4416351b09ed145b07dd66d7e3f9ef0d7712b7ceeb0b054ffaff9711d3cba1b
+  metadata.gz: deca54390c5ed088b1150c68563c3116809161022f8f608aebba17d8cae0b6c96668be0f5581f3e07f0104812d0cfc10e8d18c7008518cbf4e8f82ac9b3ba759
+  data.tar.gz: 30904b474ae33b80e9aa54f5e431bea1c8cacea9af7f3100950df920411d92601251d38e669e7d9818ce7e1b719a4ce3ef912dfcadcadadff968936a9783ce5c

data/README.markdown

@@ -102,6 +102,22 @@ end
 @tag.destroy
 ```
 
+Embedded record are automatically saved on parent save. But invalid embedded records are not auto saved.
+
+``` ruby
+# auto save on parent save
+user = User.new(name: 'test')
+user.tags.new(tag_params)
+
+user.save
+
+# auto save on parent update
+@tag = user.tags.find(params['id'])
+@tag.color = 'red'
+
+user.update(name: 'bob')
+```
+
 ## Development
 
 All pull requests are welcome.

data/lib/embeds_many/base.rb

@@ -10,6 +10,8 @@ module EmbedsMany
           instance_variable_set("@#{field}_collection", ChildrenCollection.new(self, field, child_klass))
       end
 
+      before_save { |parent| parent.send(field).before_parent_save }
+
       child_klass.class_eval(&block) if block
     end
   end

data/lib/embeds_many/child.rb

@@ -22,7 +22,7 @@ module EmbedsMany
 
     class UniquenessValidator < ActiveModel::EachValidator
       def validate_each(record, attribute, value)
-        if record.exists_in_parent? {|item| item.key?(attribute.to_s) && item[attribute.to_s] == value && record.id.to_s != item['id'] }
+        if record.exists_in_parent? {|item| item.key?(attribute.to_s) && item[attribute.to_s] == value && record.id.to_s != item['id'].to_s }
           record.errors.add attribute, "#{value} is already taken"
         end
       end
@@ -48,11 +48,15 @@ module EmbedsMany
     def save
       return false unless self.valid?
 
+      @operation_pending = true
+
       if new_record?
         save_new_record!
       else
         save_existing_record!
       end
+    ensure
+      @operation_pending = false
     end
 
     def destroy
@@ -61,12 +65,18 @@ module EmbedsMany
 
       parent.read_attribute(field_name).delete_if {|t| t['id'] == self.id}
 
-      if parent.save
+      @operation_pending = true
+
+      if parent.update(field_name => parent.read_attribute(field_name))
+        parent.send(field_name).child_destroyed(self)
+
         true
       else
         parent.send "#{field_name}=", parent.send("#{field_name}_was")
         false
       end
+    ensure
+      @operation_pending = false
     end
 
     def update(attrs)
@@ -83,17 +93,39 @@ module EmbedsMany
       parent.read_attribute(field_name).any? &block
     end
 
+    def before_parent_save
+      return if @operation_pending or !self.valid?
+
+      if new_record?
+        fill_parent_field_new_record!
+      else
+        fill_parent_field_existing_record!
+      end
+    end
+
     private
 
-    def save_new_record!
+    def fill_parent_field_new_record!
       @attributes[:id] = generate_id!
 
       # tell rails the field will change
       parent.send "#{field_name}_will_change!"
 
       parent.read_attribute(field_name) << @attributes.to_hash
+    end
 
-      if parent.save
+    def fill_parent_field_existing_record!
+      # tell rails the field will change
+      parent.send "#{field_name}_will_change!"
+
+      record = parent.read_attribute(field_name).detect {|t| t['id'].to_i == self.id.to_i }
+      record.merge!(@attributes)
+    end
+
+    def save_new_record!
+      fill_parent_field_new_record!
+
+      if parent.update(field_name => parent.read_attribute(field_name))
         true
       else
         @attributes.id = nil
@@ -104,13 +136,9 @@ module EmbedsMany
     end
 
     def save_existing_record!
-      # tell rails the field will change
-      parent.send "#{field_name}_will_change!"
-
-      record = parent.read_attribute(field_name).detect {|t| t['id'].to_i == self.id.to_i }
-      record.merge!(@attributes)
+      fill_parent_field_existing_record!
 
-      if parent.save
+      if parent.update(field_name => parent.read_attribute(field_name))
         true
       else
         # restore old value

data/lib/embeds_many/child_collection.rb

@@ -1,7 +1,10 @@
 module EmbedsMany
   class ChildrenCollection
     def new(attrs={})
-      @child_klass.new(attrs.merge(parent: @obj))
+      record = @child_klass.new(attrs.merge(parent: @obj))
+      @created_instances << record
+
+      record
     end
 
     def create(attrs={})
@@ -9,6 +12,8 @@ module EmbedsMany
 
       record.save
 
+      @created_instances << record
+
       record
     end
 
@@ -16,12 +21,18 @@ module EmbedsMany
       @obj = obj
       @field = field
       @child_klass = child_klass
+      @created_instances = []
     end
 
     def find(id)
       attrs = @obj.read_attribute(@field).find {|child| child['id'].to_i == id.to_i }
 
-      attrs && @child_klass.new(attrs.merge(parent: @obj))
+      if attrs
+        record = @child_klass.new(attrs.merge(parent: @obj))
+        @created_instances << record
+
+        record
+      end
     end
 
     # all records
@@ -31,9 +42,19 @@ module EmbedsMany
       end
     end
 
+    # called before parent save
+    def before_parent_save
+      @created_instances.map(&:before_parent_save)
+    end
+
+    # child destroyed
+    def child_destroyed(child)
+      @created_instances.delete(child)
+    end
+
     # pass unhandled message to children array
     def method_missing(symbol, *args, &block)
       all.send(symbol, *args, &block)
     end
   end
-end
+end

data/lib/embeds_many/version.rb

@@ -1,3 +1,3 @@
 module EmbedsMany
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/embeds_many/user_spec.rb

@@ -44,25 +44,92 @@ describe User do
         tag.save.should be_false
         tag.errors[:color].should_not be_empty
       end
+
+      it "should auto save new tags on parent update" do
+        tag = user.tags.new(name: 'bug', color: 'red')
+
+        user.update(name: 'liufengyun')
+
+        user.reload.tags.any? {|t| t.name == 'bug'}.should be_true
+      end
+
+      it "should not auto save invalid new tags on parent update" do
+        tag = user.tags.new(name: 'bug')
+
+        user.save
+
+        user.reload.tags.any? {|t| t.name == 'bug'}.should be_false
+      end
+
+      it "should auto save new tags on parent create" do
+        new_user = User.new(name: 'user')
+        tag = new_user.tags.new(name: 'bug', color: 'red')
+
+        new_user.save
+
+        new_user.reload.tags.any? {|t| t.name == 'bug'}.should be_true
+      end
+
+      it "should not auto save invalid new tags on parent create" do
+        new_user = User.new(name: 'user')
+        tag = new_user.tags.new(name: 'bug')
+
+        new_user.save
+
+        new_user.reload.tags.any? {|t| t.name == 'bug'}.should be_false
+      end
     end
 
+    describe "update" do
+      it "should be able to update record" do
+        tag = user.tags.create(name: 'bug', color: 'red')
+
+        user.reload.tags.any? {|t| t.name == 'bug'}.should be_true
 
-    it "should be able to update record" do
-      tag = user.tags.create(name: 'bug', color: 'red')
+        tag.update(color: 'yellow').should be_true
+
+        user.reload.tags.any? {|t| t.color == 'yellow'}.should be_true
+      end
+
+      it "should auto save tag on parent update" do
+        tag = user.tags.create(name: 'bug', color: 'red')
+        tag.color = 'yellow'
+
+        user.update(name: 'liufengyun')
+
+        user.reload.tags.any? {|t| t.color == 'yellow'}.should be_true
+      end
 
-      user.reload.tags.any? {|t| t.name == 'bug'}.should be_true
+      it "should not auto save invalid tag on parent save" do
+        tag = user.tags.create(name: 'bug', color: 'red')
 
-      tag.update(color: 'yellow').should be_true
+        tag.color = 'yellow'
+        tag.name = ''
 
-      user.reload.tags.any? {|t| t.color == 'yellow'}.should be_true
+        user.update(name: 'liufengyun')
+
+        user.reload.tags.any? {|t| t.color == 'yellow'}.should be_false
+      end
     end
 
-    it "should be able to destroy" do
-      tag = user.tags.create(name: 'bug', color: 'red')
+    describe "destroy" do
+      it "should be able to destroy" do
+        tag = user.tags.create(name: 'bug', color: 'red')
+
+        tag.destroy.should be_true
+
+        user.reload.tags.any? {|t| t.name == 'bug'}.should be_false
+      end
+
+      it "should not be saved on parent save after destroy" do
+        tag = user.tags.create(name: 'bug', color: 'red')
+        tag.destroy
 
-      tag.destroy.should be_true
+        user.update(name: 'liufengyun')
 
-      user.reload.tags.any? {|t| t.name == 'bug'}.should be_false
+        user.reload.tags.any? {|t| t.color == 'yellow'}.should be_false
+      end
     end
+
   end
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: embeds_many
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - liufengyun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-29 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: EmbedsMany allows programmers to work with embedded records the same
@@ -88,9 +88,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.markdown
@@ -114,17 +114,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Embedded records based on the power of PostgreSQL's hstore and array