maintain 0.1.8 → 0.1.9

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/lib/maintain/maintainer.rb

@@ -21,7 +21,7 @@ module Maintain
       end
       # Now define the state
       if @active_record && method_free?(name, true)
-        conditions = {:conditions => {@attribute => options.map{|value| states[value]}}}
+        conditions = {:conditions => {@attribute => options.map{|value| states[value][:value].is_a?(Symbol) ? states[value][:value].to_s : states[value][:value] }}}
         if defined?(ActiveRecord::VERSION) && ActiveRecord::VERSION::STRING >= "3"
           maintainee.scope name, conditions
         else

data/maintain.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{maintain}
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Flip Sasser"]
-  s.date = %q{2010-05-03}
+  s.date = %q{2010-05-06}
   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

data/spec/active_record_spec.rb

@@ -34,7 +34,10 @@ if proceed
         ActiveMaintainTest.maintain :status do
           state :new, :default => true
           state :old
-          aggregate :everything, :as => [:new, :old]
+          state :foo
+          state :bar
+          aggregate :everything, :as => [:new, :old, :foo, :bar]
+          aggregate :fakes, :as => [:foo, :bar]
         end
       end
 
@@ -68,6 +71,17 @@ if proceed
         ActiveMaintainTest.should respond_to(:everything)
         ActiveMaintainTest.everything.should respond_to(:each)
       end
+
+      it "should return the correct collections on aggregates" do
+        ActiveMaintainTest.destroy_all
+        one = ActiveMaintainTest.create(:status => :foo)
+        two = ActiveMaintainTest.create(:status => :bar)
+        three = ActiveMaintainTest.create(:status => :new)
+        four = ActiveMaintainTest.create(:status => :old)
+        ActiveMaintainTest.fakes.should == [one, two]
+        ActiveMaintainTest.everything.should == [one, two, three, four]
+      end
+
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Flip Sasser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-03 00:00:00 -04:00
+date: 2010-05-06 00:00:00 -04:00
 default_executable: 
 dependencies: []