enumerate_it 1.0.2 → 1.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    enumerate_it (1.0.2)
+    enumerate_it (1.0.3)
       activesupport (>= 3.0.0)
 
 GEM
@@ -19,8 +19,16 @@ GEM
     activesupport (3.0.5)
     arel (2.0.9)
     builder (2.1.2)
+    coderay (1.0.9)
     diff-lcs (1.1.2)
     i18n (0.5.0)
+    method_source (0.8.1)
+    pry (0.9.12)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    pry-nav (0.2.3)
+      pry (~> 0.9.10)
     rake (0.9.2.2)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
@@ -30,6 +38,7 @@ GEM
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
+    slop (3.4.4)
     tzinfo (0.3.24)
 
 PLATFORMS
@@ -38,5 +47,7 @@ PLATFORMS
 DEPENDENCIES
   activerecord (>= 3.0.5)
   enumerate_it!
+  pry
+  pry-nav
   rake
   rspec (>= 2.5.0)

data/lib/enumerate_it/class_methods.rb

@@ -68,7 +68,8 @@ module EnumerateIt
 
     def define_enumeration_class(attribute, options)
       if options[:with].nil?
-        options[:with] = attribute.to_s.camelize.constantize
+        inner_enum_class_name = attribute.to_s.camelize.to_sym
+        options[:with] = self.constants.include?(inner_enum_class_name) ? self.const_get(inner_enum_class_name) : attribute.to_s.camelize.constantize
       end
     end
 

data/lib/enumerate_it/version.rb

@@ -1,3 +1,3 @@
 module EnumerateIt
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/spec/enumerate_it_spec.rb

@@ -1,5 +1,6 @@
 #encoding: utf-8
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'active_record'
 
 class TestEnumeration < EnumerateIt::Base
   associate_values(
@@ -132,7 +133,9 @@ describe EnumerateIt do
         class FooBar
           extend EnumerateIt
           attr_accessor :test_enumeration
+
           has_enumeration_for :test_enumeration
+
           def initialize(test_enumeration_value)
             @test_enumeration = test_enumeration_value
           end
@@ -143,6 +146,34 @@ describe EnumerateIt do
         target = FooBar.new(TestEnumeration::VALUE_1)
         target.test_enumeration_humanize.should == 'Hey, I am 1!'
       end
+
+      context "when using a nested class as the enumeration" do
+        before do
+          class NestedEnum < EnumerateIt::Base
+            associate_values :foo => ['1', 'Fooo'], :bar => ['2', 'Barrrr']
+          end
+
+          class ClassWithNestedEnum
+            class NestedEnum < EnumerateIt::Base
+              associate_values :foo => ['1', 'Blerrgh'], :bar => ['2' => 'Blarghhh']
+            end
+
+            extend EnumerateIt
+
+            attr_accessor :nested_enum
+
+            has_enumeration_for :nested_enum
+
+            def initialize(nested_enum_value)
+              @nested_enum = nested_enum_value
+            end
+          end
+        end
+
+        it "uses the inner class as the enumeration class" do
+          target = ClassWithNestedEnum.new('1').nested_enum_humanize.should == 'Blerrgh'
+        end
+      end
     end
   end
 
@@ -199,29 +230,28 @@ describe EnumerateIt do
 
   describe "using the :create_scopes option" do
     def setup_enumeration
-      TestClass.send(:has_enumeration_for, :foobar, :with => TestEnumeration, :create_scopes => true)
+      OtherTestClass.send(:has_enumeration_for, :foobar, :with => TestEnumeration, :create_scopes => true)
     end
 
     context "if the hosting class responds to :scope" do
       before do
-        class TestClass
-          def self.where(whatever); end
-          def self.scope(name, whatever); end
+        class OtherTestClass < ActiveRecord::Base
+          extend EnumerateIt
         end
 
         setup_enumeration
       end
 
       it "creates a scope for each enumeration value" do
-        TestEnumeration.enumeration do |symbol, pair|
-          TestClass.should respond_to(symbol)
+        TestEnumeration.enumeration.keys.each do |symbol|
+          OtherTestClass.should respond_to(symbol)
         end
       end
 
       it "when called, the scopes create the correct query" do
-        TestEnumeration.enumeration do |symbol, pair|
-          TestClass.should_receive(:where).with(:foobar => pair.firs)
-          TestClass.send symbol
+        TestEnumeration.enumeration.each do |symbol, pair|
+          OtherTestClass.should_receive(:where).with(:foobar => pair.first)
+          OtherTestClass.send symbol
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enumerate_it
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-18 00:00:00.000000000 Z
+date: 2013-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -75,6 +75,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.5
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-nav
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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
@@ -124,7 +156,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 709884351936478852
+      hash: -1389146170184327843
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -133,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 709884351936478852
+      hash: -1389146170184327843
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24