inum 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 493bb30797a42fd6c51d030772bf00e079aee367
-  data.tar.gz: 699880c62844bb20bd5ef3c470eea38cbd2fb831
+  metadata.gz: e23a5e942d7583617ddbcd45931e9d4850394efe
+  data.tar.gz: 5b2ddbd32432205959846d2199390b331ff8a123
 SHA512:
-  metadata.gz: 6267ef53da51c33f37997c01ac10872a0c5f6d94b14445ccde25cce1fdbe7ceccac38af70520af430fc81bc0593da4cb989f8173087aaf554401026d3b652ee2
-  data.tar.gz: 45404163209bee403e9424a4f820e0029380792a117b8f3519644b12f5ec92a26af1063a0e6ab2d5d9bc7599efae61bd007885b189cbebebfbfe12e9846b1db2
+  metadata.gz: 5a4753423085581b73eba9cdea2eb01310abc255f72f2385cf09b35451eb08f7e4d6503576f9e4612647e6b215975124a77b88a0feb8ee154dad466a8c71957a
+  data.tar.gz: 8338f1d3b44ca69bfd43e34d33828b95968d7a66decdb777f8aefba3824ea91b081bad13718f054b363e150a2fb0877aada60f0a5309545093f4ae2cf107e654

data/lib/inum/base.rb

@@ -21,14 +21,13 @@ module Inum
     # @param label [Symbol]  label of Enum.
     # @param value [Integer] value of Enum.
     def initialize(label, value)
-      @label          = label.freeze
-      @label_string   = label.to_s.freeze
-      @label_downcase = @label_string.downcase.freeze
-      @label_upcase   = @label_string.upcase.freeze
-      @value          = value.freeze
-
-      @underscore_class_path = self.class.name ? ActiveSupport::Inflector.underscore(self.class.name).gsub('/', '.') : ''
-      @underscore_label      = ActiveSupport::Inflector.underscore(label).gsub('/', '.')
+      @label            = label.freeze
+      @label_string     = label.to_s.freeze
+      @label_downcase   = @label_string.downcase.freeze
+      @label_upcase     = @label_string.upcase.freeze
+      @label_underscore = ActiveSupport::Inflector.underscore(label).gsub('/', '.').freeze
+      @value            = value.freeze
+      @i18n_namespace   = (self.class.name ? ActiveSupport::Inflector.underscore(self.class.name).gsub('/', '.') : '').freeze
     end
 
     # Compare object.
@@ -95,12 +94,19 @@ module Inum
       @label_upcase
     end
 
+    # Underscore label.
+    #
+    # @return [String] underscore label.
+    def underscore
+      @label_underscore
+    end
+
     # Translate Enum to localized string.(use i18n)
     # @note find default `Namespace.Classname.EnumMember`
     #
     # @return [String] localized string of Enum.
     def translate
-      I18n.t(self.class.i18n_key(@underscore_class_path, @underscore_label))
+      I18n.t(self.class.i18n_key(@i18n_namespace, @label_underscore))
     end
     alias_method :t, :translate
 
@@ -220,12 +226,17 @@ module Inum
       new(label, value).tap do |enum|
         const_set(label, enum)
         @enums.push(enum)
+        @enums.sort! {|a, b| a.to_i <=> b.to_i }
       end
     end
 
     # Initialize inherited class.
     def self.inherited(child)
-      child.instance_variable_set(:@enums, Array.new)
+      if self == Inum::Base
+        child.instance_variable_set(:@enums, Array.new)
+      else
+        child.instance_variable_set(:@enums, self.to_a)
+      end
     end
 
     # Validate enum args.
@@ -238,6 +249,10 @@ module Inum
         raise ArgumentError, "#{label} isn't instance of Symbol."
       end
 
+      unless value.kind_of?(Numeric)
+        raise ArgumentError, "#{value} isn't instance of Integer."
+      end
+
       if labels.include?(label)
         raise ArgumentError, "#{label} already exists label."
       end

data/lib/inum/version.rb

@@ -1,3 +1,3 @@
 module Inum
-  VERSION = '5.0.0'
+  VERSION = '5.1.0'
 end

data/spec/inum/base_spec.rb

@@ -37,7 +37,7 @@ describe Inum::Base do
       end
     end
 
-    context 'When define a enum having wrong label' do
+    context 'When define a enum with wrong label' do
       subject do
         Class.new(Inum::Base) {
           define 'red_bull', 0
@@ -49,7 +49,7 @@ describe Inum::Base do
       end
     end
 
-    context 'When define a enum having duplicate label' do
+    context 'When define a enum with duplicated label' do
       subject do
         Class.new(Inum::Base) {
           define :RED_BULL, 0
@@ -62,7 +62,19 @@ describe Inum::Base do
       end
     end
 
-    context 'When define a enum having duplicate value' do
+    context 'When define a enum with nan value' do
+      subject do
+        Class.new(Inum::Base) {
+          define :RED_BULL, 'hahaha'
+        }
+      end
+
+      it 'Raise ArgumentError.' do
+        expect { subject }.to raise_error(ArgumentError)
+      end
+    end
+
+    context 'When define a enum with duplicate value' do
       subject do
         Class.new(Inum::Base) {
           define :RED_BULL, 0
@@ -83,7 +95,7 @@ describe Inum::Base do
         define :Muromisan, 1
         define :Nourin,    2
         define :KMB,       3
-        define :Bakuon,    4
+        define :BakuOn,    5
       end
     end
 
@@ -176,13 +188,19 @@ describe Inum::Base do
 
     describe '#dowcase ' do
       it 'Return lowercase string.' do
-        expect(Anime::Bakuon.downcase).to eq('bakuon')
+        expect(Anime::BakuOn.downcase).to eq('bakuon')
       end
     end
 
     describe '#upcase ' do
       it 'Return uppercase string.' do
-        expect(Anime::Bakuon.upcase).to eq('BAKUON')
+        expect(Anime::BakuOn.upcase).to eq('BAKUON')
+      end
+    end
+
+    describe '#underscore ' do
+      it 'Return underscore string.' do
+        expect(Anime::BakuOn.underscore).to eq('baku_on')
       end
     end
 
@@ -217,7 +235,7 @@ describe Inum::Base do
           ['t', 1],
           ['t', 2],
           ['t', 3],
-          ['t', 4]
+          ['t', 5]
         ])
       end
 
@@ -237,7 +255,7 @@ describe Inum::Base do
             ['t', 0],
             ['t', 1],
             ['t', 2],
-            ['t', 4]
+            ['t', 5]
           ])
         end
       end
@@ -252,7 +270,7 @@ describe Inum::Base do
     describe '.each' do
       it 'Execute block with a right order.' do
         count  = 0
-        orders = [Anime::Nyaruko, Anime::Muromisan, Anime::Nourin, Anime::KMB, Anime::Bakuon]
+        orders = [Anime::Nyaruko, Anime::Muromisan, Anime::Nourin, Anime::KMB, Anime::BakuOn]
 
         Anime.each do |enum|
           expect(enum).to eq(orders[count])
@@ -263,7 +281,7 @@ describe Inum::Base do
 
     describe '.labels' do
       it 'Return array of label.' do
-        expect(Anime.labels).to match_array([:Nyaruko, :Muromisan, :Nourin, :KMB, :Bakuon])
+        expect(Anime.labels).to match_array([:Nyaruko, :Muromisan, :Nourin, :KMB, :BakuOn])
       end
     end
 
@@ -278,7 +296,7 @@ describe Inum::Base do
         expect(Anime.parse(source)).to eq(destination)
       end
 
-      let(:destination) { Anime::Bakuon }
+      let(:destination) { Anime::BakuOn }
 
       context 'When source is string' do
         let(:source) { 'Bakuon' }
@@ -295,21 +313,21 @@ describe Inum::Base do
       end
 
       context 'When source is integer' do
-        let(:source) { 4 }
+        let(:source) { 5 }
         it 'success.' do
           subject
         end
       end
 
       context 'When source is integer of string' do
-        let(:source) { '4' }
+        let(:source) { '5' }
         it 'Return inum.' do
           subject
         end
       end
 
       context 'When source is enum' do
-        let(:source) { Anime::Bakuon }
+        let(:source) { Anime::BakuOn }
         it 'Return inum.' do
           subject
         end
@@ -349,13 +367,43 @@ describe Inum::Base do
 
     describe '.to_a' do
       it 'Return array of enum.' do
-        expect(Anime.to_a).to match_array([Anime::Nyaruko, Anime::Muromisan, Anime::Nourin, Anime::KMB, Anime::Bakuon])
+        expect(Anime.to_a).to match_array([Anime::Nyaruko, Anime::Muromisan, Anime::Nourin, Anime::KMB, Anime::BakuOn])
       end
     end
 
     describe '.values' do
       it 'Return array of value.' do
-        expect(Anime.values).to match_array([0, 1, 2, 3, 4])
+        expect(Anime.values).to match_array([0, 1, 2, 3, 5])
+      end
+    end
+
+    context 'After extend Anime' do
+      describe 'Defined enum class' do
+        before :each do
+          class Anime2016 < Anime
+            define :GanbaruZoi, 4
+          end
+        end
+
+        after :each do
+          Object.class_eval{ remove_const :Anime2016 }
+        end
+
+        describe '.values' do
+          it 'Return array of value.' do
+            expect(Anime2016.values).to match_array([0, 1, 2, 3, 4, 5])
+          end
+
+          it 'Order is valid.' do
+            expect(Anime2016.values[4]).to eq(4)
+          end
+        end
+
+        describe 'extend enum' do
+          it 'is no impact.' do
+            expect(Anime.length).to eq(5)
+          end
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inum
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - alfa-jpn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-03 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler