transitions 0.0.14 → 0.0.16

data/.rvmrc

@@ -1 +1 @@
-rvm ruby-1.9.2-p290@transitions
+rvm 1.9.3@transitions --create

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.0.16 (2012-04-18):
+
+* (mperham) Remove backports, fix Ruby 1.8 support.
+
+# 0.0.15 (2012-04-17):
+
+* (troessner) Ensure ruby 1.8.7 compatibility.
+
 # 0.0.14 (2012-04-16):
 
 * (troessner) Improve error messages for invalid transitions.

data/Rakefile

@@ -4,7 +4,7 @@ Bundler.setup
 
 require "rake/testtask"
 Rake::TestTask.new(:test) do |test|
-  test.libs << "lib" << "test"
+  test.libs = %w(lib test)
   test.pattern = "test/**/test_*.rb"
   test.verbose = true
 end

data/lib/active_record/transitions.rb

@@ -1,5 +1,5 @@
-require_relative '../active_model/transitions'
+require 'active_model/transitions'
 
 module ActiveRecord
   Transitions = ActiveModel::Transitions
-end
+end

data/lib/transitions/event.rb

@@ -40,7 +40,7 @@ module Transitions
 
     def fire(obj, to_state = nil, *args)
       transitions = @transitions.select { |t| t.from == obj.current_state(@machine ? @machine.name : nil) }
-      raise InvalidTransition, error_message_for_invalid_transitions(obj) if transitions.size == 0
+      raise InvalidTransition, error_message_for_invalid_transitions(obj, to_state) if transitions.size == 0
 
       next_state = nil
       transitions.each do |transition|
@@ -134,8 +134,8 @@ module Transitions
       end
     end
 
-    def error_message_for_invalid_transitions(obj)
-      "No transitions present for `#{obj.class.name}` #{obj.class < ActiveRecord::Base && obj.persisted? ? "with ID #{obj.id} " : nil}with current state `#{obj.current_state}`"
+    def error_message_for_invalid_transitions(obj, to_state)
+      "Cannot transition to #{to_state || 'default'} from #{obj.current_state} for `#{obj.class.name}` #{obj.class < ActiveRecord::Base && obj.persisted? ? "with ID #{obj.id} " : nil}"
     end
   end
 end

data/lib/transitions/version.rb

@@ -1,3 +1,3 @@
 module Transitions
-  VERSION = "0.0.14"
+  VERSION = "0.0.16"
 end

data/lib/transitions.rb

@@ -54,8 +54,8 @@ module Transitions
       block ? state_machines[name].update(options, &block) : state_machines[name]
     end
 
-    def available_states name = :default
-      state_machines[name].states.map(&:name).sort
+    def available_states(name = :default)
+      state_machines[name].states.map(&:name).sort_by {|x| x.to_s}
     end
 
     def define_state_query_method(state_name)

data/test/db/create_db.rb

@@ -1,12 +1,12 @@
 # Use this schema to create all required tables
 class CreateDb < ActiveRecord::Migration
   def self.up
-    create_table(:traffic_lights, force: true) do |t|
+    create_table(:traffic_lights, :force => true) do |t|
       t.string :state
       t.string :name
     end
     
-    create_table(:orders, force: true) do |t|
+    create_table(:orders, :force => true) do |t|
       t.string :state
       t.string :order_number
       t.datetime :paid_at

data/test/helper.rb

@@ -4,17 +4,10 @@ require "active_support/all"
 require "active_record"
 require "mocha"
 require "db/create_db"
-require "ruby-debug"
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
 require "transitions"
 require "active_model/transitions"
 
-class Test::Unit::TestCase
-
-end
-
 def create_database
   ActiveRecord::Base.establish_connection(:adapter  => "sqlite3", :database => ":memory:")
   ActiveRecord::Migration.verbose = false

data/test/test_active_record_timestamps.rb

@@ -57,7 +57,7 @@ class TestActiveRecordTimestamps < Test::Unit::TestCase
   end
   
   def create_order(state = nil)
-    Order.create! order_number: SecureRandom.hex(4), state: state
+    Order.create! :order_number => SecureRandom.hex(4), :state => state
   end
 
   # control case, no timestamp has been set so we should expect default behaviour
@@ -106,7 +106,7 @@ class TestActiveRecordTimestamps < Test::Unit::TestCase
       class Order < ActiveRecord::Base
         include ActiveModel::Transitions
         state_machine do
-          event :replace, timestamp: 1 do
+          event :replace, :timestamp => 1 do
             transitions :from => :prepared, :to => :placed
           end
         end

data/transitions.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.name        = "transitions"
   s.version     = Transitions::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Jakub Kuźma", "Timo Rößner"]
+  s.authors     = ["Jakub Kuzma", "Timo Roessner"]
   s.email       = "timo.roessner@googlemail.com"
   s.homepage    = "http://github.com/troessner/transitions"
   s.summary     = "State machine extracted from ActiveModel"
@@ -17,9 +17,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency "bundler", "~> 1"
   s.add_development_dependency "test-unit", "~> 2.2"
   s.add_development_dependency "mocha"
-  s.add_development_dependency "sqlite3-ruby"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "sqlite3"
   s.add_development_dependency "activerecord", "~> 3"
-  s.add_development_dependency "ruby-debug19"
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

metadata

@@ -1,20 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: transitions
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.16
   prerelease: 
 platform: ruby
 authors:
-- Jakub Kuźma
-- Timo Rößner
+- Jakub Kuzma
+- Timo Roessner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-16 00:00:00.000000000Z
+date: 2012-04-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &74398430 !ruby/object:Gem::Requirement
+  requirement: &75905730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *74398430
+  version_requirements: *75905730
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &74398010 !ruby/object:Gem::Requirement
+  requirement: &75904950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '2.2'
   type: :development
   prerelease: false
-  version_requirements: *74398010
+  version_requirements: *75904950
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &74397730 !ruby/object:Gem::Requirement
+  requirement: &75904680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74397730
+  version_requirements: *75904680
 - !ruby/object:Gem::Dependency
-  name: sqlite3-ruby
-  requirement: &74397410 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: &75886600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,29 +55,29 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74397410
+  version_requirements: *75886600
 - !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: &74396940 !ruby/object:Gem::Requirement
+  name: sqlite3
+  requirement: &75886220 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74396940
+  version_requirements: *75886220
 - !ruby/object:Gem::Dependency
-  name: ruby-debug19
-  requirement: &74396440 !ruby/object:Gem::Requirement
+  name: activerecord
+  requirement: &75885690 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
-  version_requirements: *74396440
+  version_requirements: *75885690
 description: Lightweight state machine extracted from ActiveModel
 email: timo.roessner@googlemail.com
 executables: []
@@ -89,7 +89,6 @@ files:
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -130,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 950488929
+      hash: -702570801
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/Gemfile.lock

@@ -1,54 +0,0 @@
-PATH
-  remote: .
-  specs:
-    transitions (0.0.14)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
-      builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-      arel (~> 1.0.0)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.0)
-    archive-tar-minitar (0.5.2)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
-    builder (2.1.2)
-    columnize (0.3.4)
-    i18n (0.4.1)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
-    mocha (0.9.8)
-      rake
-    rake (0.8.7)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
-    sqlite3-ruby (1.3.1)
-    test-unit (2.4.1)
-    tzinfo (0.3.23)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 3)
-  bundler (~> 1)
-  mocha
-  ruby-debug19
-  sqlite3-ruby
-  test-unit (~> 2.2)
-  transitions!