ar_merge 0.2.0 → 0.3.0

data/.travis.yml

@@ -0,0 +1,13 @@
+rvm:
+  - 1.8.7
+  - 1.9.3
+  - 2.0
+gemfile:
+  - gemfiles/activerecord_2.3.gemfile
+  - gemfiles/activerecord_3.2.gemfile
+  - gemfiles/activerecord_4.0.gemfile
+matrix:
+  exclude:
+    - rvm: 2.0
+      gemfile: gemfiles/activerecord-2.3.gemfile
+script: "rake spec"

data/Appraisals

@@ -0,0 +1,12 @@
+appraise "activerecord_2.3" do
+  gem 'activerecord', '~> 2.3.18', :require => "active_record"
+end
+
+appraise "activerecord_3.2" do
+  gem 'activerecord', '~> 3.2.1', :require => "active_record"
+end
+
+appraise "activerecord_4.0" do
+  gem 'activerecord', '4.0.0.rc1', :require => "active_record"
+end
+

data/Gemfile

@@ -1,6 +1,8 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec
 
 gem 'rake'
 gem 'sqlite3'
 gem 'rspec', '~>2'
+gem 'appraisal'
+gem 'bump'

data/Gemfile.lock

@@ -1,28 +1,32 @@
 PATH
   remote: .
   specs:
-    ar_merge (0.2.0)
+    ar_merge (0.3.0)
       activerecord
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    activemodel (3.2.2)
-      activesupport (= 3.2.2)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activerecord (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.2)
-      i18n (~> 0.6)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
+    appraisal (0.5.2)
+      bundler
+      rake
     arel (3.0.2)
-    builder (3.0.0)
+    builder (3.0.4)
+    bump (0.4.1)
     diff-lcs (1.1.3)
-    i18n (0.6.0)
-    multi_json (1.3.4)
+    i18n (0.6.1)
+    multi_json (1.7.3)
     rake (0.9.2.2)
     rspec (2.9.0)
       rspec-core (~> 2.9.0)
@@ -33,13 +37,15 @@ GEM
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.9.0)
     sqlite3 (1.3.6)
-    tzinfo (0.3.33)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  appraisal
   ar_merge!
+  bump
   rake
   rspec (~> 2)
   sqlite3

data/Rakefile

@@ -1,22 +1,12 @@
+require 'bundler/setup'
 require 'bundler/gem_tasks'
+require 'appraisal'
+require 'bump/tasks'
 
-task :default do
+task :spec do
   sh "rspec spec/"
 end
 
-# extracted from https://github.com/grosser/project_template
-rule /^version:bump:.*/ do |t|
-  sh "git status | grep 'nothing to commit'" # ensure we are not dirty
-  index = ['major', 'minor','patch'].index(t.name.split(':').last)
-  file = 'lib/ar_merge/version.rb'
-
-  version_file = File.read(file)
-  old_version, *version_parts = version_file.match(/(\d+)\.(\d+)\.(\d+)/).to_a
-  version_parts[index] = version_parts[index].to_i + 1
-  version_parts[2] = 0 if index < 2 # remove patch for minor
-  version_parts[1] = 0 if index < 1 # remove minor for major
-  new_version = version_parts * '.'
-  File.open(file,'w'){|f| f.write(version_file.sub(old_version, new_version)) }
-
-  sh "bundle && git add #{file} Gemfile.lock && git commit -m 'bump version to #{new_version}'"
+task :default do
+  sh "bundle exec rake appraisal:install && bundle exec rake appraisal spec"
 end

data/Readme.md

@@ -4,40 +4,46 @@
  - Keeps counters valid
  - Removes merged record
 
-
 INSTALL
 =======
 
-Rails plugin
-
-    rails plugin install git://github.com/grosser/ar_merge.git
-
-OR Gem
-
-    gem install ar_merge
+```Bash
+gem install ar_merge
+```
 
 
 USAGE
 =====
 Merge from outside the model:
 
-    user.merge!(other,:attributes=>user.attributes.keys,:associations=>%w[movies friends])`
+```Ruby
+user.merge!(other,:attributes=>user.attributes.keys,:associations=>%w[movies friends])`
+```
 
 Merge from inside the model
 
-    User < ActiveRecord::Base
-      def merge!(other)
-        super(other,:attributes=>%w[email website])
-      end
-    end
+```Ruby
+User < ActiveRecord::Base
+  def merge!(other)
+    super(other,:attributes=>%w[email website])
+  end
+end
+```
 
 Merge duplicates
 
-    #merge all new users, that have the same email
-    User.merge_duplicates!(User.find_all_by_status('new')) , :compare=>:email)
+```Ruby
+#merge all new users, that have the same email
+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>
 michael@grosser.it</br>
+[![Build Status](https://travis-ci.org/grosser/ar_merge.png)](https://travis-ci.org/grosser/ar_merge)<br/>
 License: MIT

data/gemfiles/activerecord_2.3.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "sqlite3"
+gem "rspec", "~>2"
+gem "appraisal"
+gem "bump"
+gem "activerecord", "~> 2.3.18", :require=>"active_record"
+
+gemspec :path=>"../"

data/gemfiles/activerecord_2.3.gemfile.lock

@@ -0,0 +1,39 @@
+PATH
+  remote: /Users/mgrosser/code/tools/ar_merge
+  specs:
+    ar_merge (0.2.0)
+      activerecord
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activerecord (2.3.18)
+      activesupport (= 2.3.18)
+    activesupport (2.3.18)
+    appraisal (0.5.2)
+      bundler
+      rake
+    bump (0.4.1)
+    diff-lcs (1.2.4)
+    rake (10.0.4)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    sqlite3 (1.3.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 2.3.18)
+  appraisal
+  ar_merge!
+  bump
+  rake
+  rspec (~> 2)
+  sqlite3

data/gemfiles/activerecord_3.2.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "sqlite3"
+gem "rspec", "~>2"
+gem "appraisal"
+gem "bump"
+gem "activerecord", "~> 3.2.1", :require=>"active_record"
+
+gemspec :path=>"../"

data/gemfiles/activerecord_3.2.gemfile.lock

@@ -0,0 +1,52 @@
+PATH
+  remote: /Users/mgrosser/code/tools/ar_merge
+  specs:
+    ar_merge (0.2.0)
+      activerecord
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
+      multi_json (~> 1.0)
+    appraisal (0.5.2)
+      bundler
+      rake
+    arel (3.0.2)
+    builder (3.0.4)
+    bump (0.4.1)
+    diff-lcs (1.2.4)
+    i18n (0.6.1)
+    multi_json (1.7.3)
+    rake (10.0.4)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    sqlite3 (1.3.7)
+    tzinfo (0.3.37)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 3.2.1)
+  appraisal
+  ar_merge!
+  bump
+  rake
+  rspec (~> 2)
+  sqlite3

data/gemfiles/activerecord_4.0.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "sqlite3"
+gem "rspec", "~>2"
+gem "appraisal"
+gem "bump"
+gem "activerecord", "4.0.0.rc1", :require=>"active_record"
+
+gemspec :path=>"../"

data/gemfiles/activerecord_4.0.gemfile.lock

@@ -0,0 +1,60 @@
+PATH
+  remote: /Users/mgrosser/code/tools/ar_merge
+  specs:
+    ar_merge (0.2.0)
+      activerecord
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.0.0.rc1)
+      activesupport (= 4.0.0.rc1)
+      builder (~> 3.1.0)
+    activerecord (4.0.0.rc1)
+      activemodel (= 4.0.0.rc1)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0.rc1)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.2)
+    activesupport (4.0.0.rc1)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    appraisal (0.5.2)
+      bundler
+      rake
+    arel (4.0.0)
+    atomic (1.1.9)
+    builder (3.1.4)
+    bump (0.4.1)
+    diff-lcs (1.2.4)
+    i18n (0.6.4)
+    minitest (4.7.4)
+    multi_json (1.7.3)
+    rake (10.0.4)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    sqlite3 (1.3.7)
+    thread_safe (0.1.0)
+      atomic
+    tzinfo (0.3.37)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (= 4.0.0.rc1)
+  appraisal
+  ar_merge!
+  bump
+  rake
+  rspec (~> 2)
+  sqlite3

data/lib/ar_merge.rb

@@ -2,11 +2,6 @@ require 'ar_merge/version'
 require 'active_record'
 
 module ARMerge
-  def self.included(base)
-    base.extend ClassMethods
-    base.send(:include, InstanceMethods)
-  end
-
   module InstanceMethods
     def merge!(other, options={})
       raise "cannot merge wit a new record" if other.new_record?
@@ -17,7 +12,7 @@ module ARMerge
         other.send(association_name).each do |associated|
           send(association_name) << associated
         end
-        
+
         #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}=")
@@ -54,4 +49,5 @@ module ARMerge
   end
 end
 
-ActiveRecord::Base.send(:include, ARMerge)
+ActiveRecord::Base.send(:include, ARMerge::InstanceMethods)
+ActiveRecord::Base.send(:extend, ARMerge::ClassMethods)

data/lib/ar_merge/version.rb

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

data/spec/ar_merge_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe ARMerge do
-  describe :merge! do
+  describe "#merge!" do
     before do
       @user = User.create!(:name=>'x')
       @u2 = User.create!(:name=>'y')
@@ -50,6 +50,7 @@ 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
@@ -70,7 +71,7 @@ describe ARMerge do
     end
   end
 
-  describe :merge_duplicates! do
+  describe "#merge_duplicates!" do
     before do
       @u1 = User.create!(:name=>'a')
       @u2 = User.create!(:name=>'b')
@@ -99,4 +100,11 @@ describe ARMerge do
   it "has a VERSION" do
     ARMerge::VERSION.should =~ /^\d+\.\d+\.\d+$/
   end
+
+  it "does not mess up activerecord version" 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

data/spec/setup_test_model.rb

@@ -1,10 +1,9 @@
 # connect
-ActiveRecord::Base.configurations = {"test" => {
+ActiveRecord::Schema.verbose = false
+ActiveRecord::Base.establish_connection(
   :adapter => "sqlite3",
-  :database => ":memory:",
-}.with_indifferent_access}
-
-ActiveRecord::Base.establish_connection(:test)
+  :database => ":memory:"
+)
 
 # create tables
 ActiveRecord::Schema.define(:version => 1) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar_merge
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-14 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -33,12 +33,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .travis.yml
+- Appraisals
 - Gemfile
 - Gemfile.lock
 - Rakefile
 - Readme.md
 - ar_merge.gemspec
-- init.rb
+- gemfiles/activerecord_2.3.gemfile
+- gemfiles/activerecord_2.3.gemfile.lock
+- gemfiles/activerecord_3.2.gemfile
+- gemfiles/activerecord_3.2.gemfile.lock
+- gemfiles/activerecord_4.0.gemfile
+- gemfiles/activerecord_4.0.gemfile.lock
 - lib/ar_merge.rb
 - lib/ar_merge/version.rb
 - spec/ar_merge_spec.rb
@@ -59,7 +66,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3854198524710893758
+      hash: -2239147174191176291
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -68,10 +75,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3854198524710893758
+      hash: -2239147174191176291
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Merge 2 ActiveRecords, preserving associations and attributes

data/init.rb

@@ -1 +0,0 @@
-require 'ar_merge'