Minor syntax / doc tweaks

dosire · Jul 27, 2010 · 4718436 · 4718436
1 parent 10a1784
commit 4718436
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/lib/state_machine/integrations/active_model.rb b/lib/state_machine/integrations/active_model.rb
@@ -222,7 +222,7 @@ module ClassMethods
         def extended(base) #:nodoc:
           require 'state_machine/integrations/active_model/observer'
 
-          if Object.const_defined?(:I18n)
+          if defined?(I18n)
             locale = "#{File.dirname(__FILE__)}/active_model/locale.rb"
             I18n.load_path.unshift(locale) unless I18n.load_path.include?(locale)
           end

diff --git a/lib/state_machine/integrations/active_record.rb b/lib/state_machine/integrations/active_record.rb
@@ -331,17 +331,17 @@ def self.extended(base) #:nodoc:
 
         ::ActiveRecord::Observer.class_eval do
           include StateMachine::Integrations::ActiveModel::Observer
-        end unless ::ActiveRecord::Observer.included_modules.include?(StateMachine::Integrations::ActiveModel::Observer)
+        end unless ::ActiveRecord::Observer < StateMachine::Integrations::ActiveModel::Observer
 
-        if Object.const_defined?(:I18n)
+        if defined?(I18n)
           locale = "#{File.dirname(__FILE__)}/active_record/locale.rb"
           I18n.load_path.unshift(locale) unless I18n.load_path.include?(locale)
         end
       end
 
       # Adds a validation error to the given object 
       def invalidate(object, attribute, message, values = [])
-        if Object.const_defined?(:I18n)
+        if defined?(I18n)
           super
         else
           object.errors.add(self.attribute(attribute), generate_message(message, values))
@@ -366,7 +366,7 @@ def runs_validations_on_action?
 
         # Only adds dirty tracking support if ActiveRecord supports it
         def supports_dirty_tracking?(object)
-          defined?(::ActiveRecord::Dirty) && object.respond_to?("#{self.attribute}_changed?") || super
+          defined?(::ActiveRecord::Dirty) && object.respond_to?("#{attribute}_changed?") || super
         end
 
         # Always uses the <tt>:activerecord</tt> translation scope
@@ -386,17 +386,17 @@ def default_error_message_options(object, attribute, message)
 
         # Only allows translation of I18n is available
         def translate(klass, key, value)
-          if Object.const_defined?(:I18n)
+          if defined?(I18n)
             super
           else
             value ? value.to_s.humanize.downcase : 'nil'
           end
         end
 
         # Attempts to look up a class's ancestors via:
-        # * #lookup_ancestors
-        # * #self_and_descendants_from_active_record
-        # * #self_and_descendents_from_active_record
+        # * #lookup_ancestors (3.0.0+)
+        # * #self_and_descendants_from_active_record (2.3.2 - 2.3.x)
+        # * #self_and_descendents_from_active_record (2.0.0 - 2.3.1)
         def ancestors_for(klass)
           if ::ActiveRecord::VERSION::MAJOR >= 3
             super

diff --git a/lib/state_machine/machine.rb b/lib/state_machine/machine.rb
@@ -483,7 +483,7 @@ def owner_class=(klass)
       end
 
       # Add class-/instance-level methods to the owner class for state initialization
-      unless owner_class.included_modules.include?(StateMachine::InstanceMethods)
+      unless owner_class < StateMachine::InstanceMethods
         owner_class.class_eval do
           extend StateMachine::ClassMethods
           include StateMachine::InstanceMethods