state_machine 0.3.0 → 0.3.1

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 == master
 
+== 0.3.1 / 2008-10-26
+
+* Fix the initial state not getting set when the state attribute is mass-assigned but protected
+* Change how the base module is included to prevent namespacing conflicts
+
 == 0.3.0 / 2008-09-07
 
 * No longer allow additional arguments to be passed into event actions

data/README.rdoc

@@ -44,7 +44,7 @@ Below is an example of many of the features offered by this plugin, including
 * Conditional transitions
 
   class Vehicle < ActiveRecord::Base
-    state_machine :state, :initial => 'idling' do
+    state_machine :state, :initial => 'parked' do
       before_transition :from => %w(parked idling), :do => :put_on_seatbelt
       after_transition :to => 'parked', :do => lambda {|vehicle| vehicle.update_attribute(:seatbelt_on, false)}
       after_transition :on => 'crash', :do => :tow!
@@ -127,7 +127,7 @@ states can be transparently stored using record ids in the database like so:
   class Vehicle < ActiveRecord::Base
     belongs_to :state, :class_name => 'VehicleState'
     
-    state_machine :state, :initial => 'idling' do
+    state_machine :state, :initial => 'parked' do
       ...
       
       event :park do

data/Rakefile

@@ -5,11 +5,11 @@ require 'rake/contrib/sshpublisher'
 
 spec = Gem::Specification.new do |s|
   s.name              = 'state_machine'
-  s.version           = '0.3.0'
+  s.version           = '0.3.1'
   s.platform          = Gem::Platform::RUBY
   s.summary           = 'Adds support for creating state machines for attributes within a model'
   
-  s.files             = FileList['{lib,test}/**/*'].to_a - FileList['test/app_root/log/*'].to_a + %w(CHANGELOG.rdoc init.rb LICENSE Rakefile README.rdoc)
+  s.files             = FileList['{lib,test}/**/*'] + %w(CHANGELOG.rdoc init.rb LICENSE Rakefile README.rdoc) - FileList['test/app_root/{log,log/*,script,script/*}']
   s.require_path      = 'lib'
   s.has_rdoc          = true
   s.test_files        = Dir['test/**/*_test.rb']

data/lib/state_machine.rb

@@ -5,12 +5,6 @@ module PluginAWeek #:nodoc:
   # transitions.  This helper adds support for defining this type of
   # functionality within ActiveRecord models.
   module StateMachine
-    def self.included(base) #:nodoc:
-      base.class_eval do
-        extend PluginAWeek::StateMachine::MacroMethods
-      end
-    end
-    
     module MacroMethods
       # Creates a state machine for the given attribute.  The default attribute
       # is "state".
@@ -113,7 +107,7 @@ module PluginAWeek #:nodoc:
         
         # Set the initial value of each state machine as long as the value wasn't
         # included in the initial attributes
-        attributes = (attributes || {}).stringify_keys
+        attributes = remove_attributes_protected_from_mass_assignment((attributes || {}).stringify_keys)
         self.class.state_machines.each do |attribute, machine|
           send("#{attribute}=", machine.initial_state(self)) unless attributes.include?(attribute)
         end
@@ -125,5 +119,5 @@ module PluginAWeek #:nodoc:
 end
 
 ActiveRecord::Base.class_eval do
-  include PluginAWeek::StateMachine
+  extend PluginAWeek::StateMachine::MacroMethods
 end

data/test/factory.rb

@@ -13,12 +13,16 @@ module Factory
   def valid_attributes_for(model, attributes = {})
     name = model.to_s.underscore
     send("#{name}_attributes", attributes)
+    attributes.stringify_keys!
     attributes
   end
   
   # Build an unsaved record
   def new_record(model, *args)
-    model.new(valid_attributes_for(model, *args))
+    attributes = valid_attributes_for(model, *args)
+    record = model.new(attributes)
+    attributes.each {|attr, value| record.send("#{attr}=", value) if model.accessible_attributes && !model.accessible_attributes.include?(attr) || model.protected_attributes && model.protected_attributes.include?(attr)}
+    record
   end
   
   # Build and save/reload a record

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: state_machine
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Aaron Pfeifer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-07 00:00:00 -04:00
+date: 2008-10-26 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -38,9 +38,6 @@ files:
 - test/app_root/app/models/car.rb
 - test/app_root/app/models/switch_observer.rb
 - test/app_root/app/models/auto_shop.rb
-- test/app_root/script
-- test/app_root/script/rails_framework_root.rb
-- test/app_root/script/console
 - test/app_root/config
 - test/app_root/config/environment.rb
 - test/app_root/db
@@ -49,7 +46,6 @@ files:
 - test/app_root/db/migrate/003_create_highways.rb
 - test/app_root/db/migrate/004_create_vehicles.rb
 - test/app_root/db/migrate/001_create_switches.rb
-- test/app_root/log
 - test/functional
 - test/functional/state_machine_test.rb
 - test/test_helper.rb

data/test/app_root/script/console

@@ -1,8 +0,0 @@
-irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
-libs =  " -r irb/completion"
-libs << " -r test/app_root/script/rails_framework_root"
-libs << " -r test/test_helper"
-libs << " -r plugin_test_helper/console_with_fixtures"
-libs << " -r console_app"
-libs << " -r console_with_helpers"
-exec "#{irb} #{libs} --simple-prompt"

data/test/app_root/script/rails_framework_root.rb

@@ -1 +0,0 @@
-RAILS_FRAMEWORK_ROOT = '/home/aaron/Projects/Vendor/rails'