has_constant 0.8.1 → 0.8.2

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.8.2

data/has_constant.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{has_constant}
-  s.version = "0.8.1"
+  s.version = "0.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mattbeedle"]
-  s.date = %q{2011-04-24}
+  s.date = %q{2011-05-13}
   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.rb

@@ -65,7 +65,11 @@ module HasConstant
       end
 
       define_method("#{singular}_is?") do |value|
-        send(singular) == value.to_s
+        truth = send(singular) == value.to_s
+        if !truth && I18n.locale.to_s != 'en'
+          truth = I18n.with_locale(:en) { send(singular) == value.to_s }
+        end
+        truth
       end
 
       define_method("#{singular}_is_not?") do |value|
@@ -73,7 +77,11 @@ module HasConstant
       end
 
       define_method("#{singular}_in?") do |value_list|
-        value_list.include? send(singular)
+        truth = value_list.include? send(singular)
+        if !truth && I18n.locale.to_s != 'en'
+          truth = I18n.with_locale(:en) { value_list.include?(send(singular)) }
+        end
+        truth
       end
 
       define_method("#{singular}_not_in?") do |value_list|

data/lib/has_constant/orm/mongoid.rb

@@ -43,8 +43,14 @@ module HasConstant
             named_scope :by_constant, lambda { |constant, value|
               if self.send(constant.pluralize).respond_to?(:key)
                 value_for_query = self.send(constant.pluralize).key(value)
+                value_for_query ||= I18n.with_locale(:en) do
+                  self.send(constant.pluralize).key(value)
+                end
               else
                 value_for_query = self.send(constant.pluralize).index(value)
+                value_for_query ||= I18n.with_locale(:en) do
+                  send(contant.pluralize).index(value)
+                end
               end
               where(constant.to_sym => value_for_query)
             }
@@ -120,21 +126,26 @@ module HasConstant
               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 do |v|
-                  options = self.send(name.to_sym)
-                  if options.respond_to?(:key)
-                    options.key(v)
+                  if send(name).respond_to?(:key)
+                    send(name).key(v) || I18n.with_locale(:en) { send(name).key(v) }
                   else
-                    options.index(v)
+                    send(name).index(v) || I18n.with_locale(:en) { send(name).key(v) }
                   end
                 end)
               end
 
               define_method "#{singular}_is_not".to_sym do |values|
                 values = values.lines.to_a if values.respond_to?(:lines)
-                if self.send(plural).respond_to?(:key)
-                  values_for_query = values.map { |v| self.send(plural).key(v) }
+                if send(plural).respond_to?(:key)
+                  values_for_query = values.map { |v| send(plural).key(v) }.compact
+                  values_for_query = values.map do |v|
+                    I18n.with_locale(:en) { send(plural).key(v) }
+                  end.compact if values_for_query.blank?
                 else
-                  values_for_query = values.map { |v| self.send(plural).index(v) }
+                  values_for_query = values.map { |v| send(plural).index(v) }.compact
+                  values_for_query = values.map do |v|
+                    I18n.with_locale(:en) { send(plural).index(v) }
+                  end.compact if values_for_query.blank?
                 end
                 where(singular.to_sym.nin => values_for_query)
               end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_constant
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: 
   segments: 
   - 0
   - 8
-  - 1
-  version: 0.8.1
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - mattbeedle
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-24 00:00:00 +02:00
+date: 2011-05-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency