audit 0.3.0 → 0.4.0

data/Gemfile.lock

@@ -45,3 +45,6 @@ DEPENDENCIES
   shoulda (~> 2.11.3)
   sqlite3-ruby
   yajl-ruby (~> 0.7.7)
+
+METADATA
+  version: 1.0.6

data/Rakefile

@@ -45,14 +45,6 @@ task :compat do
   sh "rvm 1.9.2@audit,ree-1.8.7-2010.01@audit rake test"
 end
 
-desc "Generate RCov test coverage and open in your browser"
-task :coverage do
-  require 'rcov'
-  sh "rm -fr coverage"
-  sh "rcov test/test_*.rb"
-  sh "open coverage/index.html"
-end
-
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
@@ -61,15 +53,7 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-desc "Open an irb session preloaded with this library"
-task :console do
-  sh "irb -rubygems -r ./lib/#{name}.rb"
-end
-
-# =============
-# = Packaging =
-# =============
-
+desc "Build, tag, push and publish a new release."
 task :release => :build do
   unless `git branch` =~ /^\* master$/
     puts "You must be on the master branch to release!"
@@ -82,12 +66,14 @@ task :release => :build do
   sh "gem push pkg/#{name}-#{version}.gem"
 end
 
+desc "Build a new gem"
 task :build => :gemspec do
   sh "mkdir -p pkg"
   sh "gem build #{gemspec_file}"
   sh "mv #{gem_file} pkg"
 end
 
+desc "Update the generated gemspec"
 task :gemspec => :validate do
   # read spec file and split out manifest section
   spec = File.read(gemspec_file)

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.3.0'
-  s.date              = '2010-10-05'
+  s.version           = '0.4.0'
+  s.date              = '2010-11-16'
   s.rubyforge_project = 'audit'
 
   ## Make sure your summary is short. The description may be as long
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   ## a custom homepage, consider using your GitHub URL or the like.
   s.authors  = ["Adam Keys"]
   s.email    = 'adam@therealadam.com'
-  s.homepage = 'http://github.com/therealadam/auditus'
+  s.homepage = 'http://github.com/therealadam/audit'
 
   ## This gets added to the $LOAD_PATH so that 'lib/NAME.rb' can be required as
   ## require 'NAME.rb' or'/lib/NAME/file.rb' can be as require 'NAME/file.rb'

data/lib/audit.rb

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

data/lib/audit/log.rb

@@ -14,12 +14,13 @@ module Audit::Log
   # bucket - the String name for the logical bucket this audit record belongs 
   #          to (i.e. table)
   # key - the String key into the logical bucket
+  # timestamp - timestamp to use for this record's UUID
   # changes - the changes hash (as generated by ActiveRecord) to store
   #
   # Returns nothing.
-  def self.record(bucket, key, changes)
+  def self.record(bucket, key, timestamp, changes)
     json = Yajl::Encoder.encode(changes)
-    payload = {SimpleUUID::UUID.new => json}
+    payload = {SimpleUUID::UUID.new(timestamp) => json}
     connection.insert(:Audits, "#{bucket}:#{key}", payload)
   end
   

data/lib/audit/tracking.rb

@@ -34,7 +34,7 @@ module Audit::Tracking
     end
 
     data = {"changes" => changes, "metadata" => audit_metadata}
-    Audit::Tracking.log.record(audit_bucket, self.id, data)
+    Audit::Tracking.log.record(audit_bucket, self.id, Time.now.utc, data)
     @audit_metadata = {}
   end
   

data/test/log_test.rb

@@ -3,16 +3,18 @@ require 'test_helper'
 class LogTest < Test::Unit::TestCase
   
   should "save audit record" do
-    assert Audit::Log.record(:Users, 1, simple_change)
+    assert_nothing_raised do
+      Audit::Log.record(:Users, 1, timestamp, simple_change)
+    end
   end
   
   should "load audit records" do
-    Audit::Log.record(:Users, 1, simple_change)
+    Audit::Log.record(:Users, 1, timestamp, simple_change)
     assert_kind_of Audit::Changeset, Audit::Log.audits(:Users, 1).first
   end
   
   should "load audits with multiple changed attributes" do
-    Audit::Log.record(:Users, 1, multiple_changes)
+    Audit::Log.record(:Users, 1, timestamp, multiple_changes)
     changes = Audit::Log.audits(:Users, 1).first.changes
     changes.each do |change|
       assert %w{username age}.include?(change.attribute)
@@ -20,6 +22,10 @@ class LogTest < Test::Unit::TestCase
       assert ["adam", 31].include?(change.new_value)
     end
   end
+
+  def timestamp
+    Time.now.utc
+  end
   
   def simple_change
     {"changes" => {"username" => ["akk", "adam"]}, "metadata" => {}}

data/test/storage-conf.xml

@@ -2,7 +2,7 @@
 <Keyspaces>
   <Keyspace Name="Audit">
       <KeysCachedFraction>0.01</KeysCachedFraction>
-      <ColumnFamily CompareWith="UTF8Type" Name="Audits" />
+      <ColumnFamily CompareWith="TimeUUIDType" Name="Audits" />
       <ReplicaPlacementStrategy>org.apache.cassandra.locator.RackUnawareStrategy</ReplicaPlacementStrategy>
       <ReplicationFactor>1</ReplicationFactor>
       <EndPointSnitch>org.apache.cassandra.locator.EndPointSnitch</EndPointSnitch>

data/test/test_helper.rb

@@ -14,10 +14,15 @@ class Test::Unit::TestCase
 
   alias_method :original_setup, :setup
   def setup
-    Audit::Log.connection = Cassandra::Mock.new(
-      'Audit', 
-      File.join(File.dirname(__FILE__), 'storage-conf.xml')
-    )
+    if ENV["CASSANDRA"] == "Y"
+      Audit::Log.connection = Cassandra.new("Audit")
+      Audit::Log.connection.clear_keyspace!
+    else
+      Audit::Log.connection = Cassandra::Mock.new(
+        'Audit', 
+        File.join(File.dirname(__FILE__), 'storage-conf.xml')
+      )
+    end
     original_setup
   end
   

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Adam Keys
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 -05:00
+date: 2010-11-16 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,7 +90,7 @@ files:
 - test/test_helper.rb
 - test/tracking_test.rb
 has_rdoc: true
-homepage: http://github.com/therealadam/auditus
+homepage: http://github.com/therealadam/audit
 licenses: []
 
 post_install_message: