rspec_candy 0.2.10 → 0.3.0

data/.gitignore

@@ -3,6 +3,3 @@ pkg
 *.gem
 .idea
 spec/**/app_root/log/*
-Gemfile.lock
-
-

data/README.md

@@ -145,6 +145,13 @@ If you only care about the matchers or helpers you can also more specifically re
       it_should_run_callbacks :notify_this, :notify_that
     end
 
+
+  If you have used a custom state machine name, you can use specify it like this:
+
+    describe Model, '#my_event on :my_machine from :my_state1 to :my_state" do
+      it_should_run_callbacks :notify_this, :notify_that
+    end
+
 **it_should_run_callbacks_in_order**
 
   Like `it_should_run_callbacks`, but also checks the correct order.

data/lib/rspec_candy/helpers/rails/it_should_run_callbacks.rb

@@ -88,11 +88,12 @@ module RSpecCandy
           end
 
           def run_state_machine_callbacks_from_prose(prose)
-            if parts = prose.match(/^(#\w+) from ([\:\w]+) to ([\:\w]+)$/)
+            if parts = prose.match(/^(#\w+) (?:on ([\:\w]+) )?from ([\:\w]+) to ([\:\w]+)$/)
               name = parts[1].sub(/^#/, '').to_sym
-              from = parts[2].sub(/^:/, '').to_sym
-              to = parts[3].sub(/^:/, '').to_sym
-              transition = StateMachine::Transition.new(subject, subject.class.state_machine, name, from, to)
+              machine_name = parts[2] ? parts[2].sub(/^:/, '').to_sym : :state
+              from = parts[3].sub(/^:/, '').to_sym
+              to = parts[4].sub(/^:/, '').to_sym
+              transition = StateMachine::Transition.new(subject, subject.class.state_machine(machine_name), name, from, to)
               transition.run_callbacks
             end
           end

data/lib/rspec_candy/version.rb

@@ -1,3 +1,3 @@
 module RSpecCandy
-  VERSION = '0.2.10'
+  VERSION = '0.3.0'
 end

data/spec/rspec1/Gemfile.lock

@@ -0,0 +1,74 @@
+PATH
+  remote: ../..
+  specs:
+    rspec_candy (0.3.0)
+      rspec
+      sneaky-save
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (2.3.18)
+      actionpack (= 2.3.18)
+    actionpack (2.3.18)
+      activesupport (= 2.3.18)
+      rack (~> 1.1.0)
+    activerecord (2.3.18)
+      activesupport (= 2.3.18)
+    activeresource (2.3.18)
+      activesupport (= 2.3.18)
+    activesupport (2.3.18)
+    columnize (0.3.6)
+    debugger (1.6.1)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.2.3)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.2.3)
+    has_defaults (0.4.1)
+      activerecord
+    hoe (2.8.0)
+      rake (>= 0.8.7)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    rack (1.1.6)
+    rails (2.3.18)
+      actionmailer (= 2.3.18)
+      actionpack (= 2.3.18)
+      activerecord (= 2.3.18)
+      activeresource (= 2.3.18)
+      activesupport (= 2.3.18)
+      rake (>= 0.8.3)
+    rake (10.1.0)
+    rbx-require-relative (0.0.9)
+    rspec (1.3.2)
+    rspec-rails (1.3.4)
+      rack (>= 1.0.0)
+      rspec (~> 1.3.1)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    sneaky-save (0.0.2)
+      activerecord (>= 2.3.2)
+    sqlite3 (1.3.8)
+    state_machine (1.2.0)
+    test-unit (1.2.3)
+      hoe (>= 1.5.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  debugger
+  has_defaults
+  hoe (= 2.8.0)
+  rails (~> 2)
+  rspec (~> 1)
+  rspec-rails (~> 1)
+  rspec_candy!
+  ruby-debug
+  sqlite3
+  state_machine
+  test-unit (~> 1.2)

data/spec/rspec2/Gemfile.lock

@@ -0,0 +1,137 @@
+PATH
+  remote: ../..
+  specs:
+    rspec_candy (0.3.0)
+      rspec
+      sneaky-save
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.2.14)
+      actionpack (= 3.2.14)
+      mail (~> 2.5.4)
+    actionpack (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.14)
+      activesupport (= 3.2.14)
+      builder (~> 3.0.0)
+    activerecord (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
+    activesupport (3.2.14)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    builder (3.0.4)
+    columnize (0.3.6)
+    debugger (1.6.1)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.2.3)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.2.3)
+    diff-lcs (1.2.4)
+    erubis (2.7.0)
+    has_defaults (0.4.1)
+      activerecord
+    hike (1.2.3)
+    i18n (0.6.5)
+    journey (1.0.4)
+    json (1.8.0)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.24)
+    multi_json (1.7.9)
+    polyglot (0.3.3)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.14)
+      actionmailer (= 3.2.14)
+      actionpack (= 3.2.14)
+      activerecord (= 3.2.14)
+      activeresource (= 3.2.14)
+      activesupport (= 3.2.14)
+      bundler (~> 1.0)
+      railties (= 3.2.14)
+    railties (3.2.14)
+      actionpack (= 3.2.14)
+      activesupport (= 3.2.14)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.1.0)
+    rbx-require-relative (0.0.9)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
+    rspec-rails (2.14.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    sneaky-save (0.0.4)
+      activerecord (>= 3.2.0)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.8)
+    state_machine (1.2.0)
+    thor (0.18.1)
+    tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.37)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  debugger
+  has_defaults
+  rails (~> 3)
+  rspec (~> 2)
+  rspec-rails (~> 2)
+  rspec_candy!
+  ruby-debug
+  sqlite3
+  state_machine

data/spec/shared/app_root/app/models/state_machine_model.rb

@@ -22,9 +22,32 @@ class StateMachineModel < ActiveRecord::Base
 
     end
 
+    state_machine :custom_state, :initial => :state1 do
+
+      state :state1
+
+      state :state2
+
+      state :state3
+
+      event :event do
+        transition :state1 => :state2
+      end
+
+      event :another_event do
+        transition :state1 => :state3
+      end
+
+      after_transition :state1 => :state2, :do => :custom_state_event_callback
+
+    end
+
     def event_callback
     end
 
+    def custom_state_event_callback
+    end
+
   end
 
 end

data/spec/shared/rspec_candy/helpers/rails/it_should_run_callbacks_spec.rb

@@ -95,6 +95,22 @@ describe RSpecCandy::Helpers::Rails::ItShouldRunCallbacks do
         describe_block
       end
 
+      it 'should also run state machine callbacks for a state machine with a custom name and pass if they are called if StateMachine is present' do
+        <<-describe_block.should pass_as_describe_block
+          describe StateMachineModel, '#event on :custom_state from :state1 to :state2' do
+            it_should_run_callbacks :custom_state_event_callback
+          end
+        describe_block
+      end
+
+      it 'should also run state machine callbacks for a state machine with a custom name and fail if they are not called if StateMachine is present' do
+        <<-describe_block.should fail_as_describe_block
+          describe StateMachineModel, '#event on :custom_state from :state1 to :state3' do
+            it_should_run_callbacks :custom_state_event_callback
+          end
+        describe_block
+      end
+
     end
 
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec_candy
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 10
-  version: 0.2.10
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Henning Koch
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-26 00:00:00 +02:00
+date: 2013-08-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,6 +84,7 @@ files:
 - lib/rspec_candy/version.rb
 - rspec_candy.gemspec
 - spec/rspec1/Gemfile
+- spec/rspec1/Gemfile.lock
 - spec/rspec1/Rakefile
 - spec/rspec1/app_root/config/boot.rb
 - spec/rspec1/app_root/config/database.yml
@@ -98,6 +99,7 @@ files:
 - spec/rspec1/spec/switcher_spec.rb
 - spec/rspec2/.rspec
 - spec/rspec2/Gemfile
+- spec/rspec2/Gemfile.lock
 - spec/rspec2/Rakefile
 - spec/rspec2/app_root/.gitignore
 - spec/rspec2/app_root/config/application.rb