has_constant 0.4.8 → 0.4.9

data/Gemfile

@@ -10,6 +10,10 @@ group :test do
   gem 'bson'
   gem 'bson_ext'
   gem 'mocha'
+
+  gem 'dm-core'
+  gem 'dm-postgres-adapter'
+  gem 'dm-migrations'
 end
 
 group :development do

data/Gemfile.lock

@@ -1,30 +1,46 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
+    activemodel (3.0.4)
+      activesupport (= 3.0.4)
       builder (~> 2.1.2)
       i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    activerecord (3.0.4)
+      activemodel (= 3.0.4)
+      activesupport (= 3.0.4)
       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)
+    activesupport (3.0.4)
+    addressable (2.2.4)
+    arel (2.0.8)
+    bson (1.2.2)
+    bson_ext (1.2.2)
     builder (2.1.2)
+    data_objects (0.10.3)
+      addressable (~> 2.1)
+    dm-core (1.0.2)
+      addressable (~> 2.2)
+      extlib (~> 0.9.15)
+    dm-do-adapter (1.0.2)
+      data_objects (~> 0.10.2)
+      dm-core (~> 1.0.2)
+    dm-migrations (1.0.2)
+      dm-core (~> 1.0.2)
+    dm-postgres-adapter (1.0.2)
+      dm-do-adapter (~> 1.0.2)
+      do_postgres (~> 0.10.2)
+    do_postgres (0.10.3)
+      data_objects (= 0.10.3)
+    extlib (0.9.15)
     git (1.2.5)
     i18n (0.5.0)
-    jeweler (1.5.1)
+    jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    mocha (0.9.11)
-      rake
-    mongo (1.1.5)
-      bson (>= 1.1.5)
+    mocha (0.9.12)
+    mongo (1.2.2)
+      bson (>= 1.2.2)
     mongoid (2.0.0.beta.20)
       activemodel (~> 3.0)
       mongo (~> 1.1)
@@ -32,8 +48,10 @@ GEM
       will_paginate (~> 3.0.pre)
     rake (0.8.7)
     shoulda (2.11.3)
-    sqlite3-ruby (1.3.2)
-    tzinfo (0.3.23)
+    sqlite3 (1.3.3)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    tzinfo (0.3.24)
     will_paginate (3.0.pre2)
 
 PLATFORMS
@@ -44,6 +62,9 @@ DEPENDENCIES
   activesupport
   bson
   bson_ext
+  dm-core
+  dm-migrations
+  dm-postgres-adapter
   jeweler
   mocha
   mongoid (= 2.0.0.beta.20)

data/VERSION

@@ -1 +1 @@
-0.4.8
+0.4.9

data/has_constant.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{has_constant}
-  s.version = "0.4.8"
+  s.version = "0.4.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mattbeedle"]
-  s.date = %q{2011-02-07}
+  s.date = %q{2011-02-18}
   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/active_record.rb

@@ -9,9 +9,12 @@ module HasConstant
 
           singular = (options[:accessor] || name.to_s.singularize).to_s
 
-          # Add the getter method. This returns the string representation of the stored value
+          # Add the getter method. This returns the string representation of
+          # the stored value
           define_method(singular) do
-            self.class.send(name)[read_attribute(singular).to_i] if read_attribute(singular)
+            if read_attribute(singular)
+              self.class.send(name)[read_attribute(singular).to_i]
+            end
           end
 
           define_method("#{singular}=") do |val|
@@ -23,14 +26,32 @@ module HasConstant
           end
 
           class_eval do
-            named_scope :by_constant, lambda { |constant,value| { :conditions =>
-              { constant.to_sym => eval("#{self.to_s}.#{constant.pluralize}.index(value)") } } }
-            named_scope "#{singular}_is".to_sym, lambda { |*values| { :conditions =>
-              { singular.to_sym => indexes_for(name, values) }
-            } }
-            named_scope "#{singular}_is_not".to_sym, lambda { |*values| { :conditions =>
-              ["#{singular} NOT IN (?)", indexes_for(name, values)]
-            } }
+            if respond_to?(:scope)
+              scope :by_constant, lambda { |constant,value| { :conditions =>
+                { constant.to_sym =>
+                  eval("#{self.to_s}.#{constant.pluralize}.index(value)") } } }
+
+              scope "#{singular}_is".to_sym, lambda { |*values| { :conditions =>
+                { singular.to_sym => indexes_for(name, values) }
+              } }
+
+              scope "#{singular}_is_not".to_sym, lambda { |*values| {
+                :conditions => ["#{singular} NOT IN (?)",
+                                indexes_for(name, values)] } }
+            else
+              named_scope :by_constant, lambda { |constant,value| {
+                :conditions =>
+                { constant.to_sym =>
+                  eval("#{self.to_s}.#{constant.pluralize}.index(value)") } } }
+
+              named_scope "#{singular}_is".to_sym, lambda { |*values| {
+                :conditions => { singular.to_sym => indexes_for(name, values) }
+              } }
+
+              named_scope "#{singular}_is_not".to_sym, lambda { |*values| {
+                :conditions => ["#{singular} NOT IN (?)",
+                                indexes_for(name, values)] } }
+            end
           end
         end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_constant
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 4
-  - 8
-  version: 0.4.8
+  - 9
+  version: 0.4.9
 platform: ruby
 authors: 
 - mattbeedle
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-07 00:00:00 +01:00
+date: 2011-02-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency