zendesk_api 1.7.1 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 541a505d61aa6bbb9ca3bd5e088dbfa550d258dc
-  data.tar.gz: 8afd557c82c987d29d8cc206ab027f8c5f6a7b73
+  metadata.gz: 98e06ffbdacbeb08a6c0fd74786612587c721929
+  data.tar.gz: f6cc18717f45162a64e4dca92ad1b073104afdbd
 SHA512:
-  metadata.gz: b48bf63352b83b404c1e321e4c50c38ca66e01ce0689026d2501011cb63dfed386e9c6a8267bd53c8259042947951fcd59f11c7b59a3a347226a8cb5f3212b4c
-  data.tar.gz: d3a0cc1728829615852bef5cb0589f119cf09beb2414d6317ca7471ddca6432d1580ce59fbc371dd076d02eaedd37c9937e0af2467c98b730621c900eef73906
+  metadata.gz: 58cf0843963ac738917f717d8c8d9da4a813fda516099a73ff87cd6a3328f96c00617c2a8d96f1a1e296823d267d6da48f30aaa849a1b87926d08d7e7de47f2e
+  data.tar.gz: 20698254c962b84c195171a9ac5d5bf22eb1c82898290e48df26da08182fd899f0d825066b62daf07ba07e5c434ce9f8d25ec0571979ec89fd10bc1cda211c8c

data/lib/zendesk_api/collection.rb

@@ -113,11 +113,11 @@ module ZendeskAPI
     end
 
     def first_page?
-      !@options["page"] || @options["page"].to_i <= 1
+      !@prev_page
     end
 
     def last_page?
-      !@options["page"] || @options["page"].to_i * @options["per_page"].to_i >= count
+      !@next_page || @next_page == @query
     end
 
     # Saves all newly created resources stored in this collection.
@@ -172,7 +172,6 @@ module ZendeskAPI
       @response = get_response(@query || self.path)
       handle_response(@response.body)
 
-      @query = nil
       @resources
     end
 

data/lib/zendesk_api/resources.rb

@@ -824,6 +824,9 @@ module ZendeskAPI
       super
     end
 
+    class Plan < Resource
+    end
+
     class Upload < Data
       class << self
         def resource_path
@@ -866,6 +869,7 @@ module ZendeskAPI
     end
 
     has Upload, :path => "uploads"
+    has_many Plan
 
     # Don't nest attributes
     def attributes_for_save

data/lib/zendesk_api/version.rb

@@ -1,3 +1,3 @@
 module ZendeskAPI
-  VERSION = "1.7.1"
+  VERSION = "1.7.3"
 end

data/spec/core/collection_spec.rb

@@ -253,6 +253,82 @@ describe ZendeskAPI::Collection do
       end
     end
 
+    context "requests with no next_page" do
+      before(:each) do
+        stub_json_request(:get, %r{test_resources$}, json(
+          :test_resources => [{:id => 1}],
+          :next_page => "/test_resources?page=2"
+        ))
+
+        stub_json_request(:get, %r{test_resources\?page=2}, json(
+          :test_resources => [{:id => 2}]
+        ))
+      end
+
+      it "should yield resource and page" do
+        expect do |b|
+          silence_logger { subject.all(&b) }
+        end.to yield_successive_args(
+          [ZendeskAPI::TestResource.new(client, :id => 1), 1],
+          [ZendeskAPI::TestResource.new(client, :id => 2), 2]
+        )
+      end
+    end
+
+    context "incremental requests" do
+      subject do
+        ZendeskAPI::Collection.new(client, ZendeskAPI::TestResource, :path => 'exports/test_resources?start_time=0')
+      end
+
+      before(:each) do
+        stub_json_request(:get, %r{exports/test_resources\?start_time=0$}, json(
+          :test_resources => [{:id => 1}],
+          :next_page => "/exports/test_resources?start_time=200"
+        ))
+
+        stub_json_request(:get, %r{exports/test_resources\?start_time=200$}, json(
+          :test_resources => [{:id => 2}],
+          :next_page => "/exports/test_resources?start_time=200"
+        ))
+      end
+
+      it "should yield resource and page (and not infinitely loop)" do
+        expect do |b|
+          Timeout.timeout(5) do
+            silence_logger { subject.all(&b) }
+          end
+        end.to yield_successive_args(
+          [ZendeskAPI::TestResource.new(client, :id => 1), 1],
+          [ZendeskAPI::TestResource.new(client, :id => 2), 1] # page defaults to 1
+        )
+      end
+    end
+
+    context "infinite loops" do
+      before(:each) do
+        stub_json_request(:get, %r{test_resources$}, json(
+          :test_resources => [{:id => 1}],
+          :next_page => "/test_resources?page=2"
+        ))
+
+        stub_json_request(:get, %r{/test_resources\?page=2$}, json(
+          :test_resources => [{:id => 2}],
+          :next_page => "/test_resources?page=2"
+        ))
+      end
+
+      xit "should yield resource and page (and not infinitely loop)" do
+        expect do |b|
+          Timeout.timeout(5) do
+            silence_logger { subject.all(&b) }
+          end
+        end.to yield_successive_args(
+          [ZendeskAPI::TestResource.new(client, :id => 1), 1],
+          [ZendeskAPI::TestResource.new(client, :id => 2), 2]
+        )
+      end
+    end
+
     context "successful requests" do
       before(:each) do
         stub_json_request(:get, %r{test_resources$}, json(

data/spec/fixtures/zendesk.rb

@@ -18,7 +18,7 @@ module ZendeskAPI
       VCR.use_cassette("valid_user_#{role}") do
         email = "zendesk-api-client-ruby-#{role}-#{client.config.username}"
 
-        client.users.detect {|u| u.email == email } ||
+        client.users.search(query: "email:#{email}").first ||
         client.users.create(
           :name => "Test Valid with role #{role}",
           :verified => true,

data/spec/live/request_spec.rb

@@ -9,7 +9,7 @@ describe ZendeskAPI::Request do
   end
 
   it_should_be_creatable
-  it_should_be_updatable :solved, true
+  it_should_be_updatable :solved, true, { :comment => { :value => 'This is solved!' } }
   it_should_be_readable :requests
   it_should_be_readable user, :requests
 

data/spec/macros/resource_macros.rb

@@ -44,7 +44,7 @@ module ResourceMacros
     end
   end
 
-  def it_should_be_updatable(attribute, value = "TESTDATA")
+  def it_should_be_updatable(attribute, value = "TESTDATA", extra = {})
     context "update", :vcr do
       before(:all) do
         VCR.use_cassette("#{described_class.to_s}_update_create") do
@@ -54,6 +54,7 @@ module ResourceMacros
 
       before(:each) do
         @object.send("#{attribute}=", value)
+        extra.each {|k, v| @object.send("#{k}=", v)}
       end
 
       it "should be savable" do
@@ -66,7 +67,7 @@ module ResourceMacros
         end
 
         it "should keep attributes" do
-          expect(@object.send(attribute)).to eq(value )
+          expect(@object.send(attribute)).to eq(value)
         end
 
         it "should be findable", :unless => metadata[:not_findable] do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_api
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.3
 platform: ruby
 authors:
 - Steven Davidovitz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump