legato 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 980eb1079898deac8afc471a03804fda0cc3865a
-  data.tar.gz: 90eb6e06d3ccfb0ebb5cb178c8e81ef9808beef6
+  metadata.gz: 304acd2f0f716bf682b425bea037c4445afc97fd
+  data.tar.gz: 4443a2410d7c782ae282bd4913ae5f5e6730cadd
 SHA512:
-  metadata.gz: bdb333f5453cb364f28a431eb1b6b84cf3c8fedd1df39a05e3af0bf6784cda44e9279b2e81051d81158daa5717cc8ed7a6ce2786deed0b59e180266acb66ef0b
-  data.tar.gz: 6596be013de3f10f9704e9ab11167316d475919038200770f34130b99dc555218905420c7cd36a000bba44db4926b054797ba3ef497ee7bda2f3b28a3d79bb1b
+  metadata.gz: d978c8ac87bcab86a9ac8003b7afb18735f8f7281203bb186f23d0cc773a33b2ac1cd5750f502ad1ed0490a47189c6311d63f5e09f005452614dc69a750ac501
+  data.tar.gz: c1d37f5c5b819ae0c14fc7a88b486165c5ad000d1762550ee8e12a15cbe63d36668c7fc69b743dcc22cda394a3cf76862ba651db1f522849a7e0e7749bb02b8c

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## Legato 0.6.0 ##
+
+* Fix bug in `Query` where calling `results` after loading a collection would not load new data into the collection
+
+    *Tony Pitale*
+
 ## Legato 0.5.2 ##
 
 * Refactor `User.request` into a `Request` class

data/lib/legato/query.rb

@@ -39,6 +39,10 @@ module Legato
     attr_accessor :filters, :segment_filters # combined, can be appended to
     attr_accessor :tracking_scope
 
+    def self.from_query(query)
+      new(query.parent_klass, query.tracking_scope)
+    end
+
     def initialize(klass, tracking_scope = "ga")
       @loaded = false
       @parent_klass = klass
@@ -164,11 +168,13 @@ module Legato
 
     # if no filters, we use results to add profile
     def results(profile=nil, options={})
-      options, profile = profile, nil if profile.is_a?(Hash)
+      query = loaded? ? Query.from_query(self) : self
 
-      self.profile = profile unless profile.nil?
-      apply_options(options)
-      self
+      options, profile = profile, self.profile if profile.is_a?(Hash)
+
+      query.profile = profile
+      query.apply_options(options)
+      query
     end
 
     # def total_results

data/lib/legato/version.rb

@@ -1,3 +1,3 @@
 module Legato
-  VERSION = "0.5.2"
+  VERSION = "0.6.0"
 end

data/spec/lib/legato/query_spec.rb

@@ -123,15 +123,25 @@ describe Legato::Query do
     end
 
     it 'sets options and returns self' do
+      profile = @query.profile
       @query.stubs(:profile=)
       @query.stubs(:apply_options)
 
       @query.results({:sort => [:city]}).should == @query
 
-      @query.should have_received(:profile=).never
+      @query.should have_received(:profile=).with(profile)
       @query.should have_received(:apply_options).with({:sort => [:city]})
     end
 
+    it 'creates a new query if collection has already been loaded' do
+      @query.stubs(:loaded?).returns(true)
+
+      new_query = @query.results({offset: 10_000})
+
+      expect(new_query).to_not eql(@query)
+      expect(new_query.offset).to eql(10_000)
+    end
+
     context "when modifying dimensions" do
       it 'changes the query dimensions' do
         @query.dimensions << :city

metadata

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