active_enum 0.9.4 → 0.9.5

data/CHANGELOG

@@ -1,3 +1,6 @@
+[0.9.5] : 2011-09-11
+- Fix regression in enumerate method to not override set of enumerated attributes with each call. [TeWu]
+
 [0.9.4] : 2011-09-08
 - Replaced usage of deprecated class_inheritable_accessor with class_attribute.
 

data/lib/active_enum/extensions.rb

@@ -27,6 +27,7 @@ module ActiveEnum
       #
       def enumerate(*attributes, &block)
         options = attributes.extract_options!
+        self.enumerated_attributes ||= {}
 
         attributes_enum = {}
         attributes.each do |attribute|
@@ -46,7 +47,7 @@ module ActiveEnum
             raise ActiveEnum::EnumNotFound, "Enum class could not be found for attribute '#{attribute}' in class #{self}. Specify the enum class using the :with option."
           end
         end
-        self.enumerated_attributes = attributes_enum
+        enumerated_attributes.merge!(attributes_enum)
       end
 
       def active_enum_for(attribute)

data/lib/active_enum/version.rb

@@ -1,3 +1,3 @@
 module ActiveEnum
-  VERSION = '0.9.4'
+  VERSION = '0.9.5'
 end

data/spec/active_enum/extensions_spec.rb

@@ -22,12 +22,22 @@ describe ActiveEnum::Extensions do
 
   it 'should allow multiple attributes to be enumerated with same enum' do
     Person.enumerate :attending, :staying, :with => Accepted
+
     Person.active_enum_for(:attending).should == Accepted
     Person.active_enum_for(:staying).should == Accepted
   end
 
+  it 'should allow multiple attributes to be enumerated with different enums' do
+    Person.enumerate :sex, :with => Sex
+    Person.enumerate :attending, :with => Accepted
+
+    Person.active_enum_for(:sex).should == Sex 
+    Person.active_enum_for(:attending).should == Accepted
+  end
+
   it 'should allow implicit enumeration class from attribute name' do
     Person.enumerate :sex
+
     Person.active_enum_for(:sex).should == Sex
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_enum
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 9
-  - 4
-  version: 0.9.4
+  - 5
+  version: 0.9.5
 platform: ruby
 authors: 
 - Adam Meehan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-08 00:00:00 +10:00
+date: 2011-09-11 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency