era_ja 0.1.1 → 0.2.0

data/Guardfile

@@ -2,7 +2,7 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard 'rspec', :version => 2, :cli => '--color', :all_after_pass => false do
+guard 'rspec', :cli => '--color', :all_after_pass => false do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/era_ja/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch('lib/era_ja.rb')     { "spec" }

data/README.ja.md

@@ -34,6 +34,7 @@ EraJa#to_eraメソッドでの追加のフォーマット文字列は以下の
 	require 'era_ja/time'
 	Time.mktime(2012,4,29).to_era   # => "H24.4.29"
 	Time.mktime(2012,4,29).to_era("%O%E年%m月%d日") # => "平成24年4月29日"
+	Time.mktime(2012,4,29).to_era("%JE年%Jm月%Jd日") # => "平成二十四年四月二十九日"
 ```
 
 ### Dateインタンスを和暦に変換します。
@@ -42,6 +43,15 @@ EraJa#to_eraメソッドでの追加のフォーマット文字列は以下の
 	require 'era_ja/date'
 	Date.new(2012,4,29).to_era     # => "H24.4.29"
 	Date.new(2012,4,29).to_era("%O%E年%m月%d日") # => "平成24年4月29日"
+	Date.new(2012,4,29).to_era("%JE年%Jm月%Jd日") # => "平成二十四年四月二十九日"
+```
+
+### 数字を漢数字に変換します。 ###
+
+
+```ruby
+	Time.mktime(2012,4,29).to_era("%Jy年%Jm月%Jd日") # => "二千十二年四月二十九日"
+	Date.new(2012,4,29).to_era("%Jy年%Jm月%Jd日")    # => "二千十二年四月二十九日"
 ```
 
 ## Support

data/README.md

@@ -27,6 +27,7 @@ EraJa#to_era of extra format string is follow.
 * %o: era(alphabet)
 * %O: era(kanzi)
 * %E: era year
+* %J: kanzi number
 
 ### Time instance to japanese era
 
@@ -34,6 +35,7 @@ EraJa#to_era of extra format string is follow.
 	require 'era_ja/time'
 	Time.mktime(2012,4,29).to_era   # => "H24.4.29"
 	Time.mktime(2012,4,29).to_era("%O%E年%m月%d日") # => "平成24年4月29日"
+	Time.mktime(2012,4,29).to_era("%JE年%Jm月%Jd日") # => "平成二十四年四月二十九日"
 ```
 
 ### Date instance to japanese era
@@ -42,6 +44,14 @@ EraJa#to_era of extra format string is follow.
 	require 'era_ja/date'
 	Date.new(2012,4,29).to_era     # => "H24.4.29"
 	Date.new(2012,4,29).to_era("%O%E年%m月%d日") # => "平成24年4月29日"
+	Date.new(2012,4,29).to_era("%JE年%Jm月%Jd日") # => "平成二十四年四月二十九日"
+```
+
+### Change number to kansuuzi ###
+
+```ruby
+	Time.mktime(2012,4,29).to_era("%Jy年%Jm月%Jd日") # => "二千十二年四月二十九日"
+	Date.new(2012,4,29).to_era("%Jy年%Jm月%Jd日")    # => "二千十二年四月二十九日"
 ```
 
 ## Support

data/era_ja.gemspec

@@ -15,8 +15,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = EraJa::VERSION
 
-  gem.add_development_dependency "rake", '>= 0.9.2'
-  gem.add_development_dependency 'rspec', '>= 2.9.0'
-  gem.add_development_dependency 'growl', '>= 1.0.3'
-  gem.add_development_dependency "guard-rspec", '>= 0.7.0'
+  gem.add_development_dependency "rake", '~> 10.0.3'
+  gem.add_development_dependency 'rspec', '~> 2.12.0'
+  gem.add_development_dependency "guard-rspec", '~> 2.4.0'
+  gem.add_development_dependency 'rb-fsevent', '~> 0.9.3'
+  gem.add_development_dependency 'terminal-notifier-guard', '~> 1.5.3'
 end

data/lib/era_ja.rb

@@ -12,35 +12,66 @@ module EraJa
   #   * %o - era(alphabet)
   #   * %O - era(kanzi)
   #   * %E - era year
+  #   * %J - kanzi number
   # @return [String]
   def to_era(format = "%o%E.%m.%d")
-    format.sub!(/%o/i) { |m| m + ' ' }
-    format.sub!(/%E/) { |m| m + ' ' }
-    @era_format = format[/%o/i]
-    if self.to_time < ::Time.mktime(1868,9,8)
-      raise "#to_era is expeted later in 1968,9,8"
-    elsif self.to_time < ::Time.mktime(1912,7,30)
-      strftime(format).sub(/%E /, format_year(year - 1867)).sub(/%o /i) { format_era('M') }
-    elsif self.to_time < ::Time.mktime(1926,12,25)
-      strftime(format).sub(/%E /, format_year(year - 1911)).sub(/%o /i) { format_era('T') }
-    elsif self.to_time < ::Time.mktime(1989,1,8)
-      strftime(format).sub(/%E /, format_year(year - 1925)).sub(/%o /i) { format_era('S') }
-    else
-      strftime(format).sub(/%E /, format_year(year - 1988)).sub(/%o /i) { format_era('H') }
+    @era_format = format
+    @era_format.gsub!(/%J/, "%J%")
+    @era_format.sub!(/%o/i) { |m| m + ' ' }
+    @era_format.sub!(/%E/) { |m| m + ' ' }
+    str_time = strftime(@era_format)
+    if @era_format =~ /%E/
+      if self.to_time < ::Time.mktime(1868,9,8)
+        raise "#to_era is expeted later in 1968,9,8"
+      elsif self.to_time < ::Time.mktime(1912,7,30)
+        str_time = era_year(year - 1867, 'M')
+      elsif self.to_time < ::Time.mktime(1926,12,25)
+        str_time = era_year(year - 1911, 'T')
+      elsif self.to_time < ::Time.mktime(1989,1,8)
+        str_time = era_year(year - 1925, 'S')
+      else
+        str_time = era_year(year - 1988, 'H')
+      end
     end
+    str_time.gsub(/%J(\d+)/) { to_kanzi($1) }
   end
 
   private
+  def era_year(year, era)
+    strftime(@era_format).sub(/(%J)?%E /) { format_year(year, $1) }.sub(/%o /i) { format_era(era) }
+  end
+
   def format_era(string)
-    if @era_format == "%o"
+    if @era_format =~ /%o/
       return "#{ERA.detect{ |i| i[0] == string}[0]}"
-    elsif @era_format == "%O"
+    elsif @era_format =~ /%O/
       return "#{ERA.detect{ |i| i[0] == string}[1]}"
     end
   end
 
-  def format_year(year)
-    sprintf("%02d", year)
+  def format_year(year, match)
+    era_year = sprintf("%02d", year)
+    if match == "%J"
+      era_year = year == 1 ? "元" : to_kanzi(era_year)
+    end
+    era_year
+  end
+
+  def to_kanzi(numeric, kanzi = "")
+    figures = (10 ** numeric.to_s.size) / 10
+    numeric = numeric.to_i
+    kanzi_string = [nil, "一", "二", "三", "四", "五", "六", "七", "八", "九"]
+    figures_string = { 1000 => "千", 100 => "百", 10 => "十", 1 => "" }
+    return kanzi + kanzi_string[numeric] if figures == 1
+
+    numeral = numeric / figures
+    if numeral > 1
+      to_kanzi(numeric - numeral * figures, "#{kanzi}#{kanzi_string[numeral]}#{figures_string[figures]}")
+    elsif numeral == 1
+      to_kanzi(numeric - numeral * figures, "#{kanzi}#{figures_string[figures]}")
+    else
+      to_kanzi(numeric - numeral * figures, kanzi)
+    end
   end
 
 end

data/lib/era_ja/version.rb

@@ -1,3 +1,3 @@
 module EraJa
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/spec/spec_helper.rb

@@ -33,8 +33,32 @@ shared_examples "should equal '平成240429'" do
   end
 end
 
+shared_examples "should equal '平成二十四年四月二十九日'" do
+  context "with '%O%JE年%Jm月%Jd日'" do
+    it { subject.to_era('%O%JE年%Jm月%Jd日').should eq '平成二十四年四月二十九日' }
+  end
+end
+
+shared_examples "should equal '2012年04月29日'" do
+  context "with '%y年%m月%d日'" do
+    it { subject.to_era('%Y年%m月%d日').should eq '2012年04月29日' }
+  end
+end
+
+shared_examples "should equal '二千十二年四月二十九日'" do
+  context "with '%Jy年%Jm月%Jd日'" do
+    it { subject.to_era('%JY年%Jm月%Jd日').should eq '二千十二年四月二十九日' }
+  end
+end
+
 shared_examples "should equal 'H01.01.08'" do
-  it { subject.to_era.should eq "H01.01.08" }
+  context "without argument" do
+    it { subject.to_era.should eq "H01.01.08" }
+  end
+
+  context "with '%O%JE.%Jm.%Jd'" do
+    it { subject.to_era('%O%JE.%Jm.%Jd').should eq "平成元.一.八" }
+  end
 end
 
 shared_examples "should equal 'S64.01.07'" do
@@ -80,6 +104,9 @@ shared_examples "2012,4,29" do
   include_examples "should equal '24.04.29'"
   include_examples "should equal '2404'"
   include_examples "should equal '平成240429'"
+  include_examples "should equal '2012年04月29日'"
+  include_examples "should equal '平成二十四年四月二十九日'"
+  include_examples "should equal '二千十二年四月二十九日'"
 end
 
 shared_examples "1989,1,8" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: era_ja
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,72 +9,88 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-14 00:00:00.000000000 Z
+date: 2013-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 10.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 10.0.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
-  name: growl
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: rb-fsevent
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.3
+- !ruby/object:Gem::Dependency
+  name: terminal-notifier-guard
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 1.5.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 1.5.3
 description: Convert to Japanese era.
 email:
 - tomiacannondale@gmail.com
@@ -113,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2746383159837241495
+      hash: -1339535651453117489
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -122,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2746383159837241495
+      hash: -1339535651453117489
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24