.autotest README.rdoc spec/helper.rb spec/spec.opts spec/stateful/builders/event_spec.rb spec/stateful/builders/machine_spec.rb spec/stateful/event_spec.rb spec/stateful/listeners_spec.rb spec/stateful/machine_spec.rb @@ -1,9 +1,56 @@ +require "date" +require "fileutils" require "rubygems" -require "hoe" +require "rake/gempackagetask" +require "spec/rake/spectask" require "./lib/stateful/version.rb" -Hoe.new("stateful", Stateful::VERSION) do |p| - p.developer("John Barnette", "jbarnette@rubyforge.org") - p.test_globs = ["test/**/*_test.rb"] +stateful_gemspec = Gem::Specification.new do |s| + s.name = "stateful" + s.version = Stateful::VERSION + s.platform = Gem::Platform::RUBY + s.has_rdoc = true + s.extra_rdoc_files = ["README.rdoc"] + s.summary = "Make your Ruby objects stately." + s.description = s.summary + s.author = "John Barnette" + s.email = "jbarnette@rubyforge.org" + s.homepage = "http://github.com/jbarnette/stateful" + s.require_path = "lib" + s.autorequire = "stateful" + s.files = %w(README.rdoc Rakefile) + Dir.glob("{lib,spec}/**/*") + + # Uncomment this to add a dependency + # s.add_dependency "foo" end + +Rake::GemPackageTask.new(stateful_gemspec) do |pkg| + pkg.gem_spec = stateful_gemspec +end + +namespace :gem do + task :install => :package do + sh %{sudo gem install --local pkg/stateful-#{Stateful::VERSION}} + end + + namespace :spec do + desc "Update stateful.gemspec" + task :generate do + File.open("stateful.gemspec", "w") do |f| + f.puts(stateful_gemspec.to_ruby) + end + end + end +end + +desc "Run all specs" +Spec::Rake::SpecTask.new do |t| + t.spec_files = FileList["spec/**/*_spec.rb"] + t.spec_opts = ["--options", "spec/spec.opts"] +end + +task :default => :spec + +desc "Remove all generated artifacts" +task :clean => :clobber_package Rakefile @@ -9,18 +9,18 @@ require "stateful/persisters/default" class Class def statefully(options={}, &block) unless stateful? - @stateful = Stateful::Machine.new + @machine = Stateful::Machine.new include Stateful::Persisters::Default end - return @stateful if options.empty? && !block_given? + return @machine if options.empty? && !block_given? - @stateful.apply(options, &block) - @stateful.accessorize(self) - @stateful + @machine.apply(options, &block) + @machine.accessorize(self) + @machine end - + def stateful? - defined?(@stateful) + defined?(@machine) end end lib/stateful.rb @@ -3,6 +3,8 @@ require "stateful/builders/event" module Stateful #:nodoc: module Builders #:nodoc: class Event #:nodoc: + attr_accessor :parent, :event + def initialize(parent, event) @parent = parent @event = event @@ -18,7 +20,7 @@ module Stateful #:nodoc: end # ensure all referenced states exist - pair.to_a.flatten.each { |n| @parent.state(n) } + pair.to_a.flatten.uniq.each { |n| @parent.state(n) } froms, to = pair.keys.first, pair.values.first Array(froms).each { |from| @event.transitions[from] = to } lib/stateful/builders/event.rb @@ -1,8 +1,12 @@ require "stateful/builders/event" +require "stateful/event" +require "stateful/state" module Stateful #:nodoc: module Builders #:nodoc: class Machine #:nodoc: + attr_reader :machine + def initialize(machine) @machine = machine end @@ -38,8 +42,8 @@ module Stateful #:nodoc: kinds.each do |kind| class_eval <<-END, __FILE__, __LINE__ def #{kind}(*names, &block) - @machine.listeners(#{kind.inspect}) << block if names.empty? - names.each { |n| #{source}(n).listeners(#{kind.inspect}) << block } + @machine.listeners[#{kind.inspect}] << block if names.empty? + names.each { |n| #{source}(n).listeners[#{kind.inspect}] << block } end END end lib/stateful/builders/machine.rb @@ -1,12 +1,11 @@ module Stateful #:nodoc: module Listeners #:nodoc: - def listeners(kind) + def listeners @listeners ||= Hash.new { |h,k| h[k] = [] } - @listeners[kind] end def fire(kind, *args) - listeners(kind).each { |l| l.call(*args) } + listeners[kind].each { |l| l[*args] } end end end lib/stateful/listeners.rb @@ -22,21 +22,21 @@ module Stateful def accessorize(target) @states.keys.each do |name| unless target.method_defined?("#{name}?") - target.class_eval <<-END, __FILE__, __LINE__ + target.class_eval <<-RUBY def #{name}? current_state == #{name.inspect} end - END + RUBY end end @events.keys.each do |name| unless target.method_defined?("#{name}!") - target.class_eval <<-END, __FILE__, __LINE__ + target.class_eval <<-RUBY def #{name}! self.class.statefully.execute(self, #{name.inspect}) end - END + RUBY end end end @@ -51,20 +51,20 @@ module Stateful to = states[dest] or raise StateNotFound.new(dest) args = model, event.name, to.name, from.name - multifire(event, :firing, args) - multifire(from, :exiting, args) - multifire(to, :entering, args) + fire(event, :firing, args) + fire(from, :exiting, args) + fire(to, :entering, args) model.current_state = to.name - multifire(to, :entered, args) - multifire(event, :fired, args) + fire(to, :entered, args) + fire(event, :fired, args) end private - def multifire(target, event_name, args) - fire(event_name, *args) # first fire the global listeners, + def fire(target, event_name, args) + super(event_name, *args) # first fire the global listeners, target.fire(event_name, *args) # then the ones for a specific state/event end end lib/stateful/machine.rb @@ -2,18 +2,18 @@ module Stateful module Persisters module Default def self.included(target) - unless target.method_defined?(:current_state) - target.class_eval <<-END, __FILE__, __LINE__ + unless target.respond_to?(:current_state) + target.class_eval <<-RUBY def current_state @current_state ||= self.class.statefully.start end - END + RUBY end - unless target.method_defined?(:current_state=) - target.class_eval <<-END, __FILE__, __LINE__ + unless target.respond_to?(:current_state=) + target.class_eval <<-RUBY attr_writer :current_state - END + RUBY end end end lib/stateful/persisters/default.rb History.txt Manifest.txt README.txt test/helper.rb test/stateful/machine_test.rb 91e16b164957bd818bf1b3d8e56128060b498111 John Barnette jbarnette@gmail.com http://github.com/jbarnette/stateful/commit/b5203b2321942b3c4f592d6b22e3b814e6db5bb3 b5203b2321942b3c4f592d6b22e3b814e6db5bb3 2008-07-03T13:31:55-07:00 2008-07-03T13:31:55-07:00 Autotestify, RSpecify, and unhoe. e30f66c69af20afdeb1c4d208e29b1342c28fd5d John Barnette jbarnette@gmail.com