Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/dvdplm/aasm into dvdplm/master
Browse files Browse the repository at this point in the history
  • Loading branch information
jacqui committed Jan 26, 2009
2 parents cf67500 + 112166a commit 558fd12
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG
@@ -1,3 +1,5 @@
* Fixed compatibility issue with Ruby 1.9.1

* In AR persistence, move state column from class level variables into the StateMachine object for the class

* allowed :to array and :on_transition callback [Kevin Triplett]
Expand Down
8 changes: 4 additions & 4 deletions aasm.gemspec
Expand Up @@ -5,15 +5,15 @@ Gem::Specification.new do |s|
s.version = "2.0.5"
s.summary = 'State machine mixin for Ruby objects'
s.description = <<-EOF
AASM is a continuation of the acts as state machine rails plugin, built for plain Ruby objects.
AASM is a continuation of the acts as state machine rails plugin, built for plain Ruby objects. This fork adds Ruby 1.9.1 compatibility.
EOF
s.files = PKG_FILES
s.require_path = 'lib'
s.has_rdoc = true
s.extra_rdoc_files = ['README.rdoc', 'MIT-LICENSE', 'TODO', 'CHANGELOG']
s.rdoc_options = ['--line-numbers', '--inline-source', '--main', 'README.rdoc', '--title', 'AASM']

s.author = 'Scott Barron'
s.email = 'scott@elitists.net'
s.homepage = 'http://github.com/rubyist/aasm'
s.author = 'Scott Barron, David Palm'
s.email = 'scott@elitists.net, dvdplm@gmail.com'
s.homepage = 'http://github.com/dvdplm/aasm'
end
6 changes: 3 additions & 3 deletions lib/event.rb
Expand Up @@ -34,11 +34,11 @@ def transitions_from_state?(state)

def execute_success_callback(obj)
case success
when String, Symbol:
when String, Symbol
obj.send(success)
when Array:
when Array
success.each { |meth| obj.send(meth) }
when Proc:
when Proc
success.call(obj)
end
end
Expand Down

0 comments on commit 558fd12

Please sign in to comment.