delta_changes 0.0.1 → 1.0.0

data/.travis.yml

@@ -1,4 +1,4 @@
 rvm:
   - ree
-  - 1.9.2
   - 1.9.3
+  - 2.0.0

data/Appraisals

@@ -1,15 +1,5 @@
-appraise "rails2" do
-  version = "2.3.14"
-  gem 'activerecord', version
-end
-
-appraise "rails30" do
-  version = "3.2.3"
-  gem 'activerecord', version
-end
-
-
-appraise "rails32" do
-  version = "3.2.3"
-  gem 'activerecord', version
+["2.3.18", "3.0.20", "3.1.12", "3.2.13"].each do |version|
+  appraise "rails#{version[0..2].sub(".","")}" do
+    gem 'activerecord', version
+  end
 end

data/Gemfile

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

data/Gemfile.lock

@@ -1,32 +1,33 @@
 PATH
   remote: .
   specs:
-    delta_changes (0.0.1)
+    delta_changes (1.0.0)
       activerecord
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.8)
-      i18n (~> 0.6)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
-    appraisal (0.4.1)
+    appraisal (0.5.2)
       bundler
       rake
     arel (3.0.2)
-    builder (3.0.3)
+    builder (3.0.4)
+    bump (0.4.2)
     diff-lcs (1.1.3)
     i18n (0.6.1)
-    multi_json (1.3.6)
-    rake (0.9.2)
+    multi_json (1.7.6)
+    rake (10.0.4)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -36,13 +37,14 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
     sqlite3 (1.3.6)
-    tzinfo (0.3.33)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   appraisal
+  bump
   delta_changes!
   rake
   rspec (~> 2)

data/Rakefile

@@ -1,27 +1,12 @@
+require "bundler/setup"
 require "bundler/gem_tasks"
 require "appraisal"
+require "bump/tasks"
 
 task :spec do
   sh "rspec spec/"
 end
 
 task :default do
-  sh "bundle exec rake appraisal:install && bundle exec rake appraisal spec"
-end
-
-# extracted from https://github.com/grosser/project_template
-rule /^version:bump:.*/ do |t|
-  file = "lib/delta_changes/version.rb"
-
-  sh "git status | grep 'nothing to commit'" # ensure we are not dirty
-  index = ["major", "minor", "patch"].index(t.name.split(':').last)
-  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}'"
+  sh "rake appraisal:install && rake appraisal spec"
 end

data/gemfiles/{rails2.gemfile → rails23.gemfile}

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

data/gemfiles/rails23.gemfile.lock

@@ -0,0 +1,39 @@
+PATH
+  remote: /Users/mgrosser/code/tools/delta_changes
+  specs:
+    delta_changes (0.0.1)
+      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.2)
+    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
+  bump
+  delta_changes!
+  rake
+  rspec (~> 2)
+  sqlite3

data/gemfiles/rails30.gemfile

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

data/gemfiles/rails30.gemfile.lock

@@ -1,49 +1,49 @@
 PATH
   remote: /Users/mgrosser/code/tools/delta_changes
   specs:
-    delta_changes (0.0.0)
+    delta_changes (0.0.1)
       activerecord
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
-      builder (~> 3.0.0)
-    activerecord (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.3)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    appraisal (0.4.1)
+    activemodel (3.0.20)
+      activesupport (= 3.0.20)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.20)
+    appraisal (0.5.2)
       bundler
       rake
-    arel (3.0.2)
-    builder (3.0.3)
-    diff-lcs (1.1.3)
-    i18n (0.6.1)
-    multi_json (1.3.6)
-    rake (0.9.2.2)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
-    sqlite3 (1.3.6)
-    tzinfo (0.3.33)
+    arel (2.0.10)
+    builder (2.1.2)
+    bump (0.4.2)
+    diff-lcs (1.2.4)
+    i18n (0.5.0)
+    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.3)
+  activerecord (= 3.0.20)
   appraisal
+  bump
   delta_changes!
   rake
   rspec (~> 2)

data/gemfiles/rails31.gemfile

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

data/gemfiles/rails31.gemfile.lock

@@ -0,0 +1,52 @@
+PATH
+  remote: /Users/mgrosser/code/tools/delta_changes
+  specs:
+    delta_changes (0.0.1)
+      activerecord
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (3.1.12)
+      activesupport (= 3.1.12)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.12)
+      activemodel (= 3.1.12)
+      activesupport (= 3.1.12)
+      arel (~> 2.2.3)
+      tzinfo (~> 0.3.29)
+    activesupport (3.1.12)
+      multi_json (~> 1.0)
+    appraisal (0.5.2)
+      bundler
+      rake
+    arel (2.2.3)
+    builder (3.0.4)
+    bump (0.4.2)
+    diff-lcs (1.2.4)
+    i18n (0.6.4)
+    multi_json (1.7.6)
+    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.1.12)
+  appraisal
+  bump
+  delta_changes!
+  rake
+  rspec (~> 2)
+  sqlite3

data/gemfiles/rails32.gemfile

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

data/gemfiles/rails32.gemfile.lock

@@ -1,49 +1,51 @@
 PATH
   remote: /Users/mgrosser/code/tools/delta_changes
   specs:
-    delta_changes (0.0.0)
+    delta_changes (0.0.1)
       activerecord
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activerecord (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.3)
-      i18n (~> 0.6)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
-    appraisal (0.4.1)
+    appraisal (0.5.2)
       bundler
       rake
     arel (3.0.2)
-    builder (3.0.3)
-    diff-lcs (1.1.3)
+    builder (3.0.4)
+    bump (0.4.2)
+    diff-lcs (1.2.4)
     i18n (0.6.1)
-    multi_json (1.3.6)
-    rake (0.9.2.2)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
-    sqlite3 (1.3.6)
-    tzinfo (0.3.33)
+    multi_json (1.7.6)
+    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.3)
+  activerecord (= 3.2.13)
   appraisal
+  bump
   delta_changes!
   rake
   rspec (~> 2)

data/lib/delta_changes/version.rb

@@ -1,3 +1,3 @@
 module DeltaChanges
-  VERSION = "0.0.1"
+  VERSION = "1.0.0"
 end

data/lib/delta_changes.rb

@@ -96,14 +96,19 @@ module DeltaChanges
         # The attribute already has an unsaved change.
         if delta_changed_attributes.include?(attr)
           old = delta_changed_attributes[attr]
-          delta_changed_attributes.delete(attr) unless field_changed?(attr, old, value)
+          delta_changed_attributes.delete(attr) unless delta_changes_field_changed?(attr, old, value)
         else
           old = clone_attribute_value(:read_attribute, attr)
-          delta_changed_attributes[attr] = old if field_changed?(attr, old, value)
+          delta_changed_attributes[attr] = old if delta_changes_field_changed?(attr, old, value)
         end
       end
 
       write_attribute_without_delta_changes(attr, value)
     end
+
+    def delta_changes_field_changed?(attr, old, value)
+      @delta_changes_field_changed ||= defined?(field_changed?)
+      @delta_changes_field_changed ? field_changed?(attr, old, value) : _field_changed?(attr, old, value) # rails 3.0-3.1 vs 3.2
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delta_changes
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-20 00:00:00.000000000 Z
+date: 2013-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -40,10 +40,12 @@ files:
 - Rakefile
 - Readme.md
 - delta_changes.gemspec
-- gemfiles/rails2.gemfile
-- gemfiles/rails2.gemfile.lock
+- gemfiles/rails23.gemfile
+- gemfiles/rails23.gemfile.lock
 - gemfiles/rails30.gemfile
 - gemfiles/rails30.gemfile.lock
+- gemfiles/rails31.gemfile
+- gemfiles/rails31.gemfile.lock
 - gemfiles/rails32.gemfile
 - gemfiles/rails32.gemfile.lock
 - lib/delta_changes.rb
@@ -65,7 +67,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3940600882562868341
+      hash: -171365277466758643
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -74,10 +76,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3940600882562868341
+      hash: -171365277466758643
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Additional real/virtual attribute change tracking independent of ActiveRecords

data/gemfiles/rails2.gemfile.lock

@@ -1,37 +0,0 @@
-PATH
-  remote: /Users/mgrosser/code/tools/delta_changes
-  specs:
-    delta_changes (0.0.0)
-      activerecord
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activerecord (2.3.14)
-      activesupport (= 2.3.14)
-    activesupport (2.3.14)
-    appraisal (0.4.1)
-      bundler
-      rake
-    diff-lcs (1.1.3)
-    rake (0.9.2.2)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
-    sqlite3 (1.3.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (= 2.3.14)
-  appraisal
-  delta_changes!
-  rake
-  rspec (~> 2)
-  sqlite3