active_merge 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a852fec8deb9d07be3fc9c377d1094a12a3574c
-  data.tar.gz: 9dc95d04b550e50ffbf1250c11ee578a35c60729
+  metadata.gz: 8bde8bd1023ad75735b0b43d1590a3c5c850f1de
+  data.tar.gz: 59c0323922f36d6a90a261c47ecedf28fc054a5a
 SHA512:
-  metadata.gz: 2c57dcfd9df06c76630812169fc38e815b059b33e23b6f9c623eb3324469177ed4f41384ac5eda12ed199e82770b5a4f0bbbcb3c55d239b7b946e6e364edfaf7
-  data.tar.gz: 5a606c8a1aa4ade555780ecad0dee9e303ae76b3a05c118ce42150b4b8d46485ab82009aa3762d52380110772d6d6fca16828db7380e8b9e4177a803a63d1c65
+  metadata.gz: 0ee977c4db6b5322463aa3b2d5c044c117d89c17a348f690f2e0ddeac8901ebb1eff7427b553f0ed9ac350f0e06a9f410d5f9a1a5407e7f7a81b7a51c8daca65
+  data.tar.gz: a6876cd10e845f2abb6e34696652b45f69740b517dcf3259c8184c3e373e3ccbdca6ef3e69f1a97d54c2ec47273b002fbd1ffdc3dc88e5a8a1d7379e39b7ad23

data/CHANGELOG.rdoc

@@ -1,5 +1,27 @@
 = Список изменений в версиях
 
+== v.1.2.0
+
+* Rebinding algorithm was changed. Now the links saved AFTER the second record
+  destroyed.
+
+=== Why (example)
+
+Suppose we have named items and their synonyms:
+* a synonym can be identical to the item (item "John" can have both "JONH" and
+  "John" in synonyms).
+* a synonym cannot be equal to another item's name (if the "John" item
+  exists, the "John" cannot be added as a synonym to the "john" item).
+
+Right algorithm of rebinding is:
+* at first, the "John" synonym linked to the "john" item without saving to db;
+* then the "John" item is deleted;
+* at last, the "John" synonym (linked to "john" item) is saved to db.
+
+== v.1.1.0
+
+* Skipping validation added
+
 == v.1.0.4
 
 * The gem is allowed to use with rails 4.1

data/lib/active_merge/service.rb

@@ -77,7 +77,7 @@ module ActiveMerge
   #
   # You can use the <tt>validate: false</tt> option.
   #
-  # With this option set any activerecord validation and callback are skipped.
+  # With this option set any activerecord validation and callback skipped.
   #
   #     Service.new(Kingdom.all).provide validate: false
   #

data/lib/active_merge/simple_service.rb

@@ -14,65 +14,58 @@ module ActiveMerge
     include ActiveModel::Validations
 
     def initialize(first, second)
-
-      if first.class.ancestors.include?(ActiveRecord::Base) && first.persisted?
-        @first = first
-      end
-
-      if @first && (second.class == @first.class) && second.persisted?
-        @second = second
-      end
+      @klass  = first.class
+      return unless klass.ancestors.include?(ActiveRecord::Base) &&
+        second.is_a?(klass) && first.persisted? && second.persisted?
+      @first, @second = first, second
+      @links  = find_links
     end
-    attr_reader :first, :second
+    attr_reader :klass, :first, :second, :links
 
-    validates :second, presence: true
+    validates :first, :second, presence: true
 
-    def provide(options = {})
+    def provide(validate: true)
       transaction do
-        Links.new(second).each { |item, key| rebind(item, key, options) }
-        remove(options)
+        remove_second! validate
+        save_links! validate
       end
     end
 
     private
 
-      # Initializes a hash, whose keys are instances linked to given one,
-      # and their values are names of methods for linking to another object.
-      class Links
-        class << self
-
-          def new(item)
-            @item = item
-            return hash
-          end
-
-          # Returns a hash whose keys are "has_many" associations' names
-          # and their values are corresponding foreign keys
-          def refs
-            @item.class.reflect_on_all_associations(:has_many).
-              inject({}){ |hash, item| hash.merge(item.name => item.foreign_key) }
-          end
-
-          def hash
-            @hash = {}
-            refs.each do |name, foreign_key|
-              @item.send(name).each{ |item| @hash[item] = "#{ foreign_key }=" }
-            end
-            @hash
+      # Finds links to the second record and rebinds it to the first one.
+      # Doesn't validate and save links yet!
+      def find_links
+        return [] unless first && second
+        klass.reflect_on_all_associations(:has_many).inject([]) do |arr, item|
+          arr + second.send(item.name).map do |link|
+            link.send "#{ item.foreign_key }=", first.id
+            link
           end
         end
       end
 
-      # Deletes or destroys second object
-      def remove(validate: true)
-        change(second) { validate ? second.destroy! : second.delete }
-      end
+      # Removes the second record.
+      # Any errors are moved to the service.
+      def remove_second!(validate)
+        begin
+          validate ? second.destroy! : second.delete
+        rescue => error
+          second.errors.each{ |_, message| errors.add :second, message }
+          raise error
+        end
+      end    
 
-      # Re-assigns given object to the #first
-      def rebind(item, key, options)
-        change item do
-          item.send key, first.id
-          item.save! options
+      # Saves changed links.
+      # Any errors are moved to the service.
+      def save_links!(validate)
+        links.each do |link|
+          begin
+            validate ? link.save! : link.save(validate: false)
+          rescue => error
+            link.errors.each{ |_, message| errors.add :base, message }
+            raise error
+          end
         end
       end
   end

data/lib/active_merge/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerge
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/spec/active_merge/service_spec.rb

@@ -147,9 +147,9 @@ module ActiveMerge
       let!(:men)     { lords.map{ |lord| lord.men.create! }}
       let!(:service) { Service.new lords }
       
-      context "if :validate option isn't set" do
+      context "(validate: true)" do
 
-        context "and no exceptions raised:" do
+        context "if no exceptions raised:" do
 
           it "merges the objects" do
             service.provide
@@ -159,7 +159,7 @@ module ActiveMerge
           end
         end
 
-        context "and the service's own validation returns false:" do
+        context "if service validation fails" do
 
           before { service.stub(:valid?).and_return false }
 
@@ -174,7 +174,7 @@ module ActiveMerge
           end
         end
 
-        context "and a validation returns false when rebinding a link:" do
+        context "if a link validation fails" do
 
           before do
             Man.any_instance.stub(:valid?).and_return false
@@ -197,7 +197,7 @@ module ActiveMerge
           end
         end
 
-        context "and a callback returns false when destroying an object:" do
+        context "if a destroy fails" do
 
           before do
             Lord.before_destroy(){ false }
@@ -222,9 +222,9 @@ module ActiveMerge
         end
       end
 
-      context "if :validate option is set to false" do
+      context "(validate: false)" do
 
-        context "and no exceptions raised:" do
+        context "if no exceptions raised" do
 
           it "merges the objects" do
             service.provide validate: false
@@ -234,7 +234,7 @@ module ActiveMerge
           end
         end
 
-        context "and a validation returns false when rebinding a link:" do
+        context "if a link validation fails" do
 
           before do
             Man.any_instance.stub(:valid?).and_return false
@@ -249,7 +249,7 @@ module ActiveMerge
           end
         end
 
-        context "and a callback returns false when destroying an object:" do
+        context "if destroy validation fails" do
 
           before do
             Lord.before_destroy(){ false }
@@ -265,7 +265,7 @@ module ActiveMerge
           end
         end
 
-        context "and the service's own validation returns false:" do
+        context "if service validation fails" do
 
           before { service.stub(:valid?).and_return false }
 
@@ -280,10 +280,10 @@ module ActiveMerge
           end
         end
 
-        context "and db recording fails when rebinding a link:" do
+        context "if a db request fails" do
 
           before do
-            Man.any_instance.stub(:save!){ fail }
+            Man.any_instance.stub(:save){ fail }
             Man.any_instance.stub(:errors).and_return({ base: "record_invalid" })
           end
 

data/spec/active_merge/simple_service_spec.rb

@@ -48,6 +48,23 @@ module ActiveMerge
       end
     end
 
+    describe "#links" do
+
+      let!(:lords)  { 2.times.map{ Lord.create }}
+      let!(:domain) { lords.last.domains.create! }
+      let!(:man)    { lords.last.men.create! }
+      let!(:service){ SimpleService.new lords.first, lords.last }
+
+      it "contains links rebinded from the second record to the first one" do
+        links = service.links
+        links.should include(domain)
+        links.should include(man)
+        service.links.each do |link|
+          link.lord_id.should eq lords.first.id
+        end
+      end
+    end
+
     describe "#valid?" do
 
       it "возвращает true если #second инициализирован" do

data/spec/dummy/log/development.log

@@ -36,3 +36,239 @@ Migrating to CreateDomains (20140416183059)
             FROM sqlite_temp_master
             WHERE name='index_men_on_lord_id' AND type='index'
 
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction