transitions 0.1.9 → 0.1.10

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4680820f6d1835b1e12df126890a7c898070b74b
+  data.tar.gz: 98e7433625dee0e047fda25da2c46611c0d93228
+SHA512:
+  metadata.gz: 3c91efda00de051d2b0990d6bc82fd71d9eb27ad41e6f8d44ed6adf85e37a77a1372a0f824b04b3e44a0d8c72963fa410804e6f8bcaed6732315468acb4f3c7e
+  data.tar.gz: 5471dd6553cc527e69e90571ef68709ec7dd28678f96cb43d9e6d9df07c0ecb78a05c014d0e361d80365d121ad4164af10dd92cd9ab87b7e19af9637ea953cfe

data/.ruby-gemset

@@ -0,0 +1 @@
+transitions

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.1.10
+
+* (troessner) Fix: Using a custom ActiveRecord select query without the name of the state attribute would trigger an exception.
+
 #  0.1.9
 
 * (barelyknow) add can_transition? and cant_transition? methods

data/README.md

@@ -1,10 +1,7 @@
 ### Overview 
-
-[<img
-src="https://secure.travis-ci.org/troessner/transitions.png?branch=master"/>](
-http://travis-ci.org/troessner/transitions) [<img
-src="https://badge.fury.io/rb/transitions.png" alt="Gem Version"
-/>](http://badge.fury.io/rb/transitions)
+[![Build status](https://secure.travis-ci.org/troessner/transitions.png?branch=master)](http://travis-ci.org/troessner/transitions) 
+[![Gem Version](https://badge.fury.io/rb/transitions.png)](http://badge.fury.io/rb/transitions)
+[![Code Climate](https://codeclimate.com/github/troessner/transitions.png)](https://codeclimate.com/github/troessner/transitions)
 
 ### Synopsis
 
@@ -71,7 +68,7 @@ wherever you load your dependencies in your application.
 *   You can only use one state machine per model. While in theory you can
     define two or more, this won't work as you would expect. Not supporting
     this was intentional, if you're interested in the ratione look up version
-    1.0.0 in the CHANGELOG.
+    0.1.0 in the CHANGELOG.
 
 *   Use symbols, not strings for declaring the state machine. Using strings is
     **not** supported as is using whitespace in names (because `transitions`
@@ -110,6 +107,11 @@ In addition, a `can_transition?` method is added to the object that expects one
     >> Product.new.can_transition? :out_of_stock
     => true
 
+If you need to get all available transitions for current state you can simply call:
+
+    >> Product.new.available_transitions
+    => [:discontinued, :out_of_stock]
+    
 #### Automatic scope generation
 
 `transitions` will automatically generate scopes for you if you are using
@@ -142,12 +144,18 @@ you can use this feature a la:
 Each event definition takes an optional `guard` argument, which acts as a
 predicate for the transition.
 
-You can pass in a Symbol, a String, or a Proc like this:
+You can pass in Symbols, Strings, or Procs like this:
 
     event :discontinue do
       transitions :to => :discontinued, :from => [:available, :out_of_stock], :guard => :can_discontinue
     end
 
+or
+
+    event :discontinue do
+      transitions :to => :discontinued, :from => [:available, :out_of_stock], :guard => [:can_discontinue, :super_sure?]
+    end
+
 Any arguments passed to the event method will be passed on to the `guard`
 predicate.
 

data/lib/active_model/transitions.rb

@@ -87,8 +87,11 @@ module ActiveModel
     end
 
     def set_initial_state
-      self[transitions_state_column_name] ||= self.class.get_state_machine.initial_state.to_s if self.has_attribute?(transitions_state_column_name)
-      self.class.get_state_machine.state_index[self[transitions_state_column_name].to_sym].call_action(:enter, self)
+      # In case we use a query with a custom select that excludes our state attribute name we need to skip the initialization below.
+      if self.has_attribute?(transitions_state_column_name)
+        self[transitions_state_column_name] ||= self.class.get_state_machine.initial_state.to_s
+        self.class.get_state_machine.state_index[self[transitions_state_column_name].to_sym].call_action(:enter, self)
+      end
     end
 
     def state_presence

data/lib/transitions/state_transition.rb

@@ -30,11 +30,15 @@ module Transitions
     end
 
     def perform(obj, *args)
-      case @guard
+      [@guard].flatten.all? { |g| perform_guard(obj, g, *args) }
+    end
+
+    def perform_guard(obj, guard, *args)
+      case guard
       when Symbol, String
-        obj.send(@guard, *args)
+        obj.send(guard, *args)
       when Proc
-        @guard.call(obj, *args)
+        guard.call(obj, *args)
       else
         true
       end

data/lib/transitions/version.rb

@@ -1,3 +1,3 @@
 module Transitions
-  VERSION = '0.1.9'
+  VERSION = '0.1.10'
 end

data/lib/transitions.rb

@@ -72,6 +72,10 @@ module Transitions
     instance_variable_set(ivar, new_state)
   end
 
+  def available_transitions
+    self.class.get_state_machine.events_for(current_state)
+  end
+
   def can_transition?(*events)
     events.all? do |event|
       self.class.get_state_machine.events_for(current_state).include?(event.to_sym)

data/test/active_record/test_custom_select.rb

@@ -0,0 +1,36 @@
+require "helper"
+
+# Regressiontest for https://github.com/troessner/transitions/issues/95
+# TODO We use this Trafficlight class quite a lot in our specs including a ton of duplication.
+#      Unify class and migration definition in one place and then clean up all related specs, including this one.
+class CreateTrafficLights < ActiveRecord::Migration
+  def self.up
+    create_table(:traffic_lights, :force => true) do |t|
+      t.string :state
+      t.string :name
+    end
+  end
+end
+
+class TrafficLight < ActiveRecord::Base
+  include ActiveModel::Transitions
+
+  state_machine do
+    state :off
+    state :on
+  end
+end
+
+class TestCustomSelect < Test::Unit::TestCase
+  def setup
+    set_up_db CreateTrafficLights
+    @light = TrafficLight.create!
+  end
+
+  test "should not trigger an exception when we use a custom select query which excludes the name of our state attribute" do
+    result = TrafficLight.select("id, name")
+    assert_nothing_raised NoMethodError do
+      result.inspect
+    end
+  end
+end

data/test/machine/test_machine.rb

@@ -36,6 +36,13 @@ class TransitionsMachineTest < Test::Unit::TestCase
     assert events.include?(:timeout)
   end
 
+  test "knows all available transitions for current state" do
+    machine = MachineTestSubject.new
+    assert_equal [:restart], machine.available_transitions
+    machine.restart
+    assert_equal [:shutdown, :timeout], machine.available_transitions
+  end
+
   test "knows that it can use a transition when it is available" do
     machine = MachineTestSubject.new
     machine.restart

data/test/state_transition/test_state_transition_guard_check.rb

@@ -39,4 +39,16 @@ class TestStateTransitionGuardCheck < Test::Unit::TestCase
 
     st.perform(obj, *args)
   end
+
+  test "should call the method on the object if guard is a symbol" do
+    opts = {:from => "foo", :to => "bar", :guard => [:test_guard, :test_another_guard] }
+    st = Transitions::StateTransition.new(opts)
+
+    obj = stub
+    obj.expects(:test_guard).with(*args).returns(true)
+    obj.expects(:test_another_guard).with(*args).returns(true)
+
+    assert st.perform(obj, *args)
+  end
+
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: transitions
 version: !ruby/object:Gem::Version
-  version: 0.1.9
-  prerelease: 
+  version: 0.1.10
 platform: ruby
 authors:
 - Jakub Kuzma
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-26 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -31,7 +28,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -39,7 +35,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -47,7 +42,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,7 +49,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,55 +56,48 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: random_data
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -119,7 +105,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -131,7 +116,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rvmrc
+- .ruby-gemset
+- .ruby-version
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
@@ -149,6 +135,7 @@ files:
 - test/active_record/test_active_record.rb
 - test/active_record/test_active_record_scopes.rb
 - test/active_record/test_active_record_timestamps.rb
+- test/active_record/test_custom_select.rb
 - test/event/test_event.rb
 - test/event/test_event_arguments.rb
 - test/event/test_event_being_fired.rb
@@ -167,29 +154,25 @@ files:
 - transitions.gemspec
 homepage: http://github.com/troessner/transitions
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -611477343
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: transitions
-rubygems_version: 1.8.25
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: State machine extracted from ActiveModel
 test_files: []

data/.rvmrc

@@ -1 +0,0 @@
-rvm 1.9.3@transitions --create