maintain 0.2.9 → 0.2.10

data/VERSION

@@ -1 +1 @@
-0.2.9
+0.2.10

data/lib/maintain/bitmask_value.rb

@@ -29,10 +29,10 @@ module Maintain
         if $2 == '?'
           self.class.class_eval <<-EOC
             def #{method}
-              @value & #{compare.inspect} != 0
+              value_for(@value) & #{compare.inspect} != 0
             end
           EOC
-          @value & compare != 0
+          value_for(@value) & compare != 0
         else
           self.class.class_eval <<-EOC
             def #{method}

data/lib/maintain/maintainer.rb

@@ -41,7 +41,11 @@ module Maintain
 
     def default(state = nil)
       if state
-        @default = state
+        if bitmask?
+          @default = (@default || 0) | states[state][:value]
+        else
+          @default = state
+        end
       else
         @default
       end
@@ -108,9 +112,6 @@ module Maintain
         options = value
         value = nil
       end
-      if options.has_key?(:default)
-        default(name)
-      end
       @increment ||= 0
       if bitmask?
         unless value.is_a?(Integer)
@@ -127,6 +128,12 @@ module Maintain
         back_end.state maintainee, name, @attribute, value.is_a?(Symbol) ? value.to_s : value
       end
 
+      # We need the states hash to contain the compare_value for this guy before we can set defaults on the bitmask,
+      # since the default should actually be a bitmask of all possible default states
+      if options.has_key?(:default)
+        default(name)
+      end
+
       # Now we're going to add proxies to test for state. These methods only get added if a
       # method of their name doesn't already exist.
       boolean_method = "#{name}?"

data/maintain.gemspec

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

@@ -9,7 +9,20 @@ describe Maintain do
     end
   end
 
-  describe "bitmask" do
+  describe "bitmask", "class methods" do
+    it "should allow multiple defaults" do
+      MaintainTest.maintain :permissions, :bitmask => true do
+        state :edit, 1, :default => true
+        state :delete, 2, :default => true
+        state :update, 3
+      end
+      @maintainer = MaintainTest.new
+      @maintainer.permissions.edit?.should be_true
+      @maintainer.permissions.delete?.should be_true
+    end
+  end
+
+  describe "bitmask", "instance methods" do
     before :each do
       MaintainTest.maintain :permissions, :bitmask => true do
         state :edit, 1

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: maintain
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 2
-  - 9
-  version: 0.2.9
+  - 10
+  version: 0.2.10
 platform: ruby
 authors: 
 - Flip Sasser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-02 00:00:00 -04:00
+date: 2011-06-03 00:00:00 -04:00
 default_executable: 
 dependencies: []