aasm 4.0.5 → 4.1.0

data/spec/unit/persistence/active_record_persistence_spec.rb

@@ -30,15 +30,15 @@ describe "instance methods" do
     let(:columns_hash) { Hash[column_name, column] }
 
     before :each do
-      gate.class.aasm.stub(:attribute_name).and_return(column_name.to_sym)
-      gate.class.stub(:columns_hash).and_return(columns_hash)
+      allow(gate.class.aasm).to receive(:attribute_name).and_return(column_name.to_sym)
+      allow(gate.class).to receive(:columns_hash).and_return(columns_hash)
     end
 
     context "when AASM column has integer type" do
       let(:column) { double(Object, type: :integer) }
 
       it "returns true" do
-        expect(subject.call).to be_true
+        expect(subject.call).to be_truthy
       end
     end
 
@@ -46,7 +46,7 @@ describe "instance methods" do
       let(:column) { double(Object, type: :string) }
 
       it "returns false" do
-        expect(subject.call).to be_false
+        expect(subject.call).to be_falsey
       end
     end
   end
@@ -55,7 +55,7 @@ describe "instance methods" do
     subject { lambda{ gate.send(:aasm_guess_enum_method) } }
 
     before :each do
-      gate.class.aasm.stub(:attribute_name).and_return(:value)
+      allow(gate.class.aasm).to receive(:attribute_name).and_return(:value)
     end
 
     it "pluralizes AASM column name" do
@@ -75,7 +75,7 @@ describe "instance methods" do
     context "when AASM enum setting is simply set to true" do
       let(:with_true_enum) { WithTrueEnum.new }
       before :each do
-        WithTrueEnum.aasm.stub(:attribute_name).and_return(:value)
+        allow(WithTrueEnum.aasm).to receive(:attribute_name).and_return(:value)
       end
 
       it "infers enum method name from pluralized column name" do
@@ -93,12 +93,12 @@ describe "instance methods" do
 
     context "when AASM enum setting is not enabled" do
       before :each do
-        Gate.aasm.stub(:attribute_name).and_return(:value)
+        allow(Gate.aasm).to receive(:attribute_name).and_return(:value)
       end
 
       context "when AASM column looks like enum" do
         before :each do
-          gate.stub(:aasm_column_looks_like_enum).and_return(true)
+          allow(gate).to receive(:aasm_column_looks_like_enum).and_return(true)
         end
 
         it "infers enum method name from pluralized column name" do
@@ -108,7 +108,7 @@ describe "instance methods" do
 
       context "when AASM column doesn't look like enum'" do
         before :each do
-          gate.stub(:aasm_column_looks_like_enum)
+          allow(gate).to receive(:aasm_column_looks_like_enum)
             .and_return(false)
         end
 
@@ -126,24 +126,17 @@ describe "instance methods" do
     let(:enum) { Hash[state_sym, state_code] }
 
     before :each do
-      gate
-        .stub(:aasm_enum)
-        .and_return(enum_name)
-      gate.stub(:aasm_write_attribute)
-      gate.stub(:write_attribute)
-
-      gate
-        .class
-        .stub(enum_name)
-        .and_return(enum)
+      allow(gate).to receive(:aasm_enum).and_return(enum_name)
+      allow(gate).to receive(:aasm_write_attribute)
+      allow(gate).to receive(:write_attribute)
+
+      allow(Gate).to receive(enum_name).and_return(enum)
     end
 
     describe "aasm_write_state" do
       context "when AASM is configured to skip validations on save" do
         before :each do
-          gate
-            .stub(:aasm_skipping_validations)
-            .and_return(true)
+          allow(gate).to receive(:aasm_skipping_validations).and_return(true)
         end
 
         it "passes state code instead of state symbol to update_all" do
@@ -151,10 +144,7 @@ describe "instance methods" do
           # parameters in the middle of the chain, so we need to use
           # intermediate object instead.
           obj = double(Object, update_all: 1)
-          gate
-            .class
-            .stub(:where)
-            .and_return(obj)
+          allow(Gate).to receive(:where).and_return(obj)
 
           gate.aasm_write_state state_sym
 
@@ -166,7 +156,7 @@ describe "instance methods" do
       context "when AASM is not skipping validations" do
         it "delegates state update to the helper method" do
           # Let's pretend that validation is passed
-          gate.stub(:save).and_return(true)
+          allow(gate).to receive(:save).and_return(true)
 
           gate.aasm_write_state state_sym
 
@@ -197,9 +187,7 @@ describe "instance methods" do
     let(:state_sym) { :running }
 
     before :each do
-      gate
-        .stub(:aasm_enum)
-        .and_return(nil)
+      allow(gate).to receive(:aasm_enum).and_return(nil)
     end
 
     describe "aasm_raw_attribute_value" do
@@ -215,9 +203,8 @@ describe "instance methods" do
     let(:value) { 42 }
 
     before :each do
-      gate.stub(:write_attribute)
-      gate.stub(:aasm_raw_attribute_value)
-        .and_return(value)
+      allow(gate).to receive(:write_attribute)
+      allow(gate).to receive(:aasm_raw_attribute_value).and_return(value)
 
       gate.send(:aasm_write_attribute, sym)
     end
@@ -270,6 +257,18 @@ describe "instance methods" do
 
 end
 
+if ActiveRecord::VERSION::MAJOR < 4 && ActiveRecord::VERSION::MINOR < 2 # won't work with Rails >= 4.2
+describe "direct state column access" do
+  it "accepts false states" do
+    f = FalseState.create!
+    expect(f.aasm_state).to eql false
+    expect {
+      f.aasm.events.map(&:name)
+    }.to_not raise_error
+  end
+end
+end
+
 describe 'subclasses' do
   it "should have the same states as its parent class" do
     expect(DerivateNewDsl.aasm.states).to eq(SimpleNewDsl.aasm.states)
@@ -289,7 +288,7 @@ describe "named scopes with the new DSL" do
   context "Does not already respond_to? the scope name" do
     it "should add a scope" do
       expect(SimpleNewDsl).to respond_to(:unknown_scope)
-      expect(SimpleNewDsl.unknown_scope.is_a?(ActiveRecord::Relation)).to be_true
+      expect(SimpleNewDsl.unknown_scope.is_a?(ActiveRecord::Relation)).to be_truthy
     end
   end
 
@@ -348,7 +347,7 @@ describe 'transitions with persistence' do
 
     validator.name = nil
     expect(validator).not_to be_valid
-    expect(validator.run!).to be_false
+    expect(validator.run!).to be_falsey
     expect(validator).to be_sleeping
 
     validator.reload
@@ -357,7 +356,7 @@ describe 'transitions with persistence' do
 
     validator.name = 'another name'
     expect(validator).to be_valid
-    expect(validator.run!).to be_true
+    expect(validator.run!).to be_truthy
     expect(validator).to be_running
 
     validator.reload
@@ -372,7 +371,7 @@ describe 'transitions with persistence' do
 
     persistor.name = nil
     expect(persistor).not_to be_valid
-    expect(persistor.run!).to be_true
+    expect(persistor.run!).to be_truthy
     expect(persistor).to be_running
 
     persistor = InvalidPersistor.find(persistor.id)
@@ -477,7 +476,7 @@ describe "invalid states with persistence" do
   it "should not store states" do
     validator = Validator.create(:name => 'name')
     validator.status = 'invalid_state'
-    expect(validator.save).to be_false
+    expect(validator.save).to be_falsey
     expect {validator.save!}.to raise_error(ActiveRecord::RecordInvalid)
 
     validator.reload
@@ -487,7 +486,7 @@ describe "invalid states with persistence" do
   it "should store invalid states if configured" do
     persistor = InvalidPersistor.create(:name => 'name')
     persistor.status = 'invalid_state'
-    expect(persistor.save).to be_true
+    expect(persistor.save).to be_truthy
 
     persistor.reload
     expect(persistor.status).to eq('invalid_state')

data/spec/unit/persistence/mongo_mapper_persistance_spec.rb

@@ -0,0 +1,135 @@
+describe 'mongo_mapper' do
+  begin
+    require 'mongo_mapper'
+    require 'logger'
+    require 'spec_helper'
+
+    before(:all) do
+      Dir[File.dirname(__FILE__) + "/../../models/mongo_mapper/*.rb"].sort.each { |f| require File.expand_path(f) }
+
+      config = {
+        'test' => {
+          'database' => "mongo_mapper_#{Process.pid}"
+        }
+      }
+
+      MongoMapper.setup(config, 'test') #, :logger => Logger.new(STDERR))
+    end
+
+    after do
+      # Clear Out all non-system Mongo collections between tests
+      MongoMapper.database.collections.each do |collection|
+        collection.drop unless collection.capped? || (collection.name =~ /\Asystem/)
+      end
+    end
+
+    describe "named scopes with the old DSL" do
+
+      context "Does not already respond_to? the scope name" do
+        it "should add a scope" do
+          expect(SimpleMongoMapper).to respond_to(:unknown_scope)
+          expect(SimpleMongoMapper.unknown_scope.class).to eq(MongoMapper::Plugins::Querying::DecoratedPluckyQuery)
+          #expect(SimpleMongoMapper.unknown_scope.is_a?(ActiveRecord::Relation)).to be_truthy
+        end
+      end
+
+      context "Already respond_to? the scope name" do
+        it "should not add a scope" do
+          expect(SimpleMongoMapper).to respond_to(:next)
+          expect(SimpleMongoMapper.new.class).to eq(SimpleMongoMapper)
+        end
+      end
+
+    end
+
+    describe "named scopes with the new DSL" do
+
+      context "Does not already respond_to? the scope name" do
+        it "should add a scope" do
+          expect(SimpleNewDslMongoMapper).to respond_to(:unknown_scope)
+          expect(SimpleNewDslMongoMapper.unknown_scope.class).to eq(MongoMapper::Plugins::Querying::DecoratedPluckyQuery)
+        end
+      end
+
+      context "Already respond_to? the scope name" do
+        it "should not add a scope" do
+          expect(SimpleNewDslMongoMapper).to respond_to(:next)
+          expect(SimpleNewDslMongoMapper.new.class).to eq(SimpleNewDslMongoMapper)
+        end
+      end
+
+      it "does not create scopes if requested" do
+        expect(NoScopeMongoMapper).not_to respond_to(:ignored_scope)
+      end
+
+    end
+
+    describe "#find_in_state" do
+
+      let!(:model)    { SimpleNewDslMongoMapper.create!(:status => :unknown_scope) }
+      let!(:model_id) { model._id }
+
+      it "should respond to method" do
+        expect(SimpleNewDslMongoMapper).to respond_to(:find_in_state)
+      end
+
+      it "should find the model when given the correct scope and model id" do
+        expect(SimpleNewDslMongoMapper.find_in_state(model_id, 'unknown_scope').class).to eq(SimpleNewDslMongoMapper)
+        expect(SimpleNewDslMongoMapper.find_in_state(model_id, 'unknown_scope')).to eq(model)
+      end
+
+      it "should raise DocumentNotFound error when given incorrect scope" do
+        expect {SimpleNewDslMongoMapper.find_in_state(model_id, 'next')}.to raise_error MongoMapper::DocumentNotFound
+      end
+
+      it "should raise DocumentNotFound error when given incorrect model id" do
+        expect {SimpleNewDslMongoMapper.find_in_state('bad_id', 'unknown_scope')}.to raise_error MongoMapper::DocumentNotFound
+      end
+
+    end
+
+    describe "#count_in_state" do
+
+      before do
+        3.times { SimpleNewDslMongoMapper.create!(:status => :unknown_scope) }
+      end
+
+      it "should respond to method" do
+        expect(SimpleNewDslMongoMapper).to respond_to(:count_in_state)
+      end
+
+      it "should return n for a scope with n records persisted" do
+        expect(SimpleNewDslMongoMapper.count_in_state('unknown_scope').class).to eq(Fixnum)
+        expect(SimpleNewDslMongoMapper.count_in_state('unknown_scope')).to eq(3)
+      end
+
+      it "should return zero for a scope without records persisted" do
+        expect(SimpleNewDslMongoMapper.count_in_state('next').class).to eq(Fixnum)
+        expect(SimpleNewDslMongoMapper.count_in_state('next')).to eq(0)
+      end
+
+    end
+
+    describe "instance methods" do
+
+      let(:simple) {SimpleNewDslMongoMapper.new}
+
+      it "should call aasm_ensure_initial_state on validation before create" do
+        expect(SimpleNewDslMongoMapper.aasm.initial_state).to eq(:unknown_scope)
+        expect(SimpleNewDslMongoMapper.aasm.attribute_name).to eq(:status)
+        expect(simple.status).to eq(nil)
+        simple.valid?
+        expect(simple.status).to eq('unknown_scope')
+      end
+
+      it "should call aasm_ensure_initial_state before create, even if skipping validations" do
+        expect(simple.status).to eq(nil)
+        simple.save(:validate => false)
+        expect(simple.status).to eq('unknown_scope')
+      end
+    end
+
+  rescue LoadError
+    puts "Not running MongoMapper specs because mongo_mapper gem is not installed!!!"
+  end
+end

data/spec/unit/persistence/mongoid_persistance_spec.rb

@@ -1,6 +1,4 @@
-describe 'mongoid', :if => Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3') do
-# describe 'mongoid' do
-
+describe 'mongoid' do
   begin
     require 'mongoid'
     require 'logger'
@@ -135,15 +133,11 @@ describe 'mongoid', :if => Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version
     describe "instance methods" do
       let(:simple) {SimpleNewDslMongoid.new}
 
-      it "should call aasm_ensure_initial_state on validation before create" do
-        expect(simple).to receive(:aasm_ensure_initial_state).and_return(true)
-        simple.valid?
+      it "should initialize the aasm state on instantiation" do
+        expect(SimpleNewDslMongoid.new.status).to eql 'unknown_scope'
+        expect(SimpleNewDslMongoid.new.aasm.current_state).to eql :unknown_scope
       end
 
-      it "should call aasm_ensure_initial_state before create, even if skipping validations" do
-        expect(simple).to receive(:aasm_ensure_initial_state).and_return(true)
-        simple.save(:validate => false)
-      end
     end
 
   rescue LoadError

data/spec/unit/persistence/sequel_persistence_spec.rb

@@ -6,7 +6,8 @@ describe 'sequel' do
     require 'spec_helper'
 
     before(:all) do
-      db = Sequel.sqlite
+      db = Sequel.connect(SEQUEL_DB)
+
       # if you want to see the statements while running the spec enable the following line
       # db.loggers << Logger.new($stderr)
       db.create_table(:models) do

data/spec/unit/subclassing_spec.rb

@@ -19,7 +19,7 @@ describe 'subclassing' do
   end
 
   it 'should know how to respond to `may_add_details?`' do
-    expect(son.may_add_details?).to be_true
+    expect(son.may_add_details?).to be_truthy
   end
 
   it 'should not break if I call Son#update_state' do

data/spec/unit/transition_spec.rb

@@ -10,19 +10,19 @@ describe 'transitions' do
 
   it 'should not raise an exception when not whiny' do
     silencer = Silencer.new
-    expect(silencer.smile!).to be_false
+    expect(silencer.smile!).to be_falsey
     expect(silencer).to be_silent
   end
 
   it 'should not raise an exception when superclass not whiny' do
     sub = SubClassing.new
-    expect(sub.smile!).to be_false
+    expect(sub.smile!).to be_falsey
     expect(sub).to be_silent
   end
 
   it 'should not raise an exception when from is nil even if whiny' do
     silencer = Silencer.new
-    expect(silencer.smile_any!).to be_true
+    expect(silencer.smile_any!).to be_truthy
     expect(silencer).to be_smiling
   end
 
@@ -43,7 +43,7 @@ describe 'transitions' do
       silencer.smile! do
         success = true
       end
-    }.not_to change { success }.to(true)
+    }.not_to change { success }
   end
 
 end
@@ -64,14 +64,14 @@ describe AASM::Core::Transition do
   it 'should set on_transition with deprecation warning' do
     opts = {:from => 'foo', :to => 'bar'}
     st = AASM::Core::Transition.allocate
-    st.should_receive(:warn).with('[DEPRECATION] :on_transition is deprecated, use :after instead')
+    expect(st).to receive(:warn).with('[DEPRECATION] :on_transition is deprecated, use :after instead')
 
     st.send :initialize, opts do
       guard :gg
       on_transition :after_callback
     end
 
-    st.opts[:after].should == [:after_callback]
+    expect(st.opts[:after]).to eql [:after_callback]
   end
 
   it 'should set after and guard from dsl' do
@@ -81,8 +81,8 @@ describe AASM::Core::Transition do
       after :after_callback
     end
 
-    st.opts[:guard].should == ['g', :gg]
-    st.opts[:after].should == [:after_callback] # TODO fix this bad code coupling
+    expect(st.opts[:guard]).to eql ['g', :gg]
+    expect(st.opts[:after]).to eql [:after_callback] # TODO fix this bad code coupling
   end
 
   it 'should pass equality check if from and to are the same' do
@@ -124,7 +124,7 @@ describe AASM::Core::Transition, '- when performing guard checks' do
     opts = {:from => 'foo', :to => 'bar'}
     st = AASM::Core::Transition.new(opts)
 
-    expect(st.allowed?(nil)).to be_true
+    expect(st.allowed?(nil)).to be_truthy
   end
 
   it 'should call the method on the object if guard is a symbol' do
@@ -185,7 +185,7 @@ describe AASM::Core::Transition, '- when executing the transition with a Proc' d
     args = {:arg1 => '1', :arg2 => '2'}
     obj = double('object', :aasm => 'aasm')
 
-    obj.should_receive(:test).with(args)
+    expect(obj).to receive(:test).with(args)
 
     st.execute(obj, args)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aasm
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 4.1.0
 platform: ruby
 authors:
 - Scott Barron
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-06 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -46,20 +46,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -74,7 +68,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: AASM is a continuation of the acts as state machine rails plugin, built
+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, aasm@mt7.de
 executables: []
@@ -97,7 +91,11 @@ files:
 - callbacks.txt
 - gemfiles/rails_3.2.gemfile
 - gemfiles/rails_4.0.gemfile
+- gemfiles/rails_4.0_bson1.gemfile
 - gemfiles/rails_4.1.gemfile
+- gemfiles/rails_4.1_bson1.gemfile
+- gemfiles/rails_4.2.gemfile
+- gemfiles/rails_4.2_bson1.gemfile
 - lib/aasm.rb
 - lib/aasm/aasm.rb
 - lib/aasm/base.rb
@@ -112,6 +110,7 @@ files:
 - lib/aasm/persistence.rb
 - lib/aasm/persistence/active_record_persistence.rb
 - lib/aasm/persistence/base.rb
+- lib/aasm/persistence/mongo_mapper_persistence.rb
 - lib/aasm/persistence/mongoid_persistence.rb
 - lib/aasm/persistence/plain_persistence.rb
 - lib/aasm/persistence/sequel_persistence.rb
@@ -128,6 +127,7 @@ files:
 - spec/models/callbacks/basic.rb
 - spec/models/callbacks/guard_within_block.rb
 - spec/models/callbacks/multiple_transitions_transition_guard.rb
+- spec/models/callbacks/private_method.rb
 - spec/models/callbacks/with_args.rb
 - spec/models/callbacks/with_state_args.rb
 - spec/models/conversation.rb
@@ -136,6 +136,9 @@ files:
 - spec/models/foo.rb
 - spec/models/guardian.rb
 - spec/models/invalid_persistor.rb
+- spec/models/mongo_mapper/no_scope_mongo_mapper.rb
+- spec/models/mongo_mapper/simple_mongo_mapper.rb
+- spec/models/mongo_mapper/simple_new_dsl_mongo_mapper.rb
 - spec/models/mongoid/no_scope_mongoid.rb
 - spec/models/mongoid/simple_mongoid.rb
 - spec/models/mongoid/simple_new_dsl_mongoid.rb
@@ -163,6 +166,7 @@ files:
 - spec/unit/memory_leak_spec.rb
 - spec/unit/new_dsl_spec.rb
 - spec/unit/persistence/active_record_persistence_spec.rb
+- spec/unit/persistence/mongo_mapper_persistance_spec.rb
 - spec/unit/persistence/mongoid_persistance_spec.rb
 - spec/unit/persistence/sequel_persistence_spec.rb
 - spec/unit/reloading_spec.rb
@@ -182,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -206,6 +210,7 @@ test_files:
 - spec/models/callbacks/basic.rb
 - spec/models/callbacks/guard_within_block.rb
 - spec/models/callbacks/multiple_transitions_transition_guard.rb
+- spec/models/callbacks/private_method.rb
 - spec/models/callbacks/with_args.rb
 - spec/models/callbacks/with_state_args.rb
 - spec/models/conversation.rb
@@ -214,6 +219,9 @@ test_files:
 - spec/models/foo.rb
 - spec/models/guardian.rb
 - spec/models/invalid_persistor.rb
+- spec/models/mongo_mapper/no_scope_mongo_mapper.rb
+- spec/models/mongo_mapper/simple_mongo_mapper.rb
+- spec/models/mongo_mapper/simple_new_dsl_mongo_mapper.rb
 - spec/models/mongoid/no_scope_mongoid.rb
 - spec/models/mongoid/simple_mongoid.rb
 - spec/models/mongoid/simple_new_dsl_mongoid.rb
@@ -241,6 +249,7 @@ test_files:
 - spec/unit/memory_leak_spec.rb
 - spec/unit/new_dsl_spec.rb
 - spec/unit/persistence/active_record_persistence_spec.rb
+- spec/unit/persistence/mongo_mapper_persistance_spec.rb
 - spec/unit/persistence/mongoid_persistance_spec.rb
 - spec/unit/persistence/sequel_persistence_spec.rb
 - spec/unit/reloading_spec.rb