inum 5.1.1 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92efa81161155f336cb84f1e2f6ae43dfa7e3dbe
-  data.tar.gz: f9e80cd38edae6fca9d49b70561d90833addec3c
+  metadata.gz: abafc6e9e99d1761840987fb78cf6a860997a556
+  data.tar.gz: b82eebf3ec9240161f7a6510ce04481032aaebea
 SHA512:
-  metadata.gz: 8bc684c912cd842f6e54b0f4f7a1591e33949a2681ef703f4266ce6c2c3c8dbb96e872df1794a6d9870832cf1ec00569287b11e327484778c10a00580bd832d7
-  data.tar.gz: ea2395a6da2f5c111412726a62c1f1af97a90d370875d725f6c98c3e5326dbf0fa397e5f886df951389f34b1f2021c9c86ba476236dde87eb6dd71c48639229b
+  metadata.gz: 6fe09e0679c6a2ef1397d49b17c8031ced46758a1d3ebfa2db71375c75e85ae274cdb45a9ee9edac4f4e1432b01da15b49b6e89cd79cf8849d08418244b5bed3
+  data.tar.gz: 0ec254f25e567994628f4881d321bc6ac87f62c530e5049a13927946ef3f14e757a9971620b380ddcff1981df48841d66f9fb21c72b92479269311ef7f37ac6d

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.travis.yml

@@ -7,6 +7,7 @@ rvm:
   - 2.1.0
   - 2.2.0
   - 2.3.0
+  - 2.4.0
 env:
   - RAILS_VERSION=3.2.20
   - RAILS_VERSION=4.1.7
@@ -15,3 +16,6 @@ matrix:
   include:
     - rvm: 2.3.0
       env: RAILS_VERSION=5.0.0
+    - rvm: 2.4.0
+      env: RAILS_VERSION=5.1.0
+

data/README.md

@@ -3,6 +3,10 @@
 Inum(enumerated type of Integer) provide a Java-enum-like Enum.
 Inum has a function to localize by i18n.
 
+[![Build Status](https://travis-ci.org/alfa-jpn/inum.svg?branch=master)](https://travis-ci.org/alfa-jpn/inum)
+[![Coverage Status](https://coveralls.io/repos/github/alfa-jpn/inum/badge.svg?branch=master)](https://coveralls.io/github/alfa-jpn/inum?branch=master)
+[![Code Climate](https://codeclimate.com/github/alfa-jpn/inum/badges/gpa.svg)](https://codeclimate.com/github/alfa-jpn/inum)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -62,13 +66,13 @@ AnimeTypes.length # => 3
 AnimeTypes.labels # => [:EVANGELION, :HARUHI, :NYARUKO]
 AnimeTypes.values # => [0, 1, 2]
 
-# Get collection array.
-AnimeTypes.collection # => [["EVANGELION", 0], ["HARUHI", 1], ....]
+# Get form items.
+AnimeTypes.form_items # => [['エヴァンゲリオン', 'EVANGELION'], ['涼宮ハルヒの憂鬱', 'HARUHI'], ....]
 
-# 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])
+# form_items usually use with some rails view helpers.
+# f.select :name, Enum.form_items
+# f.select :name, Enum.form_items(except:[:EVANGELION])
+# f.select :name, Enum.form_items(only:[:EVANGELION])
 ```
 
 can use Enumerable and Comparable.
@@ -134,4 +138,8 @@ end
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
-# I have poor English. Please help meeeeeeeee!!!!
+### Testing
+
+```shell
+$ bundle exec rspec
+```

data/inum.gemspec

@@ -4,29 +4,30 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'inum/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "inum"
+  spec.name          = 'inum'
   spec.version       = Inum::VERSION
-  spec.authors       = ["alfa-jpn"]
-  spec.email         = ["alfa.jpn@gmail.com"]
-  spec.description   = "Inum(enumerated type of Integer) provide a java-Enum-like."
-  spec.summary       = "Inum(enumerated type of Integer) provide a java-Enum-like."
-  spec.homepage      = "https://github.com/alfa-jpn/inum"
-  spec.license       = "MIT"
+  spec.authors       = ['alfa-jpn']
+  spec.email         = ['alfa.jpn@gmail.com']
+  spec.description   = 'Inum(enumerated type of Integer) provide a java-Enum-like.'
+  spec.summary       = 'Inum(enumerated type of Integer) provide a java-Enum-like.'
+  spec.homepage      = 'https://github.com/alfa-jpn/inum'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.required_ruby_version = ">= 1.9.3"
+  spec.required_ruby_version = '>= 1.9.3'
 
-  spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", ">= 3.0.0"
-  spec.add_development_dependency "yard"
-  spec.add_development_dependency "activerecord"
-  spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency 'bundler', '~> 1.5'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec', '>= 3.0.0'
+  spec.add_development_dependency 'yard'
+  spec.add_development_dependency 'activerecord'
+  spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'coveralls'
 
-  spec.add_dependency "i18n"
-  spec.add_dependency "activesupport"
+  spec.add_dependency 'i18n'
+  spec.add_dependency 'activesupport'
 end

data/lib/inum/base.rb

@@ -2,9 +2,8 @@ module Inum
   require 'active_support/inflector'
   require 'i18n'
 
-  # InumBase class.
-  #
-  # @abstract Inum class should be a inheritance of Inum::Base.
+  # Inum base class.
+  # @abstract Inum::Base class should be a inheritance of Inum::Base.
   # @example
   #   class FruitType < Inum::Base
   #     define :APPLE,  0
@@ -25,9 +24,9 @@ module Inum
       @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
+      @label_underscore = ActiveSupport::Inflector.underscore(@label_string).freeze
       @value            = value.freeze
-      @i18n_namespace   = (self.class.name ? ActiveSupport::Inflector.underscore(self.class.name).gsub('/', '.') : '').freeze
+      @i18n_namespace   = (self.class.name ? ActiveSupport::Inflector.underscore(self.class.name).tr('/', '.') : '').freeze
     end
 
     # Compare object.
@@ -35,7 +34,7 @@ module Inum
     # @param object [Object] parsable object.
     # @return [Integer] same normal <=>.
     def <=> (object)
-      if other = self.class.parse(object)
+      if (other = self.class.parse(object))
         @value <=> other.to_i
       else
         nil
@@ -102,7 +101,7 @@ module Inum
     end
 
     # Translate Enum to localized string.(use i18n)
-    # @note find default `Namespace.Classname.EnumMember`
+    # @note find default `namespace.enum_class_name.enum_label`
     #
     # @return [String] localized string of Enum.
     def translate
@@ -118,33 +117,33 @@ module Inum
     end
     alias_method :to_i, :value
 
-    # Get collection.
+    # Execute the yield(block) with each member of enum.
+    #
+    # @yield [enum] execute the block with enums.
+    # @yieldparam [Inum::Base] enum enum.
+    def self.each(&block)
+      @enums.each(&block)
+    end
+
+    # Get items for rails form.
     # @note Type of usable with a Rails form helper.
-    # @exapmle
-    #  f.select :name, Enum.collection
-    #  f.select :name, Enum.collection(except:[:HOGE])      # Except Enum::HOGE
-    #  f.select :name, Enum.collection(only:[:HOGE, :FUGA]) # Only Enum::HOGE and Enum::FUGA
+    # @example
+    #  f.select :name, Enum.form_items
+    #  f.select :name, Enum.form_items(except:[:HOGE])      # Except Enum::HOGE
+    #  f.select :name, Enum.form_items(only:[:HOGE, :FUGA]) # Only Enum::HOGE and Enum::FUGA
     #
     # @param option [Hash] Options.
     # @option option [Array<Symbol>] except Except enum.
     # @option option [Array<Symbol>] only   Limit enum.
     # @return [Array<Array>] collection. ex `[["HOGE", 0], ["FUGA", 1]]`
-    def self.collection(option = {})
+    def self.form_items(option = {})
       map { |e|
         next if option[:except] and option[:except].include?(e.label)
         next if option[:only]   and !option[:only].include?(e.label)
-        [e.translate, e.value]
+        [e.translate, e.to_s]
       }.compact
     end
 
-    # Execute the yield(block) with each member of enum.
-    #
-    # @yield [enum] execute the block with enums.
-    # @yieldparam [Inum::Base] enum enum.
-    def self.each(&block)
-      @enums.each(&block)
-    end
-
     # Override the rule of i18n keys.
     # @abstract if change the rule of i18n keys.
     #
@@ -180,12 +179,12 @@ module Inum
           parse(object.to_i)
         else
           underscore = object.underscore
-          find {|e| e.underscore == underscore}
+          find { |e| e.underscore == underscore }
         end
       when Symbol
         parse(object.to_s)
       when Integer
-        find {|e| e.value == object}
+        find { |e| e.value == object }
       when self
         object
       else

data/lib/inum/version.rb

@@ -1,3 +1,3 @@
 module Inum
-  VERSION = '5.1.1'
+  VERSION = '5.2.0'
 end

data/spec/inum/active_record_mixin_spec.rb

@@ -1,8 +1,7 @@
-require 'rspec'
 require 'spec_helper'
 
 describe Inum::ActiveRecordMixin do
-  create_temp_table(:tvs){|t| t.integer :anime}
+  create_temp_table(:tvs) { |t| t.integer :anime }
 
   before :each do
     class Anime < Inum::Base
@@ -23,7 +22,7 @@ describe Inum::ActiveRecordMixin do
   end
 
   let :bind_class do
-    TV.tap {|klass| klass.instance_eval{ bind_inum :anime, Anime } }
+    TV.tap { |klass| klass.instance_eval{ bind_inum :anime, Anime } }
   end
 
   let :instance do
@@ -99,11 +98,23 @@ describe Inum::ActiveRecordMixin do
         }.from(type.to_i).to(Anime.parse(1).to_i)
       end
     end
+
+    context 'When invalid value' do
+      let(:target){ 'Hoge' }
+
+      it 'set value.' do
+        expect {
+          instance.anime = target
+        }.to change {
+          instance.send(:read_attribute, :anime)
+        }.from(type.to_i).to(nil)
+      end
+    end
   end
 
   describe '#getter' do
     it 'Return enum' do
-      expect(instance.anime.instance_of?(Anime)).to be_truthy
+      expect(instance.anime).to be_instance_of(Anime)
     end
   end
 
@@ -114,7 +125,7 @@ describe Inum::ActiveRecordMixin do
 
     describe 'Comparison methods' do
       it 'Will be defined with prefix.' do
-        expect(bind_class.method_defined?(:prefix_nyaruko?)).to   be_truthy
+        expect(bind_class.method_defined?(:prefix_nyaruko?)).to be_truthy
       end
     end
   end

data/spec/inum/base_spec.rb

@@ -1,4 +1,3 @@
-require 'rspec'
 require 'spec_helper'
 
 describe Inum::Base do
@@ -221,21 +220,39 @@ describe Inum::Base do
       end
     end
 
-    describe '.collection' do
+    describe '.new' do
+      it 'Can not create a instance of enum.' do
+        expect{ Anime.new(:NICONICO, 2525) }.to raise_error(NoMethodError)
+      end
+    end
+
+    describe '.each' do
+      it 'Execute block with a right order.' do
+        count  = 0
+        orders = [Anime::Nyaruko, Anime::Muromisan, Anime::Nourin, Anime::KMB, Anime::BakuOn]
+
+        Anime.each do |enum|
+          expect(enum).to eq(orders[count])
+          count += 1
+        end
+      end
+    end
+
+    describe '.form_items' do
       subject do
-        allow(I18n).to receive(:t) { 't' }
-        Anime.collection(option)
+        allow(I18n).to receive(:t) { |key| "t-key-#{key}" }
+        Anime.form_items(option)
       end
 
       let(:option) { Hash.new }
 
       it 'Return all item array.' do
         expect(subject).to match_array([
-          ['t', 0],
-          ['t', 1],
-          ['t', 2],
-          ['t', 3],
-          ['t', 5]
+          ['t-key-anime.nyaruko',   'Nyaruko'],
+          ['t-key-anime.muromisan', 'Muromisan'],
+          ['t-key-anime.nourin',    'Nourin'],
+          ['t-key-anime.kmb',       'KMB'],
+          ['t-key-anime.baku_on',   'BakuOn'],
         ])
       end
 
@@ -243,7 +260,7 @@ describe Inum::Base do
         let(:option) { {only: [:KMB]} }
 
         it 'Return only selected item array.' do
-          expect(subject).to match_array([['t', 3]])
+          expect(subject).to match_array([['t-key-anime.kmb', 'KMB']])
         end
       end
 
@@ -252,33 +269,15 @@ describe Inum::Base do
 
         it 'Return only except item array.' do
           expect(subject).to match_array([
-            ['t', 0],
-            ['t', 1],
-            ['t', 2],
-            ['t', 5]
+            ['t-key-anime.nyaruko',   'Nyaruko'],
+            ['t-key-anime.muromisan', 'Muromisan'],
+            ['t-key-anime.nourin',    'Nourin'],
+            ['t-key-anime.baku_on',   'BakuOn'],
           ])
         end
       end
     end
 
-    describe '.new' do
-      it 'Can not create a instance of enum.' do
-        expect{ Anime.new(:NICONICO, 2525) }.to raise_error(NoMethodError)
-      end
-    end
-
-    describe '.each' do
-      it 'Execute block with a right order.' do
-        count  = 0
-        orders = [Anime::Nyaruko, Anime::Muromisan, Anime::Nourin, Anime::KMB, Anime::BakuOn]
-
-        Anime.each do |enum|
-          expect(enum).to eq(orders[count])
-          count += 1
-        end
-      end
-    end
-
     describe '.labels' do
       it 'Return array of label.' do
         expect(Anime.labels).to match_array([:Nyaruko, :Muromisan, :Nourin, :KMB, :BakuOn])

data/spec/spec_helper.rb

@@ -3,27 +3,17 @@ require 'bundler/setup'
 require 'active_record'
 require 'inum'
 
+require 'rspec'
+require 'spec_helpers/active_record_helper'
+require 'coveralls'
+
 RSpec.configure do |config|
-  config.color = true
+  config.color          = true
   config.mock_framework = :rspec
-  config.before(:all) {
+  config.before(:all) do
     ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
     I18n.enforce_available_locales = false
-  }
-end
-
-def create_temp_table(name, &block)
-  raise 'No Block given!' unless block_given?
-
-  before :all do
-    migration = ActiveRecord::Migration.new
-    migration.verbose = false
-    migration.create_table name, &block
-  end
-
-  after :all do
-    migration = ActiveRecord::Migration.new
-    migration.verbose = false
-    migration.drop_table name
   end
 end
+
+Coveralls.wear!

data/spec/spec_helpers/active_record_helper.rb

@@ -0,0 +1,18 @@
+# Create table.
+# @param [String] name table name.
+# @yield [t] table dsl block.
+def create_temp_table(name, &block)
+  raise 'No Block given!' unless block_given?
+
+  before :all do
+    migration = ActiveRecord::Migration.new
+    migration.verbose = false
+    migration.create_table name, &block
+  end
+
+  after :all do
+    migration = ActiveRecord::Migration.new
+    migration.verbose = false
+    migration.drop_table name
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inum
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.2.0
 platform: ruby
 authors:
 - alfa-jpn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2017-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -129,6 +143,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".coveralls.yml"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
@@ -143,6 +158,8 @@ files:
 - spec/inum/active_record_mixin_spec.rb
 - spec/inum/base_spec.rb
 - spec/spec_helper.rb
+- spec/spec_helpers/active_record_helper.rb
+- vendor/.keep
 homepage: https://github.com/alfa-jpn/inum
 licenses:
 - MIT
@@ -163,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Inum(enumerated type of Integer) provide a java-Enum-like.
@@ -171,4 +188,4 @@ test_files:
 - spec/inum/active_record_mixin_spec.rb
 - spec/inum/base_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 
+- spec/spec_helpers/active_record_helper.rb