aasm 2.1.5 → 2.2.0

data/README.rdoc

@@ -1,3 +1,7 @@
+= Alternatives
+
+If you are looking for an alternative to AASM, I would highly suggest transitions: http://github.com/qoobaa/transitions
+
 = AASM - Ruby state machines
 
 This package contains AASM, a library for adding finite state machines to Ruby classes.

data/VERSION

@@ -1 +1 @@
-2.1.5
+2.2.0

data/aasm.gemspec

@@ -0,0 +1,94 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{aasm}
+  s.version = "2.2.0"
+
+  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{2010-09-13}
+  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",
+     ".gitignore",
+     "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/test_helper.rb",
+     "test/unit/aasm_test.rb",
+     "test/unit/event_test.rb",
+     "test/unit/state_test.rb",
+     "test/unit/state_transition_test.rb"
+  ]
+  s.homepage = %q{http://rubyist.github.com/aasm/}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  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/test_helper.rb",
+     "test/unit/aasm_test.rb",
+     "test/unit/event_test.rb",
+     "test/unit/state_test.rb",
+     "test/unit/state_transition_test.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      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>, [">= 0"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<sdoc>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<sdoc>, [">= 0"])
+  end
+end
+

data/lib/aasm/aasm.rb

@@ -11,6 +11,7 @@ module AASM
     unless AASM::StateMachine[base]
       AASM::StateMachine[base] = AASM::StateMachine.new('')
     end
+   super
   end
 
   module ClassMethods

data/lib/aasm/persistence/active_record_persistence.rb

@@ -13,7 +13,7 @@ module AASM
       #
       # Adds
       #
-      #   before_validation_on_create :aasm_ensure_initial_state
+      #   before_validation :aasm_ensure_initial_state, :on => :create
       #
       # As a result, it doesn't matter when you define your methods - the following 2 are equivalent
       #
@@ -38,24 +38,28 @@ module AASM
         base.send(:include, AASM::Persistence::ActiveRecordPersistence::WriteState) unless base.method_defined?(:aasm_write_state)
         base.send(:include, AASM::Persistence::ActiveRecordPersistence::WriteStateWithoutPersistence) unless base.method_defined?(:aasm_write_state_without_persistence)
 
-        if base.respond_to?(:named_scope)
+        if base.respond_to?(:named_scope) || base.respond_to?(:scope)
           base.extend(AASM::Persistence::ActiveRecordPersistence::NamedScopeMethods)
 
           base.class_eval do
             class << self
-              unless method_defined?(:aasm_state_without_named_scope)
-                alias_method :aasm_state_without_named_scope, :aasm_state
-                alias_method :aasm_state, :aasm_state_with_named_scope
+              unless method_defined?(:aasm_state_without_scope)
+                alias_method :aasm_state_without_scope, :aasm_state
+                alias_method :aasm_state, :aasm_state_with_scope
               end
             end
           end
         end
-
-        base.before_validation_on_create :aasm_ensure_initial_state
+        
+        if ActiveRecord::VERSION::MAJOR >= 3
+          base.before_validation(:aasm_ensure_initial_state, :on => :create)
+        else
+          base.before_validation_on_create(:aasm_ensure_initial_state)
+        end        
       end
 
       module ClassMethods
-        # Maps to the aasm_column in the database.  Deafults to "aasm_state".  You can write:
+        # Maps to the aasm_column in the database.  Defaults to "aasm_state".  You can write:
         #
         #   create_table :foos do |t|
         #     t.string :name
@@ -237,9 +241,15 @@ module AASM
       end
 
       module NamedScopeMethods
-        def aasm_state_with_named_scope name, options = {}
-          aasm_state_without_named_scope name, options
-          self.named_scope name, :conditions => { "#{table_name}.#{self.aasm_column}" => name.to_s} unless self.respond_to?(name)
+        def aasm_state_with_scope name, options = {}
+          aasm_state_without_scope name, options
+          
+          unless self.respond_to?(name)
+            scope_options = {:conditions => { "#{table_name}.#{self.aasm_column}" => name.to_s}}
+            scope_method = ActiveRecord::VERSION::MAJOR >= 3 ? :scope : :named_scope
+            self.send(scope_method, name, scope_options)
+          end
+          
         end
       end
     end

data/spec/functional/conversation_spec.rb

@@ -1,5 +1,5 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
-require File.join(File.dirname(__FILE__), 'conversation')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__), 'conversation'))
 
 describe Conversation, 'description' do
   it '.aasm_states should contain all of the states' do

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')))
 
 require 'aasm'
 

data/spec/unit/aasm_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 class Foo
   include AASM
@@ -236,7 +236,7 @@ describe AASM, '- event firing without persistence' do
     def foo.aasm_write_state
     end
 
-    foo.should_receive(:aasm_write_state_without_persistence)
+    foo.should_receive(:aasm_write_state_without_persistence).twice
 
     foo.close
   end

data/spec/unit/active_record_persistence_spec.rb

@@ -1,8 +1,9 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'aasm')
-
 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
@@ -214,16 +215,16 @@ begin
     end
 
     context "Does not already respond_to? the scope name" do
-      it "should add a named_scope" do
-        NamedScopeExample.should_receive(:named_scope)
+      it "should add a scope" do
         NamedScopeExample.aasm_state :unknown_scope
+        NamedScopeExample.scopes.keys.should include(:unknown_scope)
       end
     end
 
     context "Already respond_to? the scope name" do
-      it "should not add a named_scope" do
-        NamedScopeExample.should_not_receive(:named_scope)
+      it "should not add a scope" do
         NamedScopeExample.aasm_state :new
+        NamedScopeExample.scopes.keys.should_not include(:new)
       end
     end
   end

data/spec/unit/before_after_callbacks_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 class Foo2
   include AASM

data/spec/unit/event_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 describe AASM::SupportingClasses::Event do
   before(:each) do

data/spec/unit/state_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 # TODO These are specs ported from original aasm
 describe AASM::SupportingClasses::State do

data/spec/unit/state_transition_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 describe AASM::SupportingClasses::StateTransition do
   it 'should set from, to, and opts attr readers' do

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: aasm
 version: !ruby/object:Gem::Version 
-  version: 2.1.5
+  prerelease: false
+  segments: 
+  - 2
+  - 2
+  - 0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Scott Barron
@@ -11,39 +16,48 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-30 00:00:00 -05:00
+date: 2010-09-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: sdoc
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id003
 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: []
@@ -60,6 +74,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- aasm.gemspec
 - lib/aasm.rb
 - lib/aasm/aasm.rb
 - lib/aasm/event.rb
@@ -94,21 +109,25 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: State machine mixin for Ruby objects