google_holiday_calendar 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87ff02c8c74a34ae2db1d25e804e745673a5365f
-  data.tar.gz: e025c7f86ea9dcb8922e74c956cb6b9260c549b0
+  metadata.gz: a4e1d29ab01f9ca5714f4378aae0d5cbe6c84240
+  data.tar.gz: e6ef5a072140fe6c554a94bd64c25fb255d04888
 SHA512:
-  metadata.gz: fa3d7ec59f3e7387b0b4ff9f00e560c7388dcf36817118444d9c7e5da07d7f2f6b5edaf3b3a12ead4db1d6ce0f3cf0537968296e04ff9046c3e3791f776cf41c
-  data.tar.gz: b8f6ba4975fda277f2286abe8ad8e883cbf055a79d512c0c20f392380a3561890a1e4b23858f4e3a91a08468d76fb0d1ba4f77f5a9cfa44c40c41c175d465460
+  metadata.gz: 216fee75103099dfcff4032cc910a47097a7e534f5b86f34953badea4e448d6e5e23e0ced9f6f357334518b2464e21c44e2b540f857e89034f955d7e9a46b32d
+  data.tar.gz: 9f17d2eea3c0290c1ec473bf7299e94eaf4fde8a9d05afca48bab200aafb4417940fe388464c3f9be447fde5705888ccfd39def05c5dadd17eafff641d0b00a0

data/.env.example

@@ -0,0 +1 @@
+GOOGLE_API_KEY=

data/.gitignore

@@ -15,3 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.env
+

data/.travis.yml

@@ -1,10 +1,24 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.0
-  - 2.1.1
+- 2.0
+- 2.1
+- 2.2
+- ruby-head
+before_script:
+- export COVERAGE=true
+script:
+- bundle exec rspec
 branches:
   only:
     - master
+env:
+  global:
+    secure: "PUaG7vOmYf3MhO6KJR7kaOeDk+MiP31JCMI6m47z7y+4SGBj0+pxdYK9CY50McGkjjNajXC6RoNJiaVwlQduLS7mM8WKusGKgtnr/APHtZqbVy+KSXdXLvVD/GPaGxb+W7/SlTj5lLAe75hFj48hMWH2g7qDERmbEksEMqXM8CE="
 notifications:
   email: false
+  slack:
+    secure: LFMFNHkB88zWrcjwRstw7Ri+pKVndjkz11H8r73GbrJOL76Lt4llVsraYLRrCnx859kRZul4SjbUIlYsRl28Wv2IJmIhvDnK9n5gX4nSbEfjrZGsaMOmJhY8MxazM4757TFEY6ugzwRD3hzWKEK6bIY6nRu5KAFaZhPjDbSaEpA=
+matrix:
+  allow_failures:
+  - rvm: 2.2
+  - rvm: ruby-head

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## master
-[full changelog](http://github.com/sue445/google_holiday_calendar/compare/v0.0.2...master)
+[full changelog](http://github.com/sue445/google_holiday_calendar/compare/v0.1.0...master)
+
+## v0.1.0
+[full changelog](http://github.com/sue445/google_holiday_calendar/compare/v0.0.2...v0.1.0)
+
+* Use Google Calendar API v3
+* relax dependency gem version
 
 ## v0.0.2
 [full changelog](http://github.com/sue445/google_holiday_calendar/compare/v0.0.1...v0.0.2)

data/README.md

@@ -1,4 +1,10 @@
-# 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)
+# 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.
 
@@ -93,6 +99,14 @@ $ google_holiday_calendar --start-date=2014-01-01 --end-date=2014-07-01 --countr
 ## More reference
 http://rubydoc.info/github/sue445/google_holiday_calendar
 
+## Testing
+get api key on [API Console](https://code.google.com/apis/console/) and enable Google Calendar API
+
+```bash
+cp .env.example .env
+vi .env
+```
+
 ## Contributing
 
 1. Fork it ( http://github.com/sue445/google_holiday_calendar/fork )

data/google_holiday_calendar.gemspec

@@ -20,15 +20,16 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activesupport", "~> 4.0.0"
+  spec.add_dependency "activesupport", ">= 4.0.0"
 
-  spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "bundler", ">= 1.5"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "3.0.0.beta1"
+  spec.add_development_dependency "rspec", "~> 3.1.0"
   spec.add_development_dependency "rspec-its"
   spec.add_development_dependency "rspec-collection_matchers"
   spec.add_development_dependency "delorean"
   spec.add_development_dependency "yard"
   spec.add_development_dependency "memoist"
   spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "dotenv"
 end

data/lib/google_holiday_calendar/calendar.rb

@@ -1,14 +1,16 @@
 module GoogleHolidayCalendar
   require 'open-uri'
+  require 'cgi'
 
   class Calendar
     attr_reader :country, :lang
 
     # @param country [String]
     # @param lang    [String]
-    def initialize(country: "usa", lang: "en")
+    def initialize(country: "usa", lang: "en", api_key: nil)
       @country = country.downcase
       @lang    = lang.downcase
+      @api_key = api_key
     end
 
     # get holidays via google calendar
@@ -21,23 +23,24 @@ module GoogleHolidayCalendar
       start_date = Date.today unless start_date
       end_date = to_date(start_date) + 1.month unless end_date
 
-      url = "http://www.google.com/calendar/feeds/#{@country}__#{@lang}@holiday.calendar.google.com/public/full?"
+      calendar_id = "#{@lang}.#{@country}#holiday@group.v.calendar.google.com"
+      url = "https://www.googleapis.com/calendar/v3/calendars/#{CGI.escape(calendar_id)}/events?"
       params = {
-          "alt"         => "json",
-          "start-min"   => to_ymd(start_date),
-          "start-max"   => to_ymd(end_date),
-          "max-results" => limit,
+        "key"         => @api_key,
+        "timeMin"     => to_ymd(start_date),
+        "timeMax"     => to_ymd(end_date),
+        "maxResults" => limit,
       }
       url += params.to_query
 
       calendar_response = fetch(url)
 
-      entries = calendar_response["feed"]["entry"]
+      entries = calendar_response["items"]
       return {} unless entries
 
-      holidays = entries.inject({}){ |res, entry|
-        date = Date.parse(entry["gd$when"][0]["startTime"])
-        title = entry["title"]["$t"]
+      holidays = entries.inject({}){ |res, item|
+        date = Date.parse(item['start']['date'])
+        title = item["summary"]
         res[date] =title
         res
       }
@@ -65,7 +68,7 @@ module GoogleHolidayCalendar
     # @return [String] YYYY-MM-DD
     def to_ymd(arg)
       date = to_date(arg)
-      date.strftime("%Y-%m-%d")
+      date.strftime("%Y-%m-%d") + "T00:00:00Z"
     end
 
     # @param arg [Date,String]

data/lib/google_holiday_calendar/version.rb

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

data/lib/google_holiday_calendar.rb

@@ -1,6 +1,6 @@
 require "google_holiday_calendar/version"
 require "google_holiday_calendar/calendar"
-require "active_support/core_ext"
+require "active_support/all"
 
 module GoogleHolidayCalendar
   # Your code goes here...

data/spec/google_holiday_calendar/calendar_spec.rb

@@ -7,13 +7,13 @@ describe GoogleHolidayCalendar::Calendar do
     let(:end_date)  { "2014-01-31" }
 
     context "Without country and lang" do
-      let(:calendar){ GoogleHolidayCalendar::Calendar.new }
+      let(:calendar){ GoogleHolidayCalendar::Calendar.new(api_key: ENV["GOOGLE_API_KEY"]) }
 
       its(:count){ should > 0 }
     end
 
     context "With country and lang" do
-      let(:calendar){ GoogleHolidayCalendar::Calendar.new(country: country, lang: lang) }
+      let(:calendar){ GoogleHolidayCalendar::Calendar.new(country: country, lang: lang, api_key: ENV["GOOGLE_API_KEY"]) }
 
       context "When holidays in Japan" do
         let(:country)   { "japanese" }
@@ -64,7 +64,7 @@ describe GoogleHolidayCalendar::Calendar do
   describe "#holiday?" do
     subject{ calendar.holiday?(date) }
 
-    let(:calendar){ GoogleHolidayCalendar::Calendar.new(country: country, lang: lang) }
+    let(:calendar){ GoogleHolidayCalendar::Calendar.new(country: country, lang: lang, api_key: ENV["GOOGLE_API_KEY"]) }
     let(:country) { "japanese" }
     let(:lang)    { "ja" }
 

data/spec/spec_helper.rb

@@ -1,3 +1,8 @@
+if ENV["COVERAGE"]
+  require 'coveralls'
+  Coveralls.wear!
+end
+
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'google_holiday_calendar'
 
@@ -6,9 +11,8 @@ require 'rspec/its'
 require 'rspec/collection_matchers'
 require 'delorean'
 require 'memoist'
-
-require 'coveralls'
-Coveralls.wear!
+require 'dotenv'
+Dotenv.load
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.

data/spec/support/examples/holidays_in_japan_at_jan.rb

@@ -1,7 +1,5 @@
 shared_examples :holidays_in_japan_at_jan do
-  its(:count){ should == 4 }
+  its(:count){ should == 2 }
   it{ should include(date("2014-01-01") => "元日") }
-  it{ should include(date("2014-01-02") => "銀行休業日") }
-  it{ should include(date("2014-01-03") => "銀行休業日") }
   it{ should include(date("2014-01-13") => "成人の日") }
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: google_holiday_calendar
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - sue445
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
@@ -56,16 +56,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  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: Get holidays via Google Calendar.
 email:
 - sue445@sue445.net
@@ -159,6 +173,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".coveralls.yml"
+- ".env.example"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"