has_constant 0.8.0 → 0.8.1

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.8.1

data/has_constant.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{has_constant}
-  s.version = "0.8.0"
+  s.version = "0.8.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mattbeedle"]
-  s.date = %q{2011-03-28}
+  s.date = %q{2011-04-24}
   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

@@ -40,15 +40,25 @@ module HasConstant
 
             index singular.to_sym, :background => true if options[:index]
 
-            named_scope :by_constant, lambda { |constant,value| { :where =>
-              { constant.to_sym => eval("#{self.to_s}.#{constant.pluralize}.index(value)") } } }
+            named_scope :by_constant, lambda { |constant, value|
+              if self.send(constant.pluralize).respond_to?(:key)
+                value_for_query = self.send(constant.pluralize).key(value)
+              else
+                value_for_query = self.send(constant.pluralize).index(value)
+              end
+              where(constant.to_sym => value_for_query)
+            }
           end
 
           # Define the setter method here
           if options[:as] == :array
             define_method("#{plural}=") do |value_set|
-              indexes = value_set.map do |value|
-                self.class.send(plural).index(value)
+              indexes = (value_set.blank? ? [] : value_set).map do |value|
+                if self.class.send(plural).respond_to?(:key)
+                  self.class.send(plural).key(value)
+                else
+                  self.class.send(plural).index(value)
+                end
               end
               write_attribute plural, indexes
             end
@@ -93,9 +103,17 @@ module HasConstant
             if options[:as] == :array
               define_method "#{plural}_include".to_sym do |value|
                 if value.is_a?(String)
-                  where(plural.to_sym => values.index(value))
+                  if values.respond_to?(:key)
+                    where(plural.to_sym => values.key(value))
+                  else
+                    where(plural.to_sym => values.index(value))
+                  end
                 else
-                  where(plural.to_sym => value.map { |v| send(plural).index(v) })
+                  if values.respond_to?(:key)
+                    where(plural.to_sym => value.map { |v| send(plural).key(v) })
+                  else
+                    where(plural.to_sym => value.map { |v| send(plural).index(v) })
+                  end
                 end
               end
             else
@@ -113,7 +131,12 @@ module HasConstant
 
               define_method "#{singular}_is_not".to_sym do |values|
                 values = values.lines.to_a if values.respond_to?(:lines)
-                where(singular.to_sym.nin => values.map { |v| self.send(name.to_sym).index(v) })
+                if self.send(plural).respond_to?(:key)
+                  values_for_query = values.map { |v| self.send(plural).key(v) }
+                else
+                  values_for_query = values.map { |v| self.send(plural).index(v) }
+                end
+                where(singular.to_sym.nin => values_for_query)
               end
             end
           end

data/test/unit/orm/mongoid_test.rb

@@ -35,6 +35,7 @@ class Thing
 end
 
 class MongoidTest < Test::Unit::TestCase
+
   context 'Instance' do
     context 'when storing arrays' do
       setup do
@@ -90,6 +91,13 @@ class MongoidTest < Test::Unit::TestCase
       should 'return the correct value' do
         assert_equal 'Mrs', @u.reload.salutation
       end
+
+      context '#update_attribute' do
+        should 'store the correct value' do
+          @u.update_attribute :salutation, 'Mr'
+          assert_equal 'Mr', @u.reload.salutation
+        end
+      end
     end
 
     should 'add the field automatically' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_constant
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - mattbeedle
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-28 00:00:00 +02:00
+date: 2011-04-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency