hisui 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f63cc587035f036777979c56d4d39fed2e9f512e126d3809b3a85a7487ff675
-  data.tar.gz: '08e8bea765cb07fae43410ce041ab2ff38bf4ea51c997240f4fac1b05aed0b83'
+  metadata.gz: 40023cc074221349d9cad623cd2caaac5e2ffb88e67034898369f66b7fc816c9
+  data.tar.gz: 25adc10ab95a55e827019fc7dcb602b526c2c9a294dc6cc5e14df44cd4ac079e
 SHA512:
-  metadata.gz: 4196498ee4b4985e30cbac8391115c78b3a43de0e8cb06273f89b12eaa4cfe27fd64c5357d0c5794a56d2ff0a1be5590aa6067a238c14c54a2890474ef178a6d
-  data.tar.gz: d69cf054f142c53fee1692253c6d9b4c6b5d8479fbe5aa80b90b10f5c6f669b280585d76645586a5e3ae0ac138795ccdd44ec76ba743b7131875c5af8beef4dd
+  metadata.gz: ac21d837a1d1fbe96652c678e5152ec07678c89a941c31b128268bc875e4121af60ae11abe33f7746ee380a46c846df20f10cc2a5649bcc591e4fa4d4af03539
+  data.tar.gz: f9d20bf6242ee9da3033e52173b9ed7348ef20cdcf0f7906107a09ae4f2b31c5d0116dec8e3741e7572cb803677a9296897c6f0b799690b2a53f91d7533ed93c

data/lib/hisui/request.rb

@@ -2,9 +2,9 @@ require 'google/apis/analyticsreporting_v4'
 
 module Hisui
   class Request
-    BASIC_OPTION_KEYS = [:start_date, :end_date, :compare_start_date, :compare_end_date, :limit]
+    BASIC_OPTION_KEYS = [:start_date, :end_date, :comparing_start_date, :comparing_end_date, :limit, :sort]
 
-    attr_accessor :profile, :model, :start_date, :end_date, :compare_start_date, :compare_end_date, :limit
+    attr_accessor :profile, :model, :start_date, :end_date, :comparing_start_date, :comparing_end_date, :limit
 
     def initialize(profile:, model:, **options)
       @profile = profile
@@ -24,8 +24,8 @@ module Hisui
       date_ranges = []
       date_ranges << Google::Apis::AnalyticsreportingV4::DateRange.new(start_date: start_date.to_s, end_date: end_date.to_s)
 
-      if compare_start_date && compare_end_date
-        date_ranges << Google::Apis::AnalyticsreportingV4::DateRange.new(start_date: compare_start_date.to_s, end_date: compare_end_date.to_s)
+      if comparing_start_date && comparing_end_date
+        date_ranges << Google::Apis::AnalyticsreportingV4::DateRange.new(start_date: comparing_start_date.to_s, end_date: comparing_end_date.to_s)
       end
 
       request = Google::Apis::AnalyticsreportingV4::GetReportsRequest.new(

data/lib/hisui/response.rb

@@ -55,6 +55,35 @@ module Hisui
       end
     end
 
+    def rows
+      @rows ||= begin
+        rows = []
+
+        data.rows.each do |row|
+          dimension_values = row.dimensions
+          primary_data = []
+          comparing_data = []
+
+          row.metrics.first.values.each do |value|
+            primary_data << value
+          end
+
+          if row.metrics.second
+            row.metrics.second.values.each do |value|
+              comparing_data << value
+            end
+          end
+
+          rows << {
+            dimensions: OpenStruct.new(Hash[dimensions.zip(dimension_values)]),
+            primary: OpenStruct.new(Hash[metrics.zip(primary_data)]),
+            comparing: OpenStruct.new(Hash[metrics.zip(comparing_data)]) }
+        end
+
+        rows.map { |attributes| OpenStruct.new(attributes) }
+      end
+    end
+
     def total_values
       warn "[DEPRECATION] `total_values` is deprecated. Please use `primary_total` instead."
       primary_total
@@ -78,6 +107,14 @@ module Hisui
       @column_header ||= response.reports.first.column_header
     end
 
+    def dimensions
+      @dimensions ||= begin
+        column_header.dimensions.each_with_object([]) do |dimension, arr|
+          arr << Hisui.from_ga_string(dimension)
+        end
+      end
+    end
+
     def metrics
       @metrics ||= begin
         column_header.metric_header.metric_header_entries.each_with_object([]) do |metric, arr|

data/lib/hisui/version.rb

@@ -1,3 +1,3 @@
 module Hisui
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hisui
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - ikepon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-26 00:00:00.000000000 Z
+date: 2018-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails