has_constant 0.6.2 → 0.7.0

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.7.0

data/has_constant.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{has_constant}
-  s.version = "0.6.2"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mattbeedle"]
-  s.date = %q{2011-02-18}
+  s.date = %q{2011-02-26}
   s.description = %q{Allows certain fields to be limited to a set of values}
   s.email = %q{mattbeedle@gmail.com}
   s.extra_rdoc_files = [
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/mattbeedle/has_constant}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{Allows certain fields to be limited to a set of values}
   s.test_files = [
     "test/has_constant_test.rb",
@@ -46,7 +46,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/has_constant/orm/mongoid.rb

@@ -20,6 +20,7 @@ module HasConstant
           super(name, values, options)
 
           singular = (options[:accessor] || name.to_s.singularize).to_s
+          plural = (options[:accessor] || name.to_s)
 
           class_eval do
             unless fields.map(&:first).include?(singular.to_s)
@@ -32,34 +33,60 @@ module HasConstant
               { constant.to_sym => eval("#{self.to_s}.#{constant.pluralize}.index(value)") } } }
           end
 
-          define_method("#{singular}=") do |val|
-            if val.instance_of?(String)
-              if index = self.class.send(name.to_s).index(val)
-                write_attribute singular.to_sym, index
-              elsif !val.blank?
-                values = values.call if values.respond_to?(:call)
-                @has_constant_errors ||= {}
-                @has_constant_errors.merge!(singular.to_sym => "must be one of #{values.join(', ')}")
+          # Define the setter method here
+          if options[:as] == :array
+            define_method("#{plural}=") do |value_set|
+              indexes = value_set.map do |value|
+                values.index(value)
+              end
+              write_attribute plural, indexes
+            end
+          else
+            define_method("#{singular}=") do |val|
+              if val.instance_of?(String)
+                if index = self.class.send(name.to_s).index(val)
+                  write_attribute singular.to_sym, index
+                elsif !val.blank?
+                  values = values.call if values.respond_to?(:call)
+                  @has_constant_errors ||= {}
+                  @has_constant_errors.merge!(singular.to_sym => "must be one of #{values.join(', ')}")
+                end
+              else
+                write_attribute singular.to_sym, val
               end
-            else
-              write_attribute singular.to_sym, val
             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]")
+          if options[:as] == :array
+            define_method(plural) do
+              attributes[plural].map { |val| values[val] }
+            end
+          else
+            define_method(singular) do
+              eval("#{self.class}.#{name.to_s}[self.attributes[singular].to_i] if self.attributes[singular]")
+            end
           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)
-              where(singular.to_sym => { '$in' => values.map { |v| self.send(name.to_sym).index(v) } })
-            end
+            if options[:as] == :array
+              define_method "#{plural}_include".to_sym do |value|
+                if value.is_a?(String)
+                  where(plural.to_sym => values.index(value))
+                else
+                  where(plural.to_sym => value.map { |v| send(plural).index(v) })
+                end
+              end
+            else
+              define_method "#{singular}_is".to_sym do |values|
+                values = values.lines.to_a if values.respond_to?(:lines)
+                where(singular.to_sym.in => values.map { |v| self.send(name.to_sym).index(v) })
+              end
 
-            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) } })
+              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) })
+              end
             end
           end
         end

data/test/unit/orm/mongoid_test.rb

@@ -27,8 +27,68 @@ class AnotherUser
   include HasConstant
 end
 
+class Thing
+  include Mongoid::Document
+  include HasConstant
+end
+
 class MongoidTest < Test::Unit::TestCase
   context 'Instance' do
+    context 'when storing arrays' do
+      setup do
+        MongoUserWithout.has_constant :sports, %w(running cycling tennis),
+          :as => :array
+        @user = MongoUserWithout.new :sports => %w(running tennis)
+      end
+
+      context 'setter' do
+        should 'take an array' do
+          assert_equal [0,2], @user.attributes['sports']
+        end
+      end
+
+      context 'getter' do
+        should 'return array of strings' do
+          assert_equal %w(running tennis), @user.sports
+        end
+      end
+
+      context 'named scopes' do
+        setup do
+          @u = MongoUserWithout.create! :sports => %w(running cycling)
+          @u2 = MongoUserWithout.create! :sports => %w(running tennis)
+        end
+
+        context 'includes scope' do
+          should 'return all where one of the array items is matched' do
+            assert_equal 1, MongoUserWithout.sports_include('cycling').count
+            assert MongoUserWithout.sports_include('cycling').include?(@u)
+          end
+
+          should 'work with array arguement' do
+            result = MongoUserWithout.sports_include(%w(running tennis))
+            assert_equal 1, result.count
+            assert result.include?(@u2)
+          end
+        end
+      end
+    end
+
+    context 'using a hash' do
+      setup do
+        Thing.has_constant :salutations, { :first => 'Mr', :second => 'Mrs' }
+        @u = Thing.new :salutation => 'Mrs'
+      end
+
+      should 'store the hash key' do
+        assert_equal 'second', @u.attributes['salutation']
+      end
+
+      should 'return the correct value' do
+        assert_equal 'Mrs', @u.salutation
+      end
+    end
+
     should 'add the field automatically' do
       MongoUserWithout.has_constant :salutations, ['Mr', 'Mrs']
       assert MongoUserWithout.fields.map(&:first).include?('salutation')

metadata

@@ -2,12 +2,12 @@
 name: has_constant
 version: !ruby/object:Gem::Version 
   hash: 3
-  prerelease: false
+  prerelease: 
   segments: 
   - 0
-  - 6
-  - 2
-  version: 0.6.2
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - mattbeedle
@@ -15,14 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-18 00:00:00 +01:00
+date: 2011-02-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
-  name: jeweler
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -31,12 +29,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
+  name: jeweler
+  version_requirements: *id001
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
-  name: shoulda
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,12 +43,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
+  name: shoulda
+  version_requirements: *id002
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
-  name: activesupport
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -59,7 +57,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
+  name: activesupport
+  version_requirements: *id003
+  prerelease: false
 description: Allows certain fields to be limited to a set of values
 email: mattbeedle@gmail.com
 executables: []
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Allows certain fields to be limited to a set of values