power_enum 0.9.3 → 0.9.4

data/lib/power_enum/enumerated.rb

@@ -125,10 +125,15 @@ module PowerEnum::Enumerated
     # Returns all the enum values.  Caches results after the first time this method is run.
     def all
       return @all if @all
+      @all = load_all.collect{|val| val.freeze}.freeze
+    end
+
+    def load_all
       conditions = self.acts_enumerated_conditions
       order = self.acts_enumerated_order
-      @all = where(conditions).order(order).collect{|val| val.freeze}.freeze
+      where(conditions).order(order)
     end
+    private :load_all
 
     # Returns all the active enum values.  See the 'active?' instance method.
     def active
@@ -242,6 +247,9 @@ module PowerEnum::Enumerated
       if block_given?
         begin
           self.enumeration_model_updates_permitted = true
+          purge_enumerations_cache
+          @all = load_all
+          @enumerations_model_updating = true
           case block.arity
           when 0
             yield
@@ -250,11 +258,18 @@ module PowerEnum::Enumerated
           end
         ensure
           purge_enumerations_cache
+          @enumerations_model_updating = false
           self.enumeration_model_updates_permitted = false
         end
       end
     end
 
+    # Returns true if the enumerations model is in the middle of an
+    # update_enumerations_model block, false otherwise.
+    def enumerations_model_updating?
+      !!@enumerations_model_updating
+    end
+
     # Returns the name of the column this enum uses as the basic underlying value.
     def name_column
       @name_column ||= self.acts_enumerated_name_column
@@ -282,10 +297,12 @@ module PowerEnum::Enumerated
     private :all_by_name
 
     def all_by_attribute(attr)
-      all.inject({}) { |memo, item|
+      aba = all.inject({}) { |memo, item|
         memo[item.send(attr)] = item
         memo
-      }.freeze
+      }
+      aba.freeze unless enumerations_model_updating?
+      aba
     end
     private :all_by_attribute
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: power_enum
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-24 00:00:00.000000000 Z
+date: 2012-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -145,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2052291500201023565
+      hash: 2627295504409005826
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: