has_constant 0.4.4 → 0.4.5

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.5

data/has_constant.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{has_constant}
-  s.version = "0.4.4"
+  s.version = "0.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mattbeedle"]

data/lib/has_constant/orm/mongoid.rb

@@ -21,9 +21,13 @@ module HasConstant
 
           singular = (options[:accessor] || name.to_s.singularize).to_s
 
-          # Add the getter method. This returns the string representation of the stored value
-          define_method(singular) do
-            eval("#{self.class}.#{name.to_s}[self.attributes[singular].to_i] if self.attributes[singular]")
+          class_eval do
+            field singular.to_sym, { :type => Integer }.merge(options)
+
+            index singular.to_sym if options[:index]
+
+            named_scope :by_constant, lambda { |constant,value| { :where =>
+              { constant.to_sym => eval("#{self.to_s}.#{constant.pluralize}.index(value)") } } }
           end
 
           define_method("#{singular}=") do |val|
@@ -40,6 +44,11 @@ module HasConstant
             end
           end
 
+          # Add the getter method. This returns the string representation of the stored value
+          define_method(singular) do
+            eval("#{self.class}.#{name.to_s}[self.attributes[singular].to_i] if self.attributes[singular]")
+          end
+
           (class << self; self; end).instance_eval do
             define_method "#{singular}_is".to_sym do |values|
               values = values.lines.to_a if values.respond_to?(:lines)
@@ -51,11 +60,6 @@ module HasConstant
               where(singular.to_sym => { '$nin' => values.map { |v| self.send(name.to_sym).index(v) } })
             end
           end
-
-          class_eval do
-            named_scope :by_constant, lambda { |constant,value| { :where =>
-              { constant.to_sym => eval("#{self.to_s}.#{constant.pluralize}.index(value)") } } }
-          end
         end
       end
     end

data/test/unit/orm/mongoid_test.rb

@@ -7,8 +7,6 @@ class MongoUser
   include HasConstant
   include HasConstant::Orm::Mongoid
 
-  field :salutation, :type => Integer
-
   has_constant :salutations, ['Mr', 'Mrs']
 end if defined?(Mongoid)
 
@@ -17,13 +15,32 @@ class MongoUserWithProc
   include HasConstant
   include HasConstant::Orm::Mongoid
 
-  field :salutation, :type => Integer
-
   has_constant :salutations, lambda { ['Mr', 'Mrs'] }
 end if defined?(Mongoid)
 
+class MongoUserWithout
+  include Mongoid::Document
+  include HasConstant
+  include HasConstant::Orm::Mongoid
+end
+
 class MongoidTest < Test::Unit::TestCase
   context 'Instance' do
+    should 'add the field automatically' do
+      MongoUserWithout.has_constant :salutations, ['Mr', 'Mrs']
+      assert MongoUserWithout.fields.map(&:first).include?('salutation')
+    end
+
+    should 'take the accessor into account when adding the field' do
+      MongoUserWithout.has_constant :salutations, ['Mr', 'Mrs'], :accessor => :sal
+      assert MongoUserWithout.fields.map(&:first).include?('sal')
+    end
+
+    should 'add index when index option is supplied' do
+      MongoUserWithout.has_constant :salutations, ['Mr', 'Mrs'], :index => true
+      assert MongoUserWithout.index_information.keys.any? { |k| k.match(/salutation/) }
+    end
+
     should 'save values as integers' do
       m = MongoUser.new(:salutation => 'Mr')
       m.save!

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_constant
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 4
-  - 4
-  version: 0.4.4
+  - 5
+  version: 0.4.5
 platform: ruby
 authors: 
 - mattbeedle