google_holiday_calendar 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d7daf762af6f01eeb55d3776af29583fd092f3e
-  data.tar.gz: 4dfe7151d30491d132f4ae187bd4fc19737cf167
+  metadata.gz: 87ff02c8c74a34ae2db1d25e804e745673a5365f
+  data.tar.gz: e025c7f86ea9dcb8922e74c956cb6b9260c549b0
 SHA512:
-  metadata.gz: 528765e8b03de7d4a44be7a4b3156bdc45c3af108e9578ddf6b8c0ebde8bcd54964f499a5dc82146468089c939ddf4e677f7904636fc1d7205bf2c972aa46fbf
-  data.tar.gz: 776c6002ff00ac3b500c8d6421c5b75532b60bb909666d12556b6beb79f48e1df0f56eb6131a929d2afb732aca96ec1b811832b291da0790cd173a3c6bb33fba
+  metadata.gz: fa3d7ec59f3e7387b0b4ff9f00e560c7388dcf36817118444d9c7e5da07d7f2f6b5edaf3b3a12ead4db1d6ce0f3cf0537968296e04ff9046c3e3791f776cf41c
+  data.tar.gz: b8f6ba4975fda277f2286abe8ad8e883cbf055a79d512c0c20f392380a3561890a1e4b23858f4e3a91a08468d76fb0d1ba4f77f5a9cfa44c40c41c175d465460

data/.travis.yml

@@ -2,8 +2,7 @@ language: ruby
 rvm:
   - 2.0.0
   - 2.1.0
-before_install:
-  - gem install bundler -v '= 1.5.2'
+  - 2.1.1
 branches:
   only:
     - master

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+## master
+[full changelog](http://github.com/sue445/google_holiday_calendar/compare/v0.0.2...master)
+
+## v0.0.2
+[full changelog](http://github.com/sue445/google_holiday_calendar/compare/v0.0.1...v0.0.2)
+
+* bugfix: NoMethodError if not exists holidays
+* Impl `GoogleHolidayCalendar::Calendar#holiday?`
+
+## v0.0.1
+* first release

data/README.md

@@ -1,4 +1,4 @@
-# GoogleHolidayCalendar [![Build Status](https://travis-ci.org/sue445/google_holiday_calendar.png?branch=master)](https://travis-ci.org/sue445/google_holiday_calendar) [![Coverage Status](https://coveralls.io/repos/sue445/google_holiday_calendar/badge.png)](https://coveralls.io/r/sue445/google_holiday_calendar) [![Dependency Status](https://gemnasium.com/sue445/google_holiday_calendar.png)](https://gemnasium.com/sue445/google_holiday_calendar) [![Code Climate](https://codeclimate.com/github/sue445/google_holiday_calendar.png)](https://codeclimate.com/github/sue445/google_holiday_calendar)
+# GoogleHolidayCalendar [![Gem Version](https://badge.fury.io/rb/google_holiday_calendar.png)](http://badge.fury.io/rb/google_holiday_calendar) [![Build Status](https://travis-ci.org/sue445/google_holiday_calendar.png?branch=master)](https://travis-ci.org/sue445/google_holiday_calendar) [![Coverage Status](https://coveralls.io/repos/sue445/google_holiday_calendar/badge.png)](https://coveralls.io/r/sue445/google_holiday_calendar) [![Dependency Status](https://gemnasium.com/sue445/google_holiday_calendar.png)](https://gemnasium.com/sue445/google_holiday_calendar) [![Code Climate](https://codeclimate.com/github/sue445/google_holiday_calendar.png)](https://codeclimate.com/github/sue445/google_holiday_calendar)
 
 Get holidays via Google Calendar.
 
@@ -26,13 +26,19 @@ require "google_holiday_calendar"
 
 usa_calendar = GoogleHolidayCalendar::Calendar.new(country: "usa", lang: "en")
 
-usa_calendar.holidays(start_date: "2014-01-01", end_date: "2014-03-01, limit: 5")
+usa_calendar.holidays(start_date: "2014-01-01", end_date: "2014-03-01", limit: 5)
 # => {Wed, 01 Jan 2014=>"New Year's Day", Mon, 20 Jan 2014=>"Martin Luther King Day", Fri, 14 Feb 2014=>"Valentine's Day", Mon, 17 Feb 2014=>"Presidents' Day (Washington's Birthday)"}
 
 japan_calendar = GoogleHolidayCalendar::Calendar.new(country: "japanese", lang: "ja")
 
-japan_calendar.holidays(start_date: "2014-01-01", end_date: "2014-03-01, limit: 5")
+japan_calendar.holidays(start_date: "2014-01-01", end_date: "2014-03-01", limit: 5)
 # => {Wed, 01 Jan 2014=>"元日", Thu, 02 Jan 2014=>"銀行休業日", Fri, 03 Jan 2014=>"銀行休業日", Mon, 13 Jan 2014=>"成人の日", Tue, 11 Feb 2014=>"建国記念の日"}
+
+japan_calendar.holiday?("2014-01-01")
+# => true
+
+japan_calendar.holiday?("2014-02-01")
+# => false
 ```
 
 ## Usage (via bash)
@@ -44,7 +50,9 @@ $ date +"%Y-%m-%d"
 
 $ google_holiday_calendar
 2014-03-09: Daylight Saving Time starts
+```
 
+```sh
 # get holidays (2014/01/01 - 2014/07/01)
 $ google_holiday_calendar --start-date=2014-01-01 --end-date=2014-07-01
 2014-01-01: New Year's Day
@@ -57,14 +65,17 @@ $ google_holiday_calendar --start-date=2014-01-01 --end-date=2014-07-01
 2014-05-11: Mothers' Day
 2014-05-26: Memorial Day
 2014-06-15: Fathers' Day
+```
 
+```sh
 # get holidays (with limit)
 $ google_holiday_calendar --start-date=2014-01-01 --end-date=2014-07-01 --limit=3
-google_holiday_calendar --start-date=2014-01-01 --end-date=2014-07-01 --limit=3
 2014-02-14: Valentine's Day
 2014-02-17: Presidents' Day (Washington's Birthday)
 2014-04-13: Thomas Jefferson's Birthday
+```
 
+```sh
 # get holidays (specify country and language)
 $ google_holiday_calendar --start-date=2014-01-01 --end-date=2014-07-01 --country=japanese --lang=ja
 2014-01-01: 元日
@@ -79,6 +90,9 @@ $ google_holiday_calendar --start-date=2014-01-01 --end-date=2014-07-01 --countr
 2014-05-06: みどりの日 振替休日
 ```
 
+## More reference
+http://rubydoc.info/github/sue445/google_holiday_calendar
+
 ## Contributing
 
 1. Fork it ( http://github.com/sue445/google_holiday_calendar/fork )

data/lib/google_holiday_calendar/calendar.rb

@@ -16,6 +16,7 @@ module GoogleHolidayCalendar
     # @param end_date   [String,Date] end date ("YYYY-MM-DD" or Date). not contain this date. default: 1 month after the start_date
     # @param limit      [Integer]
     # @return [Hash] key: date, value: holiday title
+    # @return [{}]   if found no holidays, return empty hash
     def holidays(start_date: nil, end_date: nil, limit: 10)
       start_date = Date.today unless start_date
       end_date = to_date(start_date) + 1.month unless end_date
@@ -31,7 +32,10 @@ module GoogleHolidayCalendar
 
       calendar_response = fetch(url)
 
-      holidays = calendar_response["feed"]["entry"].inject({}){ |res, entry|
+      entries = calendar_response["feed"]["entry"]
+      return {} unless entries
+
+      holidays = entries.inject({}){ |res, entry|
         date = Date.parse(entry["gd$when"][0]["startTime"])
         title = entry["title"]["$t"]
         res[date] =title
@@ -41,6 +45,13 @@ module GoogleHolidayCalendar
       Hash[holidays.sort_by{|k,v| k }]
     end
 
+    # whether arg is holiday
+    # @param arg [#to_date, String] {Date}, {Time}, or date like String (ex. "YYYY-MM-DD")
+    def holiday?(arg)
+      date = to_date(arg)
+      holidays(start_date: date, end_date: date + 1.day, limit: 1).length > 0
+    end
+
     private
 
     # @param url [String]
@@ -62,6 +73,8 @@ module GoogleHolidayCalendar
     def to_date(arg)
       if arg.is_a?(String)
         Date.parse(arg)
+      elsif arg.respond_to?(:to_date)
+        arg.to_date
       else
         arg
       end

data/lib/google_holiday_calendar/version.rb

@@ -1,3 +1,3 @@
 module GoogleHolidayCalendar
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/google_holiday_calendar/calendar_spec.rb

@@ -43,6 +43,13 @@ describe GoogleHolidayCalendar::Calendar do
 
           it_behaves_like :holidays_in_japan_at_jan
         end
+
+        context "When not found holidays" do
+          let(:start_date){ "2014-06-01" }
+          let(:end_date)  { "2014-07-01" }
+
+          it{ should  == {}}
+        end
       end
 
       context "When holidays in America" do
@@ -53,4 +60,24 @@ describe GoogleHolidayCalendar::Calendar do
       end
     end
   end
+
+  describe "#holiday?" do
+    subject{ calendar.holiday?(date) }
+
+    let(:calendar){ GoogleHolidayCalendar::Calendar.new(country: country, lang: lang) }
+    let(:country) { "japanese" }
+    let(:lang)    { "ja" }
+
+    context "arg is holiday" do
+      let(:date){ Date.parse("2014-01-01") }
+
+      it{ should be true }
+    end
+
+    context "arg is not holiday" do
+      let(:date){ Date.parse("2014-02-01") }
+
+      it{ should be false }
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google_holiday_calendar
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - sue445
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-23 00:00:00.000000000 Z
+date: 2014-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -163,6 +163,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - ".yardopts"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -198,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Get holidays via Google Calendar.