aasm 3.0.8 → 3.0.9

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  # - jruby-18mode # JRuby in 1.8 mode
+  # - jruby-19mode # JRuby in 1.9 mode
+  - rbx-18mode
+  - rbx-19mode

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 3.0.9
+
+ * guard checks (e.g. may_edit?) now support guard parameters as well
+
 ## 3.0.8
 
  * fixed issue with generating docs using yard

data/README.md

@@ -1,4 +1,4 @@
-# AASM - Ruby state machines #
+# AASM - Ruby state machines [![Build Status](https://secure.travis-ci.org/aasm/aasm.png)](http://travis-ci.org/aasm/aasm)
 
 This package contains AASM, a library for adding finite state machines to Ruby classes.
 
@@ -160,7 +160,7 @@ This model can change AASM states which are stored into the database, even if th
 
 ## Changelog ##
 
-Look at the [CHANGELOG](https://github.com/rubyist/aasm/blob/master/CHANGELOG.md) for details.
+Look at the [CHANGELOG](https://github.com/aasm/aasm/blob/master/CHANGELOG.md) for details.
 
 
 ## Authors ##

data/aasm.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.name        = "aasm"
   s.version     = AASM::VERSION
   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.email       = %q{scott@elitists.net, ttilley@gmail.com, aasm@mt7.de}
+  s.homepage    = %q{https://github.com/aasm/aasm}
   s.summary     = %q{State machine mixin for Ruby objects}
   s.description = %q{AASM is a continuation of the acts as state machine rails plugin, built for plain Ruby objects.}
   s.date        = Time.now

data/lib/aasm/state_machine.rb

@@ -3,11 +3,11 @@ module AASM
     def self.[](clazz)
       (@machines ||= {})[clazz.to_s]
     end
-  
+
     def self.[]=(clazz, machine)
       (@machines ||= {})[clazz.to_s] = machine
     end
-  
+
     attr_accessor :states, :events, :initial_state, :config
     attr_reader :name
 
@@ -19,11 +19,10 @@ module AASM
       @config = OpenStruct.new
     end
 
-    def clone
-      klone = super
-      klone.states = states.clone
-      klone.events = events.clone
-      klone
+    def initialize_copy(orig)
+      super
+      @states = @states.dup
+      @events = @events.dup
     end
 
     def create_state(name, options)

data/lib/aasm/supporting_classes/event.rb

@@ -12,14 +12,14 @@ module AASM
       # a neutered version of fire - it doesn't actually fire the event, it just
       # executes the transition guards to determine if a transition is even
       # an option given current conditions.
-      def may_fire?(obj, to_state=nil)
+      def may_fire?(obj, to_state=nil, *args)
         transitions = @transitions.select { |t| t.from == obj.aasm_current_state }
         return false if transitions.size == 0
-    
+
         result = false
         transitions.each do |transition|
           next if to_state and !Array(transition.to).include?(to_state)
-          if transition.perform(obj)
+          if transition.perform(obj, *args)
             result = true
             break
           end

data/lib/aasm/version.rb

@@ -1,3 +1,3 @@
 module AASM
-  VERSION = "3.0.8"
+  VERSION = "3.0.9"
 end

data/spec/spec_helpers/models_spec_helper.rb

@@ -1,4 +1,4 @@
-Dir[File.dirname(__FILE__) + "/../models/*.rb"].each { |f| require File.expand_path(f) }
+Dir[File.dirname(__FILE__) + "/../models/*.rb"].sort.each { |f| require File.expand_path(f) }
 
 class Foo
   include AASM
@@ -87,6 +87,7 @@ class AuthMachine
     state :active,  :enter => :do_activate
     state :suspended
     state :deleted, :enter => :do_delete, :exit => :do_undelete
+    state :waiting
 
     event :register do
       transitions :from => :passive, :to => :pending, :guard => Proc.new {|u| u.can_register? }
@@ -114,6 +115,10 @@ class AuthMachine
       transitions :from => :suspended, :to => :pending, :guard => Proc.new {|u| u.has_activation_code? }
       transitions :from => :suspended, :to => :passive
     end
+
+    event :wait do
+      transitions :from => :suspended, :to => :waiting, :guard => :if_polite?
+    end
   end
 
   def initialize
@@ -150,6 +155,10 @@ class AuthMachine
   def has_activation_code?
     !!@activation_code
   end
+
+  def if_polite?(phrase = nil)
+    phrase == :please
+  end
 end
 
 class ThisNameBetterNotBeInUse

data/spec/unit/auth_machine_spec.rb

@@ -28,6 +28,22 @@ describe 'AuthMachine when being unsuspended' do
     @auth.suspend!
     @auth.may_unsuspend?(:active).should_not be_true
   end
+
+  it 'should be able to be unsuspended into active if polite' do
+    @auth = AuthMachine.new
+    @auth.suspend!
+    @auth.may_wait?(:waiting, :please).should be_true
+    @auth.wait!(nil, :please)
+  end
+
+  it 'should not be able to be unsuspended into active if not polite' do
+    @auth = AuthMachine.new
+    @auth.suspend!
+    @auth.may_wait?(:waiting).should_not be_true
+    @auth.may_wait?(:waiting, :rude).should_not be_true
+    lambda {@auth.wait!(nil, :rude)}.should raise_error(AASM::InvalidTransition)
+    lambda {@auth.wait!}.should raise_error(AASM::InvalidTransition)
+  end
   
   it 'should not be able to be unpassified' do
     @auth = AuthMachine.new
@@ -36,6 +52,7 @@ describe 'AuthMachine when being unsuspended' do
     @auth.unsuspend!
     
     @auth.may_unpassify?.should_not be_true
+    lambda {@auth.unpassify!}.should raise_error(AASM::InvalidTransition)
   end
   
   it 'should be active if previously activated' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aasm
 version: !ruby/object:Gem::Version
-  version: 3.0.8
+  version: 3.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-17 00:00:00.000000000 Z
+date: 2012-09-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70162552389420 !ruby/object:Gem::Requirement
+  requirement: &70261337622160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70162552389420
+  version_requirements: *70261337622160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70162552388580 !ruby/object:Gem::Requirement
+  requirement: &70261337621740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70162552388580
+  version_requirements: *70261337621740
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &70162552387940 !ruby/object:Gem::Requirement
+  requirement: &70261337621320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70162552387940
+  version_requirements: *70261337621320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70162552386780 !ruby/object:Gem::Requirement
+  requirement: &70261337620820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -57,10 +57,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70162552386780
+  version_requirements: *70261337620820
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70162552386120 !ruby/object:Gem::Requirement
+  requirement: &70261337620400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70162552386120
+  version_requirements: *70261337620400
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70162552385340 !ruby/object:Gem::Requirement
+  requirement: &70261337651400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70162552385340
+  version_requirements: *70261337651400
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70162552384260 !ruby/object:Gem::Requirement
+  requirement: &70261337650980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70162552384260
+  version_requirements: *70261337650980
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70162552383380 !ruby/object:Gem::Requirement
+  requirement: &70261337650560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +101,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70162552383380
+  version_requirements: *70261337650560
 - !ruby/object:Gem::Dependency
   name: ruby-debug-completion
-  requirement: &70162552395060 !ruby/object:Gem::Requirement
+  requirement: &70261337650140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,16 +112,17 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70162552395060
+  version_requirements: *70261337650140
 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
+email: scott@elitists.net, ttilley@gmail.com, aasm@mt7.de
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - .document
 - .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -166,7 +167,7 @@ files:
 - spec/unit/new_dsl_spec.rb
 - spec/unit/state_spec.rb
 - spec/unit/state_transition_spec.rb
-homepage: http://rubyist.github.com/aasm/
+homepage: https://github.com/aasm/aasm
 licenses:
 - MIT
 post_install_message: 
@@ -187,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: State machine mixin for Ruby objects