yinum 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c450598a4dcf89038e0691a37b91587dc5fe9cf
-  data.tar.gz: 6fff7a2b55d125bd61fa1bae626fb58f9792edaf
+  metadata.gz: c5f981118e63240ce752016306f552b599ed1c75
+  data.tar.gz: 5d3452a2d2417ab36550d5bc624410c690da840c
 SHA512:
-  metadata.gz: 0dd0e387e139a4a0b14ad32ac2fe60a171620ff7a56c0e2c65bdd8a5a5b11586dfa691c4cfda9c2cc020360e9c7ea5034cb57a1ad193e5a07739b144ac10659a
-  data.tar.gz: 8066897d9d060b68c3b10ab3e9b4a52f9965b5a8e5c954cbacae5828fbede143aca8c7eb3465d7dc8c15eb9d81781ed5ae27e2cdee9f7ab94ab42b0c64bbc4c9
+  metadata.gz: 836af7a5e9d795160e14bb0b312e6335f241d2568f35cf64165abc566b6635467f289b3578b720684cb704fce8bd9c17a46f60f2914017d2632369ba88e01ef5
+  data.tar.gz: 6b52268a70a4c68a3a8cb4d1c14ddf194aee6d0bbcb1b0c56caa1d368f17bfa0b62ff3882df4add8ee53bc2e1ddf64b7f2617586d52529dde7d505b9438cf46c

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+**2.2.0**
+* `EnumValue` compares to strings.
+
 **2.1.0**
 * Use generate_method in attr_enum. This is backward incompatible for using
   attr_enum on accessors defined on the class level. Use modules.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yinum (2.1.0)
+    yinum (2.2.0)
       generate_method (~> 1.0)
 
 GEM

data/README.md

@@ -274,7 +274,12 @@ Car.where(:color => Car::COLORS.red) # good
 ```
 
 You may use the EnumValue object for anything, but don't get smart using the key.
-If the EnumValue doesn't work in a spot, use #name (in `options_for_select`) or #value (in `update_all`).
+
+If the EnumValue proxy doesn't work in a specific situation (when the gem is not following the [duck typing](http://en.wikipedia.org/wiki/Duck_typing) rules), you can use `#value` (in `update_all` or `validates_uniqueness_of`):
+
+```ruby
+Car.update_all(:color => Car::COLORS.red.value)
+```
 
 ## Also
 

data/lib/enum/enum_value.rb

@@ -9,6 +9,8 @@ class Enum::EnumValue < BasicObject
 
   def initialize(enum, name = nil, value)
     @enum, @name, @value = enum, name, value
+    @name_s = @name.to_s if @name
+    @value_s = @value.to_s
   end
 
   def enum_value?
@@ -18,26 +20,26 @@ class Enum::EnumValue < BasicObject
   def inspect
     return @value.inspect if @name.nil?
 
-    "#{@enum.to_s}.#{@name}"
+    "#{@enum.to_s}.#{@name_s}"
   end
 
   def ==(other)
-    return @value == other if @name.nil?
+    return true if @value == other or @value_s == other
 
-    @name == other or @value == other
+    not @name.nil? and (@name == other or @name_s == other)
   end
 
   def ===(other)
-    return @value === other if @name.nil?
+    return true if @value === other or @value_s === other
 
-    @name === other or @value === other
+    not @name.nil? and (@name === other or @name_s === other)
   end
 
   def t(options = {})
     return @value.t(options) if @name.nil?
     if not defined?(::I18n)
-      if @name.to_s.respond_to?(:titleize)
-        return @name.to_s.titleize
+      if @name_s.respond_to?(:titleize)
+        return @name_s.titleize
       else
         raise NotImplementedError, "I18n and String#titleize are not available"
       end
@@ -57,7 +59,7 @@ class Enum::EnumValue < BasicObject
             # but if not, use without
             { scope: scope_without_klass,
               # but! if not, return titleize or scope with klass error
-              default: @name.to_s.respond_to?(:titleize) ? @name.to_s.titleize : ::I18n.t(
+              default: @name_s.respond_to?(:titleize) ? @name_s.titleize : ::I18n.t(
                 @name,
                 { scope: scope_with_klass
                 }.merge(options)
@@ -70,7 +72,7 @@ class Enum::EnumValue < BasicObject
       ::I18n.t(
         @name,
         { scope: scope_without_klass,
-          default: (@name.to_s.titleize if @name.to_s.respond_to?(:titleize))
+          default: (@name_s.titleize if @name_s.respond_to?(:titleize))
         }.merge(options)
       )
     end

data/lib/enum/version.rb

@@ -1,3 +1,3 @@
 class Enum
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
 end

data/spec/lib/enum/enum_value_spec.rb

@@ -25,13 +25,21 @@ describe Enum::EnumValue do
     subject(:enum) { Enum.new(:MY_COLORS, :red => 1, :blue => 2) }
 
     its(:red) { should == 1 }
+    its(:red) { should == '1' }
     its(:blue) { should_not == 1 }
+    its(:blue) { should_not == '1' }
     its(:red) { should == :red }
+    its(:red) { should == 'red' }
     its(:blue) { should_not == :red }
+    its(:blue) { should_not == 'red' }
     its(:red) { should === 1 }
+    its(:red) { should === '1' }
     its(:blue) { should_not === 1 }
+    its(:blue) { should_not === '1' }
     its(:red) { should === :red }
+    its(:red) { should === 'red' }
     its(:blue) { should_not === :red }
+    its(:blue) { should_not === 'red' }
     its(:red) { should be_red }
     its(:blue) { should_not be_red }
     specify { enum.red.object_id.should == enum[:red].object_id }

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: yinum
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Oded Niv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2015-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: generate_method
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: nil_or
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 description: Yummy implementation of enum that gives integer values with a special
@@ -60,8 +60,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -94,12 +94,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []