inum 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3491f1414101351d964f664aa8257409286cc49b
-  data.tar.gz: 1b2be9033dc22ffda1c14ef95107004e96fedbe4
+  metadata.gz: dac28fd8851f430ad59c8b5e3ed56eae764d6bc0
+  data.tar.gz: 7d268a99e422a2462b97eb9d7cd40bebbd53de9a
 SHA512:
-  metadata.gz: 6926d5d38ed53b126069ab24b56af810d453acb02b03ead4603ea15dca5258b9bf16997ca47340db02ecc43d526ace91e598907ac42cee17e62a7a6bb9bacaf8
-  data.tar.gz: 57f444f10bb6619a1ae8edb8e86da7ea422a93014856f0f5d258032ace0688044323f383c13315607b6dbede05f8b04229d5504803e9b6e3321c1f039e863c0e
+  metadata.gz: c89392877b24e55fcd2b570a2f30388edc691d94eb81ce0113f572953b80b0bff8e93911441c29ef5f9d17f0d575f25e237dcbfa2f02197f5de225882c5ac91c
+  data.tar.gz: 0a9e2560a3af73975fb7b462d108db424687c7608f98e8a3c0e44d15779b201cd42fa33e589a9211ece1bc340b1a410a70a42c79ab9d04779c126c7b4fb8ca46

data/README.md

@@ -51,6 +51,21 @@ p AnimeTypes::HARUHI.eql?('HARUHI')   # => true (This method can compare all par
 
 # each method.
 AnimeTypes.each {|enum| p enum}
+
+# Get length
+AnimeTypes.length # => 3
+
+# Get labels and values
+AnimeTypes.labels # => [:EVANGELION, :HARUHI, :NYARUKO]
+AnimeTypes.values # => [0, 1, 2]
+
+# Get collection array.
+AnimeTypes.collection # => [["EVANGELION", 0], ["HARUHI", 1], ....]
+
+# collection usually use with some rails view helpers.
+# f.select :name, Enum.collection
+# f.select :name, Enum.collection(except:[:EVANGELION])
+# f.select :name, Enum.collection(only:[:EVANGELION])
 ```
 
 can use Enumerable and Comparable.
@@ -75,6 +90,7 @@ p fav.anime.t # => '這いよれ！ニャル子さん' t is aliased translate.
 
 # #setter can set parsable object.
 anime.type = 1
+anime.type = '1'
 anime.type = 'NYARUKO'
 
 # check methods.
@@ -93,11 +109,13 @@ ja:
     nyaruko:    '這いよれ！ニャル子さん'
 ```
 
-If change default, Override i18n_key class method.
+If you want to change key of i18n, Override i18n_key class method.
 
 ``` ruby
-def self.i18n_key(label)
-  "hogehoge.#{label}"
+class AnimeTypes < Inum::Base
+  def self.i18n_key(underscore_class_path, underscore_label)
+    "inums.#{underscore_class_path}.#{label}"
+  end
 end
 ```
 

data/lib/inum/active_record_mixin.rb

@@ -23,10 +23,6 @@ module Inum
         end
 
         define_method("#{column}=") do |value|
-          if value.class == String and /^\d$/.match(value)
-            value = value.to_i
-          end
-
           enum_class.parse(value).tap do |enum|
             if enum
               write_attribute(column, enum.to_i)

data/lib/inum/base.rb

@@ -24,7 +24,9 @@ module Inum
       @label        = label
       @label_string = label.to_s
       @value        = value
-      @i18n_key     = ActiveSupport::Inflector.underscore("#{self.class.name}::#{label}").gsub('/', '.')
+
+      @underscore_class_path = self.class.name ? ActiveSupport::Inflector.underscore(self.class.name).gsub('/', '.') : ''
+      @underscore_label      = ActiveSupport::Inflector.underscore(label).gsub('/', '.')
     end
 
     # Compare object.
@@ -82,7 +84,7 @@ module Inum
     #
     # @return [String] localized string of Enum.
     def translate
-      I18n.t(@i18n_key)
+      I18n.t(self.class.i18n_key(@underscore_class_path, @underscore_label))
     end
     alias_method :t, :translate
 
@@ -121,6 +123,16 @@ module Inum
       @enums.each(&block)
     end
 
+    # Override the rule of i18n keys.
+    # @abstract if change the rule of i18n keys.
+    #
+    # @param underscore_class_path [String] underscore class name.
+    # @param underscore_label      [String] underscore label.
+    # @return [String] i18n key.
+    def self.i18n_key(underscore_class_path, underscore_label)
+      "#{underscore_class_path}.#{underscore_label}"
+    end
+
     # get all labels of Enum.
     #
     # @return [Array<Symbol>] all labels of Enum.
@@ -142,8 +154,12 @@ module Inum
     def self.parse(object)
       case object
       when String
-        upcase = object.upcase
-        find {|e| e.to_s == upcase}
+        if /^\d+$/.match(object)
+          parse(object.to_i)
+        else
+          upcase = object.upcase
+          find {|e| e.to_s == upcase}
+        end
       when Symbol
         upcase = object.upcase
         find {|e| e.label == upcase}

data/lib/inum/version.rb

@@ -1,3 +1,3 @@
 module Inum
-  VERSION = "4.0.1"
+  VERSION = "4.0.2"
 end

data/spec/inum/base_spec.rb

@@ -77,7 +77,7 @@ describe Inum::Base do
   end
 
   describe 'Defined enum class' do
-    before :all do
+    before :each do
       class Anime < Inum::Base
         define :NYARUKO,   0
         define :MUROMISAN, 1
@@ -86,7 +86,7 @@ describe Inum::Base do
       end
     end
 
-    after :all do
+    after :each do
       Object.class_eval{ remove_const :Anime }
     end
 
@@ -138,9 +138,27 @@ describe Inum::Base do
 
     describe '#t' do
       subject do
-        expect(I18n).to receive(:t).with('animes.kmb') { 'ok' }
+        expect(I18n).to receive(:t).with(key).once { 'ok' }
         expect(Anime::KMB.t).to eq('ok')
       end
+
+      let(:key) { 'anime.kmb' }
+
+      it 'behaviour is right.' do
+        subject
+      end
+
+      context 'override .i18n_key' do
+        before :each do
+          Anime.define_singleton_method(:i18n_key) {|path, label| "inum.#{path}.#{label}" }
+        end
+
+        let(:key) { 'inum.anime.kmb' }
+
+        it 'Use overridden key.' do
+          subject
+        end
+      end
     end
 
     describe '#to_i' do
@@ -157,9 +175,13 @@ describe Inum::Base do
 
     describe '#translate' do
       subject do
-        expect(I18n).to receive(:t).with('animes.kmb') { 'ok' }
+        expect(I18n).to receive(:t).with('anime.kmb') { 'ok' }
         expect(Anime::KMB.translate).to eq('ok')
       end
+
+      it 'behaviour is right.' do
+        subject
+      end
     end
 
     describe '#value' do
@@ -264,6 +286,13 @@ describe Inum::Base do
         end
       end
 
+      context 'source is integer of string' do
+        let(:source) { '3' }
+        it 'success.' do
+          subject
+        end
+      end
+
       context 'source is enum' do
         let(:source) { Anime::KMB }
         it 'success.' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inum
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - alfa-jpn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-10 00:00:00.000000000 Z
+date: 2014-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler