solaar 0.1.0 → 0.1.1

data/Gemfile

@@ -1,4 +1,7 @@
 source "http://rubygems.org"
 gemspec
 
-gem 'simplecov', :require => false, :group => :test
+group :test do
+  gem 'simplecov', :require => false
+  gem 'shoulda'
+end

data/HISTORY.md

@@ -1,7 +1,13 @@
 Changes
 ================
 
-0.1.0
+0.1.1 - February 26, 2012
+-----
+
+- Bump the version 0.1.1 adding test file
+
+
+0.1.0 - February 24, 2012
 -----
 
 - Initial release

data/README.md

@@ -1,7 +1,7 @@
 Solaar
-===========
+==========
 
-A Ruby gem to calculate the 24 solaar terms ("ki" in Japanese) until 2099.
+A Ruby gem to calculate the 24 solar terms ("ki" in Japanese) until 2099.
 
 Installation
 -------------
@@ -49,20 +49,15 @@ Usage
       => [{:date=>"2015-03-06", :ja=>"啓蟄", :en=>"Awakening of insects"},
           {:date=>"2015-03-21", :ja=>"春分", :en=>"Vernal equinox"}]
 
-      pp solaar.calc(year: 2100, term: "春分")
+      pp solaar.calc(year: 2012, term: "春分")
       => [{:date=>"2012-03-20", :ja=>"春分", :en=>"Vernal equinox"}]
 
       pp solaar.calc(year: 2100)
       => "Unable to calculate with the given year"
 
 
-TODO
----------
-
-* Write test
-
 Author
-==========
+---------
 
 azukiwasher, http://twitter.com/azukiwasher, azukiwasher AT higanworks.com
 

data/lib/solaar.rb

@@ -2,5 +2,5 @@ $:.unshift File.dirname(__FILE__)
 require 'solaar/terms'
 
 module Solaar
-  VERSION = Version = "0.1.0"
+  VERSION = Version = "0.1.1"
 end

data/lib/solaar/terms.rb

@@ -24,9 +24,9 @@ module Solaar
       {m: 10, day: 24.2487, adj: 0.242328, ja: '霜降', en: 'Frost descent'},
       {m: 11, day: 8.2396,  adj: 0.242469, ja: '立冬', en: 'Start of winter'},
       {m: 11, day: 23.1189, adj: 0.242592, ja: '小雪', en: 'Minor snow'},
-      {m: 12, day: 7.9152,  adj: 0.242689, ja: '大雪', en: 'Major  snow'},
+      {m: 12, day: 7.9152,  adj: 0.242689, ja: '大雪', en: 'Major snow'},
       {m: 12, day: 22.6587, adj: 0.242752, ja: '冬至', en: 'Winter solstice'}
-    ]
+  ]
 
   class Terms
 
@@ -37,11 +37,10 @@ module Solaar
     def calc(*args)
       opts = args.last.is_a?(Hash) ? args.pop : {}
       opts.merge!(year: self.year) if !opts.key?(:year)
-      return "Unable to calculate with the given year" if opts[:year].to_i > 2099
+      return "Unable to calculate with given year" if opts[:year].to_i > 2099
 
       if opts.key?(:month)
-        m = opts[:month].to_i
-        s = m*2-2
+        s = opts[:month].to_i*2-2
         self.solaarterms(opts, [s, s+1])
       else
         self.solaarterms(opts, nil)
@@ -63,7 +62,7 @@ module Solaar
 
     def formula(opts={})
       y = @year = opts[:year]
-      opts.key?(:month) ? month = opts[:month].to_i : month = opts[:m]
+      month = opts.key?(:month) ? opts[:month].to_i : opts[:m]
 
       y = month <= 2 ? y - 1 : y
       day = opts[:day] + opts[:adj] * (y - 1900) - ((y - 1900) / 4)

data/test/helper.rb

@@ -10,6 +10,7 @@ rescue Bundler::BundlerError => e
 end
 
 require 'test/unit'
+require 'shoulda'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 

data/test/test_solaar.rb

@@ -1,8 +1,60 @@
+# -*- encoding: UTF-8 -*-
 require 'helper'
 
 class TestSolaar < Test::Unit::TestCase
 
-  def test_solar_terms_with_given_year
-    true
+  context "a solaar" do
+    setup do
+      @solaar = Solaar::Terms.new
+    end
+
+    should "not calculate with give year" do
+      assert_equal "Unable to calculate with given year", @solaar.calc(year: 2100)
+    end
+
+    should "calculate a date with a year and a month" do
+      assert_equal "2012-03-05", @solaar.calc(year: 2012, month: 3).first[:date]
+      assert_equal "啓蟄", @solaar.calc(year: 2012, month: 3).first[:ja]
+      assert_equal "Awakening of insects", @solaar.calc(year: 2012, month: 3).first[:en]
+      assert_equal "2012-03-20", @solaar.calc(year: 2012, month: 3).last[:date]
+      assert_equal "春分", @solaar.calc(year: 2012, month: 3).last[:ja]
+      assert_equal "Vernal equinox", @solaar.calc(year: 2012, month: 3).last[:en]
+    end
+
+    should "calculate all dates for the given year" do
+      assert_equal 24, @solaar.calc(year: 2015).size
+      assert_equal "2015-01-06", @solaar.calc(year: 2015).first[:date]
+      assert_equal "小寒", @solaar.calc(year: 2015).first[:ja]
+      assert_equal "Minor cold", @solaar.calc(year: 2015).first[:en]
+      assert_equal "2015-12-22", @solaar.calc(year: 2015).last[:date]
+      assert_equal "冬至", @solaar.calc(year: 2015).last[:ja]
+      assert_equal "Winter solstice", @solaar.calc(year: 2015).last[:en]
+    end
+
+    should "calculate all dates for this year without year parameter" do
+      assert_equal 24, @solaar.calc.size
+      assert_equal "#{Time.now.year}", @solaar.calc.first[:date].split(/-/).first
+      assert_equal "#{Time.now.year}", @solaar.calc.first[:date].split(/-/).first
+    end
+
+    should "calculate all dates for the year and given month without year parameter" do
+      assert_equal 2, @solaar.calc(month: 3).size
+      assert_equal "#{Time.now.year}", @solaar.calc(month: 3).first[:date].split(/-/).first
+      assert_equal "#{Time.now.year}", @solaar.calc(month: 3).last[:date].split(/-/).first
+    end
+
+    should "calculate all dates for the year and given term without year parameter" do
+      assert_equal 1, @solaar.calc(term: '春分').size
+      assert_equal "#{Time.now.year}", @solaar.calc(term: "春分").first[:date].split(/-/).first
+      assert_equal "春分", @solaar.calc(term: "春分").last[:ja]
+      assert_equal "Vernal equinox", @solaar.calc(term: "春分").last[:en]
+    end
+
+    should "calculate all dates for the year and given term with a year parameter" do
+      assert_equal 1, @solaar.calc(year: 2015, term: '春分').size
+      assert_equal "2015", @solaar.calc(term: "春分").first[:date].split(/-/).first
+      assert_equal "春分", @solaar.calc(term: "春分").last[:ja]
+      assert_equal "Vernal equinox", @solaar.calc(term: "春分").last[:en]
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solaar
 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-02-24 00:00:00.000000000 Z
+date: 2012-02-26 00:00:00.000000000 Z
 dependencies: []
 description: Calculates the 24 solar terms until 2099
 email: