has_constant 0.7.2 → 0.7.3

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.7.3

data/has_constant.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{has_constant}
-  s.version = "0.7.2"
+  s.version = "0.7.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mattbeedle"]
-  s.date = %q{2011-02-26}
+  s.date = %q{2011-03-23}
   s.description = %q{Allows certain fields to be limited to a set of values}
   s.email = %q{mattbeedle@gmail.com}
   s.extra_rdoc_files = [

data/lib/has_constant/orm/mongoid.rb

@@ -28,7 +28,13 @@ module HasConstant
                 field plural.to_sym, { :type => Array, :default => [] }.
                   merge(options)
               else
-                field singular.to_sym, { :type => Integer }.merge(options)
+                if values.is_a?(Hash) || values.respond_to?(:call) &&
+                  values.call.is_a?(Hash)
+                  type = String
+                else
+                  type = Integer
+                end
+                field singular.to_sym, { :type => type }.merge(options)
               end
             end
 
@@ -50,7 +56,13 @@ module HasConstant
 
           define_method("#{singular}=") do |val|
             if val.instance_of?(String)
-              if index = self.class.send(name.to_s).index(val)
+              if self.class.send(name).respond_to?(:key)
+                index = self.class.send(name.to_s).key(val).to_s
+              elsif self.class.send(name).respond_to?(:index)
+                index = self.class.send(name.to_s).index(val)
+                index = index.to_s if self.class.send(name.to_s).is_a?(Hash)
+              end
+              if index
                 write_attribute singular.to_sym, index
               elsif !val.blank?
                 values = values.call if values.respond_to?(:call)
@@ -70,7 +82,11 @@ module HasConstant
           end
 
           define_method(singular) do
-            eval("#{self.class}.#{name.to_s}[self.attributes[singular].to_i] if self.attributes[singular]")
+            if attributes[singular]
+              res = self.class.send(name.to_s)[attributes[singular].to_i] rescue nil
+              res ||= self.class.send(name.to_s)[attributes[singular]]
+              res ||= self.class.send(name.to_s)[attributes[singular].to_sym]
+            end
           end
 
           (class << self; self; end).instance_eval do

data/test/unit/orm/mongoid_test.rb

@@ -30,6 +30,8 @@ end
 class Thing
   include Mongoid::Document
   include HasConstant
+
+  field :salutation, :type => String
 end
 
 class MongoidTest < Test::Unit::TestCase
@@ -78,14 +80,15 @@ class MongoidTest < Test::Unit::TestCase
       setup do
         Thing.has_constant :salutations, { :first => 'Mr', :second => 'Mrs' }
         @u = Thing.new :salutation => 'Mrs'
+        @u.save!
       end
 
       should 'store the hash key' do
-        assert_equal 'second', @u.attributes['salutation']
+        assert_equal 'second', @u.reload.attributes['salutation']
       end
 
       should 'return the correct value' do
-        assert_equal 'Mrs', @u.salutation
+        assert_equal 'Mrs', @u.reload.salutation
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_constant
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 7
-  - 2
-  version: 0.7.2
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - mattbeedle
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-26 00:00:00 +01:00
+date: 2011-03-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency