state_machine 0.5.0 → 0.5.1

data/CHANGELOG.rdoc

@@ -1,6 +1,12 @@
 == master
 
-== 0.5.0 / 2008-01-11
+== 0.5.1 / 2009-02-11
+
+* Allow states to be drawn as ellipses to accommodate long names
+* Fix rake tasks not being registered in Rails/Merb applications
+* Never automatically define machine attribute accessors when using an integration
+
+== 0.5.0 / 2009-01-11
 
 * Add to_name and from_name to transition objects
 * Add nicely formatted #inspect for transitions

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/contrib/sshpublisher'
 
 spec = Gem::Specification.new do |s|
   s.name              = 'state_machine'
-  s.version           = '0.5.0'
+  s.version           = '0.5.1'
   s.platform          = Gem::Platform::RUBY
   s.summary           = 'Adds support for creating state machines for attributes on any Ruby class'
   
@@ -87,28 +87,4 @@ task :release => [:gem, :package] do
   end
 end
 
-namespace :state_machine do
-  desc 'Draws a set of state machines using GraphViz. Target files to load with FILE=x,y,z; Machine class with CLASS=x,y,z; Font name with FONT=x; Image format with FORMAT=x'
-  task :draw do
-    # Load the library
-    $:.unshift(File.dirname(__FILE__) + '/lib')
-    require 'state_machine'
-    
-    # Build drawing options
-    options = {}
-    options[:file] = ENV['FILE'] if ENV['FILE']
-    options[:path] = ENV['TARGET'] if ENV['TARGET']
-    options[:format] = ENV['FORMAT'] if ENV['FORMAT']
-    options[:font] = ENV['FONT'] if ENV['FONT']
-    
-    StateMachine::Machine.draw(ENV['CLASS'], options)
-  end
-  
-  namespace :draw do
-    desc 'Draws a set of state machines using GraphViz for a Ruby on Rails application.  Target class with CLASS=x,y,z; Font name with FONT=x; Image format with FORMAT=x'
-    task :rails => [:environment, 'state_machine:draw']
-    
-    desc 'Draws a set of state machines using GraphViz for a Merb application.  Target class with CLASS=x,y,z; Font name with FONT=x; Image format with FORMAT=x'
-    task :merb => [:merb_env, 'state_machine:draw']
-  end
-end
+Dir['tasks/**/*.rake'].each {|rake| load rake}

data/lib/state_machine/integrations/active_record.rb

@@ -193,32 +193,21 @@ module StateMachine
           :save
         end
         
-        # Forces all attribute methods to be generated for the model so that
-        # the reader/writer methods for the attribute are available
+        # Skips defining reader/writer methods since this is done automatically
         def define_attribute_accessor
-          # If an exception is raised while trying to access the connection, then
-          # the assumption is that there's an issue with the database (most likely
-          # doesn't exist yet), so we won't be able to check the table properties
-          connection_exists = begin; owner_class.connection; true; rescue Exception; false; end
+        end
+        
+        # Adds support for defining the attribute predicate, while providing
+        # compatibility with the default predicate which determines whether
+        # *anything* is set for the attribute's value
+        def define_attribute_predicate
+          attribute = self.attribute
           
-          if connection_exists && owner_class.table_exists?
-            owner_class.define_attribute_methods
-            
-            # Support attribute predicate for ActiveRecord columns
-            if owner_class.column_names.include?(attribute.to_s)
-              attribute = self.attribute
-              
-              owner_class.class_eval do
-                # Checks whether the current state is a given value.  If there
-                # are no arguments, then this checks for the presence of the attribute.
-                define_method("#{attribute}?") do |*args|
-                  args.empty? ? super(*args) : self.class.state_machines[attribute].state?(self, *args)
-                end
-              end
+          owner_class.class_eval do
+            define_method("#{attribute}?") do |*args|
+              args.empty? ? super(*args) : self.class.state_machines[attribute].state?(self, *args)
             end
           end
-          
-          super
         end
         
         # Creates a scope for finding records *with* a particular state or

data/lib/state_machine/integrations/data_mapper.rb

@@ -171,6 +171,10 @@ module StateMachine
           :save
         end
         
+        # Skips defining reader/writer methods since this is done automatically
+        def define_attribute_accessor
+        end
+        
         # Creates a scope for finding records *with* a particular state or
         # states for the attribute
         def create_with_scope(name)

data/lib/state_machine/integrations/sequel.rb

@@ -141,6 +141,10 @@ module StateMachine
           :save
         end
         
+        # Skips defining reader/writer methods since this is done automatically
+        def define_attribute_accessor
+        end
+        
         # Creates a scope for finding records *with* a particular state or
         # states for the attribute
         def create_with_scope(name)

data/lib/state_machine/machine.rb

@@ -261,7 +261,7 @@ module StateMachine
       
       # Set integration-specific configurations
       @action = options.include?(:action) ? options[:action] : default_action
-      define_attribute_accessor
+      define_attribute_helpers
       define_scopes(options[:plural])
       
       # Call after hook for integration-specific extensions
@@ -970,24 +970,42 @@ module StateMachine
       def default_action
       end
       
-      # Adds reader/writer/predicate methods for accessing the attribute that
-      # this state machine is defined for.
+      # Adds helper methods for interacting with this state machine's attribute,
+      # including reader, writer, and predicate methods
+      def define_attribute_helpers
+        define_attribute_accessor
+        define_attribute_predicate
+        
+        attribute = self.attribute
+        
+        owner_class.class_eval do
+          # Gets the state name for the current value
+          define_method("#{attribute}_name") do
+            self.class.state_machines[attribute].state_for(self).name
+          end
+        end
+      end
+      
+      # Adds reader/writer methods for accessing the attribute
       def define_attribute_accessor
         attribute = self.attribute
         
         owner_class.class_eval do
           attr_reader attribute unless method_defined?(attribute) || private_method_defined?(attribute)
           attr_writer attribute unless method_defined?("#{attribute}=") || private_method_defined?("#{attribute}=")
-          
+        end
+      end
+      
+      # Adds predicate method to the owner class for determining the name of the
+      # current state
+      def define_attribute_predicate
+        attribute = self.attribute
+        
+        owner_class.class_eval do
           # Checks whether the current state is a given value
           define_method("#{attribute}?") do |state|
             self.class.state_machines[attribute].state?(self, state)
           end unless method_defined?("#{attribute}?") || private_method_defined?("#{attribute}?")
-          
-          # Gets the state name for the current value
-          define_method("#{attribute}_name") do
-            self.class.state_machines[attribute].state_for(self).name
-          end
         end
       end
       

data/lib/state_machine/state.rb

@@ -184,8 +184,7 @@ module StateMachine
         :label => description,
         :width => '1',
         :height => '1',
-        :fixedsize => 'true',
-        :shape => initial ? 'doublecircle' : 'circle'
+        :shape => initial ? 'doublecircle' : 'ellipse'
       )
     end
     

data/lib/state_machine.rb

@@ -314,3 +314,6 @@ end
 Class.class_eval do
   include StateMachine::MacroMethods
 end
+
+# Register rake tasks for supported libraries
+Merb::Plugins.add_rakefiles("#{File.dirname(__FILE__)}/../tasks/state_machine") if defined?(Merb::Plugins)