acts_as_enumeration 0.1.13 → 0.1.14

data/lib/active_record/acts/enumeration.rb

@@ -2,7 +2,7 @@ module ActiveRecord
   module Acts
     module Enumeration
 
-      VERSION="0.1.13"
+      VERSION="0.1.14"
       class << self
 
         def included(base)
@@ -64,22 +64,30 @@ module ActiveRecord
               end
             end
 
+            def allowed_chars(string)
+              string.to_s=~/^[a-z_]/
+            end
+
+            def check_string(string, &block)
+              allowed_chars(string) && (yield string)
+            end
+
             def _key(string)
-              ((string.to_s=~/^[a-z_]/) && !respond_to?(string.to_s)) ? string.to_s : "_#{string.to_s}"
+              check_string(string) {|y| !respond_to?(y)} ? string : "_#{string}"
             end
 
             def _camelized_key(string)
-              (((string.to_s=~/^[a-z_]/) && !const_defined?(string.to_s.camelize)) ? string.to_s : "_#{string.to_s.camelize}").camelize
+              check_string(string) {|y| !const_defined?(string.camelize)} ? string.camelize : "_#{string.camelize}"
             end
 
             def _camelized_upcase_key(string)
-              (((string.to_s=~/^[a-z_]/) && !const_defined?(string.to_s.camelize.upcase)) ? string.to_s : "_#{string.to_s.camelize}").camelize.upcase
+              check_string(string) {|y| !const_defined?(string.camelize.upcase)} ? string.camelize.upcase : "_#{string.camelize.upcase}"
             end
 
             portable_select(field).map { |x| normalize_intern(x.send(field)) }.each do |y|
-              key=_key(y)
-              camelized_key=_camelized_key(y)
-              camelized_upcase_key=_camelized_upcase_key(y)
+              key=_key(y.to_s)
+              camelized_key=_camelized_key(y.to_s)
+              camelized_upcase_key=_camelized_upcase_key(y.to_s)
               define_method(:as_key) { self.class.normalize_intern(send(field)) }
               define_method("is_#{y}?") { is?(y) }
               alias_method "#{key}?", "is_#{y}?"
@@ -92,9 +100,13 @@ module ActiveRecord
               end
               begin
                 self.const_set(camelized_key,self.send("id_for_#{field}",y))
+              rescue Exception=>e
+                puts("Warning: Skipping constant definition for #{camelized_key}")
+              end
+              begin
                 self.const_set(camelized_upcase_key,self.send("id_for_#{field}",y))
               rescue Exception=>e
-                puts("Warning: Skipping constant definition for #{y}")
+                puts("Warning: Skipping constant definition for #{camelized_upcase_key}")
               end
             end
           end

data/test/enumeration_test.rb

@@ -88,8 +88,10 @@ end)
     assert EnumerateAll.FIRSTFIELD,Enumerate.first.id
     assert EnumerateAll.FirstField,Enumerate.first.id
     assert BrokenEnumeration._33108,BrokenEnumeration.first.id
-    assert BrokenEnumeration._all.id,BrokenEnumeration.last.id
-    assert BrokenEnumeration::ALL,Enumerate.last.id
+    assert BrokenEnumeration._all,BrokenEnumeration.find_by_name('all')
+    assert BrokenEnumeration::All,BrokenEnumeration.find_by_name('all').id
+    assert BrokenEnumeration::ALL,BrokenEnumeration.find_by_name('all').id
+    assert BrokenEnumeration::ALL,BrokenEnumeration.id_for_name(:all)
   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.13
+  version: 0.1.14
   prerelease: 
 platform: ruby
 authors: