yoon-view_trail 0.3.0 → 0.3.1

data/README.md

@@ -27,7 +27,7 @@ Works with Rails 2.3.
     
     For example: when you visit /foo/search?query=pie
     
-    >> Activities.last.whodunnit      #=> (@controller.current_user)
+    >> Activities.last.whodiddit      #=> (@controller.current_user)
     >> Activities.last.created_at     #=> (date/time of activity)
     >> Activities.last.controller     #=> FooController
     >> Activities.last.action         #=> "search"
@@ -54,6 +54,19 @@ Works with Rails 2.3.
 
 Please submit issues via GitHub's [Issue Tracker](http://github.com/yoon/view_trail/issues)
 
+## History
+
+0.3.1
+
+Fixed conflict with paper trail whodunnit. To upgrade:
+
+    `rake db:migrate:down`
+
+remove old migration and re-run
+
+    `script/generate view_trail`
+    `rake db:migrate`
+
 ## Inspiration
 
 * [PaperTrail](http://github.com/airblade/paper_trail/)

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/features/view_trail.feature

@@ -9,7 +9,7 @@ Feature: ViewTrail
     Given I have 0 activities
     When I get the foo page
     Then I should have 1 activities
-    And the last activity should have "312" whodunnit
+    And the last activity should have "312" whodiddit
     And the last activity should have "foo" action
     And the last activity should have "foo" controller
     And the last activity should have "" params
@@ -17,19 +17,19 @@ Feature: ViewTrail
   Scenario: POST request
     When I post the foo page
     Then I should have 2 activities
-    And the last activity should have "312" whodunnit
+    And the last activity should have "312" whodiddit
     And the last activity should have "foo" action
       
   Scenario: PUT request
     Given I put the foo page
     Then I should have 3 activities
-    And the last activity should have "312" whodunnit
+    And the last activity should have "312" whodiddit
     And the last activity should have "foo" action
 
   Scenario: DELETE request
     Given I delete the foo page
     Then I should have 4 activities
-    And the last activity should have "312" whodunnit
+    And the last activity should have "312" whodiddit
     And the last activity should have "foo" action
 
   Scenario: GET request with params

data/generators/view_trail/templates/create_activities_and_items.rb

@@ -4,7 +4,7 @@ class CreateActivitiesAndItems < ActiveRecord::Migration
       t.string   :controller
       t.string   :action
       t.text     :params
-      t.string   :whodunnit
+      t.string   :whodiddit
       t.datetime :created_at
     end  
     create_table :activity_items do |t|

data/lib/view_trail.rb

@@ -2,32 +2,32 @@ require 'view_trail/activity'
 require 'view_trail/activity_item'
 
 module ViewTrail
-  @@whodunnit = nil
+  @@whodiddit = nil
   
   def self.included(base)
     base.send :extend, ClassMethods
-    base.before_filter :set_whodunnit
+    base.before_filter :set_whodiddit
   end
 
-  def self.whodunnit
-    @@whodunnit.respond_to?(:call) ? @@whodunnit.call : @@whodunnit
+  def self.whodiddit
+    @@whodiddit.respond_to?(:call) ? @@whodiddit.call : @@whodiddit
   end
 
-  def self.whodunnit=(value)
-    @@whodunnit = value
+  def self.whodiddit=(value)
+    @@whodiddit = value
   end
 
   private
 
-  def set_whodunnit
-    @@whodunnit = lambda {
+  def set_whodiddit
+    @@whodiddit = lambda {
       self.respond_to?(:current_user) ? self.current_user : nil
     }
   end
 
   module ClassMethods
     def has_view_trail(*conditions)
-      before_filter :set_whodunnit
+      before_filter :set_whodiddit
       after_filter(:record_activity, conditions)
       cattr_accessor :view_trail_active
       self.view_trail_active = true
@@ -48,7 +48,7 @@ module ViewTrail
     end
     def record_activity
       if self.class.view_trail_active
-        a = Activity.create(:whodunnit => ViewTrail.whodunnit, :controller => params.delete(:controller), :action => params.delete(:action), :params => params)
+        a = Activity.create(:whodiddit => ViewTrail.whodiddit, :controller => params.delete(:controller), :action => params.delete(:action), :params => params)
         (@activity_items || {}).each do |k,v|
           a.activity_items.create(:key => k.to_s, :value => v)
         end

data/view_trail.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{view_trail}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Yoon"]
-  s.date = %q{2009-07-17}
+  s.date = %q{2009-08-14}
   s.description = %q{View trail tracks controller actions in Rails.}
   s.email = %q{yoon@northwestern.edu}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yoon-view_trail
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Mark Yoon
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-17 00:00:00 -07:00
+date: 2009-08-14 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -44,6 +44,7 @@ files:
 - view_trail.gemspec
 has_rdoc: false
 homepage: http://github.com/yoon/view_trail
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -64,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: View trail tracks controller actions in Rails.