groovehq 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e61b3bab09b188fd2d9c2f1aad3dead54143be4b
-  data.tar.gz: a2c9ce9160d98b446c0ab415f473b1e7c7a267f8
+  metadata.gz: 2145e0b487829c02c6e0080c1720c7667426e8fe
+  data.tar.gz: 057464d5b2a57bc162728f8f4a65d8b29ba04ae4
 SHA512:
-  metadata.gz: d57eacb85e4bd8b1855bbcbcce1e80641ff9bfdb1501fa8e344b7153320676d9ff415445f54ed7e978bc0f8066facf3448846ac9b4a2888e121f476d876061b2
-  data.tar.gz: ecdc813e58dfd8a11e7eca21748aa910ffddd9c26f217892a071a47dec23b0d377d82746ee3ce41d6fc7956b15abcb2261557a691a9845e50e9a098c2f90a641
+  metadata.gz: f4a5e18231d02edeef700b2766135dc4f7737f933b5a20ff8832d79a10294b212e6e980c2a3bb923eaf45324e5f6025218e1c4c0d76e46cbb114fe95a14292e0
+  data.tar.gz: 643eb4a6844f303f509a002ebb3a4545a7be9643697fb0823817deba82e03fb02ef9c96bb7dafeecac4e666c1174f28418b6bf2b576bd9640fd257ed77ff668a

data/Rakefile

@@ -4,7 +4,8 @@ begin
   require 'rspec/core/rake_task'
 
   RSpec::Core::RakeTask.new(:spec) do |t|
-    t.rspec_opts = ["--tag=~integration"] unless ENV["TRAVIS_BRANCH"] == "master"
+    travis_master = ENV["TRAVIS_BRANCH"] == "master" && ENV["TRAVIS_PULL_REQUEST"] == "false"
+    t.rspec_opts = ["--tag=~integration"] unless travis_master
   end
 
   task :default => :spec

data/lib/groovehq/resource.rb

@@ -20,7 +20,7 @@ module GrooveHQ
 
     def parse_links(links)
       (links || {}).each_with_object({}) do |(relation, value), result|
-        result[relation] = Relation.new(@client, value[:href])
+        result[relation] = Relation.new(@client, value[:href]) if value[:href]
       end.with_indifferent_access
     end
 

data/lib/groovehq/resource_collection.rb

@@ -3,7 +3,9 @@ module GrooveHQ
   class ResourceCollection < Resource
     include Enumerable
 
-    def initialize(client, data)
+    attr_reader :options
+
+    def initialize(client, data, options = {})
       data = {} unless data.is_a?(Hash)
       data = data.with_indifferent_access
 
@@ -25,15 +27,26 @@ module GrooveHQ
           prev: {
             href: meta_data["pagination"]["prev_page"]
           }
-        }.with_indifferent_access
+        }
       end
 
       @data = OpenStruct.new(meta: meta_data, collection: collection)
       @rels = parse_links(links)
+      @options = options.with_indifferent_access
     end
 
-    def each(&block)
+    def each
+      return enum_for(:each) unless block_given?
+
       collection.each { |item| yield item }
+
+      rel = @rels[:next] or return self
+      resource_collection = rel.get(@options.except(:page))
+      resource_collection.each(&Proc.new)
+
+      @data = OpenStruct.new(meta: resource_collection.meta,
+                             collection: collection + resource_collection.collection)
+      @rels = resource_collection.rels
     end
 
   end

data/lib/groovehq/version.rb

@@ -1,3 +1,3 @@
 module GrooveHQ
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

data/spec/groovehq/client/connection_spec.rb

@@ -106,6 +106,16 @@ describe GrooveHQ::Client::Connection do
       expect(subject.rels[:next]).to be_instance_of(GrooveHQ::Relation)
     end
 
+    context "with request options" do
+      subject { client.get(resource_path, per_page: 20) }
+
+      it "retains options" do
+        stub_request(:get, "#{api_groovehq_url}#{resource_path}?per_page=20").to_return(body: response)
+        expect(subject.options).to eq({})
+      end
+
+    end
+
   end
 
 end

data/spec/groovehq/resource_collection_spec.rb

@@ -39,6 +39,88 @@ describe GrooveHQ::Resource do
       resource = GrooveHQ::ResourceCollection.new(client, data)
       expect(resource.rels[:next]).to be_instance_of(GrooveHQ::Relation)
       expect(resource.rels[:next].href).to eq("http://api.groovehq.dev/v1/tickets?page=2")
+      expect(resource.rels[:prev]).to be_nil
+    end
+
+  end
+
+  context "#each" do
+
+    it "returns an enumerator when block omitted" do
+      data = {
+        tickets: [ { name: "When I am small" } ]
+      }
+
+      resource = GrooveHQ::ResourceCollection.new(client, data)
+      expect(resource.each).to be_instance_of(Enumerator)
+      expect(resource.first.name).to eql "When I am small"
+    end
+
+    context "paginated requests" do
+
+      before do
+        page_1 = {
+          tickets: [{ title: "Ticket 1" }],
+          meta: {
+            pagination: {
+              next_page: "http://api.groovehq.dev/v1/tickets?page=2"
+            }
+          }
+        }.stringify_keys
+
+        page_2 = {
+          tickets: [{ title: "Ticket 2"}],
+          meta: {
+            pagination: {
+              prev_page: "http://api.groovehq.dev/v1/tickets?page=1",
+              next_page: "http://api.groovehq.dev/v1/tickets?page=3"
+            }
+          }
+        }.stringify_keys
+
+        page_3 = {
+          tickets: [{ title: "Ticket 3"}],
+          meta: {
+            pagination: {
+              prev_page: "http://api.groovehq.dev/v1/tickets?page=2",
+            }
+          }
+        }.stringify_keys
+
+        stub_request(:get, "http://api.groovehq.dev/v1/tickets?page=2").
+          with(headers: {'Authorization' => 'Bearer phantogram'}).
+          to_return(body: page_2.to_json, status: 200)
+
+        stub_request(:get, "http://api.groovehq.dev/v1/tickets?page=3").
+          with(headers: {'Authorization' => 'Bearer phantogram'}).
+          to_return(body: page_3.to_json, status: 200)
+
+        @page_1 = page_1
+      end
+
+      it "enumerates all pages" do
+        resource = GrooveHQ::ResourceCollection.new(client, @page_1)
+
+        all_tickets = resource.each.to_a
+        expect(all_tickets.size).to eql(3)
+        expect(all_tickets.map(&:title)).to eql(["Ticket 1", "Ticket 2", "Ticket 3"])
+      end
+
+      it "merges data" do
+        resource = GrooveHQ::ResourceCollection.new(client, @page_1)
+
+        expect(resource.map(&:title)).to eql(["Ticket 1", "Ticket 2", "Ticket 3"])
+        expect(resource.collection.size).to eql(3)
+      end
+
+      it "respects :per_page and other parameters except :page" do
+        resource = GrooveHQ::ResourceCollection.new(client, @page_1, page: 1, per_page: 20, foo: "bar")
+        stub_request(:get, "http://api.groovehq.dev/v1/tickets?page=2&per_page=20&foo=bar").
+          with(headers: {'Authorization' => 'Bearer phantogram'}).
+          to_return(body: {tickets: []}.to_json, status: 200)
+
+        expect(resource.map(&:title)).to eql(["Ticket 1"])
+      end
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groovehq
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Kirill Shirinkin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-31 00:00:00.000000000 Z
+date: 2016-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty