ga-shikomi 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aefa66eed695aeebed4c52f2aa4fcfb2ea7ba535
-  data.tar.gz: f67aabae92c5059be40011dc4b7c778ce89134ec
+  metadata.gz: 2845b8a68e5ec317c6ad20262a2c489d94e797ac
+  data.tar.gz: 07e6b5fdc51f53256df6ec59246e0f706022ff57
 SHA512:
-  metadata.gz: f442d95ccac518787f6b235fc30c8ca596be7368c0a743af5f863615b14da616682d3afe97b33be9d21cbcbfcee4152a785cda5c8a5aa19cf13fcde832111ba0
-  data.tar.gz: f27d1ecde593533849ed0ff3db2128f2c3608fc9d54056bae7f07010e5d78df68a3b6630154be307577bed4a212ae5c74add467f33da536ad72a5943283e7124
+  metadata.gz: 164b7532867104eef11618afb57f41640bf028f6bb4d7e783f7ef3ca522784cd23a71feee24a69e6999af6d49abf5033c0465b7b7ac4d748140cb18c84f92385
+  data.tar.gz: 548891e6337d0d5114e920b28116ebcbec4c050f53de274fc947e4986ed27b6f2a5ba504d75a50ac71a0f5acb4e257cdae81497e635b92ae1c5ffaa51ea9b67a

data/ga_shikomi.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "google-api-client", ">= 0.8.6", "< 0.9"
+  spec.add_runtime_dependency "google-api-client", "0.8.6"
   spec.add_runtime_dependency "thor"
   spec.add_runtime_dependency "hirb"
 

data/lib/ga_shikomi/subcommand/ga.rb

@@ -8,6 +8,25 @@ module GAShikomi
       # --end-date
       # --metrics
       def get(config)
+        result = _raw_get(config)
+
+        case result['rows'].size
+        when 1
+          [result['totalsForAllResults']]
+        else
+          fields = %w(columnHeaders totalsForAllResults rows)
+          fields.map {|e| {e => result[e]}}.reduce(:merge)
+        end
+
+      end
+
+      #
+      # allow recursive call
+      #
+      # [param]  Hash
+      # [return] Hash
+      #
+      def _raw_get(config)
         opts = {
           'ids'        => options['profile_id'],
           'start-date' => options['start_date'],
@@ -30,13 +49,20 @@ module GAShikomi
 
         result = api.execute(api.analytics.data.ga.get, opts)
 
-        case result['rows'].size
-        when 1
-          [result['totalsForAllResults']]
-        else
-          fields = %w(columnHeaders totalsForAllResults rows)
-          fields.map {|e| {e => result[e]}}.reduce(:merge)
+        if result['nextLink']
+          query = result['query']
+          start = query['start-index']
+          limit = query['max-results']
+
+          rows  = result['rows']
+
+          config['start-index'] = start + limit
+
+          result = _raw_get(config)
+          result['rows'] += rows
         end
+
+        result
       end
     end
   end

data/lib/ga_shikomi/version.rb

@@ -1,3 +1,3 @@
 module GAShikomi
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ga-shikomi
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - wtnabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.8.6
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.8.6
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -182,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Google Analytics API wrapper for CLI written in Ruby.