hisui 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed5550e23b11889424c0bf4ec332d655989f080ab442e78954e62342b9450a65
-  data.tar.gz: c4d88b0d28878e96196ba088db6b6610617cbeba5e3c7dd4f2c8c013bef708df
+  metadata.gz: 539f07615132804cd99b435af49bfb73380983d58b967a16d9326dde055ca47c
+  data.tar.gz: 7cb0f27599b5e2fa28fd947ea0db9aacaa9f669bf6d6b301baba108d7bd892c2
 SHA512:
-  metadata.gz: 1ab1c8635dd6023ca3778c47df5940d846e89ee02e701b66cbd2252bc15bb7a0e72cf3d0a2fc5be38985680e36b0798cb81cb2a653b21ae8d12da2ef7444e7bf
-  data.tar.gz: 8ec50ed5bdc40a0d28f86e90052323532c61ace7c8b71eba99232978066238dad326b1747e032ec78e5451252b16f6b39cd3b13d868f40a22f5a59f29c8972b1
+  metadata.gz: dbdf33eeb8906f14d19c7eb14fa3e90f3be7819beca4a9d408d468e4059aa92c1784cf6926dc61f1bfc8e6bdd32518d1b1b735d7fe732397f58b67cb258ed90e
+  data.tar.gz: 55ed36f65dff20ea4d59af454638049db05588b9251a717014b1862589dbf3ad03ba693e9cf6b8aa962c38f302460fd9d41af4cb26e12e21ca97ec1d95e4b5c4

data/README.md

@@ -54,38 +54,40 @@ response = DailySummary.results(profile: profile, start_date: Date.current - 7.d
 # Deprecate
 response.raw_attributes
 
-#=> [#<OpenStruct date="20171122", pageviews="137", sessions="73", users="51", newUsers="43", bounceRate="69.56521739130434", pageviewsPerSession="2.608695652173913", avgSessionDuration="87.69565217391305">,
+# [DEPRECATION] `raw_attributes` is deprecated. Please use `primary` instead.
+# => [#<struct date="20171122", pageviews="137", sessions="73", users="51", newUsers="43", bounceRate="69.56521739130434", pageviewsPerSession="2.608695652173913", avgSessionDuration="87.69565217391305">,
 # ...
-# #<OpenStruct date="20171129", pageviews="95", sessions="67", users="44", newUsers="32", bounceRate="80.0", pageviewsPerSession="2.25", avgSessionDuration="42.0">]
+# #<struct date="20171129", pageviews="95", sessions="67", users="44", newUsers="32", bounceRate="80.0", pageviewsPerSession="2.25", avgSessionDuration="42.0">]
 
 response.primary
 
-#=> [#<OpenStruct date="20171122", pageviews="137", sessions="73", users="51", newUsers="43", bounceRate="69.56521739130434", pageviewsPerSession="2.608695652173913", avgSessionDuration="87.69565217391305">,
+# => [#<struct date="20171122", pageviews="137", sessions="73", users="51", newUsers="43", bounceRate="69.56521739130434", pageviewsPerSession="2.608695652173913", avgSessionDuration="87.69565217391305">,
 # ...
-# #<OpenStruct date="20171129", pageviews="95", sessions="67", users="44", newUsers="32", bounceRate="80.0", pageviewsPerSession="2.25", avgSessionDuration="42.0">]
+# #<struct date="20171129", pageviews="95", sessions="67", users="44", newUsers="32", bounceRate="80.0", pageviewsPerSession="2.25", avgSessionDuration="42.0">]
 
 response.comparing
 
-#=> [#<OpenStruct date="20171022", pageviews="130", sessions="69", users="45", newUsers="40", bounceRate="70.09567898751234", pageviewsPerSession="1.884057975234981", avgSessionDuration="85.02349863284283">,
+# => [#<struct date="20171022", pageviews="130", sessions="69", users="45", newUsers="40", bounceRate="70.09567898751234", pageviewsPerSession="1.884057975234981", avgSessionDuration="85.02349863284283">,
 # ...
-# #<OpenStruct date="20171029", pageviews="95", sessions="67", users="44", newUsers="32", bounceRate="80.0", pageviewsPerSession="2.25", avgSessionDuration="42.0">]
+# #<struct date="20171029", pageviews="95", sessions="67", users="44", newUsers="32", bounceRate="80.0", pageviewsPerSession="2.25", avgSessionDuration="42.0">]
 
 # Deprecate
 response.total_values
 
-#=> #<OpenStruct pageviews="646", sessions="308", users="223", newUsers="144", bounceRate="77.77777777777779", pageviewsPerSession="2.3518518518518519", avgSessionDuration="62.148148148148145">
+# [DEPRECATION] `total_values` is deprecated. Please use `primary_total` instead.
+#=> #<struct pageviews="646", sessions="308", users="223", newUsers="144", bounceRate="77.77777777777779", pageviewsPerSession="2.3518518518518519", avgSessionDuration="62.148148148148145">
 
 response.primary_total
 
-#=> #<OpenStruct pageviews="646", sessions="308", users="223", newUsers="144", bounceRate="77.77777777777779", pageviewsPerSession="2.3518518518518519", avgSessionDuration="62.148148148148145">
+# => #<struct pageviews="646", sessions="308", users="223", newUsers="144", bounceRate="77.77777777777779", pageviewsPerSession="2.3518518518518519", avgSessionDuration="62.148148148148145">
 
 response.comparing_total
 
-#=> #<OpenStruct pageviews="640", sessions="299", users="213", newUsers="138", bounceRate="75.97253924292489", pageviewsPerSession="2.1404682398523578", avgSessionDuration="60.814845134904329">
+# => #<struct pageviews="640", sessions="299", users="213", newUsers="138", bounceRate="75.97253924292489", pageviewsPerSession="2.1404682398523578", avgSessionDuration="60.814845134904329">
 
 response.data?
 
-#=> true
+# => true
 ```
 
 #### Filtering

data/lib/hisui.rb

@@ -4,6 +4,7 @@ require 'hisui/user'
 require 'hisui/model'
 require 'hisui/request'
 require 'hisui/response'
+require 'hisui/response/ga_data'
 require 'hisui/filters_expression'
 
 require 'hisui/management/base'

data/lib/hisui/model.rb

@@ -2,7 +2,7 @@ module Hisui
   module Model
     # Adds metrics to the class for retrieval from GA
     #
-    # @param fields [Symbol] the names of the fields to retrieve
+    # @param field [Symbol] the names of the fields to retrieve
     # @return [ListParameter] the set of all metrics
     def metrics(*field)
       @metrics ||= Set.new([])
@@ -12,7 +12,7 @@ module Hisui
 
     # Adds dimensions to the class for retrieval from GA
     #
-    # @param fields [Symbol] the names of the fields to retrieve
+    # @param field [Symbol] the names of the fields to retrieve
     # @return [ListParameter] the set of all dimensions
     def dimensions(*field)
       @dimensions ||= Set.new([])

data/lib/hisui/response.rb

@@ -1,9 +1,7 @@
 module Hisui
   class Response
-    attr_reader :response
-
     def initialize(response)
-      @response = response
+      @ga_data = GaData.new(response)
     end
 
     def raw_attributes
@@ -12,74 +10,15 @@ module Hisui
     end
 
     def primary
-      @primary ||= begin
-        primary = []
-
-        data.try(:rows).try(:each) do |row|
-          row_data = []
-          row.dimensions.each do |dimension|
-            row_data << dimension
-          end
-
-          row.metrics.first.values.each do |value|
-            row_data << value
-          end
-
-          primary << Hash[fields.zip(row_data)]
-        end
-
-        primary.map { |attributes| OpenStruct.new(attributes) }
-      end
+      @primary ||= @ga_data.construct(:first)
     end
 
     def comparing
-      @comparing ||= begin
-        comparing = []
-
-        data.try(:rows).try(:each) do |row|
-          row_data = []
-          row.dimensions.each do |dimension|
-            row_data << dimension
-          end
-
-          row.try(:metrics).try(:second).try(:values).try(:each) do |value|
-            row_data << value
-          end
-
-          comparing << Hash[fields.zip(row_data)]
-        end
-
-        comparing.map { |attributes| OpenStruct.new(attributes) }
-      end
+      @comparing ||= @ga_data.construct(:second)
     end
 
     def rows
-      @rows ||= begin
-        rows = []
-
-        data.try(:rows).try(: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
+      @rows ||= @ga_data.rows
     end
 
     def total_values
@@ -88,57 +27,15 @@ module Hisui
     end
 
     def primary_total
-      @primary_total ||= OpenStruct.new(Hash[metrics.zip(data.totals.first.values)])
+      @primary_total ||= @ga_data.sum(:first)
     end
 
     def comparing_total
-      @comparing_total ||= OpenStruct.new(Hash[metrics.zip(data.totals.try(:second).try(:values) || [])])
+      @comparing_total ||= @ga_data.sum(:second)
     end
 
     def data?
-      data.row_count.to_i > 0
-    end
-
-    private
-
-    def column_header
-      @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|
-          arr << Hisui.from_ga_string(metric.name)
-        end
-      end
-    end
-
-    def fields
-      @fields ||= begin
-        fields = []
-
-        column_header.dimensions.each do |dimension|
-          fields << Hisui.from_ga_string(dimension)
-        end
-
-        column_header.metric_header.metric_header_entries.each do |metric|
-          fields << Hisui.from_ga_string(metric.name)
-        end
-
-        fields
-      end
-    end
-
-    def data
-      @data ||= response.reports.first.data
+      @ga_data.data?
     end
   end
 end

data/lib/hisui/response/ga_data.rb

@@ -0,0 +1,105 @@
+module Hisui
+  class Response
+    class GaData
+      attr_reader :response
+
+      def initialize(response)
+        @response = response
+      end
+
+      def construct(ordinal)
+        row_data_struct = Struct.new(*fields)
+
+        data.try(:rows).try(:each_with_object, []) do |row, arr|
+          row_data = []
+          row.dimensions.each do |dimension|
+            row_data << dimension
+          end
+
+          row.try(:metrics).try(ordinal.to_sym).try(:values).try(:each) do |value|
+            row_data << value
+          end
+
+          arr << row_data_struct.new(*row_data)
+        end
+      end
+
+      def sum(ordinal)
+        total_struct = Struct.new(*metrics)
+        total_struct.new(*data.totals.try(ordinal).try(:values))
+      end
+
+      def rows
+        @rows ||= begin
+          data.try(:rows).try(:each_with_object, []) do |row, arr|
+            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_struct = Struct.new(:dimensions, :primary, :comparing)
+            dimension_struct = Struct.new(*dimensions)
+            metric_struct = Struct.new(*metrics)
+
+            arr << rows_struct.new(dimension_struct.new(*dimension_values), metric_struct.new(*primary_data), metric_struct.new(*comparing_data))
+          end
+        end
+      end
+
+      def data?
+        data.row_count.to_i > 0
+      end
+
+      private
+
+      def column_header
+        @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).to_sym
+          end
+        end
+      end
+
+      def metrics
+        @metrics ||= begin
+          column_header.metric_header.metric_header_entries.each_with_object([]) do |metric, arr|
+            arr << Hisui.from_ga_string(metric.name).to_sym
+          end
+        end
+      end
+
+      def fields
+        @fields ||= begin
+          fields = []
+
+          column_header.dimensions.each do |dimension|
+            fields << Hisui.from_ga_string(dimension).to_sym
+          end
+
+          column_header.metric_header.metric_header_entries.each do |metric|
+            fields << Hisui.from_ga_string(metric.name).to_sym
+          end
+
+          fields
+        end
+      end
+
+      def data
+        @data ||= response.reports.first.data
+      end
+    end
+  end
+end

data/lib/hisui/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hisui
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - ikepon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-03 00:00:00.000000000 Z
+date: 2018-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -172,6 +172,7 @@ files:
 - lib/hisui/model.rb
 - lib/hisui/request.rb
 - lib/hisui/response.rb
+- lib/hisui/response/ga_data.rb
 - lib/hisui/user.rb
 - lib/hisui/version.rb
 homepage: https://github.com/ikepon/hisui