flurry 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cde1d598b20fc4514de059bcc23ca9c80fae07433c9a3f5d50cc26c872afb68
-  data.tar.gz: d33afbd639fc828e7fe05bb4b47b94f35654ee8e36bb85064e1cecc969ac875a
+  metadata.gz: 7dfb857e76e829fc5ef38c907de8ac00e8433071bbf8ffca566dfce7c5bc2020
+  data.tar.gz: f16bd69eb991bee0be3dbc5845c82b0ff6697e4d08ebccbf7cfe0ce6801f0d41
 SHA512:
-  metadata.gz: a1c24852b29328043a97eb502475581062f96d957bceff546dd822db1c9f22a9a8d0c66f7644f908192eaf8f95874d42cd559a06922a48acb8e0fb74993fabd7
-  data.tar.gz: 14374f12b87fc3dff4556ddd7dea211a543e5ee96ecc68cce9bf9f42df9c6089d9431a352330a651be6acc1b8a3fc6a2d27095749e461c4a2d7d112b5599c1b4
+  metadata.gz: 2de8d6cb00b1ee989c2211808ff11fd2f0185b8411a229ad250346cf4e622e51d6aab1d62b19deeaada6edaad45797f93e76d767e0eac0472a25a11277434f5c
+  data.tar.gz: e08caab0c91b15427444eff98b503cdf447ebf20215f2acc69c3d389dda6fa829c2aa966f86cc589e52b5a9c31e33bcefa4ffe5d218a6b87db185af1ccc197ee

data/lib/flurry/helper.rb

@@ -20,5 +20,18 @@ module Flurry
       tomorrow = Date.parse(date.to_s) if date.is_a?(Time)
       (tomorrow || date) + 1
     end
+
+    def merge(hsh, other)
+      (hsh || {}).merge(other || {}) do |_key, old_val, new_val|
+        case old_val
+        when Hash
+          merge old_val, new_val
+        when Array
+          old_val | new_val
+        else
+          new_val
+        end
+      end
+    end
   end
 end

data/lib/flurry/request.rb

@@ -16,14 +16,17 @@ module Flurry
     end
 
     def showing(**dimensions)
-      dup.tap { |it| it.dimensions = clean_dimensions(dimensions || {}) }
+      dup.tap { |it| it.dimensions = merge(it.dimensions, clean_dimensions(dimensions || {})) }
     end
 
     def select(*metrics)
       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.map { |m| camelize(m.to_s) } }
+      dup.tap do |it|
+        it.metrics ||= []
+        it.metrics |= metrics.map { |m| camelize(m.to_s) }
+      end
     end
 
     def between(start, finish = nil, format: '%Y-%m-%d')
@@ -41,7 +44,7 @@ module Flurry
 
       sorts = { sorts => nil } unless sorts.is_a?(Hash)
       dup.tap do |it|
-        it.sorts = clean_sorts(sorts || {})
+        it.sorts = merge(it.sorts, clean_sorts(sorts || {}))
         it.top = top
       end
     end
@@ -49,7 +52,7 @@ module Flurry
     def having(**havings)
       raise Flurry::Error, 'metrics must be provided before having' unless @metrics
 
-      dup.tap { |it| it.havings = clean_havings(havings || {}) }
+      dup.tap { |it| it.havings = merge(it.havings, clean_havings(havings || {})) }
     end
 
     def time_zone(time_zone)
@@ -68,7 +71,8 @@ module Flurry
 
     protected
 
-    attr_writer :table, :grain, :dimensions, :metrics, :range, :sorts, :top, :havings, :time_zone, :format
+    attr_writer :table, :grain, :range, :top, :time_zone, :format
+    attr_accessor :dimensions, :metrics, :sorts, :havings
 
     private
 

data/lib/flurry/version.rb

@@ -1,3 +1,3 @@
 module Flurry
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flurry
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Roger Bagué
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-25 00:00:00.000000000 Z
+date: 2019-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty