inum 1.3.7 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2444048eeca560efb532eaa19664c90b7d2d04a7
-  data.tar.gz: 54da67d9bda64b6f6f27e39daee963dc32f75df1
+  metadata.gz: 0a6e4aafb92b4720071dd774230f494aa12c262f
+  data.tar.gz: 8e4bbf13d8e57b1797429a4e90aa87eaf861981e
 SHA512:
-  metadata.gz: daba5f2276fe14a2d9690fbdb7f46b50b4c13b3701d9bef80148bdfeaa1048f6d213859f9d461ded0bf8ec407656c3378c208c6df4298cfbb821f21f2ec18385
-  data.tar.gz: 9b54db93b5e6f141fbe6de234f40feb5647cce4aeeba79072c3c8e0e00bdf0ea45027debd7ab790466becd8f74260e09ff9b636a9f451b9ac74f4ddd72df9e4c
+  metadata.gz: df2f30c61d0f50a81aa9828c7acb0c1b87bd788aaf28a3b3d6aa1ce30bb1e1be6fcecd95a59ae18bab13307fc4259341e719952dcf4b4a4223e5f3b2b4df9c25
+  data.tar.gz: 6e1bb7185dfd184393c41ec1a4c6fc142ee6b311738abbbcfa097c1253d6a71001ad3a9d11d3b7627af6a5f983d2a1a35c218d97bff1c8d51f20b34cc3365276

data/README.md

@@ -43,7 +43,7 @@ How to use Enum(Inum).
 ``` ruby
 p AnimeType::EVANGELION       # => EVANGELION
 p AnimeType::EVANGELION.to_i  # => 0
-p AnimeType::EVANGELION.to_t  # => エヴァンゲリオン (i18n find `anime_type.evangelion`.)
+p AnimeType::EVANGELION.to_t  # => エヴァンゲリオン (i18n find `inum.anime_type.evangelion`.)
 
 # parse object to instance of AnimeType.
 # object can use class of Symbol or String or Integer or Self.
@@ -96,16 +96,27 @@ p anime.haruhi? # => true
 
 ### Localize(i18n)
 to_t methods localize enum by i18n.
-default i18n key is name_space.class_name.enum_member_label.
+default i18n key is inum.{name_space}.{class_name}.{enum_member_label}.
 If change default, Override i18n_key class method.
 
 ``` ruby
 # default i18n_key.
 def self.i18n_key(label)
-  Inum::Utils::underscore("#{self.name}::#{label}")
+  Inum::Utils::underscore("inum::#{self.name}::#{label}")
 end
 ```
 
+example
+
+``` yaml
+ja:
+  inum:
+    anime_type:
+      evangelion: 'エヴァンゲリオン'
+      haruhi:     'ハルヒ'
+      nyaruko:    '這いよれ！ニャル子さん'
+```
+
 ## API DOCUMENT
 
 - [Documentation for alfa-jpn/Inum(master)](http://rubydoc.info/github/alfa-jpn/inum/frames)

data/lib/inum/base.rb

@@ -166,9 +166,11 @@ module Inum
       self.const_set(label, new(label, value))
     end
 
-    # get hash of :DEFINED_ENUMS.
+    # get hash of @defined_enums.
+    #
+    # @return [Hash] hash of defined enums.
     def self.defined_enums
-      self.const_get(:DEFINED_ENUMS)
+      @defined_enums
     end
 
     # get key for I18n.t method.
@@ -178,13 +180,13 @@ module Inum
     # @return [String] key for I18n.t method.
     # @abstract If change key from the default.
     def self.i18n_key(label)
-      Inum::Utils::underscore("#{self.name}::#{label}")
+      Inum::Utils::underscore("inum::#{self.name}::#{label}")
     end
 
     # call after inherited.
     # @note Define hash of :DEFINED_ENUMS in child.
     def self.inherited(child)
-      child.const_set(:DEFINED_ENUMS, Hash.new)
+      child.instance_variable_set(:@defined_enums, Hash.new)
     end
 
     # Validate enum args, and raise exception.
@@ -196,10 +198,6 @@ module Inum
         raise ArgumentError, "The label(#{label}!) isn't instance of Symbol."
       end
 
-      if label == :DEFINED_ENUMS
-        raise ArgumentError, "The label(#{label}!) is keyword."
-      end
-
       if defined_enums.has_key?(label)
         raise ArgumentError, "The label(#{label}!) already exists!!"
       end

data/lib/inum/define_check_method.rb

@@ -18,9 +18,9 @@ module Inum
     # @param enum_class    [Inum::Base] class of extended Enum::EnumBase.
     def define_check_method(variable_name, enum_class)
       self.class_eval do
-        enum_class::DEFINED_ENUMS.each_key do |enum_name|
-          define_method("#{Inum::Utils::underscore(enum_name)}?") do
-            enum_class::parse(enum_name).eql?(send(variable_name))
+        enum_class::each do |enum|
+          define_method("#{enum.to_u}?") do
+            enum.eql?(send(variable_name))
           end
         end
       end

data/lib/inum/version.rb

@@ -1,3 +1,3 @@
 module Inum
-  VERSION = "1.3.7"
+  VERSION = "2.0.0"
 end

data/spec/inum/base_spec.rb

@@ -54,7 +54,7 @@ describe Inum::Base do
   end
 
   it 'i18n.t called when call define_enum.' do
-    I18n.should_receive(:t).with('hoge.redbull')
+    I18n.should_receive(:t).with('inum.hoge.redbull')
 
     class Hoge < Inum::Base
       define_enum :REDBULL
@@ -79,7 +79,12 @@ describe Inum::Base do
       @enum2 = Class.new(Inum::Base) do
         define_enum :REDBULL,  0
       end
-      expect( @enum::DEFINED_ENUMS.equal?(@enum2::DEFINED_ENUMS) ).to be_false
+
+      defined_enum_inst  = @enum.instance_variable_get(:@defined_enums)
+      defined_enum_inst2 = @enum2.instance_variable_get(:@defined_enums)
+
+      expect( defined_enum_inst.eql?(defined_enum_inst2) ).to be_false
+      expect( defined_enum_inst.equal?(defined_enum_inst2) ).to be_false
     end
 
     it 'A enum instance is equal instance.' do
@@ -164,9 +169,12 @@ describe Inum::Base do
     end
 
     it 'to_h return Hash' do
+      defined_enum_inst  = @enum.instance_variable_get(:@defined_enums)
+
       expect(@enum::to_h.instance_of?(Hash)).to be_true
-      expect(@enum::to_h.eql?(@enum::DEFINED_ENUMS)).to be_true
-      expect(@enum::to_h.equal?(@enum::DEFINED_ENUMS)).to be_false
+
+      expect(@enum::to_h.eql?(defined_enum_inst)).to be_true
+      expect(@enum::to_h.equal?(defined_enum_inst)).to be_false
     end
 
     it 'parse return instance from string.' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inum
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 2.0.0
 platform: ruby
 authors:
 - alfa-jpn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-01 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler