acts_as_enumeration 0.1.9 → 0.1.10

data/lib/active_record/acts/enumeration.rb

@@ -2,7 +2,7 @@ module ActiveRecord
   module Acts
     module Enumeration
 
-      VERSION="0.1.9"
+      VERSION="0.1.10"
       class << self
 
         def included(base)
@@ -76,8 +76,12 @@ module ActiveRecord
                 define_method(key.camelize) { self.send("id_for_#{field}", y)}
                 define_method(key.camelize.upcase) { self.send(key.camelize)}
               end
-              self.const_set(key.camelize,self.send("id_for_#{field}",y)) unless self.const_defined?(key.camelize)
-              self.const_set(key.camelize.upcase,self.send("id_for_#{field}",y)) unless self.const_defined?(key.camelize.upcase)
+              begin
+                self.const_set(key.camelize,self.send("id_for_#{field}",y)) unless self.const_defined?(key.camelize)
+                self.const_set(key.camelize.upcase,self.send("id_for_#{field}",y)) unless self.const_defined?(key.camelize.upcase)
+              rescue Exception=>e
+                puts("Warning: Skipping constant definition for #{key}")
+              end
             end
           end
         end

data/test/enumeration_test.rb

@@ -29,12 +29,10 @@ def teardown_db
   end
 end
 
-class Enumerate < ActiveRecord::Base;
-end
-class EnumerateAll < Enumerate;
-end
-class EnumerateSome < Enumerate;
-end
+class Enumerate < ActiveRecord::Base; end
+class EnumerateAll < Enumerate; end
+class EnumerateSome < Enumerate; end
+class BrokenEnumeration < Enumerate; end
 
 class EnumerateTest < (
 begin
@@ -52,8 +50,12 @@ end)
       klass.create! :name => 'fifth', :description => 'Fifth field'
       klass.create! :name => 'sixth', :description => 'Sixth field'
     end
+    [BrokenEnumeration].each do |klass|
+      klass.create! :name => '33108', :description => '33108 field'
+    end
     EnumerateAll.acts_as_enumeration :description
     EnumerateSome.acts_as_enumeration :description
+    BrokenEnumeration.acts_as_enumeration :name
   end
 
   def teardown
@@ -84,6 +86,7 @@ end)
     assert EnumerateAll::FirstField,Enumerate.first.id
     assert EnumerateAll.FIRSTFIELD,Enumerate.first.id
     assert EnumerateAll.FirstField,Enumerate.first.id
+    assert BrokenEnumeration._33108,BrokenEnumeration.first.id
   end
 
   def test_sti

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_enumeration
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler