aasm 3.0.3 → 3.0.4

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 3.0.4
+
+ * bugfix: Subclasses of aasm-enabled classes don't lose settings anymore (thanks to codez)
+
 ## 3.0.3
 
  * bugfix: ActiveRecord scopes are generated when using the new DSL

data/aasm.gemspec

@@ -5,7 +5,7 @@ require "aasm/version"
 Gem::Specification.new do |s|
   s.name        = "aasm"
   s.version     = AASM::VERSION
-  s.authors     = ["Scott Barron", "Scott Petersen", "Travis Tilley", "Thorsten Böttger"]
+  s.authors     = ["Scott Barron", "Scott Petersen", "Travis Tilley", "Thorsten Boettger"]
   s.email       = %q{scott@elitists.net, ttilley@gmail.com}
   s.homepage    = %q{http://rubyist.github.com/aasm/}
   s.summary     = %q{State machine mixin for Ruby objects}

data/lib/aasm/base.rb

@@ -7,13 +7,13 @@ module AASM
 
       if options.key?(:whiny_transitions)
         sm.config.whiny_transitions = options[:whiny_transitions]
-      else
+      elsif sm.config.whiny_transitions.nil?
         sm.config.whiny_transitions = true # this is the default, so let's cry
       end
 
       if options.key?(:skip_validation_on_save)
         sm.config.skip_validation_on_save = options[:skip_validation_on_save]
-      else
+      elsif sm.config.skip_validation_on_save.nil?
         sm.config.skip_validation_on_save = false # this is the default, so don't store any new state if the model is invalid
       end
     end

data/lib/aasm/version.rb

@@ -1,3 +1,3 @@
 module AASM
-  VERSION = "3.0.3"
+  VERSION = "3.0.4"
 end

data/spec/models/sub_classing.rb

@@ -0,0 +1,3 @@
+class SubClassing < Silencer
+  
+end

data/spec/unit/state_transition_spec.rb

@@ -8,12 +8,18 @@ describe 'transitions' do
     process.should be_sleeping
   end
 
-  it 'should not raise an exception when whiny' do
+  it 'should not raise an exception when not whiny' do
     silencer = Silencer.new
     silencer.smile!.should be_false
     silencer.should be_silent
   end
 
+  it 'should not raise an exception when superclass not whiny' do
+    sub = SubClassing.new
+    sub.smile!.should be_false
+    sub.should be_silent
+  end
+  
 end
 
 describe AASM::SupportingClasses::StateTransition do

metadata

@@ -1,22 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: aasm
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
   prerelease: 
 platform: ruby
 authors:
 - Scott Barron
 - Scott Petersen
 - Travis Tilley
-- Thorsten Böttger
+- Thorsten Boettger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-22 00:00:00.000000000Z
+date: 2012-04-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70214630172340 !ruby/object:Gem::Requirement
+  requirement: &70112209965860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70214630172340
+  version_requirements: *70112209965860
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70214630171920 !ruby/object:Gem::Requirement
+  requirement: &70112209965440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70214630171920
+  version_requirements: *70112209965440
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &70214630171500 !ruby/object:Gem::Requirement
+  requirement: &70112209965020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70214630171500
+  version_requirements: *70112209965020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70214630171000 !ruby/object:Gem::Requirement
+  requirement: &70112209964520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -57,10 +57,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70214630171000
+  version_requirements: *70112209964520
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70214630170580 !ruby/object:Gem::Requirement
+  requirement: &70112209964100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70214630170580
+  version_requirements: *70112209964100
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70214630170120 !ruby/object:Gem::Requirement
+  requirement: &70112209963640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70214630170120
+  version_requirements: *70112209963640
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70214630200660 !ruby/object:Gem::Requirement
+  requirement: &70112209994180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70214630200660
+  version_requirements: *70112209994180
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70214630200240 !ruby/object:Gem::Requirement
+  requirement: &70112209993760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +101,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70214630200240
+  version_requirements: *70112209993760
 - !ruby/object:Gem::Dependency
   name: ruby-debug-completion
-  requirement: &70214630199820 !ruby/object:Gem::Requirement
+  requirement: &70112209993340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,7 +112,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70214630199820
+  version_requirements: *70112209993340
 description: AASM is a continuation of the acts as state machine rails plugin, built
   for plain Ruby objects.
 email: scott@elitists.net, ttilley@gmail.com
@@ -149,6 +149,7 @@ files:
 - spec/models/not_auto_loaded/process.rb
 - spec/models/process_with_new_dsl.rb
 - spec/models/silencer.rb
+- spec/models/sub_classing.rb
 - spec/models/validator.rb
 - spec/schema.rb
 - spec/spec_helper.rb
@@ -196,6 +197,7 @@ test_files:
 - spec/models/not_auto_loaded/process.rb
 - spec/models/process_with_new_dsl.rb
 - spec/models/silencer.rb
+- spec/models/sub_classing.rb
 - spec/models/validator.rb
 - spec/schema.rb
 - spec/spec_helper.rb