era_ja 0.1.0 → 0.1.1

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 vendor/bundle
+.DS_Store

data/lib/era_ja.rb

@@ -15,17 +15,18 @@ module EraJa
   # @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') }
+      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') }
+      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') }
+      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') }
+      strftime(format).sub(/%E /, format_year(year - 1988)).sub(/%o /i) { format_era('H') }
     end
   end
 

data/lib/era_ja/version.rb

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

data/spec/spec_helper.rb

@@ -21,6 +21,18 @@ shared_examples "should equal '24.04.29'" do
   end
 end
 
+shared_examples "should equal '2404'" do
+  context "with '%E%m'" do
+    it { subject.to_era("%E%m").should eq "2404" }
+  end
+end
+
+shared_examples "should equal '平成240429'" do
+  context "with '%O%E%m%d'" do
+    it { subject.to_era("%O%E%m%d").should eq '平成240429' }
+  end
+end
+
 shared_examples "should equal 'H01.01.08'" do
   it { subject.to_era.should eq "H01.01.08" }
 end
@@ -66,6 +78,8 @@ shared_examples "2012,4,29" do
   include_examples "should equal 'H24.04.29'"
   include_examples "should equal '平成24年04月29日'"
   include_examples "should equal '24.04.29'"
+  include_examples "should equal '2404'"
+  include_examples "should equal '平成240429'"
 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.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-09 00:00:00.000000000 Z
+date: 2012-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -113,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4408163875494566668
+      hash: -2746383159837241495
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4408163875494566668
+      hash: -2746383159837241495
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24