audit 0.4.0 → 0.5.0

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.4.0'
-  s.date              = '2010-11-16'
+  s.version           = '0.5.0'
+  s.date              = '2010-11-17'
   s.rubyforge_project = 'audit'
 
   ## Make sure your summary is short. The description may be as long

data/lib/audit.rb

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

data/lib/audit/log.rb

@@ -20,7 +20,7 @@ module Audit::Log
   # Returns nothing.
   def self.record(bucket, key, timestamp, changes)
     json = Yajl::Encoder.encode(changes)
-    payload = {SimpleUUID::UUID.new(timestamp) => json}
+    payload = {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, Time.now.utc, data)
+    Audit::Tracking.log.record(audit_bucket, self.id, Time.now.utc.iso8601, data)
     @audit_metadata = {}
   end
   

data/test/log_test.rb

@@ -7,6 +7,12 @@ class LogTest < Test::Unit::TestCase
       Audit::Log.record(:Users, 1, timestamp, simple_change)
     end
   end
+
+  should "save audit records idempotently" do
+    t = Time.now.utc.iso8601
+    3.times { Audit::Log.record(:Users, 1, t, simple_change) }
+    assert_equal 1, Audit::Log.audits(:Users, 1).length
+  end
   
   should "load audit records" do
     Audit::Log.record(:Users, 1, timestamp, simple_change)
@@ -23,8 +29,13 @@ 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
+    Time.now.utc.iso8601
   end
   
   def simple_change

data/test/storage-conf.xml

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

data/test/test_helper.rb

@@ -10,6 +10,10 @@ require 'cassandra/mock'
 require 'active_record'
 require 'audit'
 
+if ENV["CASSANDRA"] == "Y"
+  puts "-- RUNNING TESTS AGAINST CASSANDRA --"
+end
+
 class Test::Unit::TestCase
 
   alias_method :original_setup, :setup

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Adam Keys
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 -06:00
+date: 2010-11-17 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency