yinum 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6c73933a509d17c611e833780d494509c743d76
-  data.tar.gz: 08cbfb277952c6542c39b1dc5ebe9e9e331f2682
+  metadata.gz: 46b4c4c4f5f5cce627f88c4c19607cc77bd23095
+  data.tar.gz: db4d64a617533347040e9b0176fc968b95486f64
 SHA512:
-  metadata.gz: 6e2e98a5b4b03df21652b9539da8e29e7a7661fde7df110d155172ef4c05bad87a3e8de61ae042490487139bee7b6a2e46252ddd1739d3cf51ec6a54a568dff1
-  data.tar.gz: 467a1640a733bdef9a958c1c8b452cfbe50af55cd913395af3bccceade2b6111ab3eab2224d56cd141eebb6ca389ead9d05b3be52d601082c6e28e1e1ed21766
+  metadata.gz: 46d4bd89347488975200454f7000cdd61459acf21ede9f1c1ee07858fb4437fdd9cfd032db08f9bc8680f0edb858f97b225b926b48acafccb0ee63289c5bcd25
+  data.tar.gz: e8c496f34c5b983a5cea385eb1ad162e2b0ebf719540de12ffd481d24a10030c493c06aca5ee00e15176e0fd13992ed8c9bc15676c2aba526fbbfb68d8f99848

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+**1.7.0**
 * `attr_enum` reader always returns an EnumValue.
 * `EnumValue#t` uses `String#titlelize` if it's available and I18n or the
-  specific translation are not available.
+  specific translation are not available.
+
+**1.7.1**
+* Remove usage of `reverse_merge`, apparently doesn't exist in Ruby core.
+* `attr_enum`'s writer does not pass an EnumValue to the super.
+* Fix `EnumValue#t` specs (mocking `I18n`).

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yinum (1.6.0)
+    yinum (1.7.1)
 
 GEM
   remote: http://rubygems.org/

data/lib/enum/enum_value.rb

@@ -44,32 +44,28 @@ class Enum::EnumValue < BasicObject
       ::I18n.t(
         @name,
         # prefer scope with klass
-        options.reverse_merge(
-          scope: scope_with_klass
-        ).merge( # our :default is a priority here
+        { scope: scope_with_klass
+        }.merge(options).merge( # our :default is a priority here
           default: ::I18n.t(
             @name,
             # but if not, use without
-            options.reverse_merge(
-              scope: scope_without_klass,
+            { 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(
                 @name,
-                options.reverse_merge(
-                  scope: scope_with_klass
-                )
+                { scope: scope_with_klass
+                }.merge(options)
               )
-            )
+            }.merge(options)
           )
         )
       )
     else
       ::I18n.t(
         @name,
-        options.reverse_merge(
-          scope: scope_without_klass,
+        { scope: scope_without_klass,
           default: (@name.to_s.titleize if @name.to_s.respond_to?(:titleize))
-        )
+        }.merge(options)
       )
     end
   end

data/lib/enum/helpers/enum_attribute.rb

@@ -21,7 +21,15 @@ module Enum::Helpers::EnumAttribute
     # attribute reader
     define_method(attr) { v = super(); (v.nil? or not e.values.include?(v)) ? Enum::EnumValue.new(e, v) : e[v] }
     # attribute writer
-    define_method("#{attr}=") { |v| v.nil? ? super(v) : super(e[v]) }
+    define_method("#{attr}=") do |v|
+      if v.respond_to?(:enum_value?) and v.enum_value?
+        super(v.value)
+      elsif v.nil?
+        super(v)
+      else
+        super(e[v].value)
+      end
+    end
 
     if options[:qualifier]
       # generating scopes and questioning methods

data/lib/enum/version.rb

@@ -1,3 +1,3 @@
 class Enum
-  VERSION = '1.7.0'
+  VERSION = '1.7.1'
 end

data/spec/lib/enum/enum_value_spec.rb

@@ -1,5 +1,11 @@
 require 'spec_helper'
 
+class I18n
+  def self.t(path, scope: nil, default: nil)
+    "#{scope}.#{path}"
+  end
+end
+
 describe Enum::EnumValue do
   subject { @enum }
 
@@ -8,7 +14,7 @@ describe Enum::EnumValue do
     # can't use subject @enum.red as it turns into a Fixnum
 
     specify { @enum.red.inspect.should == "MY_COLORS.red" }
-    specify { @enum.red.t.should == "I18n not available: enums.my_colors.red" }
+    specify { @enum.red.t.should == "enums.my_colors.red" }
   end # context "no parent"
 
   context "with parent" do
@@ -16,7 +22,7 @@ describe Enum::EnumValue do
     # can't use subject @enum.red as it turns into a Fixnum
 
     specify { @enum.red.inspect.should == "Object::MY_COLORS.red" }
-    specify { @enum.red.t.should == "I18n not available: enums.object.my_colors.red" }
+    specify { @enum.red.t.should == "enums.object.my_colors.red" }
   end # context "with parent"
 
   context "comparison" do

data/spec/lib/enum/helpers/enum_attribute_spec.rb

@@ -51,16 +51,19 @@ def enum_attribute_specs
       specify "nil" do
         @record.color = nil
         @record[:color].should be_nil
+        @record[:color].should_not respond_to(:enum_value?)
       end
 
       specify "name" do
         @record.color = :red
-        @record[:color].should be_enum_value and @record[:color].should be_red
+        @record[:color] == 1
+        @record[:color].should_not respond_to(:enum_value?)
       end
 
       specify "value" do
         @record.color = 2
-        @record[:color].should be_enum_value and @record[:color].should be_blue
+        @record[:color] == 2
+        @record[:color].should_not respond_to(:enum_value?)
       end
 
       specify "invalid" do

data/spec/lib/enum/helpers/enum_column_spec.rb

@@ -75,12 +75,14 @@ def enum_columns_attribute_specs
 
       specify "name" do
         @record.color = :red
-        @record[:color].should be_enum_value and @record[:color].should be_red
+        @record[:color].should == 1
+        @record[:color].should_not respond_to(:enum_value?)
       end
 
       specify "value" do
         @record.color = 2
-        @record[:color].should be_enum_value and @record[:color].should be_blue
+        @record[:color].should == 2
+        @record[:color].should_not respond_to(:enum_value?)
       end
 
       specify "invalid" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yinum
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Oded Niv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec