enumerate_it 0.7.14 → 0.7.15

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    enumerate_it (0.7.13)
-      activesupport (>= 2.3.2)
+    enumerate_it (0.7.14)
+      activesupport (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/

data/lib/enumerate_it.rb

@@ -201,6 +201,8 @@
 # - You can add behaviour to the enumeration class.
 # - You can reuse the enumeration inside other classes.
 #
+
+require "active_support/core_ext/class/attribute"
 module EnumerateIt
   class Base
     @@registered_enumerations = {}
@@ -276,6 +278,8 @@ module EnumerateIt
 
   module ClassMethods
     def has_enumeration_for(attribute, options = {})
+      self.enumerations = self.enumerations.dup
+
       define_enumeration_class attribute, options
       set_validations attribute, options
       create_enumeration_humanize_method options[:with], attribute
@@ -290,10 +294,6 @@ module EnumerateIt
       end
     end
 
-    def enumerations
-      @_enumerations ||= {}
-    end
-
     private
 
     def store_enumeration(klass, attribute)
@@ -355,6 +355,9 @@ module EnumerateIt
   end
 
   def self.included(receiver)
+    receiver.class_attribute :enumerations, :instance_writer => false, :instance_reader => false
+    receiver.enumerations = {}
+
     receiver.extend ClassMethods
   end
 end

data/lib/enumerate_it/version.rb

@@ -1,3 +1,3 @@
 module EnumerateIt
-  VERSION = "0.7.14"
+  VERSION = "0.7.15"
 end

data/spec/enumerate_it_spec.rb

@@ -73,6 +73,20 @@ describe EnumerateIt do
       TestClass.enumerations[:foobar].should == TestEnumeration
     end
 
+    context 'use the same enumeration from an inherited class' do
+      before do
+        class SomeClass < BaseClass
+        end
+        @target = SomeClass.new
+      end
+
+      it 'should have use the correct class' do
+        @base = BaseClass.new
+        @base.class.enumerations[:foobar].should == TestEnumeration
+        @target.class.enumerations[:foobar].should == TestEnumeration
+      end
+    end
+
     context 'declaring a simple enum on an inherited class' do
       before do
         class SomeClass < BaseClass

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enumerate_it
 version: !ruby/object:Gem::Version
-  version: 0.7.14
+  version: 0.7.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-02 00:00:00.000000000 Z
+date: 2012-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2159371700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2159371700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2159371020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159371020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2159386540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2159386540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2159385820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: 3.0.5
   type: :development
   prerelease: false
-  version_requirements: *2159385820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.5
 description: Have a legacy database and need some enumerations in your models to match
   those stupid '4 rows/2 columns' tables with foreign keys and stop doing joins just
   to fetch a simple description? Or maybe use some integers instead of strings as
@@ -105,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby Enumerations