era_ja 0.2.0 → 0.2.1

data/Guardfile

@@ -2,7 +2,7 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard 'rspec', :cli => '--color', :all_after_pass => false do
+guard 'rspec', :cmd => 'rspec --color --format progress', :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

@@ -16,6 +16,10 @@
 
     $ gem install era_ja
 
+### ruby version ###
+
+era_jaはruby1.9.3とruby2.0.0でテストをしています。
+
 ## Usage
 
 ### フォーマット文字列
@@ -70,7 +74,7 @@ EraJa#to_eraメソッドでの追加のフォーマット文字列は以下の
 
 元号については以下の問題点があります。
 
-* 明治の開始を1968年9月8日としていますが旧暦での日付です。
+* 明治の開始を1868年9月8日としていますが旧暦での日付です。
 * 大正、昭和の開始日はそれぞれ明治、大正の最終日と同日です。
   * [昭和ト改元](http://ja.wikisource.org/wiki/%e6%98%ad%e5%92%8c%e3%83%88%e6%94%b9%e5%85%83)
   * [大正十五年十二月ニ十五日以後ヲ改メテ昭和元年ト爲ス](http://ja.wikisource.org/wiki/%e5%a4%a7%e6%ad%a3%e5%8d%81%e4%ba%94%e5%b9%b4%e5%8d%81%e4%ba%8c%e6%9c%88%e3%83%8b%e5%8d%81%e4%ba%94%e6%97%a5%e4%bb%a5%e5%be%8c%e3%83%b2%e6%94%b9%e3%83%a1%e3%83%86%e6%98%ad%e5%92%8c%e5%85%83%e5%b9%b4%e3%83%88%e7%88%b2%e3%82%b9)

data/README.md

@@ -16,6 +16,10 @@ Or install it yourself as:
 
     $ gem install era_ja
 
+### ruby version ###
+
+era_ja was run test on ruby 1.9.3 and ruby 2.0.0
+
 ## Usage
 
 ### format string
@@ -70,7 +74,7 @@ Report issues and feature requests to github Issues. https://github.com/tomiacan
 
 I think about the era and there is a problem in the following.
 
-* The date in the lunar calendar Although it is September 8, 1968 the start of the Meiji era.
+* The date in the lunar calendar Although it is September 8, 1868 the start of the Meiji era.
 * Start date Taisho, Showa is the same day as the last day of the Meiji, Taisho, respectively.
   * [昭和ト改元](http://ja.wikisource.org/wiki/%e6%98%ad%e5%92%8c%e3%83%88%e6%94%b9%e5%85%83)
   * [大正十五年十二月ニ十五日以後ヲ改メテ昭和元年ト爲ス](http://ja.wikisource.org/wiki/%e5%a4%a7%e6%ad%a3%e5%8d%81%e4%ba%94%e5%b9%b4%e5%8d%81%e4%ba%8c%e6%9c%88%e3%83%8b%e5%8d%81%e4%ba%94%e6%97%a5%e4%bb%a5%e5%be%8c%e3%83%b2%e6%94%b9%e3%83%a1%e3%83%86%e6%98%ad%e5%92%8c%e5%85%83%e5%b9%b4%e3%83%88%e7%88%b2%e3%82%b9)

data/era_ja.gemspec

@@ -15,9 +15,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = EraJa::VERSION
 
-  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 "rake", '~> 10.1.0'
+  gem.add_development_dependency 'rspec', '~> 2.14.1'
+  gem.add_development_dependency "guard-rspec", '~> 4.0.3'
   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

@@ -22,7 +22,7 @@ module EraJa
     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"
+        raise "#to_era is expeted later in 1868,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)

data/lib/era_ja/version.rb

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

data/spec/date_spec.rb

@@ -47,8 +47,8 @@ describe Date do
     end
 
     context "date is 1868,9,7" do
-      it { expect { Date.new(1868,9,7).to_era }.
-        to raise_error(RuntimeError, "#to_era is expeted later in 1968,9,8") }
+      subject { Date.new(1868,9,7) }
+      include_examples "1868,9,7"
     end
 
   end

data/spec/spec_helper.rb

@@ -97,6 +97,9 @@ shared_examples "should equal 'M01.09.08'" do
   it { subject.to_era.should eq "M01.09.08" }
 end
 
+shared_examples "should raise error" do
+  it { expect {subject.to_era}.to raise_error(RuntimeError, "#to_era is expeted later in 1868,9,8") }
+end
 
 shared_examples "2012,4,29" do
   include_examples "should equal 'H24.04.29'"
@@ -139,3 +142,7 @@ end
 shared_examples "1868,9,8" do
   include_examples "should equal 'M01.09.08'"
 end
+
+shared_examples "1868,9,7" do
+  include_examples "should raise error"
+end

data/spec/time_spec.rb

@@ -47,8 +47,8 @@ describe Time do
     end
 
     context "time is 1868,9,7" do
-      it { expect { Time.mktime(1868,9,7).to_era }.
-        to raise_error(RuntimeError, "#to_era is expeted later in 1968,9,8") }
+      subject { Time.mktime(1868,9,7) }
+      include_examples "1868,9,7"
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: era_ja
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-10 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: 10.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: 10.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 4.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 4.0.3
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
@@ -129,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1339535651453117489
+      hash: -1696226539030765327
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -138,10 +138,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1339535651453117489
+      hash: -1696226539030765327
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Convert Date or Time instance to String of Japanese era.