legato 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9077eb3bf7200ccae8aaa176ae3199c983501ca
-  data.tar.gz: efd2b61790708f18b5be1bf612ae3267b99de0bd
+  metadata.gz: 4d2378f43a51af8784a18791483c114fdcfcaaff
+  data.tar.gz: e395bbd3c4bda622d04ce876454959feb1d3d9ed
 SHA512:
-  metadata.gz: d90896b83ec99911d48a493cd990c731f5a6e05a11551162510ac2956339c343a0262730e065dddcc0690fbcefcdd024a8228c45e4c146c6055d85ba481ce0c0
-  data.tar.gz: 88fd641061a3b056833dba164ee8c7b22a9318c9b6fd922b687626f82f6f26da61c8cf85237ebb4f941200edba58b1f1eda96221f3028c4934744719dc978c7a
+  metadata.gz: 4f7614523c21e385d4ea0157d620c54af0b1e35643fc13ab5cf924570a5c7ba8d995a82a56859ed9ca67b82c5db7f74e0698b5f2085019792a802b2bf4c6b7dd
+  data.tar.gz: 2eb7085a97a99d5ad21471b376641beb16e9b8927af25ef4f9b1a410a1a5f3de98a247f05f1e4b00f8a6974cc5cf1e4bbde174f7b737547a2546f0426a66026d

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## Legato 0.6.2 ##
+
+* Add `filters` and `segment_filters` to query duplicating
+
+    *Tony Pitale*
+
 ## Legato 0.6.1 ##
 
 * Fix bug in `Query` where calling `results` did not retain previous basic options

data/lib/legato/model.rb

@@ -87,7 +87,7 @@ module Legato
     #   to Google Analytics which returns the result data
     def results(profile, options = {})
       # TODO: making tracking scope configurable when results are querried.  not sure how to do this.
-      Query.new(self).results(profile, options)
+      Query.new(self).apply_options(options.merge(:profile => profile))
     end
 
     # Builds a `query` and sets the `realtime` property

data/lib/legato/query.rb

@@ -45,14 +45,14 @@ module Legato
     attr_accessor :tracking_scope
 
     def self.from_query(query)
-      new(query.parent_klass, query.tracking_scope)
+      new(query.parent_klass, query.tracking_scope, query.filters, query.segment_filters)
     end
 
-    def initialize(klass, tracking_scope = "ga")
+    def initialize(klass, tracking_scope = "ga", filters = FilterSet.new, segment_filters = FilterSet.new)
       @loaded = false
       @parent_klass = klass
-      self.filters = FilterSet.new
-      self.segment_filters = FilterSet.new
+      self.filters = filters
+      self.segment_filters = segment_filters
       self.start_date = Time.now - MONTH
       self.end_date = Time.now
       self.tracking_scope = tracking_scope
@@ -99,6 +99,10 @@ module Legato
         options[:sort] = options.delete(:sort)
       end
 
+      if options.has_key?(:profile)
+        self.profile = options.delete(:profile)
+      end
+
       apply_basic_options(options)
       # apply_filter_options(options[:filters])
 

data/lib/legato/version.rb

@@ -1,3 +1,3 @@
 module Legato
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/spec/lib/legato/model_spec.rb

@@ -116,13 +116,13 @@ describe "Legato::Model" do
     it 'has results' do
       options = {}
       profile = stub
-      query = stub(:results => "a query")
+      query = stub(:apply_options => "a query")
       Legato::Query.stubs(:new).returns(query)
 
       @model.results(profile, options).should == "a query"
 
       Legato::Query.should have_received(:new).with(@model)
-      query.should have_received(:results).with(profile, options)
+      query.should have_received(:apply_options).with(options.merge(:profile => profile))
     end
 
     it 'has a query with realtime set' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: legato
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Tony Pitale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2015-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake