dm-is-state_machine 0.9.11 → 0.10.0

data/{History.txt → History.rdoc}

@@ -1,3 +1,7 @@
+=== 0.10.0 / 2009-10-15
+
+* Updated to work with dm-core 0.10.0
+
 === 0.9.11 / 2009-03-29
 
 * No changes this version

data/Manifest.txt

@@ -1,8 +1,7 @@
-History.txt
+History.rdoc
 LICENSE
 Manifest.txt
-README.markdown
-README.txt
+README.rdoc
 Rakefile
 TODO
 lib/dm-is-state_machine.rb

data/{README.markdown → README.rdoc}

@@ -1,8 +1,8 @@
-# dm-is-state_machine #
+= dm-is-state_machine
 
 DataMapper plugin that adds state machine functionality to your models.
 
-## Why is this plugin useful? ##
+== Why is this plugin useful?
 
 Your DataMapper resource might benefit from a state machine if it:
 
@@ -14,46 +14,46 @@ And you want a clean, high-level way of describing these modes / behaviors
 and how the resource moves between them.  This plugin allows you to
 declaratively describe the states and transitions involved.
 
-## Installation ##
+== Installation
 
 1. Download dm-more.
 2. Install dm-is-state_machine using the supplied rake files.
 
-## Setting up with Merb ##
+== Setting up with Merb ##
 
 Add this line to your init.rb:
 
-    dependency "dm-is-state_machine"
+  dependency "dm-is-state_machine"
 
 ## Example DataMapper resource (i.e. model) ##
 
-    # /app/models/traffic_light.rb
-    class TrafficLight
-      include DataMapper::Resource
+  # /app/models/traffic_light.rb
+  class TrafficLight
+    include DataMapper::Resource
 
-      property :id, Serial
+    property :id, Serial
 
-      is :state_machine, :initial => :green, :column => :color do
-        state :green
-        state :yellow
-        state :red,    :enter => :red_hook
-        state :broken
+    is :state_machine, :initial => :green, :column => :color do
+      state :green
+      state :yellow
+      state :red,    :enter => :red_hook
+      state :broken
 
-        event :forward do
-          transition :from => :green,  :to => :yellow
-          transition :from => :yellow, :to => :red
-          transition :from => :red,    :to => :green
-        end
+      event :forward do
+        transition :from => :green,  :to => :yellow
+        transition :from => :yellow, :to => :red
+        transition :from => :red,    :to => :green
       end
+    end
 
-      def red_hook
-        # Do something
-      end
+    def red_hook
+      # Do something
     end
+  end
 
-## What this gives you ##
+== What this gives you
 
-### Explained in words ###
+=== Explained in words
 
 The above DSL (domain specific language) does these things "behind the scenes":
 
@@ -67,7 +67,7 @@ The above DSL (domain specific language) does these things "behind the scenes":
    it with an invalid state (such as :broken, see above).  After the method
    runs successfully, the state machine will be left in the :to state.
 
-### Explained with some code examples ###
+=== Explained with some code examples
 
     # Somewhere in your controller, perhaps
     light = TrafficLight.new
@@ -85,11 +85,11 @@ The above DSL (domain specific language) does these things "behind the scenes":
       # do something red-related
     end
 
-## Specific examples ##
+== Specific examples
 
 We would also like to hear how *you* are using state machines in your code.
 
-## See also ##
+== See also
 
 Here are some other projects you might want to look at.  Most of them
 are probably intended for ActiveRecord.  They take different approaches,

data/Rakefile

@@ -1,5 +1,4 @@
 require 'pathname'
-require 'rubygems'
 
 ROOT    = Pathname(__FILE__).dirname.expand_path
 JRUBY   = RUBY_PLATFORM =~ /java/
@@ -14,10 +13,10 @@ GEM_NAME = 'dm-is-state_machine'
 GEM_VERSION = DataMapper::Is::StateMachine::VERSION
 GEM_DEPENDENCIES = [['dm-core', GEM_VERSION]]
 GEM_CLEAN = %w[ log pkg coverage ]
-GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt README.markdown LICENSE TODO History.txt] }
+GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.rdoc LICENSE TODO History.rdoc] }
 
 PROJECT_NAME = 'datamapper'
-PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/#{GEM_NAME}"
+PROJECT_URL  = "http://github.com/datamapper/dm-more/tree/master/#{GEM_NAME}"
 PROJECT_DESCRIPTION = PROJECT_SUMMARY = 'DataMapper plugin for creating state machines'
 
 [ ROOT, ROOT.parent ].each do |dir|

data/lib/dm-is-state_machine/is/state_machine.rb

@@ -86,7 +86,7 @@ module DataMapper
         def initialize(*args)
           super
           # ===== Run :enter hook if present =====
-          return unless is_sm = self.class.instance_variable_get(:@is_state_machine)
+          return unless is_sm = model.instance_variable_get(:@is_state_machine)
           return unless machine = is_sm[:machine]
           return unless initial = machine.initial
           return unless initial_state = machine.find_state(initial)
@@ -104,7 +104,7 @@ module DataMapper
         end
 
         def transition!(event_name)
-          machine = self.class.instance_variable_get(:@is_state_machine)[:machine]
+          machine = model.instance_variable_get(:@is_state_machine)[:machine]
           column = machine.column
           machine.current_state_name = attribute_get(:"#{column}")
           machine.fire_event(event_name, self)

data/lib/dm-is-state_machine/is/version.rb

@@ -1,7 +1,7 @@
 module DataMapper
   module Is
     module StateMachine
-      VERSION = '0.9.11'
+      VERSION = '0.10.0'.freeze
     end
   end
 end

data/lib/dm-is-state_machine.rb

@@ -1,25 +1,8 @@
-# Needed to import datamapper and other gems
-require 'rubygems'
-require 'pathname'
-
-# Add all external dependencies for the plugin here
-gem 'dm-core', '0.9.11'
-require 'dm-core'
-
-# Require plugin-files
-require Pathname(__FILE__).dirname.expand_path / 'dm-is-state_machine' / 'is' / 'state_machine'
-require Pathname(__FILE__).dirname.expand_path / 'dm-is-state_machine' / 'is' / 'data' / 'event'
-require Pathname(__FILE__).dirname.expand_path / 'dm-is-state_machine' / 'is' / 'data' / 'machine'
-require Pathname(__FILE__).dirname.expand_path / 'dm-is-state_machine' / 'is' / 'data' / 'state'
-require Pathname(__FILE__).dirname.expand_path / 'dm-is-state_machine' / 'is' / 'dsl' / 'event_dsl'
-require Pathname(__FILE__).dirname.expand_path / 'dm-is-state_machine' / 'is' / 'dsl' / 'state_dsl'
-
-# Include the plugin in Resource
-module DataMapper
-  module Model
-    include DataMapper::Is::StateMachine
-  end # module Model
-end # module DataMapper
-
-# An alternative way to do the same thing as above:
-# DataMapper::Model.append_extensions DataMapper::Is::StateMachine
+require 'dm-is-state_machine/is/state_machine'
+require 'dm-is-state_machine/is/data/event'
+require 'dm-is-state_machine/is/data/machine'
+require 'dm-is-state_machine/is/data/state'
+require 'dm-is-state_machine/is/dsl/event_dsl'
+require 'dm-is-state_machine/is/dsl/state_dsl'
+
+DataMapper::Model.append_extensions DataMapper::Is::StateMachine

data/spec/examples/slot_machine.rb

@@ -28,7 +28,7 @@ class SlotMachine
     end
   end
 
-  def initialize
+  def initialize(attributes = {})
     @log = []
     super
   end

data/spec/examples/traffic_light.rb

@@ -46,12 +46,3 @@ class TrafficLight
 end
 
 TrafficLight.auto_migrate!
-
-# ===== Note 1 =====
-#
-# One would expect that these two would be the same:
-#   property :id, Serial
-#   property :id, Integer, :serial => true
-#
-# But on 2008-07-05, the 2nd led to problems with an in-memory SQLite
-# database.

data/spec/integration/invalid_events_spec.rb

@@ -1,11 +1,10 @@
-require 'pathname'
-require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
+require 'spec_helper'
 
 describe "InvalidEvents" do
 
   it "should get InvalidContext when requiring" do
     lambda {
-      require File.join( File.dirname(__FILE__), "..", "examples", "invalid_events" )
+      require 'examples/invalid_events'
     }.should raise_error(DataMapper::Is::StateMachine::InvalidContext)
   end
 

data/spec/integration/invalid_states_spec.rb

@@ -1,11 +1,10 @@
-require 'pathname'
-require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
+require 'spec_helper'
 
 describe "InvalidStates" do
 
   it "should get InvalidContext when requiring" do
     lambda {
-      require File.join( File.dirname(__FILE__), "..", "examples", "invalid_states" )
+      require 'examples/invalid_states'
     }.should raise_error(DataMapper::Is::StateMachine::InvalidContext)
   end
 

data/spec/integration/invalid_transitions_spec.rb

@@ -1,11 +1,10 @@
-require 'pathname'
-require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
+require 'spec_helper'
 
 describe "InvalidTransitions1" do
 
   it "should get InvalidContext when requiring" do
     lambda {
-      require File.join( File.dirname(__FILE__), "..", "examples", "invalid_transitions_1" )
+      require 'examples/invalid_transitions_1'
     }.should raise_error(DataMapper::Is::StateMachine::InvalidContext)
   end
 
@@ -15,7 +14,7 @@ describe "InvalidTransitions2" do
 
   it "should get InvalidContext when requiring" do
     lambda {
-      require File.join( File.dirname(__FILE__), "..", "examples", "invalid_transitions_2" )
+      require 'examples/invalid_transitions_2'
     }.should raise_error(DataMapper::Is::StateMachine::InvalidContext)
   end
 

data/spec/integration/slot_machine_spec.rb

@@ -1,6 +1,5 @@
-require 'pathname'
-require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
-require Pathname(__FILE__).dirname.expand_path.parent + 'examples/slot_machine'
+require 'spec_helper'
+require 'examples/slot_machine'
 
 describe SlotMachine do
 

data/spec/integration/traffic_light_spec.rb

@@ -1,6 +1,5 @@
-require 'pathname'
-require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
-require Pathname(__FILE__).dirname.expand_path.parent + 'examples/traffic_light'
+require 'spec_helper'
+require 'examples/traffic_light'
 
 describe TrafficLight do
 
@@ -55,7 +54,7 @@ describe TrafficLight do
       @t.forward!
       @t.color.should == "green"
       @t.log.should == %w(G Y R G)
-      @t.new_record?.should == true
+      @t.should be_new
     end
 
     it "should skip to :yellow then transition to :red, :green, :yellow" do
@@ -71,7 +70,7 @@ describe TrafficLight do
       @t.forward!
       @t.color.should == "yellow"
       @t.log.should == %w(G R G Y)
-      @t.new_record?.should == true
+      @t.should be_new
     end
 
     it "should skip to :red then transition to :green, :yellow, :red" do
@@ -87,7 +86,7 @@ describe TrafficLight do
       @t.forward!
       @t.color.should == "red"
       @t.log.should == %w(G G Y R)
-      @t.new_record?.should == true
+      @t.should be_new
     end
 
   end
@@ -110,7 +109,7 @@ describe TrafficLight do
       @t.backward!
       @t.color.should == "green"
       @t.log.should == %w(G R Y G)
-      @t.new_record?.should == true
+      @t.should be_new
     end
 
     it "should skip to :yellow then transition to :green, :red, :yellow" do
@@ -126,7 +125,7 @@ describe TrafficLight do
       @t.backward!
       @t.color.should == "yellow"
       @t.log.should == %w(G G R Y)
-      @t.new_record?.should == true
+      @t.should be_new
     end
 
     it "should skip to :red then transition to :yellow, :green, :red" do
@@ -142,7 +141,7 @@ describe TrafficLight do
       @t.backward!
       @t.color.should == "red"
       @t.log.should == %w(G Y G R)
-      @t.new_record?.should == true
+      @t.should be_new
     end
 
   end

data/spec/spec.opts

@@ -1 +1,2 @@
 --colour
+--loadby random

data/spec/spec_helper.rb

@@ -1,17 +1,21 @@
-require 'pathname'
 require 'rubygems'
 
-gem 'rspec', '~>1.2'
-require 'spec'
+# use local dm-core if running from a typical dev checkout.
+lib = File.join('..', '..', 'dm-core', 'lib')
+$LOAD_PATH.unshift(lib) if File.directory?(lib)
+require 'dm-core'
 
-require Pathname(__FILE__).dirname.expand_path.parent + 'lib/dm-is-state_machine'
+# Support running specs with 'rake spec' and 'spec'
+$LOAD_PATH.unshift('lib') unless $LOAD_PATH.include?('lib')
+
+require 'dm-is-state_machine'
 
 def load_driver(name, default_uri)
   return false if ENV['ADAPTER'] != name.to_s
 
   begin
     DataMapper.setup(name, ENV["#{name.to_s.upcase}_SPEC_URI"] || default_uri)
-    DataMapper::Repository.adapters[:default] = DataMapper::Repository.adapters[name]
+    DataMapper::Repository.adapters[:default] =  DataMapper::Repository.adapters[name]
     true
   rescue LoadError => e
     warn "Could not load do_#{name}: #{e}"

data/spec/unit/data/event_spec.rb

@@ -1,5 +1,4 @@
-require 'pathname'
-require Pathname(__FILE__).dirname.expand_path.parent.parent + 'spec_helper'
+require 'spec_helper'
 
 module EventHelper
   def new_event(*args)

data/spec/unit/data/machine_spec.rb

@@ -1,5 +1,4 @@
-require 'pathname'
-require Pathname(__FILE__).dirname.expand_path.parent.parent + 'spec_helper'
+require 'spec_helper'
 
 module MachineHelper
   def new_machine(*args)

data/spec/unit/data/state_spec.rb

@@ -1,5 +1,4 @@
-require 'pathname'
-require Pathname(__FILE__).dirname.expand_path.parent.parent + 'spec_helper'
+require 'spec_helper'
 
 module StateHelper
   def new_state(*args)

data/spec/unit/dsl/event_dsl_spec.rb

@@ -1,5 +1,4 @@
-require 'pathname'
-require Pathname(__FILE__).dirname.expand_path.parent.parent + 'spec_helper'
+require 'spec_helper'
 
 describe "EventDsl" do
 

data/spec/unit/dsl/state_dsl_spec.rb

@@ -1,5 +1,4 @@
-require 'pathname'
-require Pathname(__FILE__).dirname.expand_path.parent.parent + 'spec_helper'
+require 'spec_helper'
 
 describe "StateDsl" do
 

data/spec/unit/state_machine_spec.rb

@@ -1,5 +1,4 @@
-require 'pathname'
-require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
+require 'spec_helper'
 
 describe "StateMachine" do
 
@@ -27,8 +26,3 @@ describe "StateMachine" do
 
   end
 end
-
-# is_state_machine
-# push_state_machine_context(label)
-# pop_state_machine_context
-# state_machine_context?(label)

data/tasks/install.rb

@@ -4,7 +4,7 @@ end
 
 desc "Install #{GEM_NAME} #{GEM_VERSION}"
 task :install => [ :package ] do
-  sudo_gem "install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
+  sudo_gem "install pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
 end
 
 desc "Uninstall #{GEM_NAME} #{GEM_VERSION}"

data/tasks/spec.rb

@@ -1,6 +1,4 @@
 begin
-  gem 'rspec', '~>1.2'
-  require 'spec'
   require 'spec/rake/spectask'
 
   task :default => [ :spec ]
@@ -8,16 +6,18 @@ begin
   desc 'Run specifications'
   Spec::Rake::SpecTask.new(:spec) do |t|
     t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s).map { |f| f.to_s }
+    t.libs      << 'lib' << 'spec' # needed for CI rake spec task, duplicated in spec_helper
 
     begin
-      gem 'rcov', '~>0.8'
+      require 'rcov'
       t.rcov = JRUBY ? false : (ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true)
       t.rcov_opts << '--exclude' << 'spec'
       t.rcov_opts << '--text-summary'
       t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
     rescue LoadError
       # rcov not installed
+    rescue SyntaxError
+      # rcov syntax invalid
     end
   end
 rescue LoadError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-is-state_machine
 version: !ruby/object:Gem::Version 
-  version: 0.9.11
+  version: 0.10.0
 platform: ruby
 authors: 
 - David James
@@ -9,19 +9,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-29 00:00:00 -07:00
+date: 2009-09-16 00:00:00 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.9.11
-    version: 
+dependencies: []
+
 description: DataMapper plugin for creating state machines
 email: 
 - djwonk [a] collectiveinsight [d] net
@@ -30,17 +21,15 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.txt
-- README.markdown
+- README.rdoc
 - LICENSE
 - TODO
-- History.txt
+- History.rdoc
 files: 
-- History.txt
+- History.rdoc
 - LICENSE
 - Manifest.txt
-- README.markdown
-- README.txt
+- README.rdoc
 - Rakefile
 - TODO
 - lib/dm-is-state_machine.rb
@@ -73,11 +62,13 @@ files:
 - tasks/install.rb
 - tasks/spec.rb
 has_rdoc: true
-homepage: http://github.com/sam/dm-more/tree/master/dm-is-state_machine
+homepage: http://github.com/datamapper/dm-more/tree/master/dm-is-state_machine
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -95,9 +86,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: DataMapper plugin for creating state machines
 test_files: []
 

data/README.txt

@@ -1,5 +0,0 @@
-= dm-is-state_machine
-
-== DESCRIPTION:
-
-See README.markdown