maintain 0.2.18 → 0.2.19

data/CHANGES

@@ -0,0 +1,9 @@
+0.2.19
+	* Added :force option to state and aggregate definitions, allowing you
+		to force a method overwrite
+	* Added an attribute_name alias to named scopes in the ActiveRecord
+		backend, since Rails 3.1 has eaten up a number of previously
+		usable state names
+
+0.2.18
+	* Ruby 1.9.2 and Rails 3.1 compatibility updates (no API changes)

data/README.markdown

@@ -39,6 +39,12 @@ But wait! What if you've already defined "new?" on the Foo class? Not to worry,
 
 	foo.state.new?
 
+**UPDATE:** what happens when you *want* Maintain to step on your toes? You can add an optionally add:
+
+	state :new, :force => true
+
+...and Maintain will make sure your methods get added, even if it overwrites a previous method.
+
 Comparisons
 -
 

data/VERSION

@@ -1 +1 @@
-0.2.18
+0.2.19

data/lib/maintain/backend/active_record.rb

@@ -1,9 +1,9 @@
 module Maintain
   module Backend
     class ActiveRecord < Maintain::Backend::Base
-      def aggregate(maintainee, name, attribute, states)
+      def aggregate(maintainee, name, attribute, states, options = {})
         # named_scope will handle the array of states as "IN" in SQL
-        state(maintainee, name, attribute, states, false)
+        state(maintainee, name, attribute, states, options.merge(:dirty => false))
       end
 
       def on(maintainee, attribute, event, state, method, options)
@@ -35,14 +35,14 @@ module Maintain
         instance.read_attribute(attribute)
       end
 
-      def state(maintainee, name, attribute, value, dirty = true)
+      def state(maintainee, name, attribute, value, options = {})
+        options = {:dirty => true}.merge(options)
         conditions = {:conditions => {attribute => value}}
-        if defined?(::ActiveRecord::VERSION) && ::ActiveRecord::VERSION::STRING >= '3'
-          maintainee.scope name, conditions
-        else
-          maintainee.named_scope name, conditions
-        end
-        if dirty
+        puts "NAMING SCOPE: #{name} with #{conditions.inspect} "
+        named_scope_method = defined?(::ActiveRecord::VERSION) && ::ActiveRecord::VERSION::STRING >= '3' ? :scope : :named_scope
+        maintainee.send(named_scope_method, name, conditions) if !maintainee.respond_to?(name) || options[:force]
+        maintainee.send(named_scope_method, "#{attribute}_#{name}", conditions)
+        if options[:dirty]
           maintainee.class_eval <<-dirty_tracker
             def #{attribute}_was_#{name}?
               #{attribute}_was == self.class.maintainers[:#{attribute}].value(self).value_for(:#{name})

data/lib/maintain/maintainer.rb

@@ -3,11 +3,12 @@ module Maintain
   class Maintainer
     attr_reader :back_end
 
-    def aggregate(name, options)
-      if options.is_a?(Hash) && options.has_key?(:as)
-        options = options[:as]
+    def aggregate(name, conditions, options = {})
+      if conditions.is_a?(Hash) && conditions.has_key?(:as)
+        options = conditions
+        conditions = options[:as]
       end
-      aggregates[name] = options
+      aggregates[name] = conditions
       # Now we're going to add proxies to test for state being in this aggregate. Don't create
       # this method unless it doesn't exist.
       boolean_method = "#{name}?"
@@ -22,8 +23,8 @@ module Maintain
         EOC
       end
       # Now define the state
-      if back_end && method_free?(name, true)
-        back_end.aggregate(maintainee, name, @attribute, options.map{|value| states[value][:value].is_a?(Symbol) ? states[value][:value].to_s : states[value][:value] })
+      if back_end
+        back_end.aggregate(maintainee, name, @attribute, conditions.map{|value| states[value][:value].is_a?(Symbol) ? states[value][:value].to_s : states[value][:value] }, {:force => options[:force]})
       end
     end
 
@@ -128,8 +129,8 @@ module Maintain
       value ||= name
       states[name] = {:compare_value => !bitmask? && value.is_a?(Integer) ? value : @increment, :value => value}
       @increment += 1
-      if !maintainee.respond_to?(name) && back_end
-        back_end.state maintainee, name, @attribute, value.is_a?(Symbol) ? value.to_s : value
+      if back_end
+        back_end.state maintainee, name, @attribute, value.is_a?(Symbol) ? value.to_s : value, :force => options[:force]
       end
 
       # We need the states hash to contain the compare_value for this guy before we can set defaults on the bitmask,
@@ -154,7 +155,7 @@ module Maintain
         def #{@attribute}_#{boolean_method}
           #{@attribute}.#{boolean_method}
         end
-        #{"alias :#{boolean_method} :#{@attribute}_#{boolean_method}" if method_free?(boolean_method)}
+        #{"alias :#{boolean_method} :#{@attribute}_#{boolean_method}" if method_free?(boolean_method) || options[:force]}
       EOC
     end
 

data/maintain.gemspec

@@ -4,23 +4,20 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{maintain}
-  s.version = "0.2.16"
+  s.name = "maintain"
+  s.version = "0.2.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Flip Sasser"]
-  s.date = %q{2011-07-14}
-  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
-      stay out of your way and let your code drive the machine, and not vice versa.
-    }
-  s.email = %q{flip@x451.com}
+  s.date = "2011-11-02"
+  s.description = "\n      Maintain is a simple state machine mixin for Ruby objects. It supports comparisons, bitmasks,\n      and hooks that really work. It can be used for multiple attributes and will always do its best to\n      stay out of your way and let your code drive the machine, and not vice versa.\n    "
+  s.email = "flip@x451.com"
   s.extra_rdoc_files = [
     "README.markdown"
   ]
   s.files = [
     ".rspec",
+    "CHANGES",
     "README.markdown",
     "Rakefile",
     "VERSION",
@@ -49,12 +46,13 @@ Gem::Specification.new do |s|
     "spec/proxy_spec.rb",
     "spec/setting_state_spec.rb",
     "spec/spec.opts",
+    "spec/spec_helper.rb",
     "spec/subclass_spec.rb"
   ]
-  s.homepage = %q{http://github.com/flipsasser/maintain}
+  s.homepage = "http://github.com/flipsasser/maintain"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{A Ruby state machine that lets your code do the driving}
+  s.rubygems_version = "1.8.10"
+  s.summary = "A Ruby state machine that lets your code do the driving"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maintain
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-01 00:00:00.000000000Z
+date: 2011-11-02 00:00:00.000000000Z
 dependencies: []
 description: ! "\n      Maintain is a simple state machine mixin for Ruby objects.
   It supports comparisons, bitmasks,\n      and hooks that really work. It can be
@@ -22,6 +22,7 @@ extra_rdoc_files:
 - README.markdown
 files:
 - .rspec
+- CHANGES
 - README.markdown
 - Rakefile
 - VERSION