has_constant 0.2.9 → 0.3.0

data/Gemfile

@@ -5,4 +5,12 @@ group :test do
   gem 'activesupport'
   gem 'activerecord'
   gem 'sqlite3-ruby'
+  gem 'activesupport'
+  gem 'mongoid', '2.0.0.beta.20'
+  gem 'bson'
+  gem 'bson_ext'
+end
+
+group :development do
+  gem 'jeweler'
 end

data/Gemfile.lock

@@ -0,0 +1,48 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.3)
+    arel (2.0.6)
+    bson (1.1.5)
+    bson_ext (1.1.5)
+    builder (2.1.2)
+    git (1.2.5)
+    i18n (0.5.0)
+    jeweler (1.5.1)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
+    mongo (1.1.5)
+      bson (>= 1.1.5)
+    mongoid (2.0.0.beta.20)
+      activemodel (~> 3.0)
+      mongo (~> 1.1)
+      tzinfo (~> 0.3.22)
+      will_paginate (~> 3.0.pre)
+    rake (0.8.7)
+    shoulda (2.11.3)
+    sqlite3-ruby (1.3.2)
+    tzinfo (0.3.23)
+    will_paginate (3.0.pre2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord
+  activesupport
+  bson
+  bson_ext
+  jeweler
+  mongoid (= 2.0.0.beta.20)
+  shoulda
+  sqlite3-ruby

data/VERSION

@@ -1 +1 @@
-0.2.9
+0.3.0

data/has_constant.gemspec

@@ -1,49 +1,48 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{has_constant}
-  s.version = "0.2.9"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mattbeedle"]
-  s.date = %q{2010-10-09}
+  s.date = %q{2010-12-19}
   s.description = %q{Allows certain fields to be limited to a set of values}
   s.email = %q{mattbeedle@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     ".rvmrc",
-     "Gemfile",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "has_constant.gemspec",
-     "lib/has_constant.rb",
-     "lib/has_constant/orm/active_record.rb",
-     "lib/has_constant/orm/mongoid.rb",
-     "test/has_constant_test.rb",
-     "test/helper.rb",
-     "test/unit/orm/active_record_test.rb",
-     "test/unit/orm/mongoid_test.rb"
+    ".rvmrc",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "has_constant.gemspec",
+    "lib/has_constant.rb",
+    "lib/has_constant/orm/active_record.rb",
+    "lib/has_constant/orm/mongoid.rb",
+    "test/has_constant_test.rb",
+    "test/helper.rb",
+    "test/unit/orm/active_record_test.rb",
+    "test/unit/orm/mongoid_test.rb"
   ]
   s.homepage = %q{http://github.com/mattbeedle/has_constant}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Allows certain fields to be limited to a set of values}
   s.test_files = [
     "test/has_constant_test.rb",
-     "test/helper.rb",
-     "test/unit/orm/active_record_test.rb",
-     "test/unit/orm/mongoid_test.rb"
+    "test/helper.rb",
+    "test/unit/orm/active_record_test.rb",
+    "test/unit/orm/mongoid_test.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -51,13 +50,16 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<activesupport>, [">= 0"])
     else
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<activesupport>, [">= 0"])
     end
   else
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<activesupport>, [">= 0"])
   end

data/lib/has_constant/orm/active_record.rb

@@ -1,9 +1,7 @@
 module HasConstant
   module Orm
     module ActiveRecord
-      def self.included( base )
-        base.extend(ClassMethods)
-      end
+      extend ActiveSupport::Concern
 
       module ClassMethods
         def has_constant( name, values, options = {} )
@@ -43,4 +41,4 @@ module HasConstant
       end
     end
   end
-end
+end if defined?(ActiveRecord::Base)

data/lib/has_constant/orm/mongoid.rb

@@ -1,20 +1,18 @@
 module HasConstant
   module Orm
     module Mongoid
-      def self.included( base )
-        base.extend(ClassMethods)
-        base.send(:include, InstanceMethods)
-        base.class_eval do
+      extend ActiveSupport::Concern
+
+      included do
+        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
+      def validate_has_constant_attributes
+        @has_constant_errors.each do |key, value|
+          self.errors.add key, value
+        end if @has_constant_errors
       end
 
       module ClassMethods
@@ -41,13 +39,13 @@ module HasConstant
               write_attribute singular.to_sym, val
             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
-            
+
             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) } })
@@ -62,4 +60,4 @@ module HasConstant
       end
     end
   end
-end
+end if defined?(Mongoid)

data/lib/has_constant.rb

@@ -1,11 +1,9 @@
-require 'has_constant/orm/mongoid'
-require 'has_constant/orm/active_record'
+require 'active_support'
+require 'has_constant/orm/mongoid' if defined?(Mongoid)
+require 'has_constant/orm/active_record' if defined?(ActiveRecord::Base)
 require 'active_support/inflector'
 module HasConstant
-
-  def self.included(base)
-    base.extend(ClassMethods)
-  end
+  extend ActiveSupport::Concern
 
   # HasConstant takes a Proc containing an array of possible values for a field name
   # The field name is inferred as the singular of the has constant name. For example
@@ -58,7 +56,19 @@ module HasConstant
       end
 
       define_method("#{singular}_is?") do |value|
-        eval("#{singular} == '#{value.to_s}'")
+        send(singular) == value.to_s
+      end
+
+      define_method("#{singular}_is_not?") do |value|
+        !send("#{singular}_is?", value)
+      end
+
+      define_method("#{singular}_in?") do |value_list|
+        value_list.include? send(singular)
+      end
+
+      define_method("#{singular}_not_in?") do |value_list|
+        !send("#{singular}_in?", value_list)
       end
     end
   end

data/test/has_constant_test.rb

@@ -2,8 +2,6 @@ require 'helper'
 
 class Model
   include HasConstant
-
-  attr_accessor :salutation
 end
 
 class TestHasConstant < Test::Unit::TestCase
@@ -22,6 +20,7 @@ class TestHasConstant < Test::Unit::TestCase
   end
 
   should 'be able to override accessor' do
+    Model.send(:attr_accessor, :salutation)
     Model.has_constant :titles, ['Mr', 'Mrs'], :accessor => :salutation
     m = Model.new
     m.salutation = 'Mr'
@@ -43,10 +42,67 @@ class TestHasConstant < Test::Unit::TestCase
     assert_equal ['Mr', 'Mrs'], Model.titles
   end
 
-  should 'provide singular_is? comparison method' do
-    Model.has_constant :titles, ['Mr', 'Mrs']
-    m = Model.new
-    m.title = 'Mr'
-    assert m.title_is?('Mr')
+  context '#field_is?' do
+    setup do
+      Model.has_constant :titles, ['Mr', 'Mrs', 'Ms']
+      @m = Model.new
+      @m.title = 'Mr'
+    end
+
+    should 'be true when the value is equal to the supplied one' do
+      assert @m.title_is?('Mr')
+    end
+
+    should 'be false when the value is not equal to the supplied one' do
+      assert !@m.title_is?('Mrs')
+    end
+  end
+
+  context '#field_in?' do
+    setup do
+      Model.has_constant :titles, ['Mr', 'Mrs', 'Ms']
+      @m = Model.new
+      @m.title = 'Mr'
+    end
+
+    should 'be true when the field value is in the supplied set of values' do
+      assert @m.title_in?(['Mr', 'Ms'])
+    end
+
+    should 'be false when the field value is not in the supplied set of values' do
+      assert !@m.title_in?(['Mrs', 'Ms'])
+    end
+  end
+
+  context '#field_is_not?' do
+     setup do
+      Model.has_constant :titles, ['Mr', 'Mrs', 'Ms']
+      @m = Model.new
+      @m.title = 'Mr'
+    end
+
+     should 'be true when the field value is not equal to the supplied one' do
+       assert @m.title_is_not?('Mrs')
+     end
+
+     should 'be false when the field value is equal to the supplied one' do
+       assert !@m.title_is_not?('Mr')
+     end
+  end
+
+  context '#field_not_in?' do
+    setup do
+      Model.has_constant :titles, ['Mr', 'Mrs', 'Ms']
+      @m = Model.new
+      @m.title = 'Mr'
+    end
+
+    should 'be true when the field value is not in the supplied list' do
+      assert @m.title_not_in?(['Mrs', 'Ms'])
+    end
+
+    should 'be false when the field value is in the supplied list' do
+      assert !@m.title_not_in?(['Mr', 'Mrs'])
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_constant
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 9
-  version: 0.2.9
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - mattbeedle
@@ -15,13 +15,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-09 00:00:00 +02:00
+date: 2010-12-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: jeweler
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,12 +31,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  type: :development
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: shoulda
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -44,8 +45,21 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  name: activesupport
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id003
 description: Allows certain fields to be limited to a set of values
 email: mattbeedle@gmail.com
 executables: []
@@ -57,9 +71,9 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - .rvmrc
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -77,8 +91,8 @@ homepage: http://github.com/mattbeedle/has_constant
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/.gitignore

@@ -1,22 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-.bundle
-
-## PROJECT::SPECIFIC