auditing 1.3.0 → 1.3.1

data/.gitignore

@@ -18,5 +18,7 @@ coverage
 rdoc
 pkg
 
+*.gem
+
 ## PROJECT::SPECIFIC
 test.sqlite3

data/Gemfile.lock

@@ -1,22 +1,23 @@
 PATH
   remote: .
   specs:
-    auditing (1.2.2)
+    auditing (1.3.0)
       activerecord (~> 3.0.0)
+      activesupport (~> 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.5)
-      activesupport (= 3.0.5)
+    activemodel (3.0.6)
+      activesupport (= 3.0.6)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
+      i18n (~> 0.5.0)
+    activerecord (3.0.6)
+      activemodel (= 3.0.6)
+      activesupport (= 3.0.6)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activesupport (3.0.5)
+    activesupport (3.0.6)
     arel (2.0.9)
     builder (2.1.2)
     diff-lcs (1.1.2)
@@ -33,7 +34,8 @@ GEM
     sqlite3 (1.3.3)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
-    tzinfo (0.3.25)
+    timecop (0.3.5)
+    tzinfo (0.3.26)
 
 PLATFORMS
   ruby
@@ -43,3 +45,4 @@ DEPENDENCIES
   rake (~> 0.8.7)
   rspec (~> 2.4.0)
   sqlite3-ruby
+  timecop

data/README.markdown

@@ -26,7 +26,7 @@ If you want to track the user, uncomment the t.integer :user_id above.  See the
 
 ## Upgrading to 1.3.0
 
-New installs will not need to do this.  Anyone that is using 1.2.2 and belong should 
+New installs will not need to do this.  Anyone that is using 1.2.X and below should upgrade
 
     gem update auditing
     # ... updates happen

data/auditing.gemspec

@@ -15,8 +15,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<rspec>, ["~> 2.4.0"])
   s.add_development_dependency(%q<rake>,  ["~> 0.8.7"])
   s.add_development_dependency "sqlite3-ruby"
+  s.add_development_dependency "timecop"
   
   s.add_dependency('activerecord', '~> 3.0.0')
+  s.add_dependency('activesupport', '~> 3.0.0')
   
   s.rubyforge_project = "auditing"
 

data/lib/auditing/auditor.rb

@@ -7,12 +7,12 @@ module Auditing
     
     def old_value
       return nil unless read_attribute(:old_value)
-      Marshal.load(read_attribute(:old_value))
+      Marshal.load( ActiveSupport::Base64.decode64( read_attribute(:old_value) ) )
     end
     
     def new_value
       return nil unless read_attribute(:new_value)
-      Marshal.load(read_attribute(:new_value))
+      Marshal.load( ActiveSupport::Base64.decode64( read_attribute(:new_value) ) )
     end
     
     def rollback

data/lib/auditing/base.rb

@@ -28,18 +28,26 @@ module Auditing
     end
 
     module InstanceMethods
+      # http://stackoverflow.com/questions/1906421/problem-saving-rails-marshal-in-sqlite3-db
+       
+      def dump_data(value)
+        ActiveSupport::Base64.encode64(Marshal.dump(value))
+      end
+       
       def log_creation
         add_audit(:action => 'created', :undoable => false)
       end
-
+     
       def log_update
         if changed?
           changes.each.select {|k,v| auditing_fields.include?(k)}.each do |field, change|
             next if change[0].to_s == change[1].to_s
+
             add_audit(:action     => 'updated',
                       :field_name => field,
-                      :old_value  => Marshal.dump(change[0]),
-                      :new_value  => Marshal.dump(change[1]) )
+                      :old_value  => dump_data(change[0]),
+                      :new_value  => dump_data(change[1]) 
+                      )
           end
         end
       end
@@ -48,16 +56,16 @@ module Auditing
         add_audit(:action      => 'added',
                   :association => child_object,
                   :field_name  => hash[:field],
-                  :old_value   => Marshal.dump(nil),
-                  :new_value   => Marshal.dump(hash[:value].to_s) )
+                  :old_value   => dump_data(nil),
+                  :new_value   => dump_data(hash[:value]) )
       end
 
       def log_association_update(child_object, hash)
         add_audit(:action      => 'updated',
                   :association => child_object,
                   :field_name  => hash[:field],
-                  :old_value   => Marshal.dump(hash[:old_value].to_s),
-                  :new_value   => Marshal.dump(hash[:new_value].to_s) ) 
+                  :old_value   => ( dump_data(hash[:old_value]) if hash[:old_value] ) || dump_data(nil),
+                  :new_value   => dump_data(hash[:new_value]) ) 
       end
 
       def log_association_destroy(item)

data/lib/auditing/version.rb

@@ -1,3 +1,3 @@
 module Auditing
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/spec/auditing/base_spec.rb

@@ -204,48 +204,4 @@ describe "Base" do
     end
   end # belongs_to relationships
 
-  describe "text fields" do
-    before do
-      class Special < ActiveRecord::Base
-        audit_enabled
-      end
-    end
-    
-    it "should properly work on creation" do
-      long_string = 'a'
-      2000.times do
-        long_string << 'b'
-      end
-      special = Special.create(:text_field => long_string)
-      special.audits.should_not be_nil
-    end
-    
-    describe "updating a text field" do
-      before do
-        @long_string     = 'a'
-        @new_long_string = 'c'
-        2000.times do
-          @long_string     << 'b'
-          @new_long_string << 'd'
-        end
-        @special = Special.create(:text_field => @long_string)
-      end
-      
-      it "should create an audit log when we update a text field" do
-        lambda {@special.update_attributes(:text_field => @new_long_string)
-                }.should change { Audit.count }.by(1)
-      end
-      
-      it "should allow access to the old and new values" do
-        @special.update_attributes(:text_field => @new_long_string)
-        audit = @special.audits.first
-        audit.old_value.should eql(@long_string)
-        audit.new_value.should eql(@new_long_string)
-      end
-      
-    end
-    
-    
-  end
-
 end

data/spec/auditing/formats_spec.rb

@@ -0,0 +1,91 @@
+require 'spec_helper'
+require 'timecop'
+
+describe "formats" do
+  
+  describe "text fields" do
+    before do
+      class Special < ActiveRecord::Base
+        audit_enabled
+      end
+    end
+    
+    it "should properly work on creation" do
+      long_string = 'a'
+      2000.times do
+        long_string << 'b'
+      end
+      special = Special.create(:text_field => long_string)
+      special.audits.should_not be_nil
+    end
+    
+    describe "updating a text field" do
+      before do
+        @long_string     = 'a'
+        @new_long_string = 'c'
+        2000.times do
+          @long_string     << 'b'
+          @new_long_string << 'd'
+        end
+        @special = Special.create(:text_field => @long_string)
+      end
+      
+      it "should create an audit log when we update a text field" do
+        lambda {@special.update_attributes(:text_field => @new_long_string)
+                }.should change { Audit.count }.by(1)
+      end
+      
+      it "should allow access to the old and new values" do
+        @special.update_attributes(:text_field => @new_long_string)
+        audit = @special.audits.first
+        audit.old_value.should eql(@long_string)
+        audit.new_value.should eql(@new_long_string)
+      end
+    end
+  end
+  
+  describe "date_fields" do
+     before do
+       class Special < ActiveRecord::Base
+         audit_enabled
+       end
+     end
+
+     it "should properly work on creation" do
+       special = Special.create(:date_field => Date.today)
+       special.audits.should_not be_nil
+     end
+
+     it "can update a blank date field" do
+       special = Special.create
+       special.date_field = Date.today
+       lambda { special.save }.should change { Audit.count }.by(1)
+     end
+
+     describe "updating a date field" do
+       before do
+         new_time = Time.local(2008, 9, 1, 12, 0, 0)
+         Timecop.freeze(new_time) # 2008-09-01 
+         @special = Special.create(:date_field => Date.today)
+       end
+       
+       it "should create an audit log when we update a text field" do
+         lambda {@special.update_attributes(:date_field => Date.today + 1)
+                 }.should change { Audit.count }.by(1)
+         Timecop.return
+       end
+
+       it "should allow access to the old and new values" do
+         @special.update_attributes(:date_field => Date.today + 1)
+         audit = @special.audits.first
+         audit.old_value.should eql(Date.today)
+         audit.new_value.should eql(Date.today + 1)
+         
+         Timecop.return
+       end
+       
+     end
+
+   end
+  
+end

data/spec/schema.rb

@@ -63,6 +63,7 @@ ActiveRecord::Schema.define(:version => 0) do
   
   create_table :specials do |t|
     t.text :text_field
+    t.date :date_field
   end
   
 end

data/spec/spec_helper.rb

@@ -22,5 +22,5 @@ class Audit < ActiveRecord::Base
   belongs_to :association, :polymorphic => true
 end
 
-class User < ActiveRecord::Base
-end
+# class User < ActiveRecord::Base
+# end

metadata

@@ -2,7 +2,7 @@
 name: auditing
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors: 
 - Brad Cantin
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-14 00:00:00 -04:00
+date: 2011-04-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,16 +47,38 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  name: timecop
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 3.0.0
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 3.0.0
+  type: :runtime
+  version_requirements: *id006
 description: acts_as_versioned is good. This allows an attribute level rollback instead
 email: 
 - brad.cantin@gmail.com
@@ -96,6 +118,7 @@ files:
 - spec/auditing/audit_relationship_spec.rb
 - spec/auditing/auditor_spec.rb
 - spec/auditing/base_spec.rb
+- spec/auditing/formats_spec.rb
 - spec/auditing/with_users_spec.rb
 - spec/schema.rb
 - spec/spec_helper.rb
@@ -131,6 +154,7 @@ test_files:
 - spec/auditing/audit_relationship_spec.rb
 - spec/auditing/auditor_spec.rb
 - spec/auditing/base_spec.rb
+- spec/auditing/formats_spec.rb
 - spec/auditing/with_users_spec.rb
 - spec/schema.rb
 - spec/spec_helper.rb