ar_merge 0.3.0 → 0.3.1

data/.travis.yml

@@ -8,6 +8,8 @@ gemfile:
   - gemfiles/activerecord_4.0.gemfile
 matrix:
   exclude:
+    - rvm: 1.8.7
+      gemfile: gemfiles/activerecord_4.0.gemfile
     - rvm: 2.0
-      gemfile: gemfiles/activerecord-2.3.gemfile
+      gemfile: gemfiles/activerecord_2.3.gemfile
 script: "rake spec"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ar_merge (0.3.0)
+    ar_merge (0.3.1)
       activerecord
 
 GEM

data/Readme.md

@@ -37,10 +37,6 @@ Merge duplicates
 User.merge_duplicates!(User.find_all_by_status('new')) , :compare=>:email)
 ```
 
-TODO
-====
- - 1 counter test fails on rails 4 (search for pending)
-
 AUTHOR
 ======
 [Michael Grosser](grosser.it)</br>

data/gemfiles/activerecord_2.3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/ar_merge
   specs:
-    ar_merge (0.2.0)
+    ar_merge (0.3.0)
       activerecord
 
 GEM

data/gemfiles/activerecord_3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/ar_merge
   specs:
-    ar_merge (0.2.0)
+    ar_merge (0.3.0)
       activerecord
 
 GEM

data/gemfiles/activerecord_4.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/ar_merge
   specs:
-    ar_merge (0.2.0)
+    ar_merge (0.3.0)
       activerecord
 
 GEM

data/lib/ar_merge.rb

@@ -9,14 +9,14 @@ module ARMerge
 
       #merge associations
       (options[:associations]||[]).each do |association_name|
-        other.send(association_name).each do |associated|
-          send(association_name) << associated
-        end
+        send(association_name).concat other.send(association_name)
 
-        #update counters, this is very basic/hacky/not secure for customized counters...
-        counter = "#{association_name}_count"
-        next unless other.respond_to?(counter) and respond_to?("#{counter}=")
-        self.class.update_counters(id, counter => other.send(counter))
+        if ActiveRecord::VERSION::MAJOR < 4
+          #update counters, this is very basic/hacky/not secure for customized counters...
+          counter = "#{association_name}_count"
+          next unless other.respond_to?(counter) and respond_to?("#{counter}=")
+          self.class.update_counters(id, counter => other.send(counter))
+        end
       end
 
       #merge attributes

data/lib/ar_merge/version.rb

@@ -1,3 +1,3 @@
 module ARMerge
-  VERSION = Version = '0.3.0'
+  VERSION = Version = '0.3.1'
 end

data/spec/ar_merge_spec.rb

@@ -7,7 +7,7 @@ describe ARMerge do
       @u2 = User.create!(:name=>'y')
     end
 
-    describe :removal do
+    describe "removal" do
       it "removes the merged user" do
         @user.merge!(@u2)
         lambda{@u2.reload}.should raise_error(ActiveRecord::RecordNotFound)
@@ -19,7 +19,7 @@ describe ARMerge do
       end
     end
 
-    describe :attributes do
+    describe "attributes" do
       it "merges and overtakes attributes" do
         @user.name = ''
         @user.merge!(@u2,:attributes=>['name'])
@@ -32,7 +32,7 @@ describe ARMerge do
       end
     end
 
-    describe :associations do
+    describe "associations" do
       before do
         Movie.delete_all
         @user.movies << Movie.new
@@ -50,7 +50,6 @@ describe ARMerge do
       end
 
       it "keeps counters in sync" do
-        pending if ActiveRecord::VERSION::MAJOR == 4
         user, merged_user = CountingUser.create!, CountingUser.create!
         user.movies_count.should == 0
         merged_user.movies << Movie.new
@@ -105,6 +104,5 @@ describe ARMerge do
     ARMerge::VERSION.should_not == ActiveRecord::VERSION
     defined?(ActiveRecord::Version).should == nil
     defined?(ActiveRecord::Base::Version).should == nil
-    defined?(ActiveRecord::Base::VERSION).should == nil
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar_merge
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2013-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -66,7 +66,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2239147174191176291
+      hash: -3638300009276460742
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2239147174191176291
+      hash: -3638300009276460742
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25