zendesk_api 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 558412300c43c0e2ce45a0c149261bd0a6d60568
-  data.tar.gz: e64f115c5aa31ada40ff8084bbf2059ac6d53d2b
+  metadata.gz: 04ffe4c8d58e8f4e587f813afee1b867cc8e15a6
+  data.tar.gz: 12bee85ee43c5d1af6fda0a4f069c6f2cfe57334
 SHA512:
-  metadata.gz: f4476bfb5fd72707b5e14a62114d60b30f70e585b59cbc9b695512a666834c55ed3f60367067a0ab39cac12153c88053e53cea913b54a79804279ed9bee3c664
-  data.tar.gz: 7af9a7e1816ad64d83d525e29a5893cc2b0551bb588fb48953412ab41d461af1a3ed648841317d6a767d0d5c8b4bf7948d79e44d2b6f515de7c0571f5ff9bc16
+  metadata.gz: 03cea5cefaecc99504fdf12040b4dc1fc7b1bb12465d2804aec05f794da7c12b0148b196affcdedc3a77b07d97034e24983a0e4d958a716d07673132e78295dd
+  data.tar.gz: 0fd99e6c20b86d84b5703282fdb2d9d09a5d4a41d62fbda52b7ccb5b43d038d59b3eefdec02ae7a1d6e14a1fd48940cb135578479f0d15c1c0a0d9965de73203

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zendesk_api (1.4.3)
+    zendesk_api (1.4.4)
       faraday (~> 0.9)
       hashie (>= 1.2, < 4.0)
       inflection
@@ -43,7 +43,7 @@ GEM
     erubis (2.7.0)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
-    hashie (3.2.0)
+    hashie (3.3.1)
     hike (1.2.3)
     i18n (0.6.11)
     inflection (1.0.0)

data/lib/zendesk_api/client.rb

@@ -40,6 +40,7 @@ module ZendeskAPI
         cached
       else
         @resource_cache[method][:class] ||= method_as_class(method)
+        raise "Resource for #{method} does not exist" unless @resource_cache[method][:class]
         @resource_cache[method][:cache].write(options.hash, ZendeskAPI::Collection.new(self, @resource_cache[method][:class], options))
       end
     end

data/lib/zendesk_api/collection.rb

@@ -19,6 +19,9 @@ module ZendeskAPI
     # @return [Hash] query options
     attr_reader :options
 
+    # @return [ZendeskAPI::ClientError] The last response error
+    attr_reader :error
+
     # Creates a new Collection instance. Does not fetch resources.
     # Additional options are: verb (default: GET), path (default: resource param), page, per_page.
     # @param [Client] client The {Client} to use.
@@ -176,6 +179,8 @@ module ZendeskAPI
     def fetch(*args)
       fetch!(*args)
     rescue Faraday::Error::ClientError => e
+      @error = e
+
       []
     end
 
@@ -373,6 +378,7 @@ module ZendeskAPI
     ## Fetch
 
     def get_response(path)
+      @error = nil
       @response = @client.connection.send(@verb || "get", path) do |req|
         opts = @options.delete_if {|_, v| v.nil?}
 
@@ -394,6 +400,10 @@ module ZendeskAPI
       body = response_body.dup
       results = body.delete(@resource_class.model_key) || body.delete("results")
 
+      unless results
+        raise ZendeskAPI::Error::ClientError, "Expected #{@resource_class.model_key} or 'results' in response keys: #{body.keys.inspect}"
+      end
+
       @resources = results.map do |res|
         wrap_resource(res)
       end

data/lib/zendesk_api/resources.rb

@@ -1,7 +1,6 @@
 module ZendeskAPI
 # @internal The following are redefined later, but needed by some circular resources (e.g. Ticket -> User, User -> Ticket)
 
-
   class Ticket < Resource; end
   class Forum < Resource; end
   class User < Resource; end
@@ -103,9 +102,21 @@ module ZendeskAPI
     end
   end
 
-  class MobileDevice < Resource
-    # Clears this devices' badge
-    put :clear_badge
+  # @internal This isn't a real resource, it is used by ticket and request comments
+  module CommentMixin
+    include Save
+
+    def self.included(klass)
+      klass.has_many :uploads, :class => Attachment, :inline => true
+      klass.has :author, :class => User
+    end
+
+    def save
+      save_associations
+      true
+    end
+
+    alias :save! :save
   end
 
   class Organization < Resource
@@ -290,11 +301,11 @@ module ZendeskAPI
   end
 
   class Request < Resource
-    class Comment < ReadResource
-      has_many Attachment, :inline => true
-      has :author, :class => User
+    class Comment < DataResource
+      include CommentMixin
     end
 
+    has Comment, :inline => true
     has_many Comment
 
     has Organization
@@ -302,6 +313,14 @@ module ZendeskAPI
     has :requester, :class => User
   end
 
+  class AnonymousRequest < CreateResource
+    def self.singular_resource_name
+      'request'
+    end
+
+    namespace 'portal'
+  end
+
   class TicketField < Resource; end
 
   class TicketMetric < DataResource
@@ -325,17 +344,7 @@ module ZendeskAPI
     end
 
     class Comment < DataResource
-      include Save
-
-      has_many :uploads, :class => Attachment, :inline => true
-      has :author, :class => User
-
-      def save
-        save_associations
-        true
-      end
-
-      alias :save! :save
+      include CommentMixin
     end
 
     put :mark_as_spam
@@ -605,6 +614,7 @@ module ZendeskAPI
 
   module Voice
     include DataNamespace
+
     class PhoneNumber < Resource
       namespace "channels/voice"
     end

data/lib/zendesk_api/version.rb

@@ -1,3 +1,3 @@
 module ZendeskAPI
-  VERSION = "1.4.3"
+  VERSION = "1.4.4"
 end

data/spec/core/client_spec.rb

@@ -249,6 +249,10 @@ describe ZendeskAPI::Client do
     it "looks in the appropriate namespaces" do
       expect(subject.greetings.association.options['class']).to eq(ZendeskAPI::Voice::Greeting)
     end
+
+    it 'raises if the resource does not exist' do
+      expect { subject.random_resource }.to raise_error(RuntimeError)
+    end
   end
 
   it "can be subclassed" do

data/spec/core/collection_spec.rb

@@ -374,6 +374,19 @@ describe ZendeskAPI::Collection do
       end
     end
 
+    context "with an invalid model key expectation" do
+      before(:each) do
+        stub_json_request(:get, %r{test_resources}, json(
+          :test_resource_stuff => [{:id => 2}],
+          :next_page => "/test_resources?page=2"
+        ))
+      end
+
+      it "should properly be handled" do
+        expect(subject.fetch(true)).to be_empty
+      end
+    end
+
     context "with nil body" do
       before(:each) do
         stub_request(:get, %r{test_resources}).to_return(:status => 200)

data/spec/fixtures/zendesk.rb

@@ -67,6 +67,14 @@ module ZendeskAPI
     def suspended_ticket
       VCR.use_cassette('valid_suspended_ticket') do
         @suspended_ticket ||= client.suspended_tickets.first
+        @suspended_ticket ||= begin
+          client.anonymous_requests.create(
+            :subject => "Test Ticket",
+            :comment => { :value => "Help! I need somebody." },
+            :requester => { :email => "zendesk-api-client-ruby-anonymous-#{client.config.username}", :name => 'Anonymous User' }
+          )
+          client.suspended_tickets(:reload => true).first
+        end
       end
     end
 

data/spec/live/request_spec.rb

@@ -12,4 +12,27 @@ describe ZendeskAPI::Request do
   it_should_be_updatable :subject
   it_should_be_readable :requests
   it_should_be_readable user, :requests
+
+  it "can upload while creating" do
+    VCR.use_cassette("request_inline_uploads") do
+      request = ZendeskAPI::Request.new(client, valid_attributes)
+      request.comment.uploads << "spec/fixtures/Argentina.gif"
+      request.comment.uploads << File.new("spec/fixtures/Argentina.gif")
+
+      request.save!
+      expect(request.changes).to eq({}) # uploads were set before save
+      expect(request.comment.attributes[:uploads].map(&:class)).to eq([String, String]) # upload was sent as tokens
+    end
+  end
+
+  it "can comment while creating" do
+    VCR.use_cassette("request_inline_comments") do
+      request = ZendeskAPI::Request.new(client, valid_attributes)
+      request.comment = ZendeskAPI::Request::Comment.new(client, :value => "My comment")
+      request.save!
+
+      expect(request.changes).to eq({}) # comment was set before save
+      expect(request.attributes[:comment]).to eq({"value" => "My comment"})
+    end
+  end
 end

data/spec/live/tag_spec.rb

@@ -1,8 +1,6 @@
 require 'core/spec_helper'
 
 describe ZendeskAPI::Tag, :vcr, :not_findable do
-  it_should_be_readable :tags
-
   [organization, topic, ticket].each do |object|
     under object do
       before(:each) do

data/spec/live/ticket_spec.rb

@@ -67,7 +67,7 @@ describe ZendeskAPI::Ticket do
     it "can import" do
       VCR.use_cassette("ticket_import_can_import") do
         old = Time.now - 5*365*24*60*60
-        ticket = ZendeskAPI::Ticket.import(client, valid_attributes.merge(:created_at => old))
+        ticket = ZendeskAPI::Ticket.import(client, valid_attributes.merge(:created_at => old.iso8601))
         expect(ZendeskAPI::Ticket.find(client, ticket).created_at.year).to eq(old.year)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_api
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Steven Davidovitz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-05 00:00:00.000000000 Z
+date: 2014-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump