has_constant 0.2.2 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.4

data/has_constant.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{has_constant}
-  s.version = "0.2.2"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mattbeedle"]
-  s.date = %q{2010-07-26}
+  s.date = %q{2010-08-14}
   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

@@ -3,12 +3,26 @@ module HasConstant
     module Mongoid
       def self.included( base )
         base.extend(ClassMethods)
+        base.send(:include, InstanceMethods)
+        base.class_eval do
+          validate :validate_has_constant_attributes
+        end
+      end
+
+      module InstanceMethods
+        def validate_has_constant_attributes
+          @has_constant_errors.each do |key, value|
+            self.errors.add key, value
+          end if @has_constant_errors
+        end
       end
 
       module ClassMethods
         def has_constant( name, values, options = {} )
           super(name, values, options)
 
+          values = values.call if values.respond_to?(:call)
+
           singular = (options[:accessor] || name.to_s.singularize).to_s
 
           # Add the getter method. This returns the string representation of the stored value
@@ -18,7 +32,12 @@ module HasConstant
 
           define_method("#{singular}=") do |val|
             if val.instance_of?(String)
-              write_attribute singular.to_sym, self.class.send(name.to_s).index(val)
+              if index = self.class.send(name.to_s).index(val)
+                write_attribute singular.to_sym, index
+              else
+                @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

data/lib/has_constant.rb

@@ -47,7 +47,11 @@ module HasConstant
       # Add the setter method. This takes the string representation and converts it to an integer to store in the DB
       define_method("#{singular}=") do |val|
         if val.instance_of?(String)
-          instance_variable_set("@#{singular}", values.index(val))
+          if values.index(val)
+            instance_variable_set("@#{singular}", values.index(val))
+          else
+            raise ArgumentError, "value for #{singular} must be in #{self.class.send(name.to_s).join(', ')}"
+          end
         else
           instance_variable_set("@#{singular}", val)
         end

data/test/has_constant_test.rb

@@ -13,6 +13,14 @@ class TestHasConstant < Test::Unit::TestCase
     assert Model.new.respond_to?(:title=)
   end
 
+  should 'raise an exception when a value is provided which is not in the list' do
+    Model.has_constant :titles, ['Mr', 'Mrs']
+    m = Model.new
+    assert_raise ArgumentError do
+      m.title = 'Ms'
+    end
+  end
+
   should 'be able to override accessor' do
     Model.has_constant :titles, ['Mr', 'Mrs'], :accessor => :salutation
     m = Model.new

data/test/unit/orm/mongoid_test.rb

@@ -12,15 +12,39 @@ class MongoUser
   has_constant :salutations, ['Mr', 'Mrs']
 end if defined?(Mongoid)
 
+class MongoUserWithProc
+  include Mongoid::Document
+  include HasConstant
+  include HasConstant::Orm::Mongoid
+
+  field :salutation, :type => Integer
+
+  has_constant :salutations, lambda { ['Mr', 'Mrs'] }
+end if defined?(Mongoid)
+
 class MongoidTest < Test::Unit::TestCase
-  should 'save values as integers' do
-    m = MongoUser.new(:salutation => 'Mr')
-    m.save!
-    assert_equal 'Mr', m.salutation
-    assert_equal 0, m.attributes['salutation']
+  context 'Instance' do
+    should 'save values as integers' do
+      m = MongoUser.new(:salutation => 'Mr')
+      m.save!
+      assert_equal 'Mr', m.salutation
+      assert_equal 0, m.attributes['salutation']
+    end
+
+    should 'not be valid when an incorrect value is supplied' do
+      m = MongoUser.new(:salutation => 'asefe')
+      assert !m.valid?
+      assert_equal ['must be one of Mr, Mrs'], m.errors[:salutation]
+    end
+
+    should 'not be valid with an incorrect value is supplied and a proc/lambda has been used' do
+      m = MongoUserWithProc.new(:salutation => 'asefe')
+      assert !m.valid?
+      assert_equal ['must be one of Mr, Mrs'], m.errors[:salutation]
+    end
   end
 
-  context 'scopes' do
+  context 'Named Scopes' do
     setup do
       @man = MongoUser.create!(:salutation => 'Mr')
       @woman = MongoUser.create!(:salutation => 'Mrs')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_constant
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - mattbeedle
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-26 00:00:00 +02:00
+date: 2010-08-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency