state_machine-audit_trail 0.1.2 → 0.1.3

data/lib/state_machine/audit_trail.rb

@@ -2,7 +2,7 @@ require 'state_machine'
 
 module StateMachine::AuditTrail
     
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
     
   def self.setup
     StateMachine::Machine.send(:include, StateMachine::AuditTrail::TransitionAuditing)

data/lib/state_machine/audit_trail/transition_auditing.rb

@@ -4,7 +4,7 @@
 
 module StateMachine::AuditTrail::TransitionAuditing
   attr_accessor :transition_class_name
-  
+
   # Public tells the state machine to hook in the appropriate before / after behaviour
   #
   # options: a Hash of options. keys that are used are :to => CustomTransitionClass,
@@ -35,6 +35,7 @@ module StateMachine::AuditTrail::TransitionAuditing
   end
 
   def default_transition_class_name
-    "#{owner_class.name}#{attribute.to_s.camelize}Transition"
+    owner_class_or_base_class = owner_class.respond_to?(:base_class) ? owner_class.base_class : owner_class
+    "#{owner_class_or_base_class.name}#{attribute.to_s.camelize}Transition"
   end
 end

data/spec/helpers/active_record.rb

@@ -75,6 +75,16 @@ end
 class ActiveRecordTestModelDescendant < ActiveRecordTestModel
 end
 
+class ActiveRecordTestModelDescendantWithOwnStateMachine < ActiveRecordTestModel
+  state_machine :state, :initial => :new do
+    store_audit_trail
+
+    event :complete do
+      transition [:new] => :completed
+    end
+  end
+end
+
 class ActiveRecordTestModelWithMultipleStateMachines < ActiveRecord::Base
 
   state_machine :first, :initial => :beginning do

data/spec/state_machine/active_record_spec.rb

@@ -103,4 +103,11 @@ describe StateMachine::AuditTrail::Backend::ActiveRecord do
       lambda { m.start! }.should_not raise_error
     end
   end
+
+  context 'on a class using STI with own state machine' do
+    it "should properly grab the class name from STI models" do
+      m = ActiveRecordTestModelDescendantWithOwnStateMachine.create!
+      lambda { m.complete! }.should_not raise_error
+    end
+  end
 end

data/state_machine-audit_trail.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "state_machine-audit_trail"
-  s.version     = "0.1.2"
+  s.version     = "0.1.3"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Willem van Bergen", "Jesse Storimer"]
   s.email       = ["willem@shopify.com", "jesse@shopify.com"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: state_machine-audit_trail
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-28 00:00:00.000000000 Z
+date: 2012-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &70321730548680 !ruby/object:Gem::Requirement
+  requirement: &70284895978760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70321730548680
+  version_requirements: *70284895978760
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70321730546980 !ruby/object:Gem::Requirement
+  requirement: &70284895977960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70321730546980
+  version_requirements: *70284895977960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70321730545180 !ruby/object:Gem::Requirement
+  requirement: &70284895976820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70321730545180
+  version_requirements: *70284895976820
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70321730566140 !ruby/object:Gem::Requirement
+  requirement: &70284895976060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70321730566140
+  version_requirements: *70284895976060
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70321730564040 !ruby/object:Gem::Requirement
+  requirement: &70284895954760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70321730564040
+  version_requirements: *70284895954760
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70321730560820 !ruby/object:Gem::Requirement
+  requirement: &70284895954100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70321730560820
+  version_requirements: *70284895954100
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70321730573720 !ruby/object:Gem::Requirement
+  requirement: &70284895953520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,7 +88,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70321730573720
+  version_requirements: *70284895953520
 description: Log transitions on a state machine to support auditing and business process
   analytics.
 email:
@@ -132,18 +132,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3894931399333668545
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3894931399333668545
 requirements: []
 rubyforge_project: state_machine
 rubygems_version: 1.8.16