audit 0.5.0 → 0.6.0

data/Gemfile

@@ -1,6 +1,6 @@
 source :gemcutter
 
-gem "cassandra", "~> 0.8.2"
+gem "cassandra", "~> 0.9.0"
 gem "activemodel", "~> 3.0.0"
 gem "yajl-ruby", "~> 0.7.7"
 

data/Rakefile

@@ -37,7 +37,6 @@ task :default => :test
 
 Rake::TestTask.new do |t|
   t.libs << "test"
-  t.test_files = FileList['test/*_test.rb']
 end
 
 desc "Run tests against all supported Ruby versions"

data/audit.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'audit'
-  s.version           = '0.5.0'
-  s.date              = '2010-11-17'
+  s.version           = '0.6.0'
+  s.date              = '2011-03-22'
   s.rubyforge_project = 'audit'
 
   ## Make sure your summary is short. The description may be as long
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
 
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
-  s.add_dependency('cassandra', ["~> 0.8.2"])
+  s.add_dependency('cassandra', ["~> 0.9.0"])
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
@@ -53,7 +53,6 @@ Gem::Specification.new do |s|
   # = MANIFEST =
   s.files = %w[
     Gemfile
-    Gemfile.lock
     LICENSE
     README.md
     Rakefile
@@ -66,11 +65,11 @@ Gem::Specification.new do |s|
     lib/audit/changeset.rb
     lib/audit/log.rb
     lib/audit/tracking.rb
-    test/changeset_test.rb
-    test/log_test.rb
+    test/helper.rb
     test/storage-conf.xml
-    test/test_helper.rb
-    test/tracking_test.rb
+    test/test_changeset.rb
+    test/test_log.rb
+    test/test_tracking.rb
   ]
   # = MANIFEST =
 

data/lib/audit.rb

@@ -3,7 +3,7 @@
 module Audit
   
   # Everything needs a version.
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
   
   autoload :Log, "audit/log"
   autoload :Changeset, "audit/changeset"

data/lib/audit/log.rb

@@ -1,4 +1,4 @@
-require 'cassandra'
+require 'cassandra/0.7'
 require 'active_support/core_ext/module'
 require 'simple_uuid'
 require 'yajl'

data/lib/audit/tracking.rb

@@ -34,7 +34,8 @@ module Audit::Tracking
     end
 
     data = {"changes" => changes, "metadata" => audit_metadata}
-    Audit::Tracking.log.record(audit_bucket, self.id, Time.now.utc.iso8601, data)
+    timestamp = Time.now.utc.iso8601(3)
+    Audit::Tracking.log.record(audit_bucket, self.id, timestamp, data)
     @audit_metadata = {}
   end
   
@@ -75,4 +76,29 @@ module Audit::Tracking
     @skip ||= false
   end
   
+  # Public: Restore the model's attributes to the state recorded by
+  # a changeset.
+  #
+  # changeset - the changes to undo
+  # 
+  # Returns nothing.
+  def revert_to(changeset)
+    changeset.changes.each do |change|
+      write_attribute(change.attribute, change.old_value)
+    end
+    nil
+  end
+
+  # Public: Restore a model's attributes by reversing a series of changesets.
+  #
+  # changesets - the changesets to undo
+  #
+  # Returns nothing.
+  def revert(changesets)
+    changesets.each do |changeset|
+      revert_to(changeset)
+    end
+    nil
+  end
+
 end

data/test/{test_helper.rb → helper.rb}

@@ -5,7 +5,7 @@ Bundler.setup
 require 'test/unit'
 require 'shoulda'
 require 'flexmock/test_unit'
-require 'cassandra'
+require 'cassandra/0.6'
 require 'cassandra/mock'
 require 'active_record'
 require 'audit'

data/test/{changeset_test.rb → test_changeset.rb}

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'helper'
 
 class ChangesetTest < Test::Unit::TestCase
   

data/test/{log_test.rb → test_log.rb}

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'helper'
 
 class LogTest < Test::Unit::TestCase
   
@@ -29,11 +29,6 @@ class LogTest < Test::Unit::TestCase
     end
   end
 
-  def teardown
-    # FIXME: figure out how to properly clear a keyspace or CF
-    Audit::Log.connection.remove(:Audits, "Users:1")
-  end
-
   def timestamp
     Time.now.utc.iso8601
   end

data/test/{tracking_test.rb → test_tracking.rb}

@@ -1,4 +1,4 @@
-require "test_helper"
+require "helper"
 
 ActiveRecord::Base.establish_connection(
   :adapter => 'sqlite3',
@@ -39,9 +39,10 @@ class TrackingTest < Test::Unit::TestCase
     assert_equal({}, user.audit_metadata) # Should clear audit after write
   end
 
-  should_eventually "add audit-related methods" do
-    assert_equal %w{audit audit_bucket audit_metadata audits skip_audit}, 
-      @model.methods.map { |s| s.to_s }.grep(/audit/).sort
+  should "add audit-related methods" do
+    methods = %w{audit audit_bucket audit_metadata audits 
+                 skip_audit skip_audit?}
+    assert_equal methods, @model.methods.map { |s| s.to_s }.grep(/audit/).sort
   end
 
   should "set the log object to an arbitrary object" do
@@ -65,4 +66,25 @@ class TrackingTest < Test::Unit::TestCase
     assert !user.skip_audit?
   end
   
+  should "revert the model to the state recorded by an audit" do
+    user = User.create(:username => "adam", :age => 31)
+    user.update_attributes(:username => "therealadam")
+
+    user.revert_to(user.audits.first)
+
+    assert_equal "adam", user.username
+  end
+
+  should "revert the model to the state represented by a series of changes" do
+    user = User.create(:username => "adam", :age => 31)
+    user.update_attributes(:username => "therealadam")
+    user.update_attributes(:age => 32)
+    user.update_attributes(:username => "akk")
+    user.update_attributes(:age => 33)
+
+    user.revert(user.audits[0, 4])
+    assert_equal 31, user.age
+    assert_equal "adam", user.username
+  end
+
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Adam Keys
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 -06:00
+date: 2011-03-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,9 +26,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 8
-        - 2
-        version: 0.8.2
+        - 9
+        - 0
+        version: 0.9.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -71,7 +71,6 @@ extra_rdoc_files:
 - LICENSE
 files: 
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -84,11 +83,11 @@ files:
 - lib/audit/changeset.rb
 - lib/audit/log.rb
 - lib/audit/tracking.rb
-- test/changeset_test.rb
-- test/log_test.rb
+- test/helper.rb
 - test/storage-conf.xml
-- test/test_helper.rb
-- test/tracking_test.rb
+- test/test_changeset.rb
+- test/test_log.rb
+- test/test_tracking.rb
 has_rdoc: true
 homepage: http://github.com/therealadam/audit
 licenses: []
@@ -119,7 +118,5 @@ rubygems_version: 1.3.6
 signing_key: 
 specification_version: 2
 summary: Audit logs changes to model objects to Cassandra.
-test_files: 
-- test/changeset_test.rb
-- test/log_test.rb
-- test/tracking_test.rb
+test_files: []
+

data/Gemfile.lock

@@ -1,50 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
-      builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-      arel (~> 1.0.0)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.0)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
-    builder (2.1.2)
-    cassandra (0.8.2)
-      json
-      rake
-      simple_uuid (>= 0.1.0)
-      thrift_client (>= 0.4.0)
-    flexmock (0.8.7)
-    i18n (0.4.1)
-    json (1.4.6)
-    nokogiri (1.4.3.1)
-    rake (0.8.7)
-    shoulda (2.11.3)
-    simple_uuid (0.1.1)
-    sqlite3-ruby (1.3.1)
-    thrift (0.2.0.4)
-    thrift_client (0.4.6)
-      thrift
-    tzinfo (0.3.23)
-    yajl-ruby (0.7.7)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activemodel (~> 3.0.0)
-  activerecord (~> 3.0.0)
-  cassandra (~> 0.8.2)
-  flexmock (~> 0.8.7)
-  nokogiri (~> 1.4.3.1)
-  shoulda (~> 2.11.3)
-  sqlite3-ruby
-  yajl-ruby (~> 0.7.7)
-
-METADATA
-  version: 1.0.6