wiser_trails 1.1.3 → 2.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTVhMjgwMTM0ZGYyYWYzOWI3Y2RjNzU3NTk3OWUzNDdiMzhiOTM5Nw==
+    Y2E1MmRmZmNmYjVmZWU1MWY4MjNlNWI3MzlkOTk0MjcxYTFhNWZiZA==
   data.tar.gz: !binary |-
-    ZWI0ZDBhNTY4MGYyYWQyNjdjYTNhNjg0ZWE1NDFhZmQ1Y2FlOGIyYQ==
+    MGVjZTU3ZWYxNTk3NjE2ODFiMzFkNDgxYjBmYjA2NmM4NGNkYTZmNw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MzVhN2ZjZTgyZGIwMGM4MWQzMTFiNmY1MmZhYTc1MjA4NTVjMmMxNmZjYjU1
-    NjM2ZDEyYzg1YzQ3OTdiZjllZGM3ZTY0ZDA5OTliMDQ5ZTQwNDBkY2I1YjAy
-    ZTg4OGVkMTY1NjA1OWU2NGJjMjFlMjI5NjgxMjM4NjJhODQ2MjM=
+    ZThiNWU0MGI3OGQ1NTM3M2JiYTk0NWY5OTJlNWY4NzgzMDQyOGIwMjNlZmQx
+    MmM4OTMxZGMwMzJkZTE5YWM0OTE4MWY0Njc2YjA1NjBkMzk2MDg1ZGYzZDZk
+    NWIyZTJhMmVhYWVkMGQ0YzZkMzMzZGM2Njk4YjJjZjFlNGVlZGM=
   data.tar.gz: !binary |-
-    MGE2Y2Y3ZTE5MWIxNjU5MjcyNTIyOWNiN2E5M2VlYWY4ZTQ4ZmQ5MjkyMjc1
-    M2FmNGJkNTYxNzljYjYwYmZhNGU3NjhlODgyOWQ5NTI4YTBhOWJhMjA5YmM3
-    NTM3ZTI3Yzc5NmU5MGI3OTcwNjU3YzJhNDEyMWM1NmFhMWU3Zjk=
+    ZGFjMTE4OTVhZTQ5ZTY3YTI4OWE1ZDQ5ZWJmOWJkN2I2ZDg3ZTU3ZDNjMjQ2
+    ZjIxMmQwN2FhNDBkMDhhNzFiYmU3MDI3NTg5MWIwYWIxNTViZDhkNGQ5ZTUy
+    ZGE5ODhkMmIxYTdiNWVmMjBlZTI0YjNmYTcyNmMwNWU0NjI1MjA=

data/README.md

@@ -17,12 +17,14 @@ You can do normal gem installation for `wiser_trails`:
 or in your Gemfile:
 
 ```ruby
-gem 'wiser_trails'
+gem 'wiser_trails', ~> '2.0.0'
 ```
 
+Then restart your application.
+
 ### Database
 
-**(ActiveRecord only)** Generate a migration for trails and migrate the database (in your Rails project):
+Generate a migration for trails and migrate the database (in your Rails project):
 
     rails g wiser_trails:migration
     rake db:migrate
@@ -68,9 +70,33 @@ class Notes < ActiveRecord::Base
 end
 ```
 
+This will automatically record all the changes for trailed models.
+
+#### Good Thing
+
+_Wiser Trails_ will saved **ONLY** the changed attributes during the `update` action.
+
+For example:
+
+```ruby
+  @note = Note.create(title: "New Note", content: "This is my first note.")
+  # @note.old_value = {}
+  # @note.new_value = {"title" => "New Note", "content" => "This is my first note."}
+```
+
+Then when you update the record:
+
+```ruby
+  @note.update_attribute(:title, "New Title")
+  # @note.old_value = {"title" => "New Note"}
+  # @note.new_value = {"title" => "New Note"}
+```
+
+It will not save any unchanged attributes, and you can get the updated fields for displaying.
+
 ### Monitoring Custom Actions
 
-To record custom actions, you can manually trigger the `create_activity` method on the model record:
+To record custom actions, you can manually trigger the `create_activity` method on the model record but **this will not save the `old_value`**:
 
 ```ruby
 @note.create_activity(key: 'note.published', owner: current_user)
@@ -114,11 +140,12 @@ def show
 end
 ```
 
-You can also get the new trackable value by calling `new_value`:
+You can also get the old and new object value by calling `old_value` or `new_value`:
 
 ```ruby
 def show
   @trail = WiserTrails::Activity.find(params[:id])
+  # @trail.old_value => exact Note attributes before the trail was recorded
   # @trail.new_value => exact Note attributes after the trail was recorded
 end
 ```

data/lib/generators/wiser_trails/migration/templates/migration.rb

@@ -7,6 +7,7 @@ class CreateWiserTrails < ActiveRecord::Migration
       t.belongs_to :account, :polymorphic => true
       t.belongs_to :owner, :polymorphic => true
       t.string :key
+      t.text :old_value
       t.text :new_value
 
       t.timestamps

data/lib/generators/wiser_trails/model/model_generator.rb

@@ -1,10 +1,10 @@
-require 'generators/wiser_date'
+require 'generators/wiser_trails'
 require 'rails/generators/active_record'
 
 module WiserTrails
   module Generators
     # Activity generator that creates activity model file from template
-    class ActivityGenerator < ActiveRecord::Generators::Base
+    class ModelGenerator < ActiveRecord::Generators::Base
       extend Base
 
       argument :name, :type => :string, :default => 'wiser_trails'

data/lib/wiser_trails/actions/creation.rb

@@ -9,7 +9,8 @@ module WiserTrails
     private
       # Creates activity upon creation of the tracked model
       def activity_on_create
-        create_activity(:create)
+        activity = create_activity(:create, new_value: self.attributes.stringify_keys)
+        activity.update_attribute(:old_value, {}) if activity
       end
   end
-end
+end

data/lib/wiser_trails/actions/destruction.rb

@@ -9,7 +9,8 @@ module WiserTrails
     private
       # Records an activity upon destruction of the tracked model
       def activity_on_destroy
-        create_activity(:destroy)
+        activity = create_activity(:destroy, old_value: self.attributes)
+        activity.update_attribute(:old_value, self.attributes.stringify_keys) if activity
       end
   end
 end

data/lib/wiser_trails/actions/update.rb

@@ -4,12 +4,19 @@ module WiserTrails
     extend ActiveSupport::Concern
 
     included do
+      before_update :initialize_activity
       after_update :activity_on_update
     end
     private
       # Creates activity upon modification of the tracked model
+      def initialize_activity
+        create_activity(:update) if self.changed_attributes.except("updated_at").count > 0
+      end
       def activity_on_update
-        create_activity(:update)
+        if self.changed_attributes.except("updated_at").count > 0
+          activity = Activity.where(trackable_id: self.id, trackable_type: self.class, key: "#{self.class.to_s.downcase}.update").last
+          activity.update_attribute(:new_value, activity.trackable.attributes.stringify_keys) if activity
+        end
       end
   end
 end

data/lib/wiser_trails/common.rb

@@ -298,7 +298,12 @@ module WiserTrails
           )
         )
       )
-      options[:new_value] = self.attributes
+
+      changes = Hash.new
+      self.changed_attributes.each do |attr, val|
+        changes[attr.to_sym] = val if attr != "updated_at"
+      end
+      options[:old_value] = changes.stringify_keys
       options.delete(:params)
 
       customs = self.class.activity_custom_fields_global.clone
@@ -324,6 +329,7 @@ module WiserTrails
     # called from any other place, or from application code.
     # @private
     def reset_activity_instance_options
+      @activity_old_value = {}
       @activity_new_value = {}
       @activity_key = nil
       @activity_owner = nil

data/lib/wiser_trails/orm/active_record/activity.rb

@@ -14,10 +14,11 @@ module WiserTrails
         # Define ownership to a resource targeted by this activity
         belongs_to :account, :polymorphic => true
         # Serialize parameters Hash
+        serialize :old_value, Hash
         serialize :new_value, Hash
 
         if ::ActiveRecord::VERSION::MAJOR < 4
-          attr_accessible :key, :owner, :new_value, :account, :trackable
+          attr_accessible :key, :owner, :account, :trackable, :old_value, :new_value
         end
       end
     end

data/lib/wiser_trails/orm/active_record/adapter.rb

@@ -8,7 +8,9 @@ module WiserTrails
       class Adapter
         # Creates the activity on `trackable` with `options`
         def self.create_activity(trackable, options)
-          trackable.activities.create options
+          activity = trackable.activities.create options
+          activity.update_attribute(:new_value, trackable.attributes.stringify_keys) if activity.new_value == {}
+          return activity
         end
       end
     end

data/lib/wiser_trails/version.rb

@@ -1,3 +1,3 @@
 module WiserTrails
-  VERSION = '1.1.3'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wiser_trails
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Kenneth John Balgos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler