gaapi 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c7d609f4d8f0c6c08af4d55afaf5f0b55f29f04ee94cd5d8b3acad4cbcbd8c2
-  data.tar.gz: d3c177187c100d3eeb148250be4369cfe1bcd93fc757f9549b6e25bc793a304f
+  metadata.gz: ab86e8204d003348a950268a6ae436f4a8864b05ee265e9bf86e6ee97537792d
+  data.tar.gz: 9946f8a7d7677b48db6df4757a8a72989695559c98369965aeb0d79779d74bd0
 SHA512:
-  metadata.gz: e35b82cfa37eccb1381b79c074898311d2510e99afa6a19b57d83ff2a4c3e967eec516ada71c740afe8620113cfd54ee1b05910f921cdbb55cc58d2b6c3c08fd
-  data.tar.gz: 24806c984d60d18cec432a8f9858f6badf6882ea4ab08679256111abcbf082f83713de296662cf694237f2d8c95742d23366c834a24eacd213ece72ce676df16
+  metadata.gz: bd642771496a8728d814240b65ab52e8f07cae029b77bed5fea4cff6cbe4f5c95c7b8ad842e86b248d18e771d706b720a06c3c5615ac8ababf374421303d4be9
+  data.tar.gz: edf4b83b5f60e1b48557b3c6506bb8cf5a758599bc691ba4d7663616c6aa0534e1893297d20fac812f0a4c25070dddc4aa9d10d225a827d08c4cd2e6e0f62b70

data/lib/gaapi/query.rb

@@ -9,20 +9,21 @@ module GAAPI
     # @param access_token [String] A valid access token with which to make a request to
     #   the specified View ID.
     # @param end_date [Date, String] The end date for the report.
-    # @param query_string [String] The query in JSON format.
+    # @param query_string [String, Hash, JSON] The query in JSON format.
     # @param start_date [Date, String] The start date for the report.
     # @param view_id [String] The view ID of the property for which to submit the
     #   query.
     def initialize(query_string, view_id, access_token, start_date, end_date)
       @access_token = access_token.to_s
       query_string = JSON.parse(query_string) unless query_string.is_a?(Hash)
-      @query = {}
-      @query["reportRequests"] = query_string["reportRequests"].map do |report_request|
+      @query = stringify_keys(query_string)
+      @query["reportRequests"] = @query["reportRequests"].map do |report_request|
         report_request["viewId"] = view_id
         report_request["dateRanges"] = [
           "startDate": start_date.to_s,
           "endDate": end_date.to_s
         ]
+        report_request["pageSize"] ||= 10_000
         report_request
       end
       # puts "query: #{JSON.pretty_generate(query)}"
@@ -45,5 +46,20 @@ module GAAPI
     private
 
     attr_reader :access_token, :query
+
+    # The keys have to be strings to get converted to a GA query.
+    # Adapted from Rails.
+    def stringify_keys(object)
+      case object
+      when Hash
+        object.each_with_object({}) do |(key, value), result|
+          result[key.to_s] = stringify_keys(value)
+        end
+      when Array
+        object.map { |e| stringify_keys(e) }
+      else
+        object
+      end
+    end
   end
 end

data/lib/gaapi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GAAPI
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaapi
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Larry Reid