omnievent-google 0.1.0.pre2 → 0.1.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 582c4cf9831a82c8e9486939f5df891635c9f8c4de75eb334563616f13ef50b1
-  data.tar.gz: 4ecb96a099fb0d18754ddce917b14363700742abffb7aef4999b80357c6e22ec
+  metadata.gz: f0da08dfc39ca1d3912e18b576d42e684e8a7eb593140391ac0cfbc007826878
+  data.tar.gz: 44ee373377dd2062cbd0386a2954ef2b823014d5929ae9cd403682e9ecbc4538
 SHA512:
-  metadata.gz: 1bb759fe04b74d3acc40dabac35617a386aecdc37980b652124aff5b01892e56277d6db6428a2af22808674ebadcc085b766c42357b6093c3879e7dd8ee278af
-  data.tar.gz: 59fd7b9593e51a1927f1da44e8ea6adbe12ebbc9e7a01feec793fcef3118034356e146622b1c62c733447f9aa87a894d4f6e2e962a25cc5828c88782f40c9e1a
+  metadata.gz: 55559e8dd02abd686ac26285a5f1d8c4e2e057b63abe9a074db5c960cda91f931c92f29f0eab9bab298f3ab9d8d12f7a734c39e410797007935de1851e731856
+  data.tar.gz: 640619807882127fcc589e63e68a7a79a04ab16e8b2092056aec95392d03810feafc53a19b63cae3f44eaf742ad8c330125aa6a03a679383b3e5262002b64361

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    omnievent-google (0.1.0.pre1)
+    omnievent-google (0.1.0.pre3)
       omnievent
       omnievent-api
 
@@ -24,11 +24,11 @@ GEM
     iso-639 (0.3.6)
     json (2.7.2)
     language_server-protocol (3.17.0.3)
-    omnievent (0.1.0.pre6)
+    omnievent (0.1.0.pre7)
       hashie (>= 3.4.6)
       iso-639 (~> 0.3.5)
       tzinfo (~> 2.0)
-    omnievent-api (0.1.0.pre3)
+    omnievent-api (0.1.0.pre4)
       excon
       omnievent
     parallel (1.26.3)

data/lib/omnievent/google/version.rb

@@ -2,6 +2,6 @@
 
 module OmniEvent
   module Google
-    VERSION = "0.1.0.pre2"
+    VERSION = "0.1.0.pre4"
   end
 end

data/lib/omnievent/strategies/google.rb

@@ -14,15 +14,16 @@ module OmniEvent
       API_VERSION = "v3"
 
       def raw_events
-        params = options.slice(:from_time, :to_time)
-        response = perform_request(path: request_path_with_params(params))
-        events = response && response["items"]
+        response = perform_request(path: path_with_params(request_path, list_params))
+        return [] unless response.is_a?(Hash) && response["items"]
 
-        next_link = build_next_link(response, params)
+        events = response["items"]
+
+        next_link = build_next_link(response, list_params)
         while next_link
           response = perform_request(path: next_link)
           events << response["value"]
-          next_link = build_next_link(response, params)
+          next_link = build_next_link(response, list_params)
         end
 
         events
@@ -31,7 +32,7 @@ module OmniEvent
       def build_next_link(response, params)
         return nil unless response && response["nextPageToken"]
 
-        request_path_with_params(params.merge(pageToken: response["nextPageToken"]))
+        path_with_params(request_path, params.merge(pageToken: response["nextPageToken"]))
       end
 
       def create_event
@@ -122,13 +123,6 @@ module OmniEvent
         end
       end
 
-      def request_path_with_params(params = {})
-        uri = URI.parse(request_path)
-        params.reject! { |_k, v| v.to_s.strip.empty? }
-        uri.query = URI.encode_www_form(params) unless params.empty?
-        uri.to_s
-      end
-
       def request_url
         "https://www.googleapis.com"
       end
@@ -162,6 +156,16 @@ module OmniEvent
           "timeZone": "UTC"
         }
       end
+
+      def list_params
+        @list_params ||= begin
+          params = {}
+          params[:timeMin] = options.from_time if options.from_time
+          params[:timeMax] = options.to_time if options.to_time
+          params[:q] = options.match_name if options.match_name
+          params
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omnievent-google
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre2
+  version: 0.1.0.pre4
 platform: ruby
 authors:
 - Angus McLeod