transitions 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f76fbe7e05b93bbec46f0faa6723169979ec375
-  data.tar.gz: d968ddb9b44da30cb3b8f34bfa5f536e33d3a6a3
+  metadata.gz: 50aa94816f542aa2e3ddfb4ea2c3b158e1302226
+  data.tar.gz: e9f190796c29fc615582e3722c0d42fabaadb84b
 SHA512:
-  metadata.gz: 39fecff9fec8636c7a99efbac2f32fed979717da83c552e9c73732582ffff3a7e987ef1ce9b1b4032abd6c3491c42f148fa477013c77e18da03e4230e393a3fa
-  data.tar.gz: 7829b0d74c9cb917f4569285eaebb4ed83c4ba73405b3e42e7419f5c2a0d3ead24e4f42bf30ccf5a2a26a61e7524556b45ee290756d2fdbda13e585c2764226a
+  metadata.gz: 3428e39ec7f594f3e2988be6d99438b52fff0eed9b92e668c49a98d6107824c0aadd4ac4cbade09d609bfb3738a7f045f5223ae89a938d8e6982bc440935a888
+  data.tar.gz: 2878d1c45b68664d87bc1b036ef7d25cb4caaf01e8ebd9bdcc9e6130476c5d0aac0088ae7255a4ddb1591c27bb17fbce2938f0eab088afbd5ae153d1e61ef17e

data/.rubocop.yml

@@ -0,0 +1,4 @@
+Metrics/LineLength:
+  Max: 120
+Style/Documentation:
+  Enabled: false

data/.travis.yml

@@ -1,7 +1,9 @@
 rvm:
-  - 2.0.0
   - 1.9.3
+  - 2.0.0
+  - 2.1
   - jruby-19mode
+  - rbx-2
 gemfile:
   - gemfiles/rails_3_0.gemfile
   - gemfiles/rails_3_1.gemfile

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.2.1
+
+* (ozydingo / Andrew Schwartz) Don't use ActiveModel#has_attribute? since this adds the attribute name to self.attribute_names
+
 # 0.2.0
 
 * (troessner) Fix missing explicit returns in our callback handling

data/Gemfile

@@ -3,5 +3,10 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'activerecord', '~> 3.2.14'
-gem 'activerecord-jdbcsqlite3-adapter', :platforms => :jruby
-gem 'sqlite3', :platforms => :ruby
+gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
+
+platforms :ruby do
+  gem 'sqlite3'
+  gem 'pry'
+  gem 'byebug'
+end

data/README.md

@@ -215,7 +215,7 @@ can use `success`. This will be called after the `save!` is complete (if you
 use the `state_name!` method) and should be used for any methods that require
 that the object be persisted.
 ```ruby
-event :discontinue, :success => :notfiy_admin do
+event :discontinue, :success => :notify_admin do
   transitions :to => :discontinued, :from => [:available, :out_of_stock]
 end
 ```

data/Rakefile

@@ -1,14 +1,14 @@
-require "bundler"
+require 'bundler'
 Bundler::GemHelper.install_tasks
 Bundler.setup
 
 require 'appraisal'
 
-require "rake/testtask"
+require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs = %w(lib test)
-  test.pattern = "test/**/test_*.rb"
+  test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
 
-task :default => :test
+task default: :test

data/lib/active_model/transitions.rb

@@ -6,8 +6,8 @@ module ActiveModel
       class ::Transitions::Machine
         unless method_defined?(:new_transitions_initialize) || method_defined?(:new_transitions_update)
           attr_reader :attribute_name
-          alias :old_transitions_initialize :initialize
-          alias :old_transitions_update :update
+          alias_method :old_transitions_initialize, :initialize
+          alias_method :old_transitions_update, :update
 
           def new_transitions_initialize(*args, &block)
             @attribute_name = :state
@@ -19,8 +19,8 @@ module ActiveModel
             old_transitions_update(options, &block)
           end
 
-          alias :initialize :new_transitions_initialize
-          alias :update :new_transitions_update
+          alias_method :initialize, :new_transitions_initialize
+          alias_method :update, :new_transitions_update
         end
       end
       include ::Transitions
@@ -66,7 +66,7 @@ module ActiveModel
 
     def set_initial_state
       # 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) && state_not_set?
+      if self.attribute_names.include?(transitions_state_column_name.to_s) && state_not_set?
         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
@@ -74,13 +74,13 @@ module ActiveModel
 
     def state_presence
       unless self[transitions_state_column_name].present?
-        self.errors.add(transitions_state_column_name, :presence)
+        errors.add(transitions_state_column_name, :presence)
       end
     end
 
     def state_inclusion
-      unless self.class.get_state_machine.states.map{|s| s.name.to_s }.include?(self[transitions_state_column_name].to_s)
-        self.errors.add(transitions_state_column_name, :inclusion, :value => self[transitions_state_column_name])
+      unless self.class.get_state_machine.states.map { |s| s.name.to_s }.include?(self[transitions_state_column_name].to_s)
+        errors.add(transitions_state_column_name, :inclusion, value: self[transitions_state_column_name])
       end
     end
 

data/lib/transitions/event.rb

@@ -13,15 +13,15 @@ module Transitions
           machine.fire_event(name, self, false, *args)
         end
 
-        machine.klass.send(:define_method, "can_#{name.to_s}?") do |*args|
+        machine.klass.send(:define_method, "can_#{name}?") do |*_args|
           machine.events_for(current_state).include?(name.to_sym)
         end
 
-        machine.klass.send(:define_method, "can_execute_#{name.to_s}?") do |*args|
+        machine.klass.send(:define_method, "can_execute_#{name}?") do |*args|
           event = name.to_sym
 
-          send("can_#{name.to_s}?", *args) &&
-          machine.events[event].can_execute_transition_from_state?(current_state, self, *args)
+          send("can_#{name}?", *args) &&
+            machine.events[event].can_execute_transition_from_state?(current_state, self, *args)
         end
       end
       update(options, &block)
@@ -29,7 +29,7 @@ module Transitions
 
     def fire(obj, to_state = nil, *args)
       transitions = @transitions.select { |t| t.from == obj.current_state }
-      raise InvalidTransition, error_message_for_invalid_transitions(obj) if transitions.size == 0
+      fail InvalidTransition, error_message_for_invalid_transitions(obj) if transitions.size == 0
 
       next_state = nil
       transitions.each do |transition|
@@ -60,7 +60,7 @@ module Transitions
         name == event.name
       end
     end
-    
+
     # Has the timestamp option been specified for this event?
     def timestamp_defined?
       !@timestamp.nil?
@@ -72,12 +72,12 @@ module Transitions
       instance_eval(&block) if block
       self
     end
-    
+
     # update the timestamp attribute on obj
     def update_event_timestamp(obj, next_state)
       obj.send "#{timestamp_attribute_name(obj, next_state)}=", Time.now
     end
-    
+
     # Set the timestamp attribute.
     # @raise [ArgumentError] timestamp should be either a String, Symbol or true
     def timestamp=(value)
@@ -85,36 +85,35 @@ module Transitions
       when String, Symbol, TrueClass
         @timestamp = value
       else
-        raise ArgumentError, "timestamp must be either: true, a String or a Symbol"
+        fail ArgumentError, 'timestamp must be either: true, a String or a Symbol'
       end
     end
-    
 
     private
-    
+
     # Returns the name of the timestamp attribute for this event
     # If the timestamp was simply true it returns the default_timestamp_name
     # otherwise, returns the user-specified timestamp name
     def timestamp_attribute_name(obj, next_state)
       timestamp == true ? default_timestamp_name(obj, next_state) : @timestamp
     end
-    
+
     # If @timestamp is true, try a default timestamp name
     def default_timestamp_name(obj, next_state)
-      at_name = "%s_at" % next_state
-      on_name = "%s_on" % next_state
+      at_name = '%s_at' % next_state
+      on_name = '%s_on' % next_state
       case
       when obj.respond_to?(at_name) then at_name
       when obj.respond_to?(on_name) then on_name
       else
-        raise NoMethodError, "Couldn't find a suitable timestamp field for event: #{@name}. 
+        fail NoMethodError, "Couldn't find a suitable timestamp field for event: #{@name}.
           Please define #{at_name} or #{on_name} in #{obj.class}"
       end
     end
 
     def transitions(trans_opts)
       Array(trans_opts[:from]).each do |s|
-        @transitions << StateTransition.new(trans_opts.merge({:from => s.to_sym}))
+        @transitions << StateTransition.new(trans_opts.merge(from: s.to_sym))
       end
     end
 

data/lib/transitions/machine.rb

@@ -45,7 +45,7 @@ module Transitions
 
     def events_for(state)
       events = @events.values.select { |event| event.transitions_from_state?(state) }
-      events.map! { |event| event.name }
+      events.map!(&:name)
     end
 
     def current_state_variable
@@ -53,7 +53,7 @@ module Transitions
       :@current_state
     end
 
-  private
+    private
 
     def handle_state_exit_callback(record)
       state_index[record.current_state].call_action(:exit, record)
@@ -85,7 +85,7 @@ module Transitions
 
     def state(name, options = {})
       unless @state_index.key? name # Just ignore duplicates
-        state = State.new(name, :machine => self)
+        state = State.new(name, machine: self)
         state.update options
         @state_index[name] = state
         @states << state
@@ -100,11 +100,10 @@ module Transitions
       @states.each do |state|
         state_name = state.name.to_s
         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."
+          fail 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(@klass.state_machine.attribute_name => state_name) }
       end
     end
   end
 end
-

data/lib/transitions/presenter.rb

@@ -1,7 +1,7 @@
 module Transitions
   module Presenter
     def available_states
-      @state_machine.states.map(&:name).sort_by {|x| x.to_s}
+      @state_machine.states.map(&:name).sort_by(&:to_s)
     end
 
     def available_events

data/lib/transitions/state.rb

@@ -43,10 +43,11 @@ module Transitions
     end
 
     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.method_defined?(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."
+        fail 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

data/lib/transitions/state_transition.rb

@@ -25,7 +25,7 @@ module Transitions
         end
       else
         # TODO We probably should check for this in the constructor and not that late.
-        raise ArgumentError, "You can only pass a Symbol, a String, a Proc or an Array to 'on_transition' - got #{@on_transition.class}." unless @on_transition.nil?
+        fail ArgumentError, "You can only pass a Symbol, a String, a Proc or an Array to 'on_transition' - got #{@on_transition.class}." unless @on_transition.nil?
       end
     end
 
@@ -37,7 +37,7 @@ module Transitions
       @from == value
     end
 
-  private
+    private
 
     def perform_guard(obj, guard, *args)
       if guard.respond_to?(:call)

data/lib/transitions/version.rb

@@ -1,3 +1,3 @@
 module Transitions
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/lib/transitions.rb

@@ -1,9 +1,9 @@
-require "transitions/event"
-require "transitions/machine"
-require "transitions/presenter"
-require "transitions/state"
-require "transitions/state_transition"
-require "transitions/version"
+require 'transitions/event'
+require 'transitions/machine'
+require 'transitions/presenter'
+require 'transitions/state'
+require 'transitions/state_transition'
+require 'transitions/version'
 
 module Transitions
   class InvalidTransition     < StandardError; end
@@ -26,10 +26,12 @@ module Transitions
       block ? @state_machine.update(options, &block) : @state_machine
     end
 
-    def get_state_machine; @state_machine; end
+    def get_state_machine
+      @state_machine
+    end
 
     def available_states
-      @state_machine.states.map(&:name).sort_by {|x| x.to_s}
+      @state_machine.states.map(&:name).sort_by(&:to_s)
     end
 
     def available_events