maintain 0.1.6 → 0.1.7

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/lib/maintain/bitmask_value.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module Maintain
   class BitmaskValue < Value
     def set_value(value)

data/lib/maintain/integer_value.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module Maintain
   class IntegerValue < Value
     def value

data/lib/maintain/maintainer.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module Maintain
   class Maintainer
     def aggregate(name, options)
@@ -38,7 +39,7 @@ module Maintain
     end
 
     def bitmask?
-      @bitmask
+      !!@bitmask
     end
 
     def default(state)
@@ -50,13 +51,11 @@ module Maintain
     end
 
     def hook(event, state, instance)
-      if state && hooks[state.to_sym] && hooks[state.to_sym][event.to_sym]
-        hooks[state.to_sym][event.to_sym].each do |method|
-          if method.is_a?(Proc)
-            instance.instance_eval(&method)
-          else
-            instance.send(method)
-          end
+      if state && state.to_s.strip != '' && hooks[state.to_sym] && hook_definitions = hooks[state.to_sym][event.to_sym]
+        hook_definitions.each do |hook_definition|
+          next if hook_definition[:if] && !call_method_or_proc_on_instance(hook_definition[:if], instance)
+          next if hook_definition[:unless] && call_method_or_proc_on_instance(hook_definition[:unless], instance)
+          call_method_or_proc_on_instance(hook_definition[:method], instance)
         end
       end
     end
@@ -74,13 +73,25 @@ module Maintain
       @integer = !!value
     end
 
-    def on(event, state, method = nil, &block)
+    def integer?
+      !!@integer
+    end
+
+    def on(*args, &block)
+      options = args.last.is_a?(Hash) ? args.pop : {}
+      event, state = args.shift, args.shift
+      method = args.shift
       if block_given?
         method = block
       end
       hooks[state.to_sym] ||= {}
       hooks[state.to_sym][event.to_sym] ||= []
-      hooks[state.to_sym][event.to_sym].push(method) unless hooks[state.to_sym][event.to_sym].include?(method)
+      method_hash = {:method => method}.merge(options)
+      if old_definition = hooks[state.to_sym][event.to_sym].find{|hook| hook[:method] == method}
+        old_definition.merge!(method_hash)
+      else
+        hooks[state.to_sym][event.to_sym].push(method_hash)
+      end
     end
 
     def state_name_for(value)
@@ -98,7 +109,7 @@ module Maintain
         default(name)
       end
       @increment ||= 0
-      if @bitmask
+      if bitmask?
         unless value.is_a?(Integer)
           value = @increment
         end
@@ -107,7 +118,7 @@ module Maintain
         integer(true)
       end
       value ||= name
-      states[name] = {:compare_value => !@bitmask && value.is_a?(Integer) ? value : @increment, :value => value}
+      states[name] = {:compare_value => !bitmask? && value.is_a?(Integer) ? value : @increment, :value => value}
       @increment += 1
       if @active_record && !maintainee.respond_to?(name)
         conditions = {:conditions => {@attribute => value.is_a?(Symbol) ? value.to_s : value}}
@@ -138,9 +149,9 @@ module Maintain
     end
 
     def value(initial = nil)
-      if @bitmask
+      if bitmask?
         BitmaskValue.new(self, initial || @default || 0)
-      elsif @integer
+      elsif integer?
         IntegerValue.new(self, initial || @default)
       else
         Value.new(self, initial || @default)
@@ -164,9 +175,13 @@ module Maintain
         methods = maintainee_class.public_methods + maintainee_class.private_methods + maintainee_class.protected_methods
       else
         respond_to = false
-        methods = maintainee_class.public_instance_methods + maintainee_class.private_instance_methods + maintainee_class.protected_instance_methods
+        methods = maintainee_class.instance_methods
+        # methods = %w(instance_methods public_instance_methods private_instance_methods protected_instance_methods).inject([]) do |methods, method|
+        #   methods + maintainee_class.send(method)
+        # end.uniq
       end
-      !respond_to && !methods.include?(method_name)
+      # Ruby 1.8 returns arrays of strings; ruby 1.9 returns arrays of symbols. "Awesome."
+      !respond_to && !methods.include?(method_name) && !methods.include?(method_name.to_sym)
     end
 
     def method_missing(method, *args)
@@ -176,5 +191,14 @@ module Maintain
         super
       end
     end
+
+    private
+    def call_method_or_proc_on_instance(method, instance)
+      if method.is_a?(Proc)
+        instance.instance_eval(&method)
+      else
+        instance.send(method)
+      end
+    end
   end
 end

data/lib/maintain/value.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module Maintain
   class Value
     def >(value)

data/lib/maintain.rb

@@ -1,3 +1,6 @@
+# encoding: UTF-8
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__))
+
 module Maintain
   # We're not really interested in loading anything into memory if we don't need to,
   # so Maintainer, Value, and the Value subclasses are ignored until they're needed.
@@ -49,59 +52,39 @@ module Maintain
 
     # Define our getters and setters - these are the only methods Maintain will stomp
     # on if you've already defined them. This is because they're how Maintain works.
-    class_eval <<-EOC
+    class_eval <<-EOC, __FILE__
       def #{attribute}=(value)
         # If we can find the maintainer on this attribute, we'll use it to set values.
         if maintainer = self.class.maintainers[#{attribute.to_sym.inspect}]
-          # First, we instantiate a value on this maintainer if we haven't already
-          # @#{attribute} ||= maintainer.value#{"(read_attribute(:#{attribute}))" if active_record}
-
-          # Then run the exit hook if we're changing the value
-          maintainer.hook(:exit, #{attribute}.value, self)
+          # Run the exit hook if we're changing the value
+          maintainer.hook(:exit, #{attribute}.name, self)
 
           # Then set the value itself. Maintainer::State will return the value you set,
           # so if we're setting to nil we get rid of the attribute entirely - it's not
           # needed and we want the getter to return nil in that case.
           # unless 
-          #{attribute}.set_value(value)
-            # @#{attribute} = nil
-            # Nevermind - all of our test methods rely on that attribute existing, no
-            # matter what (e.g. maintain(:state) { state :one } and calling "one?" will
-            # throw an error if we null out our maintainer)
-          # end#{%{
+          #{attribute}.set_value(value)#{%{
 
           # If this is ActiveRecord::Base or a subclass of it, we'll make sure calling the
           # setter writes a DB-friendly value.
-          write_attribute(#{attribute.to_s.inspect}, @#{attribute} ? @#{attribute}.value.to_s : nil)
+          write_attribute(#{attribute.to_s.inspect}, @#{attribute} ? @#{attribute}.value.to_s : @#{attribute})
           } if active_record}
 
           # Last but not least, run the enter hooks for the new value - cause that's how we
           # do.
-          maintainer.hook(:enter, @#{attribute}.value, self) if @#{attribute}
+          maintainer.hook(:enter, #{attribute}.name, self) if @#{attribute}
         else
           # If we can't find a maintainer for this attribute, make our best effort to do what
           # attr_accessor does - set the instance variable.
           @#{attribute} = value#{%{
 
           # ... and on ActiveRecord::Base, we'll also write the attribute like a normal setter.
-          if respond_to?(:write_attribute)
-            write_attribute(:#{attribute}, @#{attribute})
-          end
-          } if active_record}
+          write_attribute(:#{attribute}, @#{attribute})} if active_record}
         end
       end
 
       def #{attribute}
-        # Start by returning an already-instantiated Maintainer::State if it exists
-        return @#{attribute} if @#{attribute}
-
-        # If'n it doesn't already exist AND this maintained attribute has a default value (and
-        # bitmasks must have at least a 0 value), we'll instantiate a Maintainer::State and return
-        # it.
-        # if self.class.maintainers[#{attribute.to_sym.inspect}].default? || self.class.maintainers[#{attribute.to_sym.inspect}].bitmask?#{" || attributes['#{attribute}']" if active_record}
-        # Always return a State, no matter what
-          @#{attribute} = self.class.maintainers[#{attribute.to_sym.inspect}].value#{"(read_attribute(:#{attribute}))" if active_record}
-        # end
+        @#{attribute} ||= self.class.maintainers[#{attribute.to_sym.inspect}].value#{"(read_attribute(:#{attribute}))" if active_record}
       end
     EOC
 

data/maintain.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{maintain}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Flip Sasser"]
-  s.date = %q{2010-04-24}
+  s.date = %q{2010-04-30}
   s.description = %q{
       Maintain is a simple state machine mixin for Ruby objects. It supports comparisons, bitmasks,
       and hooks that really work. It can be used for multiple attributes and will always do its best to
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
     "README.markdown"
   ]
   s.files = [
+    ".gitignore",
      "README.markdown",
      "Rakefile",
      "VERSION",
@@ -28,6 +29,7 @@ Gem::Specification.new do |s|
      "lib/maintain/integer_value.rb",
      "lib/maintain/maintainer.rb",
      "lib/maintain/value.rb",
+     "maintain.gemspec",
      "spec/active_record_spec.rb",
      "spec/aggregates_spec.rb",
      "spec/bitwise_spec.rb",

data/spec/active_record_spec.rb

@@ -22,7 +22,7 @@ if proceed
     describe "accessors" do
       before :each do
         ActiveRecord::Base.establish_connection({:adapter => 'sqlite3', :database => ':memory:', :pool => 5, :timeout => 5000})
-        class ActiveMaintainTest < ActiveRecord::Base; end
+        class ::ActiveMaintainTest < ActiveRecord::Base; end
         silence_stream(STDOUT) do
           ActiveRecord::Schema.define do
             create_table :active_maintain_tests, :force => true do |t|

data/spec/aggregates_spec.rb

@@ -4,7 +4,7 @@ require 'lib/maintain'
 
 describe Maintain, "aggregates" do
   before :each do
-    class MaintainTest
+    class ::MaintainTest
       extend Maintain
     end
   end

data/spec/bitwise_spec.rb

@@ -4,7 +4,7 @@ require 'lib/maintain'
 
 describe Maintain do
   before :each do
-    class MaintainTest
+    class ::MaintainTest
       extend Maintain
     end
   end

data/spec/comparing_state_spec.rb

@@ -4,10 +4,24 @@ require 'lib/maintain'
 
 describe Maintain do
   before :each do
-    class MaintainTest
+    class ::MaintainTest
       attr_accessor :existant_attribute
       extend Maintain
     end
+
+    class ::MaintainTestTwo
+      def new?
+        :i_existed_before_you_came_along
+      end
+
+      extend Maintain
+
+      maintains :state, :default => :new do
+        state :new
+        state :overdue
+        state :closed
+      end
+    end
   end
 
   describe "testing" do
@@ -66,17 +80,6 @@ describe Maintain do
           end
 
           it "should not override pre-existing methods" do
-            class MaintainTestTwo
-              def new?
-                :i_existed_before_you_came_along
-              end
-              extend Maintain
-              maintains :state, :default => :new do
-                state :new
-                state :overdue
-                state :closed
-              end
-            end
             MaintainTestTwo.new.new?.should == :i_existed_before_you_came_along
           end
         end

data/spec/defining_states_spec.rb

@@ -4,7 +4,7 @@ require 'lib/maintain'
 
 describe Maintain do
   before :each do
-    class MaintainTest
+    class ::MaintainTest
       attr_accessor :existant_attribute
       extend Maintain
     end

data/spec/hooks_spec.rb

@@ -4,7 +4,7 @@ require 'lib/maintain'
 
 describe Maintain, "hooks" do
   before :each do
-    class MaintainTest
+    class ::MaintainTest
       extend Maintain
     end
   end
@@ -41,4 +41,22 @@ describe Maintain, "hooks" do
     maintain.state = :old
   end
 
+  describe "guarding" do
+    it "should prevent hooks from running when they return false" do
+      MaintainTest.maintain :state do
+        state :new
+        state :old
+        on :enter, :new, :new_entered, :if => :run_hook?
+      end
+
+      maintain = MaintainTest.new
+      def maintain.run_hook?
+        false
+      end
+      maintain.should_not_receive(:new_entered)
+      maintain.state = :new
+      maintain.state = :old
+      maintain.state = :old
+    end
+  end
 end

data/spec/integer_spec.rb

@@ -4,7 +4,7 @@ require 'lib/maintain'
 
 describe Maintain do
   before :each do
-    class MaintainTest
+    class ::MaintainTest
       extend Maintain
     end
   end

data/spec/maintain_spec.rb

@@ -4,7 +4,7 @@ require 'lib/maintain'
 
 describe Maintain do
   before :each do
-    class MaintainTest
+    class ::MaintainTest
       attr_accessor :existant_attribute
       extend Maintain
     end

data/spec/proxy_spec.rb

@@ -4,7 +4,7 @@ require 'lib/maintain'
 
 describe Maintain do
   before :each do
-    class MaintainTest
+    class ::MaintainTest
       attr_accessor :existant_attribute
       extend Maintain
     end

data/spec/setting_state_spec.rb

@@ -4,7 +4,7 @@ require 'lib/maintain'
 
 describe Maintain do
   before :each do
-    class MaintainTest
+    class ::MaintainTest
       attr_accessor :existant_attribute
       extend Maintain
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Flip Sasser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-24 00:00:00 -04:00
+date: 2010-04-30 00:00:00 -04:00
 default_executable: 
 dependencies: []