simple_enum 1.2.0 → 1.3.0

data/Gemfile

@@ -0,0 +1,7 @@
+source :rubygems
+
+gem "activesupport", "~> 3.0.0", :require => "active_support"
+gem "activerecord",  "~> 3.0.0", :require => "active_record"
+
+gem "sqlite3-ruby", :require => "sqlite3", :platforms => :ruby
+gem "jdbc-sqlite3", :require => "jdbcsqlite3", :platforms => :jruby

data/Gemfile.BACKPORT

@@ -0,0 +1,7 @@
+source :rubygems
+
+gem "activesupport", "~> 2.3.8", :require => "active_support"
+gem "activerecord",  "~> 2.3.8", :require => "active_record"
+
+gem "sqlite3-ruby", :require => "sqlite3", :platforms => :ruby
+gem "jdbc-sqlite3", :require => "jdbcsqlite3", :platforms => :jruby

data/Gemfile.BACKPORT.lock

@@ -0,0 +1,16 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activerecord (2.3.10)
+      activesupport (= 2.3.10)
+    activesupport (2.3.10)
+    sqlite3-ruby (1.3.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 2.3.8)
+  activesupport (~> 2.3.8)
+  jdbc-sqlite3
+  sqlite3-ruby

data/Gemfile.lock

@@ -0,0 +1,28 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.1)
+      activesupport (= 3.0.1)
+      builder (~> 2.1.2)
+      i18n (~> 0.4.1)
+    activerecord (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
+      arel (~> 1.0.0)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.1)
+    arel (1.0.1)
+      activesupport (~> 3.0.0)
+    builder (2.1.2)
+    i18n (0.4.2)
+    sqlite3-ruby (1.3.2)
+    tzinfo (0.3.23)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 3.0.0)
+  activesupport (~> 3.0.0)
+  jdbc-sqlite3
+  sqlite3-ruby

data/lib/simple_enum.rb

@@ -21,7 +21,7 @@ require 'simple_enum/validation'
 module SimpleEnum
 
   # +SimpleEnum+ version string.
-  VERSION = "1.2.0".freeze
+  VERSION = "1.3.0".freeze
 
   class << self
     
@@ -176,24 +176,23 @@ module SimpleEnum
       end
     
       # allow access to defined values hash, e.g. in a select helper or finder method.      
-      self_name = enum_cd.to_s.pluralize   
-      self_name.upcase! if options[:upcase]   
+      attr_name = enum_cd.to_s.pluralize
+      enum_attr = :"#{attr_name.downcase}_enum_hash"
+      write_inheritable_attribute(enum_attr, values)
       
-      class_eval(<<-EOM, __FILE__, __LINE__ + 1)
-        @#{self_name} = values
-
-        def self.#{self_name}(*args)
-          return @#{self_name} if args.first.nil?          
-          return @#{self_name}[args.first] if args.size == 1
-          args.inject([]) { |ary, sym| ary << @#{self_name}[sym]; ary }
+      class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+        def self.#{attr_name}(*args)
+          return read_inheritable_attribute(#{enum_attr.inspect}) if args.first.nil?
+          return read_inheritable_attribute(#{enum_attr.inspect})[args.first] if args.size == 1
+          args.inject([]) { |ary, sym| ary << read_inheritable_attribute(#{enum_attr.inspect})[sym]; ary }
         end
         
-        def self.#{self_name}_for_select(&block)
-          self.#{self_name}.map do |k,v|
-            [block_given? ? yield(k,v) : self.human_enum_name(#{self_name.inspect}, k), k]
+        def self.#{attr_name}_for_select(&block)
+          self.#{attr_name}.map do |k,v|
+            [block_given? ? yield(k,v) : self.human_enum_name(#{attr_name.inspect}, k), k]
           end.sort
         end
-      EOM
+      RUBY
     
       # only create if :slim is not defined
       if options[:slim] != true
@@ -214,11 +213,7 @@ module SimpleEnum
         
           # allow class access to each value
           unless options[:slim] === :class
-            if self.respond_to? :singleton_class
-              singleton_class.send(:define_method, "#{prefix}#{sym}", Proc.new { |*args| args.first ? k : code })
-            else
-              metaclass.send(:define_method, "#{prefix}#{sym}", Proc.new { |*args| args.first ? k : code })
-            end
+            singleton_class.send(:define_method, "#{prefix}#{sym}", Proc.new { |*args| args.first ? k : code })
           end
         end
       end

data/test/array_conversions_test.rb

@@ -6,10 +6,11 @@ class ArrayConversionsTest < ActiveSupport::TestCase
   end
   
   test "that conversion of Gender.find(:all).map {...} to enumeration values as symbols works the same as [:male,:female]" do
-    with_enum = Class.new(ActiveRecord::Base) do
+    class DummyArrayTest1 < ActiveRecord::Base
       set_table_name 'dummies'
       as_enum :gender, Gender.find(:all).map { |g| [g.name.to_sym, g.id] }
     end
+    with_enum = DummyArrayTest1
     
     assert_equal 0, with_enum.male
     assert_equal 1, with_enum.female

data/test/class_methods_test.rb

@@ -10,9 +10,14 @@ class ClassMethodsTest < ActiveSupport::TestCase
     assert_equal Dummy.genders(:male), Dummy.genders[:male]
     assert_nil Dummy.genders(:inexistent)
     assert_nil Dummy.genders[:inexistent]
+    assert_not_nil Dummy.genders[:female]
+  end
+  
+  test "inheritance of `genders` to subclasses (#issue/3)" do
+    assert_equal({ :female => 1, :male => 0}, SpecificDummy.genders)
   end
 
-  test "GENDERS constant created" do
+  test "genders reader created" do
     assert_equal [0, 1], Dummy.genders.values.sort
     assert_equal %w{female male}, Dummy.genders.keys.map(&:to_s).sort
   end
@@ -35,10 +40,11 @@ class ClassMethodsTest < ActiveSupport::TestCase
   end
   
   test "that no Klass.shortcut are created if :slim => true" do
-    with_slim = Class.new(ActiveRecord::Base) do
+    class Dummy1 < ActiveRecord::Base
       set_table_name 'dummies'
       as_enum :gender, [:male, :female], :slim => true
     end
+    with_slim = Dummy1
 
     assert !with_slim.respond_to?(:male)
     assert !with_slim.respond_to?(:female)    
@@ -46,11 +52,12 @@ class ClassMethodsTest < ActiveSupport::TestCase
   end
   
   test "that no Klass.shortcut's are created if :slim => :class, though instance shortcuts are" do
-    with_slim_class = Class.new(ActiveRecord::Base) do
+    class Dummy2 < ActiveRecord::Base
       set_table_name 'dummies'
       as_enum :gender, [:male, :female], :slim => :class
     end
-
+    with_slim_class = Dummy2
+    
     jane = with_slim_class.new
     
     assert_respond_to jane, :male!
@@ -63,10 +70,11 @@ class ClassMethodsTest < ActiveSupport::TestCase
   end
   
   test "that Klass.shortcut respect :prefix => true and are prefixed by \#{enum_cd}" do
-    with_prefix = Class.new(ActiveRecord::Base) do
+    class Dummy3 < ActiveRecord::Base
       set_table_name 'dummies'
       as_enum :gender, [:male, :female], :prefix => true
     end
+    with_prefix = Dummy3
     
     assert !with_prefix.respond_to?(:male)
     assert !with_prefix.respond_to?(:female)    
@@ -77,10 +85,11 @@ class ClassMethodsTest < ActiveSupport::TestCase
   end
   
   test "to ensure that Klass.shortcut also work with custom prefixes" do
-    with_custom_prefix = Class.new(ActiveRecord::Base) do
+    class Dummy4 < ActiveRecord::Base
       set_table_name 'dummies'
       as_enum :gender, [:male, :female], :prefix => :g
     end
+    with_custom_prefix = Dummy4
     
     assert !with_custom_prefix.respond_to?(:male)
     assert !with_custom_prefix.respond_to?(:female)    
@@ -90,18 +99,7 @@ class ClassMethodsTest < ActiveSupport::TestCase
     assert_equal 1, with_custom_prefix.g_female    
     assert_respond_to with_custom_prefix, :genders    
   end
-  
-  test "new :upcase option for those guys picky with coding guidelines etc." do
-    with_upcase = Class.new(ActiveRecord::Base) do
-      set_table_name 'dummies'
-      as_enum :gender, [:male, :female], :upcase => true
-    end
     
-    assert_respond_to with_upcase, :GENDERS
-    assert_same 0, with_upcase.GENDERS.male
-    assert_same 1, with_upcase.GENDERS[:female]
-  end
-  
   test "that the human_enum_name method returns translated/humanized values" do
     assert_equal :male.to_s.humanize, Dummy.human_enum_name(:genders, :male)
     assert_equal "Girl", Dummy.human_enum_name(:genders, :female)

data/test/models.rb

@@ -5,4 +5,9 @@ class Dummy < ActiveRecord::Base
 end
 
 class Gender < ActiveRecord::Base
-end
+end
+
+# Used to test STI stuff
+class SpecificDummy < Dummy
+  set_table_name 'dummies'
+end

data/test/test_helper.rb

@@ -4,7 +4,9 @@
 $KCODE = 'u' unless RUBY_VERSION =~ /^1\.9/ # to make parameterize work...
 
 require 'rubygems'
+require 'bundler/setup'
 
+require 'test/unit'
 require 'active_support'
 require 'active_record'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_enum
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 27
   prerelease: false
   segments: 
   - 1
-  - 2
+  - 3
   - 0
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Lukas Westermann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 +02:00
+date: 2010-11-19 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -29,6 +29,10 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .gitignore
+- Gemfile
+- Gemfile.BACKPORT
+- Gemfile.BACKPORT.lock
+- Gemfile.lock
 - LICENCE
 - README.rdoc
 - Rakefile