holidays_from_google_calendar 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddd84d5bf6b28a28dcbfbd7cdad2574e50d1d17f
-  data.tar.gz: 3a9f0c5359768ce0ca1f136090c343b7e036e482
+  metadata.gz: ea98c95ad38a12d3c95ae95bce204eb9922fe556
+  data.tar.gz: e04b7ada90c239f80455c9db4d2b81decc2ba8da
 SHA512:
-  metadata.gz: 43dca74914287410f8715ce941a2efb1f5ede23a06b5ca25b7d35e7db6ff8a3132d9204e83177c3a0420da78803a0425e49220a52ad65d13c6b192de4c7178a5
-  data.tar.gz: 78dd94477bb25dd7ab5530d7dc2f6aa4e8234d3c82f354dbcb64a576d9f944b9320f29ed0bc56a30ae23225246f82bd24fcb1909680613fcde0216614538ef61
+  metadata.gz: d73607ef9df0b677747b7adae6a13efb66f3f31a4468a5c38d48cfa7af19f72694dbcd44ab2e3fd306f7c6150d722b621871eaf82d178ed8f631935f8de75b16
+  data.tar.gz: 3db9c1c44dcf6b6f76df199c0527fc24e4099a21f11a07b41607085f469ecef86994874ff624ae1b77c2b84dd9b9c9e57d73ca577888342fe82469bc739fcbf4

data/.rubocop.yml

@@ -0,0 +1,54 @@
+AllCops:
+  Include:
+    - '**/Rakefile'
+  Exclude:
+    - 'bin/*'
+    - 'Gemfile'
+
+# Accept single-line methods with no body
+SingleLineMethods:
+  AllowIfMethodIsEmpty: true
+
+# Top-level documentation of classes and modules are needless
+Documentation:
+  Enabled: false
+
+# Allow to chain of block after another block that spans multiple lines
+MultilineBlockChain:
+  Enabled: false
+
+# Allow `->` literal for multi line blocks
+Lambda:
+  Enabled: false
+
+# Both nested and compact are okay
+ClassAndModuleChildren:
+  Enabled: false
+
+# Specifying param names is unnecessary
+Style/SingleLineBlockParams:
+  Enabled: false
+
+# Prefer Kernel#sprintf
+FormatString:
+  EnforcedStyle: sprintf
+
+# Maximum line length
+LineLength:
+  Max: 100
+
+# Whatever we should use "postfix if/unless"
+IfUnlessModifier:
+  MaxLineLength: 100
+
+# Maximum method length
+MethodLength:
+  Max: 20
+
+# Tuned to MethodLength
+Metrics/AbcSize:
+  Max: 30
+
+# Prefer double_quotes strings unless your string literal contains escape chars
+StringLiterals:
+  EnforcedStyle: double_quotes

data/Rakefile

@@ -3,4 +3,4 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/lib/holidays_from_google_calendar.rb

@@ -10,46 +10,30 @@ require "active_support/core_ext"
 
 module HolidaysFromGoogleCalendar
   class Holidays
-    class << self
-      def configure
-        @configuration = Configuration.new
-        yield @configuration
-        @client = Client.new(@configuration.to_h)
-      end
-
-      def in_year(date)
-        response = @client.retrieve_from_google_calendar(
-          date_min: date.beginning_of_year,
-          date_max: date.end_of_year + 1.day
-        )
-        pack_response_in_struct(response)
-      end
-
-      def in_month(date)
-        response = @client.retrieve_from_google_calendar(
-          date_min: date.beginning_of_month,
-          date_max: date.end_of_month + 1.day
-        )
-        pack_response_in_struct(response)
-      end
+    def initialize
+      @configuration = Configuration.new
+      yield @configuration
+      @client = Client.new(@configuration)
+    end
 
-      def holiday?(date)
-        return true if date.wday.in?([0, 6]) # If Sunday or Saturday
-        response = @client.retrieve_from_google_calendar(date_min: date, date_max: date + 1.day)
-        response.items.size > 0
-      end
+    def in_year(date)
+      @client.retrieve_from_google_calendar(
+        date_min: date.beginning_of_year,
+        date_max: date.end_of_year + 1.day
+      )
+    end
 
-      private
+    def in_month(date)
+       @client.retrieve_from_google_calendar(
+        date_min: date.beginning_of_month,
+        date_max: date.end_of_month + 1.day
+      )
+    end
 
-      def pack_response_in_struct(response)
-        response.items.reduce([]) do |array, item|
-          holiday = Holiday.new(
-            name: item.summary,
-            date: Date.parse(item.start.date)
-          )
-          array.push(holiday)
-        end
-      end
+    def holiday?(date)
+      return true if date.wday.in?([0, 6]) # If Sunday or Saturday
+      response = @client.retrieve_from_google_calendar(date_min: date, date_max: date + 1.day)
+      response.items.size > 0
     end
   end
 end

data/lib/holidays_from_google_calendar/client.rb

@@ -1,21 +1,23 @@
 module HolidaysFromGoogleCalendar
   class Client
-    def initialize(nation: "usa", language: "en", api_key: nil)
-      @nation = nation
-      @language = language
-      @api_key = api_key
+    def initialize(configuration)
+      @nation = configuration.calendar[:nation]
+      @language = configuration.calendar[:language]
+      @api_key = configuration.credential[:api_key]
     end
 
     def retrieve_from_google_calendar(date_min: nil, date_max: nil)
       service = Google::Apis::CalendarV3::CalendarService.new
       service.key = @api_key
-      service.list_events(
+
+      response = service.list_events(
         calendar_id,
         single_events: true,
         order_by: "startTime",
         time_min: date_to_time(date_min),
         time_max: date_to_time(date_max)
       )
+      pack_response_in_object(response)
     end
 
     private
@@ -27,5 +29,15 @@ module HolidaysFromGoogleCalendar
     def date_to_time(date)
       Time.parse(date.iso8601).iso8601
     end
+
+    def pack_response_in_object(response)
+      response.items.reduce([]) do |array, item|
+        holiday = Holiday.new(
+          name: item.summary,
+          date: Date.parse(item.start.date)
+        )
+        array.push(holiday)
+      end
+    end
   end
 end

data/lib/holidays_from_google_calendar/configuration.rb

@@ -1,13 +1,15 @@
 module HolidaysFromGoogleCalendar
   class Configuration
-    ATTRIBUTES = %i(nation language api_key)
+    CALENDAR_ATTRIBUTES = %i(nation language).freeze
+    CREDENTIAL_ATTRIBUTES = %i(api_key).freeze
 
-    attr_accessor(*ATTRIBUTES)
+    attr_accessor :calendar, :credential
 
-    def to_h
-      ATTRIBUTES.reduce({}) do |hash, attribute|
-        hash.merge(attribute => public_send(attribute))
-      end
+    def initialize
+      @calendar = {
+        nation: "japanese",
+        language: "ja"
+      }
     end
   end
 end

data/lib/holidays_from_google_calendar/version.rb

@@ -1,3 +1,3 @@
 module HolidaysFromGoogleCalendar
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: holidays_from_google_calendar
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - necojackarc
@@ -89,6 +89,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile