aasm 3.0.2 → 3.0.3

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 3.0.3
+
+ * bugfix: ActiveRecord scopes are generated when using the new DSL
+
 ## 3.0.2
 
  * ActiveRecord persistence can ignore validation when trying to save invalid models

data/README.md

@@ -92,7 +92,7 @@ This example uses a few of the more complex features available.
   class Relationship
     include AASM
 
-    aasm :column => :status
+    aasm :column => :status do
       state :dating,   :enter => :make_happy,        :exit => :make_depressed
       state :intimate, :enter => :make_very_happy,   :exit => :never_speak_again
       state :married,  :enter => :give_up_intimacy,  :exit => :buy_exotic_car_and_wear_a_combover

data/Rakefile

@@ -15,7 +15,6 @@ end
 
 require 'rdoc/task'
 require 'aasm/version'
-require 'sdoc'
 
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'

data/lib/aasm/aasm.rb

@@ -3,10 +3,10 @@ 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('')
     end
+    AASM::Persistence.set_persistence(base)
    super
   end
 

data/lib/aasm/persistence/active_record_persistence.rb

@@ -38,19 +38,6 @@ 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) || base.respond_to?(:scope)
-          base.extend(AASM::Persistence::ActiveRecordPersistence::NamedScopeMethods)
-
-          base.class_eval do
-            class << self
-              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
-        
         if ActiveRecord::VERSION::MAJOR >= 3
           base.before_validation(:aasm_ensure_initial_state, :on => :create)
         else
@@ -159,7 +146,7 @@ module AASM
         #   foo.aasm_state # => nil
         #
         def aasm_ensure_initial_state
-          send("#{self.class.aasm_column}=", self.aasm_enter_initial_state.to_s) if send(self.class.aasm_column).blank?
+          aasm_enter_initial_state if send(self.class.aasm_column).blank?
         end
 
       end
@@ -245,18 +232,22 @@ module AASM
         end
       end
 
-      module NamedScopeMethods
-        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
   end
 end
+
+class AASM::Base
+  def state_with_scope(name, *args)
+    state_without_scope(name, *args)
+    if @clazz.ancestors.map {|klass| klass.to_s}.include?("ActiveRecord::Base") && !@clazz.respond_to?(name)
+      # puts "setting scope #{@clazz.name}.#{name}"
+      scope_options = {:conditions => { "#{@clazz.table_name}.#{@clazz.aasm_column}" => name.to_s}}
+      scope_method = ActiveRecord::VERSION::MAJOR >= 3 ? :scope : :named_scope
+      @clazz.send(scope_method, name, scope_options)
+    # else
+    #   puts "not setting scope #{@clazz.name}.#{name}"
+    end
+  end
+  alias_method :state_without_scope, :state
+  alias_method :state, :state_with_scope
+end

data/lib/aasm/version.rb

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

data/spec/schema.rb

@@ -1,7 +1,9 @@
 ActiveRecord::Schema.define(:version => 0) do
 
-  %w{gates readers writers transients simples thieves localizer_test_models}.each do |table_name|
-    create_table table_name, :force => true
+  %w{gates readers writers transients simples simple_new_dsls thieves localizer_test_models}.each do |table_name|
+    create_table table_name, :force => true do |t|
+      t.string "aasm_state"
+    end
   end
 
   create_table "validators", :force => true do |t|

data/spec/unit/active_record_persistence_spec.rb

@@ -46,11 +46,17 @@ end
 class Simple < ActiveRecord::Base
   include AASM
   aasm_column :status
+  aasm_state :unknown_scope
+  aasm_state :new
 end
 
 class SimpleNewDsl < ActiveRecord::Base
   include AASM
   aasm :column => :status
+  aasm do
+    state :unknown_scope
+    state :new
+  end
 end
 
 class Derivate < Simple
@@ -60,7 +66,11 @@ class DerivateNewDsl < SimpleNewDsl
 end
 
 class Thief < ActiveRecord::Base
-  set_table_name "thieves"
+  if ActiveRecord::VERSION::MAJOR >= 3
+    self.table_name = 'thieves'
+  else
+    set_table_name "thieves"
+  end
   include AASM
   aasm_initial_state  Proc.new { |thief| thief.skilled ? :rich : :jailed }
   aasm_state          :rich
@@ -216,24 +226,36 @@ describe 'Derivates' do
   end
 end
 
-describe AASM::Persistence::ActiveRecordPersistence::NamedScopeMethods do
+describe "AASM::Persistence::ActiveRecordPersistence::NamedScopeMethods" do
 
-  context "Does not already respond_to? the scope name" do
+  context "Old DSL Does not already respond_to? the scope name" do
     it "should add a scope" do
-      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
+  context "Old DSL Already respond_to? the scope name" do
     it "should not add a scope" do
-      Simple.aasm_state :new
       Simple.should respond_to(:new)
       Simple.new.class.should == Simple
     end
   end
+
+  context "New DSL Does not already respond_to? the scope name" do
+    it "should add a scope" do
+      SimpleNewDsl.should respond_to(:unknown_scope)
+      SimpleNewDsl.unknown_scope.class.should == ActiveRecord::Relation
+    end
+  end
+
+  context "New DSL Already respond_to? the scope name" do
+    it "should not add a scope" do
+      SimpleNewDsl.should respond_to(:new)
+      SimpleNewDsl.new.class.should == SimpleNewDsl
+    end
+  end
+
 end
 
 describe 'Thieves' do

metadata

@@ -1,162 +1,125 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: aasm
-version: !ruby/object:Gem::Version 
-  hash: 3
+version: !ruby/object:Gem::Version
+  version: 3.0.3
   prerelease: 
-  segments: 
-  - 3
-  - 0
-  - 2
-  version: 3.0.2
 platform: ruby
-authors: 
+authors:
 - Scott Barron
 - Scott Petersen
 - Travis Tilley
-- "Thorsten B\xC3\xB6ttger"
+- Thorsten Böttger
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-16 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-22 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70214630172340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70214630172340
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70214630171920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sdoc
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70214630171920
+- !ruby/object:Gem::Dependency
+  name: sdoc
+  requirement: &70214630171500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70214630171500
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70214630171000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rr
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70214630171000
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: &70214630170580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70214630170580
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &70214630170120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70214630170120
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70214630200660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70214630200660
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &70214630200240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug-completion
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70214630200240
+- !ruby/object:Gem::Dependency
+  name: ruby-debug-completion
+  requirement: &70214630199820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
-description: AASM is a continuation of the acts as state machine rails plugin, built for plain Ruby objects.
+  prerelease: false
+  version_requirements: *70214630199820
+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: []
-
-files: 
+files:
 - .document
 - .gitignore
 - CHANGELOG.md
@@ -201,41 +164,31 @@ files:
 - spec/unit/new_dsl_spec.rb
 - spec/unit/state_spec.rb
 - spec/unit/state_transition_spec.rb
-has_rdoc: true
 homepage: http://rubyist.github.com/aasm/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: State machine mixin for Ruby objects
-test_files: 
+test_files:
 - spec/database.yml
 - spec/en.yml
 - spec/models/conversation.rb