warekky 0.1.0 → 0.1.1

data/README.rdoc

@@ -8,6 +8,9 @@ warekkyは和暦サポートのためのライブラリです。
 
 == Simple Usage
  $ irb
+ require 'rubygems'
+ #=> false
+
  require 'warekky'
  #=> true
  

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/warekky.rb

@@ -24,7 +24,7 @@ module Warekky
     def strftime(d, format)
       era_group ? 
         era_group.strftime(d, format) : 
-        d.strftime(format)
+        try_without(d, :strftime, format)
     end
 
     def parse(str, options = {})

data/lib/warekky/ja.rb

@@ -17,7 +17,7 @@ module Warekky
     # strftimeで使える記号
     format('%G'){|era, era_year| era[:long] if era} # 明治/大正/昭和/平成
     format('%g'){|era, era_year| era.sign if era}   # M/T/S/H
-    format('%n'){|era, era_year| '%02d' % era_year} # (元号での)年度
+    format('%N'){|era, era_year| '%02d' % era_year} # (元号での)年度
 
     # parseで使われる元号毎の正規表現
     parse_regexp do |era|

data/spec/core_ext/with_date_spec.rb

@@ -14,7 +14,7 @@ describe "Warekky" do
     end
 
     it "with alphabet era name (アルファベット表記の元号)" do
-      fmt = '%g%n/%m/%d'
+      fmt = '%g%N/%m/%d'
       Date.new(1867,12,31).strftime(fmt).should == "1867/12/31"
       Date.new(1868, 1, 1).strftime(fmt).should == "M01/01/01"
       Date.new(1912, 7,29).strftime(fmt).should == "M45/07/29"
@@ -28,7 +28,7 @@ describe "Warekky" do
     end
 
     it "with chinese charactor era name (漢字表記の元号)" do
-      fmt = '%G%n/%m/%d'
+      fmt = '%G%N/%m/%d'
       Date.new(1867,12,31).strftime(fmt).should == "1867/12/31"
       Date.new(1868, 1, 1).strftime(fmt).should == "明治01/01/01"
       Date.new(1912, 7,29).strftime(fmt).should == "明治45/07/29"

data/spec/core_ext/with_date_time_spec.rb

@@ -14,7 +14,7 @@ describe "Warekky" do
     end
 
     it "with alphabet era name (アルファベット表記の元号)" do
-      fmt = '%g%n/%m/%d'
+      fmt = '%g%N/%m/%d'
       DateTime.new(1867,12,31).strftime(fmt).should == "1867/12/31"
       DateTime.new(1868, 1, 1).strftime(fmt).should == "M01/01/01"
       DateTime.new(1912, 7,29).strftime(fmt).should == "M45/07/29"
@@ -28,7 +28,7 @@ describe "Warekky" do
     end
 
     it "with chinese charactor era name (漢字表記の元号)" do
-      fmt = '%G%n/%m/%d'
+      fmt = '%G%N/%m/%d'
       DateTime.new(1867,12,31).strftime(fmt).should == "1867/12/31"
       DateTime.new(1868, 1, 1).strftime(fmt).should == "明治01/01/01"
       DateTime.new(1912, 7,29).strftime(fmt).should == "明治45/07/29"

data/spec/core_ext/with_time_spec.rb

@@ -14,7 +14,7 @@ describe "Warekky" do
     end
 
     it "with alphabet era name (アルファベット表記の元号)" do
-      fmt = '%g%n/%m/%d'
+      fmt = '%g%N/%m/%d'
       Time.local(1867,12,31).strftime(fmt).should == "1867/12/31"
       Time.local(1868, 1, 1).strftime(fmt).should == "M01/01/01"
       Time.local(1912, 7,29).strftime(fmt).should == "M45/07/29"
@@ -28,7 +28,7 @@ describe "Warekky" do
     end
 
     it "with chinese charactor era name (漢字表記の元号)" do
-      fmt = '%G%n/%m/%d'
+      fmt = '%G%N/%m/%d'
       Time.local(1867,12,31).strftime(fmt).should == "1867/12/31"
       Time.local(1868, 1, 1).strftime(fmt).should == "明治01/01/01"
       Time.local(1912, 7,29).strftime(fmt).should == "明治45/07/29"

data/spec/ja/with_date_spec.rb

@@ -14,7 +14,7 @@ describe "Warekky" do
     end
 
     it "with alphabet era name (アルファベット表記の元号)" do
-      fmt = '%g%n/%m/%d'
+      fmt = '%g%N/%m/%d'
       Warekky.strftime(Date.new(1867,12,31), fmt).should == "1867/12/31"
       Warekky.strftime(Date.new(1868, 1, 1), fmt).should == "M01/01/01"
       Warekky.strftime(Date.new(1912, 7,29), fmt).should == "M45/07/29"
@@ -28,7 +28,7 @@ describe "Warekky" do
     end
 
     it "with chinese charactor era name (漢字表記の元号)" do
-      fmt = '%G%n/%m/%d'
+      fmt = '%G%N/%m/%d'
       Warekky.strftime(Date.new(1867,12,31), fmt).should == "1867/12/31"
       Warekky.strftime(Date.new(1868, 1, 1), fmt).should == "明治01/01/01"
       Warekky.strftime(Date.new(1912, 7,29), fmt).should == "明治45/07/29"
@@ -40,6 +40,20 @@ describe "Warekky" do
       Warekky.strftime(Date.new(2010, 6, 9), fmt).should == "平成22/06/09"
       Warekky.strftime(Date.new(2050,12,31), fmt).should == "平成62/12/31"
     end
+
+    it "with chinese charactor era name (漢字表記の元号) %nの改行入り" do
+      fmt = '%G%N年%n%m月%n%d日'
+      Warekky.strftime(Date.new(1867,12,31), fmt).should == "1867年\n12月\n31日"
+      Warekky.strftime(Date.new(1868, 1, 1), fmt).should == "明治01年\n01月\n01日"
+      Warekky.strftime(Date.new(1912, 7,29), fmt).should == "明治45年\n07月\n29日"
+      Warekky.strftime(Date.new(1912, 7,30), fmt).should == "大正01年\n07月\n30日"
+      Warekky.strftime(Date.new(1926,12,24), fmt).should == "大正15年\n12月\n24日"
+      Warekky.strftime(Date.new(1926,12,25), fmt).should == "昭和01年\n12月\n25日"
+      Warekky.strftime(Date.new(1989, 1, 7), fmt).should == "昭和64年\n01月\n07日"
+      Warekky.strftime(Date.new(1989, 1, 8), fmt).should == "平成01年\n01月\n08日"
+      Warekky.strftime(Date.new(2010, 6, 9), fmt).should == "平成22年\n06月\n09日"
+      Warekky.strftime(Date.new(2050,12,31), fmt).should == "平成62年\n12月\n31日"
+    end
   end
 
   describe :parse do

data/spec/ja/with_date_time_spec.rb

@@ -14,7 +14,7 @@ describe "Warekky" do
     end
 
     it "with alphabet era name (アルファベット表記の元号)" do
-      fmt = '%g%n/%m/%d'
+      fmt = '%g%N/%m/%d'
       Warekky.strftime(DateTime.new(1867,12,31), fmt).should == "1867/12/31"
       Warekky.strftime(DateTime.new(1868, 1, 1), fmt).should == "M01/01/01"
       Warekky.strftime(DateTime.new(1912, 7,29), fmt).should == "M45/07/29"
@@ -28,7 +28,7 @@ describe "Warekky" do
     end
 
     it "with chinese charactor era name (漢字表記の元号)" do
-      fmt = '%G%n/%m/%d'
+      fmt = '%G%N/%m/%d'
       Warekky.strftime(DateTime.new(1867,12,31), fmt).should == "1867/12/31"
       Warekky.strftime(DateTime.new(1868, 1, 1), fmt).should == "明治01/01/01"
       Warekky.strftime(DateTime.new(1912, 7,29), fmt).should == "明治45/07/29"
@@ -40,6 +40,20 @@ describe "Warekky" do
       Warekky.strftime(DateTime.new(2010, 6, 9), fmt).should == "平成22/06/09"
       Warekky.strftime(DateTime.new(2050,12,31), fmt).should == "平成62/12/31"
     end
+
+    it "with chinese charactor era name (漢字表記の元号) %nの改行入り" do
+      fmt = '%G%N年%n%m月%n%d日'
+      Warekky.strftime(DateTime.new(1867,12,31), fmt).should == "1867年\n12月\n31日"
+      Warekky.strftime(DateTime.new(1868, 1, 1), fmt).should == "明治01年\n01月\n01日"
+      Warekky.strftime(DateTime.new(1912, 7,29), fmt).should == "明治45年\n07月\n29日"
+      Warekky.strftime(DateTime.new(1912, 7,30), fmt).should == "大正01年\n07月\n30日"
+      Warekky.strftime(DateTime.new(1926,12,24), fmt).should == "大正15年\n12月\n24日"
+      Warekky.strftime(DateTime.new(1926,12,25), fmt).should == "昭和01年\n12月\n25日"
+      Warekky.strftime(DateTime.new(1989, 1, 7), fmt).should == "昭和64年\n01月\n07日"
+      Warekky.strftime(DateTime.new(1989, 1, 8), fmt).should == "平成01年\n01月\n08日"
+      Warekky.strftime(DateTime.new(2010, 6, 9), fmt).should == "平成22年\n06月\n09日"
+      Warekky.strftime(DateTime.new(2050,12,31), fmt).should == "平成62年\n12月\n31日"
+    end
   end
 
   describe :parse do

data/spec/ja/with_time_spec.rb

@@ -14,7 +14,7 @@ describe "Warekky" do
     end
 
     it "with alphabet era name (アルファベット表記の元号)" do
-      fmt = '%g%n/%m/%d'
+      fmt = '%g%N/%m/%d'
       Warekky.strftime(Time.local(1867,12,31), fmt).should == "1867/12/31"
       Warekky.strftime(Time.local(1868, 1, 1), fmt).should == "M01/01/01"
       Warekky.strftime(Time.local(1912, 7,29), fmt).should == "M45/07/29"
@@ -28,7 +28,7 @@ describe "Warekky" do
     end
 
     it "with chinese charactor era name (漢字表記の元号)" do
-      fmt = '%G%n/%m/%d'
+      fmt = '%G%N/%m/%d'
       Warekky.strftime(Time.local(1867,12,31), fmt).should == "1867/12/31"
       Warekky.strftime(Time.local(1868, 1, 1), fmt).should == "明治01/01/01"
       Warekky.strftime(Time.local(1912, 7,29), fmt).should == "明治45/07/29"
@@ -40,6 +40,20 @@ describe "Warekky" do
       Warekky.strftime(Time.local(2010, 6, 9), fmt).should == "平成22/06/09"
       Warekky.strftime(Time.local(2050,12,31), fmt).should == "平成62/12/31"
     end
+
+    it "with chinese charactor era name (漢字表記の元号) %nの改行入り" do
+      fmt = '%G%N年%n%m月%n%d日'
+      Warekky.strftime(Time.local(1867,12,31), fmt).should == "1867年\n12月\n31日"
+      Warekky.strftime(Time.local(1868, 1, 1), fmt).should == "明治01年\n01月\n01日"
+      Warekky.strftime(Time.local(1912, 7,29), fmt).should == "明治45年\n07月\n29日"
+      Warekky.strftime(Time.local(1912, 7,30), fmt).should == "大正01年\n07月\n30日"
+      Warekky.strftime(Time.local(1926,12,24), fmt).should == "大正15年\n12月\n24日"
+      Warekky.strftime(Time.local(1926,12,25), fmt).should == "昭和01年\n12月\n25日"
+      Warekky.strftime(Time.local(1989, 1, 7), fmt).should == "昭和64年\n01月\n07日"
+      Warekky.strftime(Time.local(1989, 1, 8), fmt).should == "平成01年\n01月\n08日"
+      Warekky.strftime(Time.local(2010, 6, 9), fmt).should == "平成22年\n06月\n09日"
+      Warekky.strftime(Time.local(2050,12,31), fmt).should == "平成62年\n12月\n31日"
+    end
   end
 
   describe :parse do

data/spec/warekky/era_group_spec.rb

@@ -12,7 +12,7 @@ class ChineseTest < Warekky::EraGroup
   end
 
   format('%G'){|era, era_year| era.sign if era}
-  format('%n'){|era, era_year| era_year}
+  format('%N'){|era, era_year| era_year}
 
   era('1862/01/01', '1974/12/31', :tongzhi , '同治')
   era('1875/01/01', '1908/12/31', :guangxu , '光緒')
@@ -109,12 +109,12 @@ describe Warekky::EraGroup do
       regexp1 = ChineseTest.formats_regexp
       regexp1.match("%g").should be_false
       regexp1.match("%G").should be_true
-      regexp1.match("%N").should be_false
-      regexp1.match("%n").should be_true
+      regexp1.match("%n").should be_false
+      regexp1.match("%N").should be_true
       regexp1.match("%y").should be_false
       regexp1.match("%Y").should be_false
 
-      regexp1.match("%g%n/%m/%d").should be_true
+      regexp1.match("%g%N/%m/%d").should be_true
     end
   end
 

data/spec/warekky_spec.rb

@@ -10,8 +10,17 @@ describe Warekky::Era do
   describe :strftime do
     it "invoke original method" do
       d = Date.new(2010, 6, 10)
-      d.should_receive(:strftime).with("%Y/%m/%d")
-      Warekky.strftime(d, "%Y/%m/%d")
+      Warekky.strftime(d, "%Y/%m/%d").should == "2010/06/10"
+    end
+
+    it "%n means newline" do
+      d = Date.new(2010, 6, 10)
+      begin
+        Warekky.strftime(d, "%Y%n%m%n%d").should == "2010\n06\n10"
+      rescue Exception => e
+        puts e.backtrace.join("\n  ")
+        raise
+      end
     end
   end
 

data/warekky.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{warekky}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Takeshi AKIMA"]
-  s.date = %q{2010-06-10}
+  s.date = %q{2010-06-17}
   s.description = %q{Japanese Era(年号) library and Time, Date, DateTime extensions.}
   s.email = %q{akm2000@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: warekky
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Takeshi AKIMA
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-10 00:00:00 +09:00
+date: 2010-06-17 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency