ar_merge 0.1.3 → 0.2.0

data/Gemfile

@@ -0,0 +1,6 @@
+source :rubygems
+gemspec
+
+gem 'rake'
+gem 'sqlite3'
+gem 'rspec', '~>2'

data/Gemfile.lock

@@ -0,0 +1,45 @@
+PATH
+  remote: .
+  specs:
+    ar_merge (0.2.0)
+      activerecord
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.2.2)
+      activesupport (= 3.2.2)
+      builder (~> 3.0.0)
+    activerecord (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.2)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    builder (3.0.0)
+    diff-lcs (1.1.3)
+    i18n (0.6.0)
+    multi_json (1.3.4)
+    rake (0.9.2.2)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    sqlite3 (1.3.6)
+    tzinfo (0.3.33)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  ar_merge!
+  rake
+  rspec (~> 2)
+  sqlite3

data/Rakefile

@@ -1,20 +1,22 @@
-task :default => :spec
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new {|t| t.spec_opts = ['--color']}
+require 'bundler/gem_tasks'
 
-begin
-  require 'jeweler'
-  project_name = 'ar_merge'
-  Jeweler::Tasks.new do |gem|
-    gem.name = project_name
-    gem.summary = "Merge 2 ActiveRecords, preserving associations and attributes"
-    gem.email = "grosser.michael@gmail.com"
-    gem.homepage = "http://github.com/grosser/#{project_name}"
-    gem.authors = ["Michael Grosser"]
-    gem.add_dependency ['activerecord']
-  end
+task :default do
+  sh "rspec spec/"
+end
 
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-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}'"
+end

data/{README.markdown → Readme.md}

@@ -10,11 +10,11 @@ INSTALL
 
 Rails plugin
 
-    script/plugin install git://github.com/grosser/ar_merge.git
+    rails plugin install git://github.com/grosser/ar_merge.git
 
 OR Gem
 
-    sudo gem install ar_merge
+    gem install ar_merge
 
 
 USAGE
@@ -38,6 +38,6 @@ Merge duplicates
 
 AUTHOR
 ======
-[Michael Grosser](http://pragmatig.wordpress.com)  
-grosser.michael@gmail.com
-Hereby placed under public domain, do what you want, just do not hold me accountable...
+[Michael Grosser](grosser.it)</br>
+michael@grosser.it</br>
+License: MIT

data/ar_merge.gemspec

@@ -1,52 +1,13 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+name = "ar_merge"
+require "#{name}/version"
 
-Gem::Specification.new do |s|
-  s.name = %q{ar_merge}
-  s.version = "0.1.3"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+Gem::Specification.new name, ARMerge::VERSION do |s|
+  s.summary = "Merge 2 ActiveRecords, preserving associations and attributes"
   s.authors = ["Michael Grosser"]
-  s.date = %q{2009-12-13}
-  s.email = %q{grosser.michael@gmail.com}
-  s.extra_rdoc_files = [
-    "README.markdown"
-  ]
-  s.files = [
-    "README.markdown",
-     "Rakefile",
-     "VERSION",
-     "ar_merge.gemspec",
-     "init.rb",
-     "lib/ar_merge.rb",
-     "spec/ar_merge_spec.rb",
-     "spec/setup_test_model.rb",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/grosser/ar_merge}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Merge 2 ActiveRecords, preserving associations and attributes}
-  s.test_files = [
-    "spec/spec_helper.rb",
-     "spec/ar_merge_spec.rb",
-     "spec/setup_test_model.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, [">= 0"])
-    else
-      s.add_dependency(%q<activerecord>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<activerecord>, [">= 0"])
-  end
+  s.email = "michael@grosser.it"
+  s.homepage = "http://github.com/grosser/#{name}"
+  s.files = `git ls-files`.split("\n")
+  s.license = "MIT"
+  s.add_runtime_dependency "activerecord"
 end
-

data/lib/ar_merge.rb

@@ -1,8 +1,7 @@
+require 'ar_merge/version'
 require 'active_record'
 
 module ARMerge
-  VERSION = File.read( File.join(File.dirname(__FILE__),'..','VERSION') ).strip
-
   def self.included(base)
     base.extend ClassMethods
     base.send(:include, InstanceMethods)
@@ -21,7 +20,7 @@ module ARMerge
         
         #update counters, this is very basic/hacky/not secure for customized counters...
         counter = "#{association_name}_count"
-        next unless other.respond_to?(counter)
+        next unless other.respond_to?(counter) and respond_to?("#{counter}=")
         self.class.update_counters(id, counter => other.send(counter))
       end
 
@@ -55,4 +54,4 @@ module ARMerge
   end
 end
 
-ActiveRecord::Base.send(:include, ARMerge)
+ActiveRecord::Base.send(:include, ARMerge)

data/lib/ar_merge/version.rb

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

data/spec/ar_merge_spec.rb

@@ -1,4 +1,4 @@
-require "spec/spec_helper"
+require "spec_helper"
 
 describe ARMerge do
   describe :merge! do
@@ -40,7 +40,7 @@ describe ARMerge do
         @user.movies.size.should == Movie.count
       end
 
-      it "overtakes asociated objects" do
+      it "overtakes associated objects" do
         @u2.merge!(@user,:associations=>[:movies])
         @u2.reload.should have(Movie.count).movies
       end
@@ -99,4 +99,4 @@ describe ARMerge do
   it "has a VERSION" do
     ARMerge::VERSION.should =~ /^\d+\.\d+\.\d+$/
   end
-end
+end

data/spec/setup_test_model.rb

@@ -29,6 +29,9 @@ end
 # create models
 class User < ActiveRecord::Base
   has_many :movies
+  def movies_count
+    movies.count
+  end
 end
 
 class CountingUser < ActiveRecord::Base
@@ -38,4 +41,4 @@ end
 class Movie < ActiveRecord::Base
   belongs_to :user
   belongs_to :counting_user, :counter_cache => true
-end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 $LOAD_PATH << "lib"
-require "init"
-require "spec/setup_test_model"
+require "ar_merge"
+require "./spec/setup_test_model"

metadata

@@ -1,74 +1,78 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ar_merge
-version: !ruby/object:Gem::Version 
-  version: 0.1.3
+version: !ruby/object:Gem::Version
+  version: 0.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2009-12-13 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
-email: grosser.michael@gmail.com
+email: michael@grosser.it
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README.markdown
-files: 
-- README.markdown
+extra_rdoc_files: []
+files:
+- Gemfile
+- Gemfile.lock
 - Rakefile
-- VERSION
+- Readme.md
 - ar_merge.gemspec
 - init.rb
 - lib/ar_merge.rb
+- lib/ar_merge/version.rb
 - spec/ar_merge_spec.rb
 - spec/setup_test_model.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/grosser/ar_merge
-licenses: []
-
+licenses:
+- MIT
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 3854198524710893758
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 3854198524710893758
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Merge 2 ActiveRecords, preserving associations and attributes
-test_files: 
-- spec/spec_helper.rb
-- spec/ar_merge_spec.rb
-- spec/setup_test_model.rb
+test_files: []

data/VERSION

@@ -1 +0,0 @@
-0.1.3