qreki 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3c8c8a6930e72ce608f7f9971faa4577378374a
-  data.tar.gz: fc9d775805f646e3334ea74dde4e741fcf99d3be
+  metadata.gz: 9bfe2c912114cb5bd3ce3b87093b63be6b126189
+  data.tar.gz: ef14bbf85a0a8fd94626900f87169ba83fe5ef4e
 SHA512:
-  metadata.gz: 2995387ad8efb7317bbd0ed8f7cd63652c2644639e2929315d6eedc9c5d2c87c6b1edea0aecf12cb6776d3cd3f44a81124eb103e836652e77368f2f861bf9297
-  data.tar.gz: 50988f79c2dcc15b521f296790f935055a2a09f9d373e50989260654ae53d66fcd6ba5d997a0684bf6a34b41e2c611053983a1c9f163b4ce0211a4a2a8ea3344
+  metadata.gz: 3bf1e9f58fe719034b981084bef470298a8dacbfe1c186aa36d1d9138bc351413d724a108789d8bf7eab8df9c354a1b0ab2658e15a06c42f7ccb99426c981fc5
+  data.tar.gz: 579e1064028e24c0f0d980dbc811a8dbde3986b32b5b8091fb8bd611f896d1116827a82b6f84b625f57b5e2b7fbe73abd56a276870e44c00c6a917faacc194e8

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+vendor

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'rspec', '~> 3.0'
+
 # Specify your gem's dependencies in qreki.gemspec
 gemspec

data/README.md

@@ -18,6 +18,10 @@ Or install it yourself as:
 
 ## Usage
 
+    >> require 'qreki'
+
+Calc qreki "旧暦" as:
+
     >> qreki = Qreki.calc(2013,11,7)
     >> qreki.year    # 2013
     >> qreki.uruu    # false
@@ -26,6 +30,20 @@ Or install it yourself as:
     >> qreki.rokuyou # "友引"
     >> qreki.sekki   # "立冬"
 
+Calc shunbun "春分の日" as:
+
+    >> sreki = Qreki.shunbun(2014)
+    >> sreki.year    # 2014
+    >> sreki.month   # 3
+    >> sreki.day     # 21
+
+Calc shuubun "秋分の日" as:
+
+    >> sreki = Qreki.shuubun(2014)
+    >> sreki.year    # 2014
+    >> sreki.month   # 9
+    >> sreki.day     # 23
+
 ## Contributing
 
 1. Fork it

data/lib/qreki.rb

@@ -9,6 +9,10 @@ require "date"
 
 module Qreki
 
+  class Srk
+    attr_accessor :year, :month, :day
+  end
+
   class Qrk
     attr_accessor :year, :uruu, :month, :day, :rokuyou, :sekki
   end
@@ -30,7 +34,7 @@ module Qreki
   #    q.sekki : 二十四節気
   #=========================================================================
   def self.calc(year, month, day)
-    return calc_from_date(Date.new(year, month, day))
+    calc_from_date(Date.new(year, month, day))
   end
 
   def self.calc_from_date(tm)
@@ -42,7 +46,7 @@ module Qreki
     qreki.day     = array[3]
     qreki.rokuyou = rokuyou(tm.year, tm.month, tm.day)
     qreki.sekki   = sekki(tm.year, tm.month, tm.day)
-    return qreki
+    qreki
   end
 
   # =========================================================================
@@ -189,7 +193,7 @@ module Qreki
       kyureki[0] -= 1
     end
 
-    return [kyureki[0], kyureki[1], kyureki[2], kyureki[3]]
+    [kyureki[0], kyureki[1], kyureki[2], kyureki[3]]
   end
 
   # =========================================================================
@@ -271,7 +275,7 @@ module Qreki
     #  戻り値の作成
     #    時刻引数を合成し、戻り値（JSTユリウス日）とする
     # -----------------------------------------------------------------------
-    return tm2 + tm1 - $tz
+    tm2 + tm1 - $tz
   end
 
   # =========================================================================
@@ -381,7 +385,7 @@ module Qreki
     #  戻り値の作成
     #    時刻引数を合成し、戻り値（ユリウス日）とする
     # -----------------------------------------------------------------------
-    return tm2 + tm1 - $tz
+    tm2 + tm1 - $tz
   end
 
   # =========================================================================
@@ -426,7 +430,7 @@ module Qreki
     ang = normalization_angle( ang + 280.4659 )
     th  = normalization_angle( th + ang )
 
-    return th
+    th
   end
 
   # =========================================================================
@@ -505,7 +509,7 @@ module Qreki
     ang = normalization_angle( ang + 218.3162 )
     th  = normalization_angle( th + ang )
 
-    return th
+    th
   end
 
   #=========================================================================
@@ -534,7 +538,7 @@ module Qreki
 
     jd += t
 
-    return jd
+    jd
   end
 
   #=========================================================================
@@ -577,7 +581,7 @@ module Qreki
     time[4] = ( (tm - 3600.0 * time[3] ) / 60.0 ).to_i
     time[5] = (  tm - 3600.0 * time[3] - 60 * time[4] ).to_i
 
-    return time
+    time
   end
 
   #=========================================================================
@@ -591,7 +595,7 @@ module Qreki
 
     q_yaer, uruu, q_mon, q_day = calc_kyureki(year, mon, day)
 
-    return rokuyou[ (q_mon + q_day) % 6 ]
+    rokuyou[ (q_mon + q_day) % 6 ]
   end
 
   #=========================================================================
@@ -639,4 +643,24 @@ module Qreki
       return ''
     end
   end
+
+  def self.shunbun(year)
+    day = (20.8431 + 0.242194 * ( year - 1980 ) - ( year - 1980 ) / 4).to_i
+
+    sreki = Srk.new
+    sreki.year  = year
+    sreki.month = 3
+    sreki.day   = day
+    sreki
+  end
+
+  def self.shuubun(year)
+    day = (23.2488 + 0.242194 * ( year - 1980 ) - ( year - 1980 ) / 4).to_i
+
+    sreki = Srk.new
+    sreki.year  = year
+    sreki.month = 9
+    sreki.day   = day
+    sreki
+  end
 end

data/lib/qreki/version.rb

@@ -1,3 +1,3 @@
 module Qreki
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/qreki_spec.rb

@@ -11,41 +11,71 @@ describe Qreki do
 
   it "should calc eql 2013,11,1 => 2013,false,9,28 赤口" do
     @q = Qreki.calc(2013,11,1)
-    @q.year.should    eql 2013
-    @q.uruu.should    eql false
-    @q.month.should   eql 9
-    @q.day.should     eql 28
-    @q.rokuyou.should eql "赤口"
-    @q.sekki.should   eql ""
+    expect(@q.year).to    eql 2013
+    expect(@q.uruu).to    eql false
+    expect(@q.month).to   eql 9
+    expect(@q.day).to     eql 28
+    expect(@q.rokuyou).to eql "赤口"
+    expect(@q.sekki).to   eql ""
   end
 
   it "should calc eql 2014,11,1 => 2014,true, 9,9 大安" do
     @q = Qreki.calc(2014,11,1)
-    @q.year.should    eql 2014
-    @q.uruu.should    eql true
-    @q.month.should   eql 9
-    @q.day.should     eql 9
-    @q.rokuyou.should eql "大安"
-    @q.sekki.should   eql ""
+    expect(@q.year).to    eql 2014
+    expect(@q.uruu).to    eql true
+    expect(@q.month).to   eql 9
+    expect(@q.day).to     eql 9
+    expect(@q.rokuyou).to eql "大安"
+    expect(@q.sekki).to   eql ""
   end
 
   it "should calc eql 2014,3,30 => 2014,false,2,30" do
     @q = Qreki.calc(2014,3,30)  # => 2014,false,2,30
-    @q.year.should    eql 2014
-    @q.uruu.should    eql false
-    @q.month.should   eql 2
-    @q.day.should     eql 30
-    @q.rokuyou.should eql "先勝"
-    @q.sekki.should   eql ""
+    expect(@q.year).to    eql 2014
+    expect(@q.uruu).to    eql false
+    expect(@q.month).to   eql 2
+    expect(@q.day).to     eql 30
+    expect(@q.rokuyou).to eql "先勝"
+    expect(@q.sekki).to   eql ""
   end
 
   it "should calc_from_date eql 2013,11,7 => 2013,false,10,5" do
     @q = Qreki.calc_from_date(Date.new(2013,11,7))
-    @q.year.should  eql 2013
-    @q.uruu.should  eql false
-    @q.month.should eql 10
-    @q.day.should   eql 5
-    @q.rokuyou.should eql "友引"
-    @q.sekki.should   eql "立冬"
-  end
-end
+    expect(@q.year).to  eql 2013
+    expect(@q.uruu).to  eql false
+    expect(@q.month).to eql 10
+    expect(@q.day).to   eql 5
+    expect(@q.rokuyou).to eql "友引"
+    expect(@q.sekki).to   eql "立冬"
+  end
+
+
+  it "should shunbun eql 2014 => 2014,3,21" do
+    @q = Qreki.shunbun(2014)  # => 2014,3,21
+    expect(@q.year).to    eql 2014
+    expect(@q.month).to   eql 3
+    expect(@q.day).to     eql 21
+  end
+
+  it "should shunbun eql 2030 => 2030,3,20" do
+    @q = Qreki.shunbun(2030)  # => 2030,3,20
+    expect(@q.year).to    eql 2030
+    expect(@q.month).to   eql 3
+    expect(@q.day).to     eql 20
+  end
+
+
+  it "should shuubun eql 2014 => 2014,9,23" do
+    @q = Qreki.shuubun(2014)  # => 2014,9,23
+    expect(@q.year).to    eql 2014
+    expect(@q.month).to   eql 9
+    expect(@q.day).to     eql 23
+  end
+
+  it "should shuubun eql 2030 => 2030,9,23" do
+    @q = Qreki.shuubun(2030)  # => 2030,9,23
+    expect(@q.year).to    eql 2030
+    expect(@q.month).to   eql 9
+    expect(@q.day).to     eql 23
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qreki
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Masaki Ozawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: qreki