hisui 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 539f07615132804cd99b435af49bfb73380983d58b967a16d9326dde055ca47c
-  data.tar.gz: 7cb0f27599b5e2fa28fd947ea0db9aacaa9f669bf6d6b301baba108d7bd892c2
+  metadata.gz: 3208e00862c06d44baea1a6ab70be93b9a29834b69246e8e95a7f2543031677a
+  data.tar.gz: 4bcc60e4780dd8c7d48402a36b2aa35ec1b69b9d56c1f53c4274c3c310192006
 SHA512:
-  metadata.gz: dbdf33eeb8906f14d19c7eb14fa3e90f3be7819beca4a9d408d468e4059aa92c1784cf6926dc61f1bfc8e6bdd32518d1b1b735d7fe732397f58b67cb258ed90e
-  data.tar.gz: 55ed36f65dff20ea4d59af454638049db05588b9251a717014b1862589dbf3ad03ba693e9cf6b8aa962c38f302460fd9d41af4cb26e12e21ca97ec1d95e4b5c4
+  metadata.gz: efedfb4a7eb17259412725397350bdfd3af2cdcdac711495b9b804a7d00b8bbf09c37eeb71cb9879906443255b95a773c2a1da975858258042724f952ae8d0cb
+  data.tar.gz: 8804beedc7a904e8728ee99e5ad8e3f3adbd0d5514bd37d916faad372302559d3615bab6f911a770564ee4eaa933255ced4cfba305bec32399dcf3206498b5d9

data/lib/hisui/request.rb

@@ -41,7 +41,7 @@ module Hisui
       )
 
       response = reporting_service.batch_get_reports(request)
-      Hisui::Response.new(response)
+      Hisui::Response.new(response: response, request: self)
     end
   end
 end

data/lib/hisui/response.rb

@@ -1,7 +1,7 @@
 module Hisui
   class Response
-    def initialize(response)
-      @ga_data = GaData.new(response)
+    def initialize(response:, request:)
+      @ga_data = GaData.new(response: response, request: request)
     end
 
     def raw_attributes

data/lib/hisui/response/ga_data.rb

@@ -1,16 +1,20 @@
 module Hisui
   class Response
     class GaData
-      attr_reader :response
+      attr_reader :response, :date_ranges
 
-      def initialize(response)
+      DATE_DIMENSIONS = %w[ga:date ga:dateHour ga:dateHourMinute].freeze
+
+      def initialize(response:, request:)
         @response = response
+        @date_ranges = [Range.new(request.start_date.beginning_of_day, request.end_date.end_of_day), Range.new(request.try(:comparing_start_date).try(:beginning_of_day), request.try(:comparing_end_date).try(:end_of_day))]
       end
 
       def construct(ordinal)
         row_data_struct = Struct.new(*fields)
 
         data.try(:rows).try(:each_with_object, []) do |row, arr|
+          next if date_indices.present? && date_indices.all? { |index| date_ranges.try(ordinal.to_sym).exclude?(row.dimensions[index].in_time_zone) }
           row_data = []
           row.dimensions.each do |dimension|
             row_data << dimension
@@ -97,6 +101,18 @@ module Hisui
         end
       end
 
+      # NOTE: When dimensions include DATE_DIMENSIONS, Google Analytics data has data to include primary and comparing date range.
+      #       This is a method to filter only primary or comparing data.
+      def date_indices
+        @date_indices ||= begin
+          used_date_dimensions = DATE_DIMENSIONS & column_header.dimensions
+
+          used_date_dimensions.each_with_object([]) do |dimension, arr|
+            arr << column_header.dimensions.index(dimension)
+          end
+        end
+      end
+
       def data
         @data ||= response.reports.first.data
       end

data/lib/hisui/version.rb

@@ -1,3 +1,3 @@
 module Hisui
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hisui
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - ikepon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-19 00:00:00.000000000 Z
+date: 2018-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails