transitions 0.1.3 → 0.1.4

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 1.0.4
+
+(troessner)
+
+* Raise exception if we try to overwrite existing instance methods when defining state predicate methods
+* Improve exception message if we try to overwrite existing class methods when ActiveRecord scopes
+
 # 1.0.3
 
 (troessner) Make sure `empty?` works on symbols.

data/lib/transitions/machine.rb

@@ -99,7 +99,9 @@ module Transitions
     def include_scopes
       @states.each do |state|
         state_name = state.name.to_s
-        raise InvalidMethodOverride if @klass.respond_to?(state_name)
+        if @klass.respond_to?(state_name)
+          raise InvalidMethodOverride, "Transitions: Can not define scope `#{state_name}` because there is already an equally named method defined - either rename the existing method or the state."
+        end
         @klass.scope state_name, @klass.where(:state => state_name)
       end
     end

data/lib/transitions/state.rb

@@ -67,6 +67,9 @@ module Transitions
     private
     def define_state_query_method(machine)
       method_name, state_name = "#{@name}?", @name # Instance vars are out of scope when calling define_method below, so we use local variables.
+      if machine.klass.instance_methods.include?(method_name.to_sym)
+        raise InvalidMethodOverride, "Transitions: Can not define method `#{method_name}` because it is already defined - either rename the existing method or the state."
+      end
       machine.klass.send :define_method, method_name do
         current_state.to_s == state_name.to_s
       end

data/lib/transitions/version.rb

@@ -1,3 +1,3 @@
 module Transitions
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/test/active_record/test_active_record_scopes.rb

@@ -61,14 +61,14 @@ class TestScopes < Test::Unit::TestCase
   end
 
   test 'scope generation raises an exception if we try to overwrite an existing method' do
-    assert_raise(Transitions::InvalidMethodOverride) {
-      class Bear < ActiveRecord::Base
+    assert_raise(Transitions::InvalidMethodOverride) do
+      Class.new(ActiveRecord::Base) do
         include ActiveModel::Transitions
 
         state_machine :auto_scopes => true do
           state :new
         end
       end
-    }
+    end
   end
 end

data/test/state/test_state_predicate_method.rb

@@ -17,4 +17,16 @@ class TestStatePredicateMethod < Test::Unit::TestCase
     assert_true @bus.respond_to?(:parking?)
     assert_true @bus.send(:parking?)
   end
+
+  test 'should raise `InvalidMethodOverride` if we try to overwrite existing methods' do
+    assert_raise(Transitions::InvalidMethodOverride) do
+      Class.new do
+        include Transitions
+
+        state_machine do
+          state :frozen
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: transitions
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2012-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -179,7 +179,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -465074797
+      hash: -392757581
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: