cia 0.3.6 → 0.3.7

data/Gemfile

@@ -1,6 +1,7 @@
 source :rubygems
 gemspec
 
+gem 'bump'
 gem 'rake'
 gem 'rspec', '~>2'
 gem 'appraisal'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cia (0.3.6)
+    cia (0.3.7)
 
 GEM
   remote: http://rubygems.org/
@@ -22,6 +22,7 @@ GEM
       rake
     arel (3.0.2)
     builder (3.0.0)
+    bump (0.3.7)
     diff-lcs (1.1.3)
     i18n (0.6.0)
     multi_json (1.3.4)
@@ -43,6 +44,7 @@ PLATFORMS
 DEPENDENCIES
   activerecord
   appraisal
+  bump
   cia!
   rake
   rspec (~> 2)

data/Rakefile

@@ -1,5 +1,6 @@
 require 'appraisal'
 require 'bundler/gem_tasks'
+require 'bump/tasks'
 
 task :default do
   sh "bundle exec rake appraisal:install && bundle exec rake appraisal spec"
@@ -8,20 +9,3 @@ end
 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/cia/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.md

@@ -61,6 +61,14 @@ end
 
 # adding an actor e.g. for user creation
 CIA.current_actor = @user
+
+# custom changes
+
+class User < ActiveRecord::Base
+  def cia_changes
+    changes.merge("this" => ["always", "changes"])
+  end
+end
 ```
 
 

data/gemfiles/rails2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/cia
   specs:
-    cia (0.3.5)
+    cia (0.3.6)
 
 GEM
   remote: http://rubygems.org/

data/gemfiles/rails3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/cia
   specs:
-    cia (0.3.5)
+    cia (0.3.6)
 
 GEM
   remote: http://rubygems.org/

data/lib/cia.rb

@@ -36,7 +36,7 @@ module CIA
     return if options and options[:if] and not source.send(options[:if])
     return if options and options[:unless] and source.send(options[:unless])
 
-    changes = source.changes.slice(*source.class.audited_attributes)
+    changes = source.cia_changes.slice(*source.class.audited_attributes)
     message = source.audit_message if source.respond_to?(:audit_message)
 
     return if not message and changes.empty? and action.to_s == "update"

data/lib/cia/auditable.rb

@@ -8,6 +8,10 @@ module CIA
       base.after_destroy {|record| CIA.record(:destroy, record) }
     end
 
+    def cia_changes
+      changes
+    end
+
     module ClassMethods
       def audit_attribute(*attributes)
         options = (attributes.last.is_a?(Hash) ? attributes.pop : {})

data/lib/cia/version.rb

@@ -1,3 +1,3 @@
 module CIA
-  VERSION = '0.3.6'
+  VERSION = '0.3.7'
 end

data/spec/cia_spec.rb

@@ -84,6 +84,22 @@ describe CIA do
       CIA::Event.last.action.should == "update"
     end
 
+    context "custom changes" do
+      let(:object) { CarWithCustomChanges.new }
+
+      it "tracks custom changes" do
+        object.save!
+        expect{
+          object.update_attributes(:wheels => 3)
+        }.to change{ CIA::Event.count }.by(+1)
+        CIA::Event.last.action.should == "update"
+        CIA::Event.last.attribute_change_hash.should == {
+          "wheels" => [nil, "3"],
+          "foo" => ["bar", "baz"]
+        }
+      end
+    end
+
     context ":if" do
       let(:object) { CarWithIf.new }
 

data/spec/spec_helper.rb

@@ -63,6 +63,16 @@ class CarWithUnless < ActiveRecord::Base
   attr_accessor :tested
 end
 
+class CarWithCustomChanges < ActiveRecord::Base
+  self.table_name = "cars"
+  include CIA::Auditable
+  audit_attribute :wheels, :foo
+
+  def cia_changes
+    changes.merge("foo" => ["bar", "baz"])
+  end
+end
+
 def create_event(options={})
   CIA::Event.create!({:source => Car.create!, :actor => User.create!, :action => "update"}.merge(options))
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cia
 version: !ruby/object:Gem::Version
-  version: 0.3.6
   prerelease: 
+  version: 0.3.7
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2012-12-20 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -46,23 +46,23 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: -3737857467428511425
-required_rubygems_version: !ruby/object:Gem::Requirement
+      hash: 933978664134993553
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: -3737857467428511425
+      hash: 933978664134993553
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24