eto 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84a788ac4632d04952f42217b048db94d2a73f89
-  data.tar.gz: 6bb17aa13c75ea681fd983e51d280b664c431efb
+  metadata.gz: 72ebd515e75947c86d1e32a88206d4e6de306efd
+  data.tar.gz: 6f27f54d6ce987e25c736adba1e50c4c9ba63d62
 SHA512:
-  metadata.gz: dc4f615d218039bfa561b3b2b751c224e03c77a7fd43520e757848c06835d0255d90938c08452af2eceded98f8f46b6405df0e966e56c246e46786af4d1c8bd8
-  data.tar.gz: c4179d3884d1730e6c67805b59b8260ac6e8f907d475899fa4b3e90e493e393c771f9418c6909708fa48766abbe0063a35d6d7884f808efdfe6d9c5b8aa823cc
+  metadata.gz: 7970c7b36c3cc1fc52828e32ebe27fc7ee5ef3fdb42cf1b022dc584deeefaf442016df639342f5babc5d4b27de5b28f67f212e84f93cc8de20af7fc9e96be018
+  data.tar.gz: 87ab7ca0ac3826df3096d826d7b35f0b983b065646545bb4f9156e3d91ca1bda80ea85e581235310f2f6cbcef5d96431e5e67e25f02b19ca03cc7c01e382be5d

data/.rubocop.yml

@@ -0,0 +1,2 @@
+Style/AsciiComments:
+  Enabled: false

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+## v.1.0.1
+2014/11/29
+
+### Update Feature
+* Add japanese_zodiac option to Eto.name
+* Add --not-japanese_zodiac option to eto name command
+
+## v.1.0.0
+2014/11/27
+
+* first release

data/README.md

@@ -2,6 +2,7 @@
 
 Get Eto (Japanese Zodiac) name or emoji.
 
+[![Gem Version](https://badge.fury.io/rb/eto.svg)](http://badge.fury.io/rb/eto)
 [![Build Status](https://travis-ci.org/tbpgr/eto.png?branch=master)](https://travis-ci.org/tbpgr/eto)
 [![Coverage Status](https://coveralls.io/repos/tbpgr/eto/badge.png)](https://coveralls.io/r/tbpgr/eto)
 
@@ -28,9 +29,9 @@ $ gem install ruboty-articlegen
 ### Commands (Command Line)
 |name|args|memo|
 |:--|:--|:--|
-|names|--|全ての干支を配列で返却|
-|name|year|year の干支名を取得|
-|emoji|year|year に対応する干支の emoji を取得|
+|names|--|全ての十二支を配列で返却|
+|name|year, japanese_zodiac|year の 十干十二支 or 十二支名を取得|
+|emoji|year|year に対応する十二支の emoji を取得|
 
 ## Usage ( Command Line Interface)
 ### names
@@ -43,15 +44,19 @@ $ eto names
 ~~~bash
 $ eto name 1977
 巳
-$ eto name 1977
+$ eto name 1978
 午
+$ eto name 1965 --not-japanese_zodiac
+丁巳
+$ eto name 1977 --not-japanese_zodiac
+乙巳
 ~~~
 
 ### emoji year
 ~~~bash
 $ eto emoji 1977
 :snake:
-$ eto emoji 1977
+$ eto emoji 1978
 :horse:
 ~~~
 
@@ -90,6 +95,12 @@ output
 require 'eto'
 Eto.name(1977) #=> '巳'
 Eto.name(1978) #=> '午'
+Eto.name(1965, true) #=> '巳'
+Eto.name(1977, true) #=> '巳'
+Eto.name(1978, true) #=> '午'
+Eto.name(1965, false) #=> '乙巳'
+Eto.name(1977, false) #=> '丁巳'
+Eto.name(1978, false) #=> '戊午'
 ~~~
 
 ### Eto.emoji(year)

data/bin/eto

@@ -23,9 +23,10 @@ module Eto
     end
 
     desc 'name', 'get eto name from year'
+    option 'njz', type: :boolean, aliases: '--not-japanese_zodiac'
     def name(year = 1970)
       setting_debug_mode
-      puts Eto.name(year)
+      puts Eto.name(year, !options['njz'])
     rescue => e
       output_error_if_debug_mode(e)
       exit(false)

data/lib/eto.rb

@@ -1,52 +1,57 @@
-# encoding: utf-8
-
-# Eto
-module Eto
-  module_function
-
-  # Eto Names
-  NAMES = %w(子 丑 寅 卯 辰 巳 午 未 申 酉 戌 亥).freeze
-  # Eto Hash ( EtoName => EtoEmoji )
-  HASH = {
-    '子' => ':mouse:',
-    '丑' => ':cow:',
-    '寅' => ':tiger:',
-    '卯' => ':rabbit:',
-    '辰' => ':dragon:',
-    '巳' => ':snake:',
-    '午' => ':horse:',
-    '未' => ':sheep:',
-    '申' => ':monkey:',
-    '酉' => ':chicken:',
-    '戌' => ':dog:',
-    '亥' => ':boar:'
-  }.freeze
-
-  # get eto names
-  def names
-    NAMES
-  end
-
-  # get eto eto_hash
-  def eto_hash
-    HASH
-  end
-
-  # get eto name from year
-  def name(year)
-    int_year = validate_year(year)
-    NAMES[(int_year + 8) % 12]
-  end
-
-  # get eto emoji from year
-  def emoji(year)
-    int_year = validate_year(year)
-    HASH[name(int_year)]
-  end
-
-  private
-
-  def self.validate_year(year)
-    Integer(year)
-  end
-end
+# encoding: utf-8
+
+# Eto
+module Eto
+  module_function
+
+  # 十干
+  TEN_CALENDAR_SIGNS = %w(庚 辛 壬 癸 甲 乙 丙 丁 戊 己).freeze
+  # 十二支
+  JAPANESE_ZODIAC_NAMES = %w(子 丑 寅 卯 辰 巳 午 未 申 酉 戌 亥).freeze
+  # Eto Hash ( EtoName => EtoEmoji )
+  HASH = {
+    '子' => ':mouse:',
+    '丑' => ':cow:',
+    '寅' => ':tiger:',
+    '卯' => ':rabbit:',
+    '辰' => ':dragon:',
+    '巳' => ':snake:',
+    '午' => ':horse:',
+    '未' => ':sheep:',
+    '申' => ':monkey:',
+    '酉' => ':chicken:',
+    '戌' => ':dog:',
+    '亥' => ':boar:'
+  }.freeze
+
+  # get eto names
+  def names
+    JAPANESE_ZODIAC_NAMES
+  end
+
+  # get eto eto_hash
+  def eto_hash
+    HASH
+  end
+
+  # get eto name from year
+  def name(year, japanese_zodiac = true)
+    int_year = validate_year(year)
+    japanese_zodiac_text = JAPANESE_ZODIAC_NAMES[(int_year + 8) % 12]
+    return japanese_zodiac_text if japanese_zodiac
+    ten_calendar_signs_text = TEN_CALENDAR_SIGNS[(int_year) % 10]
+    "#{ten_calendar_signs_text}#{japanese_zodiac_text}"
+  end
+
+  # get eto emoji from year
+  def emoji(year)
+    int_year = validate_year(year)
+    HASH[name(int_year)]
+  end
+
+  private
+
+  def self.validate_year(year)
+    Integer(year)
+  end
+end

data/lib/eto/version.rb

@@ -1,4 +1,4 @@
 # Eto
 module Eto
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/eto_spec.rb

@@ -2,13 +2,14 @@
 require 'spec_helper'
 require 'eto'
 
+# rubocop: disable LineLength
 describe Eto do
   context :names do
     cases = [
       {
         case_no: 1,
         case_title: 'eto names',
-        expected: Eto::NAMES
+        expected: Eto::JAPANESE_ZODIAC_NAMES
       }
     ]
 
@@ -83,19 +84,36 @@ describe Eto do
         case_no: 1,
         case_title: 'eto name from year',
         year: 1977,
+        japanese_zodiac: true,
         expected: '巳'
       },
       {
         case_no: 2,
         case_title: 'eto name from year',
         year: 1978,
+        japanese_zodiac: true,
         expected: '午'
       },
       {
         case_no: 3,
         case_title: 'not integer year',
         year: 'abc',
+        japanese_zodiac: true,
         expect_error: true
+      },
+      {
+        case_no: 4,
+        case_title: 'eto name from year (japanese_zodiac = false)',
+        year: 1965,
+        japanese_zodiac: false,
+        expected: '乙巳'
+      },
+      {
+        case_no: 5,
+        case_title: 'eto name from year (japanese_zodiac = false)',
+        year: 1977,
+        japanese_zodiac: false,
+        expected: '丁巳'
       }
     ]
 
@@ -109,10 +127,10 @@ describe Eto do
 
           # -- when --
           if c[:expect_error]
-            expect  { Eto.name(c[:year]) }.to raise_error(ArgumentError)
+            expect  { Eto.name(c[:year], c[:japanese_zodiac]) }.to raise_error(ArgumentError)
             next
           end
-          actual = Eto.name(c[:year])
+          actual = Eto.name(c[:year], c[:japanese_zodiac])
 
           # -- then --
           expect(actual).to eq(c[:expected])
@@ -185,3 +203,4 @@ describe Eto do
     end
   end
 end
+# rubocop: enable LineLength

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eto
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - tbpgr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-27 00:00:00.000000000 Z
+date: 2014-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -63,7 +63,9 @@ files:
 - .coveralls.yml
 - .gitignore
 - .rspec
+- .rubocop.yml
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md