yinum 1.7.3 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c63699e6b2f39a6fafb079fa52596f79bdbf58e
-  data.tar.gz: 3693827578af653b27489c630592b995829f7e3e
+  metadata.gz: 9bfe06e2e4c74e29a8558790e3fd3cbb7e9c0d88
+  data.tar.gz: f056d6709135cb56989fe410604294e338501c61
 SHA512:
-  metadata.gz: 40532b803d520af6ad8a9543ad15c76089a1ad32cfa627cdf9d143a3f6d44e59c2d3b12808d9068cea538d064c386c2ef1d510048193afe1d5bac3f13ca55073
-  data.tar.gz: 561be7c18be076fd5ca2500b4fc76e57604ac36827d255afe1a7cbda267d0a8571a2df1fd58ed55031e6c76f18a0620905319e92bde1736cb798c5913376aed7
+  metadata.gz: c506d7599bc89186de7cd08a82b190cbd1c8ea15a50d2be068aa28301ad3454a2f0db3dc54de1189f705d005e45158091551760227574ed2e66a39353c5fbfe1
+  data.tar.gz: bfb8f3e6a05abb31a3c690da0fde44f42fcf84f5dabb58b72c2e2129ac8e4d4b080406857c557ee66738204a17bb15ba97feb2b7d2896e7c91891cc4ea7cdd25

data/CHANGELOG.md

@@ -16,3 +16,7 @@
 **1.7.3**
 * `attr_enum`'s writer to accept empty string.
 * `attr_enum`'s qualifier option to use the object's `#send` rather than `#[]`.
+
+**1.7.4**
+* `attr_enum`'s reader allows super to hold the name etc.
+* Add `#attr_enum` and `#enum` only to modules and classes (not any instance).

data/Gemfile.lock

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

data/lib/enum/helpers/enum_attribute.rb

@@ -19,12 +19,16 @@ module Enum::Helpers::EnumAttribute
       e = const_get(name_or_enum)
     end
     # attribute reader
-    define_method(attr) { v = super(); (v.nil? or not e.values.include?(v)) ? Enum::EnumValue.new(e, v) : e[v] }
+    define_method(attr) do
+      v = super()
+      (ev = e.get(v)).nil? ? Enum::EnumValue.new(e, v) : ev
+    end
     # attribute writer
     define_method("#{attr}=") do |v|
-      if v.enum_value?
+      case
+      when v.enum_value?
         super(v.value)
-      elsif v.nil? or v == "" # might be received from forms
+      when v.nil?, v == "" # might be received from forms
         super(v)
       else
         super(e[v].value)
@@ -42,6 +46,7 @@ module Enum::Helpers::EnumAttribute
   end
 end
 
-class Object
-  extend Enum::Helpers::EnumAttribute
+# Every module or class shall have it
+class Module
+  include Enum::Helpers::EnumAttribute
 end

data/lib/enum/helpers/enum_generator.rb

@@ -6,6 +6,7 @@ module Enum::Helpers::EnumGenerator
   end
 end
 
-class Object
+# Every module or class shall have it
+class Module
   include Enum::Helpers::EnumGenerator
 end

data/lib/enum/version.rb

@@ -1,3 +1,3 @@
 class Enum
-  VERSION = '1.7.3'
+  VERSION = '1.7.4'
 end

data/lib/enum.rb

@@ -29,12 +29,17 @@ class Enum
   end
 
   def [](*name_or_values)
-    return name_or_values.map { |name_or_value| self[name_or_value] } if name_or_values.length > 1
+    return name_or_values.map { |name_or_value| get(name_or_value) } if name_or_values.length > 1
 
     name_or_value = name_or_values.first
-    ev = @by_name_s[name_or_value.to_s] || @by_value_s[name_or_value.to_s]
-    raise "#{inspect} does not know #{name_or_value.inspect}" if ev.nil?
-    ev
+    get(name_or_value) or raise "#{inspect} does not know #{name_or_value.inspect}"
+  end
+
+  def get(*name_or_values)
+    return name_or_values.map { |name_or_value| get(name_or_value) } if name_or_values.length > 1
+
+    name_or_value = name_or_values.first
+    @by_name_s[name_or_value.to_s] || @by_value_s[name_or_value.to_s]
   end
 
   def options

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yinum
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.7.4
 platform: ruby
 authors:
 - Oded Niv