aasm 2.2.1 → 2.3.0

data/.gitignore

@@ -0,0 +1,10 @@
+*.sw?
+*~
+.DS_Store
+.idea
+coverage
+pkg
+rdoc
+Gemfile.lock
+spec/debug.log
+spec/*.db

data/Gemfile

@@ -1,16 +1,3 @@
 source :rubygems
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "rspec",   ">= 2.0.0"
-  gem "shoulda"
-  gem "sdoc"
-  gem "bundler", ">= 1.0.0"
-  gem "jeweler", ">= 1.5.1"
-  gem "rcov", ">= 0"
-  gem "rr"
-  gem "reek", "~> 1.2.8"
-  gem "roodi", "~> 2.1.0"
-  gem "activerecord"
-end
+gemspec

data/{README.rdoc → README.md}

@@ -1,74 +1,64 @@
-= Alternatives
-
-This project is essentially abandoned. Thorsten Böttger has volunteered to take over maintenance: https://github.com/alto/aasm
-
-If you are looking for an alternative to AASM, I would highly suggest transitions: http://github.com/qoobaa/transitions
-
-= AASM - Ruby state machines
+# AASM - Ruby state machines #
 
 This package contains AASM, a library for adding finite state machines to Ruby classes.
 
 AASM started as the acts_as_state_machine plugin but has evolved into a more generic library that no longer targets only ActiveRecord models.
 
-AASM has the following features:
+## Features ##
 
 * States
 * Machines
 * Events
 * Transitions
 
-== New Callbacks
+## New Callbacks ##
 
 The callback chain & order on a successful event looks like:
 
-  oldstate:exit*
-  event:before
-  __find transition, if possible__
-  transition:on_transition*
-  oldstate:before_exit
-  newstate:before_enter
-  newstate:enter*
-  __update state__
-  event:success*
-  oldstate:after_exit
-  newstate:after_enter
-  event:after
-  obj:aasm_event_fired*
+    oldstate:exit*
+      event:before
+        __find transition, if possible__
+        transition:on_transition*
+          oldstate:before_exit
+            newstate:before_enter
+              newstate:enter*
+              __update state__
+              event:success*
+            oldstate:after_exit
+          newstate:after_enter
+      event:after
+    obj:aasm_event_fired*
 
-  (*) marks old callbacks
+    (*) marks old callbacks
 
 
-== Download
+## Download ##
 
 The latest AASM can currently be pulled from the git repository on github.
 
 * http://github.com/rubyist/aasm/tree/master
 
 
-== Installation
-
-=== From gemcutter
-
-  % sudo gem install gemcutter
-  % sudo gem tumble
-  % sudo gem install aasm
-
-=== From GitHub hosted gems (only older releases are available)
+## Installation ##
 
-  % sudo gem sources -a http://gems.github.com # (you only need to do this once)
-  % sudo gem install rubyist-aasm
+### From RubyGems.org ###
 
-=== Building your own gems
+```sh
+% gem install aasm
+```
 
-  % rake gemspec
-  % rake build
-  % sudo gem install pkg/aasm-2.1.gem
+### Building your own gems ###
 
+```sh
+% rake build
+% sudo gem install pkg/aasm-x.y.z.gem
+```
 
-== Simple Example
+## Simple Example ##
 
 Here's a quick example highlighting some of the features.
 
+```ruby
   class Conversation
     include AASM
 
@@ -89,11 +79,13 @@ Here's a quick example highlighting some of the features.
       transitions :to => :closed, :from => [:read, :unread]
     end
   end
+```
 
-== A Slightly More Complex Example
+## A Slightly More Complex Example ##
 
 This example uses a few of the more complex features available.
 
+```ruby
   class Relationship
     include AASM
 
@@ -123,15 +115,16 @@ This example uses a few of the more complex features available.
     def give_up_intimacy; end
     def buy_exotic_car_and_wear_a_combover; end
   end
+```
 
-= Other Stuff
+# Other Stuff #
 
 Author::  Scott Barron <scott at elitists dot net>
 License:: Original code Copyright 2006, 2007, 2008 by Scott Barron.
           Released under an MIT-style license.  See the LICENSE  file
           included in the distribution.
 
-== Warranty
+## Warranty ##
 
 This software is provided "as is" and without any express or
 implied warranties, including, without limitation, the implied

data/Rakefile

@@ -1,30 +1,11 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
+require 'bundler/gem_tasks'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  gem.name = "aasm"
-  gem.summary = %Q{State machine mixin for Ruby objects}
-  gem.description = %Q{AASM is a continuation of the acts as state machine rails plugin, built for plain Ruby objects.}
-  gem.homepage = "http://rubyist.github.com/aasm/"
-  gem.authors = ["Scott Barron", "Scott Petersen", "Travis Tilley"]
-  gem.email = "scott@elitists.net, ttilley@gmail.com"
-  gem.add_development_dependency "rspec"
-  gem.add_development_dependency "shoulda"
-  gem.add_development_dependency 'sdoc'
-  # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
-Jeweler::RubygemsDotOrgTasks.new
 
-require 'rspec/core/rake_task'
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
@@ -32,48 +13,15 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new(:rcov_shoulda) do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/*_test.rb'
-  test.verbose = true
-end
-
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rspec_opts = ['-cfs']
-end
-
-RSpec::Core::RakeTask.new(:rcov_rspec) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-require 'reek/rake/task'
-Reek::Rake::Task.new do |t|
-  t.fail_on_error = true
-  t.verbose = false
-  t.source_files = 'lib/**/*.rb'
-end
-
-require 'roodi'
-require 'roodi_task'
-RoodiTask.new do |t|
-  t.verbose = false
-end
-
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
+require 'aasm/version'
 require 'sdoc'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
+Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "aasm #{version}"
+  rdoc.title = "aasm #{AASM::VERSION}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
-
-  rdoc.options << '--fmt' << 'shtml'
-  rdoc.template = 'direct'
-end
+end

data/aasm.gemspec

@@ -1,126 +1,27 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "aasm/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{aasm}
-  s.version = "2.2.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Scott Barron", "Scott Petersen", "Travis Tilley"]
-  s.date = %q{2011-08-31}
+  s.name        = "aasm"
+  s.version     = AASM::VERSION
+  s.authors     = ["Scott Barron", "Scott Petersen", "Travis Tilley", "Thorsten Böttger"]
+  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}
   s.description = %q{AASM is a continuation of the acts as state machine rails plugin, built for plain Ruby objects.}
-  s.email = %q{scott@elitists.net, ttilley@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "aasm.gemspec",
-    "lib/aasm.rb",
-    "lib/aasm/aasm.rb",
-    "lib/aasm/event.rb",
-    "lib/aasm/persistence.rb",
-    "lib/aasm/persistence/active_record_persistence.rb",
-    "lib/aasm/state.rb",
-    "lib/aasm/state_machine.rb",
-    "lib/aasm/state_transition.rb",
-    "lib/aasm/supporting_classes.rb",
-    "spec/functional/conversation.rb",
-    "spec/functional/conversation_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/unit/aasm_spec.rb",
-    "spec/unit/active_record_persistence_spec.rb",
-    "spec/unit/before_after_callbacks_spec.rb",
-    "spec/unit/event_spec.rb",
-    "spec/unit/state_spec.rb",
-    "spec/unit/state_transition_spec.rb",
-    "test/functional/auth_machine_test.rb",
-    "test/models/process.rb",
-    "test/test_helper.rb",
-    "test/unit/aasm_test.rb",
-    "test/unit/event_test.rb",
-    "test/unit/state_machine_test.rb",
-    "test/unit/state_test.rb",
-    "test/unit/state_transition_test.rb"
-  ]
-  s.homepage = %q{http://rubyist.github.com/aasm/}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{State machine mixin for Ruby objects}
-  s.test_files = [
-    "spec/functional/conversation.rb",
-    "spec/functional/conversation_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/unit/aasm_spec.rb",
-    "spec/unit/active_record_persistence_spec.rb",
-    "spec/unit/before_after_callbacks_spec.rb",
-    "spec/unit/event_spec.rb",
-    "spec/unit/state_spec.rb",
-    "spec/unit/state_transition_spec.rb",
-    "test/functional/auth_machine_test.rb",
-    "test/models/process.rb",
-    "test/test_helper.rb",
-    "test/unit/aasm_test.rb",
-    "test/unit/event_test.rb",
-    "test/unit/state_machine_test.rb",
-    "test/unit/state_test.rb",
-    "test/unit/state_transition_test.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.add_dependency             'activerecord'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'sdoc'
+  s.add_development_dependency 'rspec', '~> 2.0'
+  s.add_development_dependency 'rr'
+  s.add_development_dependency 'shoulda'
+  s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'minitest'
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<sdoc>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.5.1"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<rr>, [">= 0"])
-      s.add_development_dependency(%q<reek>, ["~> 1.2.8"])
-      s.add_development_dependency(%q<roodi>, ["~> 2.1.0"])
-      s.add_development_dependency(%q<activerecord>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<sdoc>, [">= 0"])
-    else
-      s.add_dependency(%q<rspec>, [">= 2.0.0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<sdoc>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_dependency(%q<jeweler>, [">= 1.5.1"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<rr>, [">= 0"])
-      s.add_dependency(%q<reek>, ["~> 1.2.8"])
-      s.add_dependency(%q<roodi>, ["~> 2.1.0"])
-      s.add_dependency(%q<activerecord>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<sdoc>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rspec>, [">= 2.0.0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<sdoc>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 1.0.0"])
-    s.add_dependency(%q<jeweler>, [">= 1.5.1"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<rr>, [">= 0"])
-    s.add_dependency(%q<reek>, ["~> 1.2.8"])
-    s.add_dependency(%q<roodi>, ["~> 2.1.0"])
-    s.add_dependency(%q<activerecord>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<sdoc>, [">= 0"])
-  end
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 end
-

data/lib/aasm.rb

@@ -7,3 +7,4 @@ require File.join(File.dirname(__FILE__), 'aasm', 'supporting_classes')
 require File.join(File.dirname(__FILE__), 'aasm', 'state_machine')
 require File.join(File.dirname(__FILE__), 'aasm', 'persistence')
 require File.join(File.dirname(__FILE__), 'aasm', 'aasm')
+require File.join(File.dirname(__FILE__), 'aasm', 'i18n')

data/lib/aasm/aasm.rb

@@ -7,6 +7,7 @@ module AASM
 
   def self.included(base) #:nodoc:
     base.extend AASM::ClassMethods
+
     AASM::Persistence.set_persistence(base)
     unless AASM::StateMachine[base]
       AASM::StateMachine[base] = AASM::StateMachine.new('')
@@ -41,7 +42,7 @@ module AASM
         aasm_current_state == name
       end
     end
-
+    
     def aasm_event(name, options = {}, &block)
       sm = AASM::StateMachine[self]
 
@@ -70,8 +71,11 @@ module AASM
       AASM::StateMachine[self].states.map { |state| state.for_select }
     end
 
+    def human_event_name(event)
+      AASM::I18n.new.human_event_name(self, event)
+    end
   end
-
+  
   # Instance methods
   def aasm_current_state
     return @aasm_current_state if @aasm_current_state
@@ -105,6 +109,10 @@ module AASM
     events.map {|event| event.name}
   end
 
+  def human_state
+    AASM::I18n.new.human_state(self)
+  end
+
   private
 
   def set_aasm_current_state_with_persistence(state)

data/lib/aasm/i18n.rb

@@ -0,0 +1,36 @@
+class AASM::I18n
+  def human_event_name(klass, event)
+    defaults = ancestors_list(klass).map do |ancestor|
+      :"#{i18n_scope(klass)}.events.#{i18n_klass(ancestor)}.#{event}"
+    end << event.to_s.humanize
+
+    I18n.translate(defaults.shift, :default => defaults, :raise => true)
+  end
+
+  def human_state(obj)
+    klass = obj.class
+    defaults = ancestors_list(klass).map do |ancestor|
+      :"#{i18n_scope(klass)}.attributes.#{i18n_klass(ancestor)}.#{klass.aasm_column}.#{obj.aasm_current_state}"
+    end << obj.aasm_current_state.to_s.humanize
+
+    I18n.translate(defaults.shift, :default => defaults, :raise => true)
+  end
+
+  private
+
+  # added for rails 2.x compatibility
+  def i18n_scope(klass)
+    klass.respond_to?(:i18n_scope) ? klass.i18n_scope : :activerecord
+  end
+
+  # added for rails < 3.0.3 compatibility
+  def i18n_klass(klass)
+    klass.model_name.respond_to?(:i18n_key) ? klass.model_name.i18n_key : klass.name.underscore
+  end
+
+  def ancestors_list(klass)
+    klass.ancestors.select do |ancestor|
+      ancestor.respond_to?(:model_name) unless ancestor == ActiveRecord::Base
+    end
+  end
+end

data/lib/aasm/version.rb

@@ -0,0 +1,3 @@
+module AASM
+  VERSION = "2.3.0"
+end

data/spec/database.yml

@@ -0,0 +1,3 @@
+sqlite3:
+  adapter: sqlite3
+  database: spec/aasm.sqlite3.db

data/spec/en.yml

@@ -0,0 +1,10 @@
+en:
+  activerecord:
+    events:
+      i18n_test_model:
+        close: "Let's close it!"
+
+    attributes:
+      i18n_test_model:
+        aasm_state:
+          open: "It's opened now!"

data/spec/schema.rb

@@ -0,0 +1,7 @@
+ActiveRecord::Schema.define(:version => 0) do
+
+  %w{gates readers writers transients simples thieves i18n_test_models}.each do |table_name|
+    create_table table_name, :force => true
+  end
+
+end

data/spec/spec_helper.rb

@@ -5,6 +5,9 @@ require 'aasm'
 require 'rspec'
 require 'rspec/autorun'
 
-RSpec.configure do |config|
-  
+def load_schema
+  config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
+  ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
+  ActiveRecord::Base.establish_connection(config['sqlite3'])
+  load(File.dirname(__FILE__) + "/schema.rb")
 end

data/spec/unit/active_record_persistence_spec.rb

@@ -2,20 +2,18 @@ begin
   require 'rubygems'
   require 'active_record'
   require 'logger'
-  
-  ActiveRecord::Base.logger = Logger.new(STDERR)
 
-  # A dummy class for mocking the activerecord connection class
-  class Connection
-  end
+  load_schema
 
-  class FooBar < ActiveRecord::Base
+  ActiveRecord::Base.logger = Logger.new(STDERR)
+
+  class Gate < ActiveRecord::Base
     include AASM
 
     # Fake this column for testing purposes
     attr_accessor :aasm_state
 
-    aasm_state :open
+    aasm_state :opened
     aasm_state :closed
 
     aasm_event :view do
@@ -23,36 +21,37 @@ begin
     end
   end
 
-  class Fi < ActiveRecord::Base
+  class Reader < ActiveRecord::Base
     def aasm_read_state
       "fi"
     end
     include AASM
   end
 
-  class Fo < ActiveRecord::Base
+  class Writer < ActiveRecord::Base
     def aasm_write_state(state)
       "fo"
     end
     include AASM
   end
 
-  class Fum < ActiveRecord::Base
+  class Transient < ActiveRecord::Base
     def aasm_write_state_without_persistence(state)
       "fum"
     end
     include AASM
   end
 
-  class June < ActiveRecord::Base
+  class Simple < ActiveRecord::Base
     include AASM
     aasm_column :status
   end
 
-  class Beaver < June
+  class Derivate < Simple
   end
 
   class Thief < ActiveRecord::Base
+    set_table_name "thieves"
     include AASM
     aasm_initial_state  Proc.new { |thief| thief.skilled ? :rich : :jailed }
     aasm_state          :rich
@@ -69,9 +68,9 @@ begin
     end
   end
 
-  describe FooBar, "class methods" do
+  describe Gate, "class methods" do
     before(:each) do
-      @klass = FooBar
+      @klass = Gate
     end
     it_should_behave_like "aasm model"
     it "should include AASM::Persistence::ActiveRecordPersistence::ReadState" do
@@ -85,9 +84,9 @@ begin
     end
   end
 
-  describe Fi, "class methods" do
+  describe Reader, "class methods" do
     before(:each) do
-      @klass = Fi
+      @klass = Reader
     end
     it_should_behave_like "aasm model"
     it "should not include AASM::Persistence::ActiveRecordPersistence::ReadState" do
@@ -101,9 +100,9 @@ begin
     end
   end
 
-  describe Fo, "class methods" do
+  describe Writer, "class methods" do
     before(:each) do
-      @klass = Fo
+      @klass = Writer
     end
     it_should_behave_like "aasm model"
     it "should include AASM::Persistence::ActiveRecordPersistence::ReadState" do
@@ -117,9 +116,9 @@ begin
     end
   end
 
-  describe Fum, "class methods" do
+  describe Transient, "class methods" do
     before(:each) do
-      @klass = Fum
+      @klass = Transient
     end
     it_should_behave_like "aasm model"
     it "should include AASM::Persistence::ActiveRecordPersistence::ReadState" do
@@ -133,61 +132,57 @@ begin
     end
   end
 
-  describe FooBar, "instance methods" do
-    before(:each) do
-      connection = mock(Connection, :columns => [])
-      FooBar.stub!(:connection).and_return(connection)
-    end
+  describe Gate, "instance methods" do
 
     it "should respond to aasm read state when not previously defined" do
-      FooBar.new.should respond_to(:aasm_read_state)
+      Gate.new.should respond_to(:aasm_read_state)
     end
 
     it "should respond to aasm write state when not previously defined" do
-      FooBar.new.should respond_to(:aasm_write_state)
+      Gate.new.should respond_to(:aasm_write_state)
     end
 
     it "should respond to aasm write state without persistence when not previously defined" do
-      FooBar.new.should respond_to(:aasm_write_state_without_persistence)
+      Gate.new.should respond_to(:aasm_write_state_without_persistence)
     end
 
     it "should return the initial state when new and the aasm field is nil" do
-      FooBar.new.aasm_current_state.should == :open
+      Gate.new.aasm_current_state.should == :opened
     end
 
     it "should return the aasm column when new and the aasm field is not nil" do
-      foo = FooBar.new
+      foo = Gate.new
       foo.aasm_state = "closed"
       foo.aasm_current_state.should == :closed
     end
 
     it "should return the aasm column when not new and the aasm_column is not nil" do
-      foo = FooBar.new
+      foo = Gate.new
       foo.stub!(:new_record?).and_return(false)
       foo.aasm_state = "state"
       foo.aasm_current_state.should == :state
     end
 
     it "should allow a nil state" do
-      foo = FooBar.new
+      foo = Gate.new
       foo.stub!(:new_record?).and_return(false)
       foo.aasm_state = nil
       foo.aasm_current_state.should be_nil
     end
 
     it "should have aasm_ensure_initial_state" do
-      foo = FooBar.new
+      foo = Gate.new
       foo.send :aasm_ensure_initial_state
     end
 
     it "should call aasm_ensure_initial_state on validation before create" do
-      foo = FooBar.new
+      foo = Gate.new
       foo.should_receive(:aasm_ensure_initial_state).and_return(true)
       foo.valid?
     end
 
     it "should call aasm_ensure_initial_state on validation before create" do
-      foo = FooBar.new
+      foo = Gate.new
       foo.stub!(:new_record?).and_return(false)
       foo.should_not_receive(:aasm_ensure_initial_state)
       foo.valid?
@@ -195,45 +190,41 @@ begin
 
   end
 
-  describe 'Beavers' do
+  describe 'Derivates' do
     it "should have the same states as it's parent" do
-      Beaver.aasm_states.should == June.aasm_states
+      Derivate.aasm_states.should == Simple.aasm_states
     end
 
     it "should have the same events as it's parent" do
-      Beaver.aasm_events.should == June.aasm_events
+      Derivate.aasm_events.should == Simple.aasm_events
     end
 
     it "should have the same column as it's parent" do
-      Beaver.aasm_column.should == :status
+      Derivate.aasm_column.should == :status
     end
   end
 
   describe AASM::Persistence::ActiveRecordPersistence::NamedScopeMethods do
-    class NamedScopeExample < ActiveRecord::Base
-      include AASM
-    end
 
     context "Does not already respond_to? the scope name" do
       it "should add a scope" do
-        NamedScopeExample.aasm_state :unknown_scope
-        NamedScopeExample.scopes.keys.should include(:unknown_scope)
+        Simple.should_not respond_to(:unknown_scope)
+        Simple.aasm_state :unknown_scope
+        Simple.should respond_to(:unknown_scope)
+        Simple.unknown_scope.class.should == ActiveRecord::Relation
       end
     end
 
     context "Already respond_to? the scope name" do
       it "should not add a scope" do
-        NamedScopeExample.aasm_state :new
-        NamedScopeExample.scopes.keys.should_not include(:new)
+        Simple.aasm_state :new
+        Simple.should respond_to(:new)
+        Simple.new.class.should == Simple
       end
     end
   end
 
   describe 'Thieves' do
-    before(:each) do
-      connection = mock(Connection, :columns => [])
-      Thief.stub!(:connection).and_return(connection)
-    end
 
     it 'should be rich if they\'re skilled' do
       Thief.new(:skilled => true).aasm_current_state.should == :rich

data/spec/unit/i18n_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+require 'active_record'
+require 'logger'
+require 'i18n'
+
+ActiveRecord::Base.logger = Logger.new(STDERR)
+
+class I18nTestModel < ActiveRecord::Base
+  include AASM
+
+  attr_accessor :aasm_state
+
+  aasm_initial_state :open
+  aasm_state :opened
+  aasm_state :closed
+
+  aasm_event :close
+  aasm_event :open
+end
+
+describe AASM::I18n do
+  before(:all) do
+    I18n.load_path << 'spec/en.yml'
+    I18n.default_locale = :en
+  end
+
+  after(:all) { I18n.load_path.clear }
+
+  let (:foo_opened) { I18nTestModel.new }
+  let (:foo_closed) { I18nTestModel.new.tap { |x| x.aasm_state = :closed  } }
+
+  context '.human_state' do
+    it 'should return translated state value' do
+       foo_opened.human_state.should == "It's opened now!"
+    end
+
+    it 'should return humanized value if not localized' do
+      foo_closed.human_state.should == "Closed"
+    end
+  end
+
+  context '.human_event_name' do
+    it 'should return translated event name' do
+      I18nTestModel.human_event_name(:close).should == "Let's close it!"
+    end
+
+    it 'should return humanized event name' do
+      I18nTestModel.human_event_name(:open).should == "Open"
+    end
+  end
+end

metadata

@@ -1,44 +1,43 @@
 --- !ruby/object:Gem::Specification 
 name: aasm
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 2
-  - 2
-  - 1
-  version: 2.2.1
+  - 3
+  - 0
+  version: 2.3.0
 platform: ruby
 authors: 
 - Scott Barron
 - Scott Petersen
 - Travis Tilley
+- "Thorsten B\xC3\xB6ttger"
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-08-31 00:00:00 +02:00
+date: 2011-09-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: activerecord
   prerelease: false
-  type: :development
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
-        - 2
-        - 0
         - 0
-        version: 2.0.0
-  name: rspec
+        version: "0"
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  type: :development
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,11 +47,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: shoulda
+  type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  name: sdoc
   prerelease: false
-  type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -62,43 +61,40 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: sdoc
+  type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  type: :development
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 3
         segments: 
-        - 1
-        - 0
+        - 2
         - 0
-        version: 1.0.0
-  name: bundler
+        version: "2.0"
+  type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
+  name: rr
   prerelease: false
-  type: :development
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 3
         segments: 
-        - 1
-        - 5
-        - 1
-        version: 1.5.1
-  name: jeweler
+        - 0
+        version: "0"
+  type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
+  name: shoulda
   prerelease: false
-  type: :development
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -108,11 +104,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rcov
+  type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
+  name: sqlite3
   prerelease: false
-  type: :development
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -122,58 +118,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rr
+  type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
+  name: minitest
   prerelease: false
-  type: :development
   requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 2
-        - 8
-        version: 1.2.8
-  name: reek
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
-        version: 2.1.0
-  name: roodi
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: activerecord
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -182,69 +132,46 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rspec
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: shoulda
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  requirement: &id013 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: sdoc
-  version_requirements: *id013
+  version_requirements: *id008
 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
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - .document
+- .gitignore
 - Gemfile
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
-- VERSION
 - aasm.gemspec
 - lib/aasm.rb
 - lib/aasm/aasm.rb
 - lib/aasm/event.rb
+- lib/aasm/i18n.rb
 - lib/aasm/persistence.rb
 - lib/aasm/persistence/active_record_persistence.rb
 - lib/aasm/state.rb
 - lib/aasm/state_machine.rb
 - lib/aasm/state_transition.rb
 - lib/aasm/supporting_classes.rb
+- lib/aasm/version.rb
+- spec/database.yml
+- spec/en.yml
 - spec/functional/conversation.rb
 - spec/functional/conversation_spec.rb
+- spec/schema.rb
 - spec/spec_helper.rb
 - spec/unit/aasm_spec.rb
 - spec/unit/active_record_persistence_spec.rb
 - spec/unit/before_after_callbacks_spec.rb
 - spec/unit/event_spec.rb
+- spec/unit/i18n_spec.rb
 - spec/unit/state_spec.rb
 - spec/unit/state_transition_spec.rb
 - test/functional/auth_machine_test.rb
@@ -290,13 +217,17 @@ signing_key:
 specification_version: 3
 summary: State machine mixin for Ruby objects
 test_files: 
+- spec/database.yml
+- spec/en.yml
 - spec/functional/conversation.rb
 - spec/functional/conversation_spec.rb
+- spec/schema.rb
 - spec/spec_helper.rb
 - spec/unit/aasm_spec.rb
 - spec/unit/active_record_persistence_spec.rb
 - spec/unit/before_after_callbacks_spec.rb
 - spec/unit/event_spec.rb
+- spec/unit/i18n_spec.rb
 - spec/unit/state_spec.rb
 - spec/unit/state_transition_spec.rb
 - test/functional/auth_machine_test.rb

data/VERSION

@@ -1 +0,0 @@
-2.2.1