flurry 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aab9d43586ace9b91f12ef33efe629a925b6965615760ae91302574330bba5e6
-  data.tar.gz: aad2af4110cd6fa68efaad1cd5c9e8ca886d2248684d1bc1c404c755c3ac5363
+  metadata.gz: b5702aba374c6b60521137823bd21d7c086f18c2b1629a336456afd94f11ac56
+  data.tar.gz: 605807aeee9a6e06057d90a32bf306523d8d12d1275ead1df47bdc21b3ecec77
 SHA512:
-  metadata.gz: e515c93beb93060111cb0b87355b08de981d688f258017a697a5c1591ed7950e5c6aa923431c25f41113807d7dcc43ead3d2ab2ada24155beed0518abfdd0af1
-  data.tar.gz: 1d7858cb57f6a9e14a7d3484ee9eec409565777a881d270eb33c6debba90afdd487b0a7e39571ad6ae22d8bec0346590b11530a90a0cc46dbb8af101b2f2660f
+  metadata.gz: 5c802dfcfe04234df2007bfdda5ab2530656e7f9ad7a72c300ff9bf9f60349ed050dce115eb20da88cec2e9061568ac8c1a4b6124b37067c45b74a979691f6aa
+  data.tar.gz: cf6ee0bcdac4283856fa0a4fdaad0f6775519c557431902aeea74250d031d2493aa6e52cd1c1c6b288e88739846f4f3457bea71fbccc78a4a044c1f9c1b090ac

data/lib/flurry/request.rb

@@ -23,7 +23,7 @@ module Flurry
       metrics = metrics.flatten.reject(&:nil?) || []
       raise Flurry::Error, 'at least one metric has to be provided' if metrics.empty?
 
-      dup.tap { |it| it.metrics = metrics }
+      dup.tap { |it| it.metrics = metrics.map { |m| camelize(m.to_s) } }
     end
 
     def between(start, finish = nil, format: '%Y-%m-%d')
@@ -37,13 +37,23 @@ module Flurry
       dup.tap { |it| it.range = [start, finish] }
     end
 
+    def sort(sorts, top = 0)
+      raise Flurry::Error, 'metrics must be provided before sort' unless @metrics
+
+      sorts = { sorts => nil } unless sorts.is_a?(Hash)
+      dup.tap do |it|
+        it.sorts = clean_sorts(sorts || {})
+        it.top = top
+      end
+    end
+
     def fetch
       self.class.get(full_path).response
     end
 
     protected
 
-    attr_writer :table, :grain, :dimensions, :metrics, :range
+    attr_writer :table, :grain, :dimensions, :metrics, :range, :sorts, :top
 
     private
 
@@ -56,6 +66,15 @@ module Flurry
       end
     end
 
+    def clean_sorts(sorts)
+      sorts.each_with_object({}) do |(key, val), h|
+        next if key.nil?
+
+        k = camelize(key.to_s)
+        h[k] = val || :desc if @metrics.include? k
+      end
+    end
+
     def base_partial_path
       "/#{camelize(@table.to_s)}/#{@grain}"
     end
@@ -73,7 +92,7 @@ module Flurry
 
     def metrics_partial_path
       '&metrics=' + @metrics.map do |metric|
-        camelize(metric.to_s) unless metric.nil?
+        metric unless metric.nil?
       end.join(',')
     end
 
@@ -81,6 +100,16 @@ module Flurry
       "&dateTime=#{@range.join('/')}"
     end
 
+    def sort_partial_path
+      return '' unless @sorts && @sorts.any?
+
+      partial = ("&topN=#{@top}" if @top && @top.positive?) || ''
+      partial.tap do |path|
+        path << '&sort='
+        path << @sorts.map { |k, v| "#{k}|#{v}" }.join(',')
+      end
+    end
+
     def full_path
       ''.tap do |path|
         path << base_partial_path
@@ -89,6 +118,7 @@ module Flurry
         path << 'token=' + Flurry.configuration.token
         path << '&timeZone=' + Flurry.configuration.time_zone if Flurry.configuration.time_zone
         path << metrics_partial_path
+        path << sort_partial_path
         path << time_range_partial_path
       end
     end

data/lib/flurry/version.rb

@@ -1,3 +1,3 @@
 module Flurry
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flurry
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Roger Bagué
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-04 00:00:00.000000000 Z
+date: 2019-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -91,9 +91,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="