simple_audit_trail 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05392058a30f45516932956a54df4b3531bcf941
-  data.tar.gz: df84d49f9092f4e4a296ebf706dd29a559b2d577
+  metadata.gz: d6676d538e06da759f96c5312bfddbe870847225
+  data.tar.gz: d1a314e1d44cba111a208a19c06875e60df109c3
 SHA512:
-  metadata.gz: 001e958b666d15e6923e9721118fd3436b8917047578c5d3a45bc622c28cfe547065fca68d7a2172092dd3073e3d9dda65e71d0508c3cb4fae303a7c029cb220
-  data.tar.gz: c242e91ecd549752fd03c9502414d17b0026577295b4d4d27e28c09b650ae0e4184bf91fb16f12a90a6d5db68af7ec7ddbb2bc0905525ece242180a670dc0c6a
+  metadata.gz: 591e787a48ca58f5f5772f2fb05c629bf0f369d7de229a0aad3ed5f68f267d8d63a345b7d533398904acaf1d31dcf6cc3a56771372b9c55782c626e9cb96ed06
+  data.tar.gz: 04a2b9116578b4a609bed9c2925c3f2bcdabbd5738b8f015a51ed8f1314d26631f34cd33d704d7d02a7dcd01da32795dfe17949168202372b86c5e8fcbf0cab4

data/README.md

@@ -1,9 +1,9 @@
 # Simple Audit Trail
-
+# ** rails_3 branch and 0.0.x gem versions is Rails 3x, for the rails 4 compatible gem, use the 1.x.x gem versions and the master branch**
 ## Synopsis
 
-Use to create an audit trail of field changes in a model, storing what was 
-changed and who changed it. 
+Use to create an audit trail of field changes in a model, storing what was
+changed and who changed it.
 
 **Setup**
 
@@ -13,12 +13,12 @@ changed and who changed it.
 1. Migrate: ``` rake db:migrate ```
 
 
-1. You must have a current_user method in your app. If not, you'll need to override 
-``` simple_audit_trail_who_id ``` to provide a user id 
+1. You must have a current_user method in your app. If not, you'll need to override
+``` simple_audit_trail_who_id ``` to provide a user id
 
 **Model**
 
-``` 
+```
 class Thing < ActiveRecord::Base
   audit [:some_field, :some_other_field]
 end
@@ -27,13 +27,13 @@ end
 
 **Usage**
 
-Thing instances now have an attribute, ` audited_user_id `. 
+Thing instances now have an attribute, ` audited_user_id `.
 
-You must set this on the object before you save it with changes to the audited 
+You must set this on the object before you save it with changes to the audited
 fields, or the audit attempt will fail, and raise an exception.
- 
-Assuming you have the above model, and that your controller has access to the 
-usual `current_user` method, you could do something like: 
+
+Assuming you have the above model, and that your controller has access to the
+usual `current_user` method, you could do something like:
 
 ```ruby
   t = Thing.find(1)
@@ -46,6 +46,5 @@ usual `current_user` method, you could do something like:
 
 which would generate a record in ` t.simple_audits `
 
-* If you don't wish to track users, but just track changes, 
+* If you don't wish to track users, but just track changes,
 add ` :require_audited_user_id => false ` to your `audit` call.
-

data/lib/simple_audit_trail/version.rb

@@ -1,3 +1,3 @@
 module SimpleAuditTrail
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/simple_audit_trail.rb

@@ -12,29 +12,46 @@ module SimpleAuditTrail
         cattr_accessor :audit_options
         self.audit_options = { :require_audited_user_id => true }.merge(options)
 
-
         attr_accessor :audited_user_id
+        attr_accessible :audited_user_id
 
         has_many :simple_audits,
                  :as => :simple_audit_trailable,
                  :class_name => "SimpleAuditTrail::Audit",
                  :autosave => true
 
+        after_create :save_all_audits
+        define_method :save_all_audits do
+          if audited_user_id.nil? && audit_options[:require_audited_user_id]
+            raise "audited setter method called without setting audited_user_id"
+          end
+
+          from = {}
+          to = Hash[audited_fields.map { |k| [k, send(k)] } ]
+          unchanged = {}
+
+          simple_audits.create(
+            :from => from.to_json,
+            :to => to.to_json,
+            :unchanged => unchanged.to_json,
+            :who_id => audited_user_id
+          )
+        end
+
         before_update :save_audits
         define_method :save_audits do
-          changed_audited_fields = audited_fields.select do |f|
-            send "#{f}_changed?"
-          end
+          changed_audited_fields = changes.slice(*audited_fields)
 
           if changed_audited_fields.present?
             if audited_user_id.nil? && audit_options[:require_audited_user_id]
               raise "audited setter method called without setting audited_user_id"
             end
 
-            to = Hash[changed_audited_fields.map { |f| [f, send(f)] }]
-            from = Hash[changed_audited_fields.map { |f| [f, send("#{f}_was")] }]
+
+            from = Hash[changed_audited_fields.map { |k, v| [k, v[0]] } ]
+            to = Hash[changed_audited_fields.map { |k, v| [k, v[1]] } ]
             unchanged = Hash[
-              (audited_fields - changed_audited_fields).map do |f|
+              (audited_fields - changed_audited_fields.keys).map do |f|
                 [f, send(f)]
               end
             ]

data/spec/dummy/log/development.log

@@ -1,31 +1,26 @@
-   (1.4ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL) 
-   (0.1ms)  select sqlite_version(*)
-   (0.7ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
-  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Connecting to database specified by database.yml
+   (0.2ms)  select sqlite_version(*)
+   (0.7ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.5ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
 Migrating to CreateSimpleAuditTrailAudits (20150512224022)
-   (0.1ms)  begin transaction
-DEPRECATION WARNING: `#timestamps` was called without specifying an option for `null`. In Rails 5, this behavior will change to `null: false`. You should manually specify `null: true` to prevent the behavior of your existing migrations from changing. (called from block in change at /Users/christophermaujean/projects/simple_audit_trail/db/migrate/20150512224022_create_simple_audit_trail_audits.rb:10)
-   (0.4ms)  CREATE TABLE "simple_audit_trail_audits" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "simple_audit_trailable_id" integer, "simple_audit_trailable_type" varchar, "who_id" integer, "from" text, "to" text, "created_at" datetime, "updated_at" datetime) 
-  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150512224022"]]
-   (1.0ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.3ms)  CREATE TABLE "simple_audit_trail_audits" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "simple_audit_trailable_id" integer, "simple_audit_trailable_type" varchar(255), "who_id" integer, "from" text, "to" text, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20150512224022')
+   (0.4ms)  commit transaction
+Migrating to CreateTinas (20150513181325)
+   (0.0ms)  begin transaction
+   (0.2ms)  CREATE TABLE "tinas" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "ladies" integer, "badonkadonks" integer, "mushy_snugglebites" varchar(255), "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20150513181325')
+   (0.4ms)  commit transaction
+Migrating to CreateMrTorques (20150513221356)
+   (0.0ms)  begin transaction
+   (0.3ms)  CREATE TABLE "mr_torques" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "todays_quote" varchar(255), "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20150513221356')
+   (0.4ms)  commit transaction
 Migrating to AddUnchangedColumn (20150701174723)
-   (0.0ms)  begin transaction
-   (0.3ms)  ALTER TABLE "simple_audit_trail_audits" ADD "unchanged" text
-  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150701174723"]]
-   (0.5ms)  commit transaction
-  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-   (1.7ms)  CREATE TABLE "mr_torques" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "todays_quote" varchar, "created_at" datetime, "updated_at" datetime) 
-   (0.8ms)  CREATE TABLE "simple_audit_trail_audits" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "simple_audit_trailable_id" integer, "simple_audit_trailable_type" varchar, "who_id" integer, "from" text, "to" text, "created_at" datetime, "updated_at" datetime, "unchanged" text) 
-   (0.7ms)  CREATE TABLE "tinas" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "ladies" integer, "badonkadonks" integer, "mushy_snugglebites" varchar, "created_at" datetime, "updated_at" datetime) 
-   (0.9ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL) 
-   (0.0ms)  select sqlite_version(*)
-   (0.9ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
-   (0.1ms)  SELECT version FROM "schema_migrations"
-   (0.9ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150701174723')
-   (1.0ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150513181325')
-   (0.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150513221356')
-   (0.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150512224022')
+   (0.0ms)  begin transaction
+   (0.2ms)  ALTER TABLE "simple_audit_trail_audits" ADD "unchanged" text
+   (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20150701174723')
+   (0.3ms)  commit transaction
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations"