solaar 0.1.1 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 96a05f47cecbbcf5819cc3339bdd744a3d37dcd8
+  data.tar.gz: f48d6c69a6270ecd1ac8c418a90c11b6ad377ad2
+SHA512:
+  metadata.gz: 72d7111940c4a1ca1a372331b061d51b3e9fea123b3acd3a7b893d3cd1890c00e9179d1f3fd8f9e8e2120b18f04fa4d1f3c999d47a59dbcb7b71e5fad92cf6ac
+  data.tar.gz: 00942602a935b1d470d3cfd429f2ff66a3b9aa7e90df4f96eff36c2603b0e3316f80c264c4cbdf4ac2299bc2ccb5bef9cc8d955f2afd2ab25d9033f38cd9f27d

data/.gitignore

@@ -50,4 +50,3 @@ pkg
 
 # For Gemfile.lock
 *.gem
-Gemfile.lock

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

data/Gemfile

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

data/Gemfile.lock

@@ -0,0 +1,57 @@
+PATH
+  remote: .
+  specs:
+    solaar (0.2.0)
+      oj
+      sinatra
+      sinatra-contrib
+      thin
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    backports (3.6.0)
+    daemons (1.1.9)
+    diff-lcs (1.2.5)
+    eventmachine (1.0.3)
+    multi_json (1.9.2)
+    oj (2.7.2)
+    rack (1.5.2)
+    rack-protection (1.5.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rake (10.2.2)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    sinatra (1.4.5)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    sinatra-contrib (1.4.2)
+      backports (>= 2.0)
+      multi_json
+      rack-protection
+      rack-test
+      sinatra (~> 1.4.0)
+      tilt (~> 1.3)
+    thin (1.6.2)
+      daemons (>= 1.0.9)
+      eventmachine (>= 1.0.0)
+      rack (>= 1.0.0)
+    tilt (1.4.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  rake
+  rspec
+  solaar!

data/Procfile

@@ -0,0 +1 @@
+web: bundle exec bin/solaar

data/README.md

@@ -1,7 +1,7 @@
 Solaar
 ==========
 
-A Ruby gem to calculate the 24 solar terms ("ki" in Japanese) until 2099.
+A Ruby gem to calculate the 24 solar terms ("24節気" in Japanese) until 2099.
 
 Installation
 -------------
@@ -13,10 +13,10 @@ Usage
     require 'solaar'
     require 'pp'
 
-    solaar = Solaar::Terms.new
+    solaar = Solaar::Term.new
 
     pp solaar.calc(year: 2012)
-    => [{:date=>"2012-01-06", :ja=>"小寒", :en=>"Minor cold"},
+    #=> [{:date=>"2012-01-06", :ja=>"小寒", :en=>"Minor cold"},
         {:date=>"2012-01-21", :ja=>"大寒", :en=>"Major cold"},
         {:date=>"2012-02-04", :ja=>"立春", :en=>"Start of spring"},
         {:date=>"2012-02-19", :ja=>"雨水", :en=>"Rain water"},
@@ -41,19 +41,19 @@ Usage
         {:date=>"2012-12-07", :ja=>"大雪", :en=>"Major  snow"},
         {:date=>"2012-12-21", :ja=>"冬至", :en=>"Winter solstice"}]
 
-      pp solaar.calc(year: 2012, month: 3)
-      => [{:date=>"2012-03-05", :ja=>"啓蟄", :en=>"Awakening of insects"},
-          {:date=>"2012-03-20", :ja=>"春分", :en=>"Vernal equinox"}]
+    pp solaar.calc(year: 2012, month: 3)
+    #=> [{:date=>"2012-03-05", :ja=>"啓蟄", :en=>"Awakening of insects"},
+        {:date=>"2012-03-20", :ja=>"春分", :en=>"Vernal equinox"}]
 
-      pp solaar.calc(year: 2015, month: 3)
-      => [{:date=>"2015-03-06", :ja=>"啓蟄", :en=>"Awakening of insects"},
-          {:date=>"2015-03-21", :ja=>"春分", :en=>"Vernal equinox"}]
+    pp solaar.calc(year: 2015, month: 3)
+    #=> [{:date=>"2015-03-06", :ja=>"啓蟄", :en=>"Awakening of insects"},
+        {:date=>"2015-03-21", :ja=>"春分", :en=>"Vernal equinox"}]
 
-      pp solaar.calc(year: 2012, term: "春分")
-      => [{:date=>"2012-03-20", :ja=>"春分", :en=>"Vernal equinox"}]
+    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"
+    pp solaar.calc(year: 2100)
+    #=> "Unable to calculate with the given year"
 
 
 Author

data/Rakefile

@@ -1,10 +1,5 @@
 # encoding: utf-8
+require 'rspec/core/rake_task'
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-task :default => :test
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec

data/bin/solaar

@@ -0,0 +1,47 @@
+#!/usr/bin/env ruby
+
+require 'sinatra/base'
+require 'sinatra/json'
+require 'oj'
+require_relative '../lib/solaar'
+
+class App < Sinatra::Base
+  set :show_exceptions, :after_handler
+  solaar = Solaar::Term.new
+
+  get '/' do
+    json solaar.calc
+  end
+
+  get '/:year' do
+    year = params[:year].to_i
+    json solaar.calc(year: year)
+  end
+
+  get '/:year/:month_or_term' do
+    year = params[:year].to_i
+    param = params[:month_or_term].to_i 
+    if param == 0
+      json solaar.calc(year: year, term: params[:month_or_term])
+    else
+      json solaar.calc(year: year, month: param)
+    end
+  end
+
+  error Sinatra::NotFound do
+    status 404
+    json({ error: "Resource not found" })
+  end
+
+  error ArgumentError do
+    status 400
+    json({ error: env['sinatra.error'].message })
+  end
+
+  error Solaar::Exception::OutOfRange do
+    status 400
+    json({ error: env['sinatra.error'].message })
+  end
+end
+
+App.run!

data/lib/solaar.rb

@@ -1,6 +1,3 @@
 $:.unshift File.dirname(__FILE__)
-require 'solaar/terms'
-
-module Solaar
-  VERSION = Version = "0.1.1"
-end
+require 'solaar/version'
+require 'solaar/term'

data/lib/solaar/exception.rb

@@ -0,0 +1,8 @@
+# encoding: utf-8
+
+module Solaar
+  class Exception
+    class Error < StandardError ; end
+    class OutOfRange < Error ; end
+  end
+end

data/lib/solaar/table.rb

@@ -0,0 +1,30 @@
+# encoding: UTF-8
+
+module Solaar
+  Table = [
+    {m: 1,  day: 6.3811,  adj: 0.242778, ja: '小寒', en: 'Minor cold'},
+    {m: 1,  day: 21.1046, adj: 0.242765, ja: '大寒', en: 'Major cold'},
+    {m: 2,  day: 4.8693,  adj: 0.242713, ja: '立春', en: 'Start of spring'},
+    {m: 2,  day: 19.7062, adj: 0.242627, ja: '雨水', en: 'Rain water'},
+    {m: 3,  day: 6.3968,  adj: 0.242512, ja: '啓蟄', en: 'Awakening of insects'},
+    {m: 3,  day: 21.4471, adj: 0.242377, ja: '春分', en: 'Vernal equinox'},
+    {m: 4,  day: 5.628,   adj: 0.242231, ja: '清明', en: 'Clear and bright'},
+    {m: 4,  day: 20.9375, adj: 0.242083, ja: '穀雨', en: 'Grain rainain'},
+    {m: 5,  day: 6.3771,  adj: 0.241945, ja: '立夏', en: 'Start of summer'},
+    {m: 5,  day: 21.93,   adj: 0.241825, ja: '小満', en: 'Grain full'},
+    {m: 6,  day: 6.5733,  adj: 0.241731, ja: '芒種', en: 'Grain in ear'},
+    {m: 6,  day: 22.2747, adj: 0.241669, ja: '夏至', en: 'Summer solstice'},
+    {m: 7,  day: 8.0091,  adj: 0.241642, ja: '小暑', en: 'Minor heat'},
+    {m: 7,  day: 23.7317, adj: 0.241654, ja: '大暑', en: 'Major heat'},
+    {m: 8,  day: 8.4102,  adj: 0.241703, ja: '立秋', en: 'Start of autumn'},
+    {m: 8,  day: 24.0125, adj: 0.241786, ja: '処暑', en: 'Limit of heat'},
+    {m: 9,  day: 8.5186,  adj: 0.241898, ja: '白露', en: 'White dew'},
+    {m: 9,  day: 23.8896, adj: 0.242032, ja: '秋分', en: 'Autumnal equinox'},
+    {m: 10, day: 9.1414,  adj: 0.242179, ja: '寒露', en: 'Cold dew'},
+    {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: 22.6587, adj: 0.242752, ja: '冬至', en: 'Winter solstice'}
+  ]
+end

data/lib/solaar/term.rb

@@ -0,0 +1,55 @@
+# encoding: UTF-8
+require 'solaar/table'
+require 'solaar/exception'
+
+module Solaar
+  class Term
+    attr_reader :solaar_terms
+
+    def initialize
+      @solaar_terms = Solaar::Table
+    end
+
+    def calc(*args)
+      opts = args.last.is_a?(Hash) ? args.pop : {}
+      opts.merge!(year: self.year) if !opts.key?(:year)
+
+      if opts[:year].to_i > 2099 || opts[:year].to_i <= 0
+        raise Exception::OutOfRange.new("Unable to calculate") 
+      end
+
+      if opts.key?(:month) && (1..12).map.include?(opts[:month].to_i)
+        s = opts[:month].to_i*2-2
+        solaar_terms(opts, [s, s+1])
+      else
+        solaar_terms(opts, nil)
+      end
+
+      @terms
+    end
+
+    def solaar_terms(opts={}, range=nil)
+      @terms = []
+      s, e = range.nil? ? [0,-1] : range
+      
+      if opts.key?(:term)
+        @solaar_terms[s..e].each{ |t| @terms << formula(opts.merge!(t)) if opts[:term] == t[:ja] }
+      else
+        @solaar_terms[s..e].each{ |t| @terms << formula(opts.merge!(t)) }
+      end
+    end
+
+    def formula(opts={})
+      y = @year = opts[:year]
+      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)
+      Hash[date: Time.new(@year, month, day).strftime("%F"), language: { ja: opts[:ja], en: opts[:en] }]
+    end
+
+    def year
+      @year ||= Time.now.year
+    end
+  end
+end

data/lib/solaar/version.rb

@@ -0,0 +1,4 @@
+# encoding: utf-8
+module Solaar
+  VERSION = Version = "0.2.0"
+end

data/solaar.gemspec

@@ -1,19 +1,28 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require 'solaar'
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'solaar/version'
 
-Gem::Specification.new do |s|
-  s.name      = "solaar"
-  s.version   = Solaar::VERSION
-  s.platform  = Gem::Platform::RUBY
-  s.authors   = ["azukiwasher"]
-  s.email     = ["azukiwasher@higanworks.com"]
-  s.homepage  = "http://github.com/azukiwasher/solaar"
-  s.summary   = s.description = %q(Calculates the 24 solar terms until 2099)
+Gem::Specification.new do |spec|
+  spec.name          = "solaar"
+  spec.version       = Solaar::VERSION
+  spec.authors       = ["azukiwasher"]
+  spec.email         = ["azukiwasher@higanworks.com"]
+  spec.description   = %q{Calculates the 24 solar terms until 2099}
+  spec.summary       = %q{Calculates the 24 solar terms until 2099}
+  spec.homepage      = "http://github.com/azukiwasher/solaar"
+  spec.license       = "MIT"
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- test/*`.split("\n")
-  s.require_paths = ["lib"]
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
 
-  s.rubyforge_project = "solaar"
+  spec.add_runtime_dependency "sinatra"
+  spec.add_runtime_dependency "sinatra-contrib"
+  spec.add_runtime_dependency "thin"
+  spec.add_runtime_dependency "oj"
+
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
 end

data/spec/solaar/term_spec.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Solaar::Term do
+  let(:solaar) { Solaar::Term.new }
+  let(:record) {{ date: "2014-12-07", language: { ja: "大雪", en: "Major snow" }}}
+
+  describe "#calc" do
+    it "returns a collection of terms for this year" do
+      expect(solaar.calc.first[:date]).to match /2014/
+    end
+
+    it "returns a collection of terms for the given year" do
+      expect(solaar.calc(year: 2014).size).to eql 24
+    end
+
+    it "returns a record for the given year and month" do
+      expect(solaar.calc(year: 2014, month: 12).first).to eql record
+    end
+
+    it "returns a record for the given month" do
+      expect(solaar.calc(month: 12).size).to eql 2
+      expect(solaar.calc(month: 12).first).to eql record
+    end
+
+    it "returns a record for the given month" do
+      expect(solaar.calc(term: "大雪").first).to eql record
+    end
+
+    it "raises out of range error" do
+      expect{ solaar.calc(year: 2100) }.to raise_error(Solaar::Exception::OutOfRange)
+    end
+
+    it "raises argument error" do
+      expect{ solaar.calc(month: 'hoge') }.to raise_error(ArgumentError)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,25 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# Require this file using `require "spec_helper"` to ensure that it is only
+# loaded once.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+
+require 'rspec'
+require 'solaar'
+
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end

metadata

@@ -1,59 +1,148 @@
 --- !ruby/object:Gem::Specification
 name: solaar
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - azukiwasher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-26 00:00:00.000000000 Z
-dependencies: []
+date: 2014-04-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra-contrib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Calculates the 24 solar terms until 2099
 email:
 - azukiwasher@higanworks.com
-executables: []
+executables:
+- solaar
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
+- ".gitignore"
+- ".rspec"
 - Gemfile
-- HISTORY.md
+- Gemfile.lock
 - LICENSE
+- Procfile
 - README.md
 - Rakefile
+- bin/solaar
 - lib/solaar.rb
-- lib/solaar/terms.rb
+- lib/solaar/exception.rb
+- lib/solaar/table.rb
+- lib/solaar/term.rb
+- lib/solaar/version.rb
 - solaar.gemspec
-- test/helper.rb
-- test/test_solaar.rb
+- spec/solaar/term_spec.rb
+- spec/spec_helper.rb
 homepage: http://github.com/azukiwasher/solaar
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: solaar
-rubygems_version: 1.8.15
+rubyforge_project: 
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Calculates the 24 solar terms until 2099
 test_files:
-- test/helper.rb
-- test/test_solaar.rb
+- spec/solaar/term_spec.rb
+- spec/spec_helper.rb

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/HISTORY.md

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

data/lib/solaar/terms.rb

@@ -1,77 +0,0 @@
-# encoding: UTF-8
-
-module Solaar
-  Table = TABLE = [
-      {m: 1,  day: 6.3811,  adj: 0.242778, ja: '小寒', en: 'Minor cold'},
-      {m: 1,  day: 21.1046, adj: 0.242765, ja: '大寒', en: 'Major cold'},
-      {m: 2,  day: 4.8693,  adj: 0.242713, ja: '立春', en: 'Start of spring'},
-      {m: 2,  day: 19.7062, adj: 0.242627, ja: '雨水', en: 'Rain water'},
-      {m: 3,  day: 6.3968,  adj: 0.242512, ja: '啓蟄', en: 'Awakening of insects'},
-      {m: 3,  day: 21.4471, adj: 0.242377, ja: '春分', en: 'Vernal equinox'},
-      {m: 4,  day: 5.628,   adj: 0.242231, ja: '清明', en: 'Clear and bright'},
-      {m: 4,  day: 20.9375, adj: 0.242083, ja: '穀雨', en: 'Grain rainain'},
-      {m: 5,  day: 6.3771,  adj: 0.241945, ja: '立夏', en: 'Start of summer'},
-      {m: 5,  day: 21.93,   adj: 0.241825, ja: '小満', en: 'Grain full'},
-      {m: 6,  day: 6.5733,  adj: 0.241731, ja: '芒種', en: 'Grain in ear'},
-      {m: 6,  day: 22.2747, adj: 0.241669, ja: '夏至', en: 'Summer solstice'},
-      {m: 7,  day: 8.0091,  adj: 0.241642, ja: '小暑', en: 'Minor heat'},
-      {m: 7,  day: 23.7317, adj: 0.241654, ja: '大暑', en: 'Major heat'},
-      {m: 8,  day: 8.4102,  adj: 0.241703, ja: '立秋', en: 'Start of autumn'},
-      {m: 8,  day: 24.0125, adj: 0.241786, ja: '処暑', en: 'Limit of heat'},
-      {m: 9,  day: 8.5186,  adj: 0.241898, ja: '白露', en: 'White dew'},
-      {m: 9,  day: 23.8896, adj: 0.242032, ja: '秋分', en: 'Autumnal equinox'},
-      {m: 10, day: 9.1414,  adj: 0.242179, ja: '寒露', en: 'Cold dew'},
-      {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: 22.6587, adj: 0.242752, ja: '冬至', en: 'Winter solstice'}
-  ]
-
-  class Terms
-
-    def initialize
-      @solaarterms = Solaar::Table
-    end
-
-    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 given year" if opts[:year].to_i > 2099
-
-      if opts.key?(:month)
-        s = opts[:month].to_i*2-2
-        self.solaarterms(opts, [s, s+1])
-      else
-        self.solaarterms(opts, nil)
-      end
-
-      @terms
-    end
-
-    def solaarterms(opts={}, range=nil)
-      @terms = []
-      s, e = range.nil? ? [0,-1] : range
-
-      if opts.key?(:term)
-        @solaarterms[s..e].each{ |t| @terms << self.formula(opts.merge!(t)) if opts[:term] == t[:ja] }
-      else
-        @solaarterms[s..e].each{ |t| @terms << self.formula(opts.merge!(t)) }
-      end
-    end
-
-    def formula(opts={})
-      y = @year = opts[:year]
-      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)
-      Hash[date: Time.new(@year, month, day).strftime("%F"), ja: opts[:ja], en: opts[:en]]
-    end
-
-    def year
-      @year ||= Time.now.year
-    end
-
-  end
-end

data/test/helper.rb

@@ -1,19 +0,0 @@
-require 'rubygems'
-require 'bundler'
-
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-
-require 'test/unit'
-require 'shoulda'
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-
-require 'solaar'
-class Test::Unit::TestCase
-end

data/test/test_solaar.rb

@@ -1,60 +0,0 @@
-# -*- encoding: UTF-8 -*-
-require 'helper'
-
-class TestSolaar < Test::Unit::TestCase
-
-  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