zendesk_api 1.4.0 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d07ce370fb28464897785ae66e33e426fc65b1f
-  data.tar.gz: df2e6e5fed6d5bb977b0707b7f46e7396a3c8c70
+  metadata.gz: 9c3a7d321889f60c5c4d0f0c2c4170351b271c6b
+  data.tar.gz: 2de81c86986e49e8f925fb52ee77eee475bf18e7
 SHA512:
-  metadata.gz: 789311dcc288abb846bd53a6301df3f1c60988aefec37949272d260e58a85d2fa3faca796f50814578fc377acf813b159fccbe67328a334405b81f596f58fbd6
-  data.tar.gz: 19fc5162ac0a2956a4d6a70cfe082d39dcfdc87d56f81e3c5a53c11442882a507485e5a61529f350700ffbc9d0b32da38f6fb825111b72c6212ba3f1aaf756c6
+  metadata.gz: 7127ae993715fe0b818ba71e55f0287847d671bd08d0920a2188e58211dac67643a1b09b5647790cca95e225c35f75bd7f0d030dcb72cff98a27d1f37358d9dd
+  data.tar.gz: fdf856dbb4229b36059b96cce96bc1db1037482ced53b33eed92f161ed7ed6dc9e18aad7abd6da880ca196b4c60c95e7c581723699f4b9aca43f14bf8131a958

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zendesk_api (1.4.0)
+    zendesk_api (1.4.2)
       faraday (~> 0.9)
       hashie (>= 1.2)
       inflection

data/README.md

@@ -16,6 +16,7 @@ Please check out the [wiki](https://github.com/zendesk/zendesk_api_client_rb/wik
 * Version 1.0.0 changes the way errors are handled. Please see the [wiki page](https://github.com/zendesk/zendesk_api_client_rb/wiki/Errors) for more info.
 * Version 1.3.0 updates the Faraday dependency to 0.9. Since Faraday did not bump a major version we have not either, but there is no guarantee >= 1.3.0 works with Faraday < 0.9
 * Version 1.3.8 had a bug where attachments were created, but the response was not handled properly
+* Version >= 1.0 and < 1.4.2 had a bug where non application/json response bodies were discarded
 
 ## Installation
 

data/lib/zendesk_api/actions.rb

@@ -1,7 +1,7 @@
 module ZendeskAPI
   module ResponseHandler
     def handle_response(response)
-      if response.body && response.body[self.class.singular_resource_name]
+      if response.body.is_a?(Hash) && response.body[self.class.singular_resource_name]
         @attributes.replace(@attributes.deep_merge(response.body[self.class.singular_resource_name]))
       end
     end

data/lib/zendesk_api/collection.rb

@@ -387,7 +387,7 @@ module ZendeskAPI
     end
 
     def handle_response(response_body)
-      unless response_body
+      unless response_body.is_a?(Hash)
         raise ZendeskAPI::Error::NetworkError, @response.env
       end
 

data/lib/zendesk_api/middleware/response/deflate.rb

@@ -7,7 +7,7 @@ module ZendeskAPI
       # @private
       class Deflate < Faraday::Response::Middleware
         def on_complete(env)
-          if env.body.respond_to?(:to_str) && !env.body.strip.empty? && env[:response_headers]['content-encoding'] == "deflate"
+          if !env.body.strip.empty? && env[:response_headers]['content-encoding'] == "deflate"
             env.body = Zlib::Inflate.inflate(env.body)
           end
         end

data/lib/zendesk_api/middleware/response/gzip.rb

@@ -9,7 +9,7 @@ module ZendeskAPI
       # Faraday middleware to handle content-encoding = gzip
       class Gzip < Faraday::Response::Middleware
         def on_complete(env)
-          if env[:body].respond_to?(:to_str) && !env[:body].strip.empty? && env[:response_headers]['content-encoding'] == "gzip"
+          if !env[:body].strip.empty? && env[:response_headers]['content-encoding'] == "gzip"
             env[:body] = Zlib::GzipReader.new(StringIO.new(env[:body])).read
           end
         end

data/lib/zendesk_api/middleware/response/parse_json.rb

@@ -12,10 +12,10 @@ module ZendeskAPI
           type = type.split(';', 2).first if type.index(';')
           type
 
-          if type == 'application/json' && env[:body].respond_to?(:to_str) && !env[:body].strip.empty?
+          return unless type == 'application/json'
+
+          unless env[:body].strip.empty?
             env[:body] = JSON.parse(env[:body])
-          else
-            env[:body] = nil
           end
         end
       end

data/lib/zendesk_api/resources.rb

@@ -118,6 +118,12 @@ module ZendeskAPI
   end
 
   class Brand < Resource
+    def destroy!
+      self.active = false
+      save!
+
+      super
+    end
   end
 
   class ForumSubscription < Resource
@@ -511,13 +517,6 @@ module ZendeskAPI
       put :request_verification
     end
 
-    def initialize(*)
-      super
-
-      # Needed for proper Role sideloading
-      self.role_id = role.name if key?(:role)
-    end
-
     any :password
 
     # Set a user's password
@@ -573,6 +572,13 @@ module ZendeskAPI
 
       { self.class.singular_resource_name => attrs }
     end
+
+    def handle_response(*)
+      super
+
+      # Needed for proper Role sideloading
+      self.role_id = role.name if key?(:role)
+    end
   end
 
   class UserField < Resource; end

data/lib/zendesk_api/version.rb

@@ -1,3 +1,3 @@
 module ZendeskAPI
-  VERSION = "1.4.0"
+  VERSION = "1.4.2"
 end

data/spec/core/middleware/response/parse_iso_dates_spec.rb

@@ -29,7 +29,7 @@ describe ZendeskAPI::Middleware::Response::ParseIsoDates do
   end
 
   it "should not blow up on empty body" do
-    expect(fake_response('').body).to eq(nil)
+    expect(fake_response('').body).to eq('')
   end
 
   it "should leave arrays with ids alone" do

data/spec/core/middleware/response/parse_json_spec.rb

@@ -11,8 +11,8 @@ describe ZendeskAPI::Middleware::Response::ParseJson do
       )
     end
 
-    it "should return nil body" do
-      expect(client.connection.get("blergh").body).to be_nil
+    it "should not return nil body" do
+      expect(client.connection.get("blergh").body).to eql('<nope></nope>')
     end
   end
 
@@ -29,16 +29,16 @@ describe ZendeskAPI::Middleware::Response::ParseJson do
     context "with a nil body" do
       let(:body) { nil }
 
-      it "should return nil body" do
-        expect(client.connection.get("blergh").body).to be_nil
+      it "should return empty body" do
+        expect(client.connection.get("blergh").body).to eql('')
       end
     end
 
     context "with a empty body" do
       let(:body) { '' }
 
-      it "should return nil body" do
-        expect(client.connection.get("blergh").body).to be_nil
+      it "should return empty body" do
+        expect(client.connection.get("blergh").body).to eql('')
       end
     end
 

data/spec/fixtures/zendesk.rb

@@ -85,7 +85,9 @@ module ZendeskAPI
 
     def brand
       VCR.use_cassette('valid_brand') do
-        @brand ||= current_user.brand
+        @brand ||= client.brands.detect do |brand|
+          client.config.url.start_with?(brand.brand_url)
+        end
       end
     end
   end

data/spec/live/brand_spec.rb

@@ -2,11 +2,13 @@ require 'core/spec_helper'
 
 describe ZendeskAPI::Brand, :delete_after do
   def valid_attributes
-    { :name => "Awesome-O" }
+    { :name => "awesomesauce", :subdomain => "zendeskapi#{SecureRandom.hex(3)}" }
   end
 
   it_should_be_creatable
   it_should_be_updatable :name
-  it_should_be_deletable
-  it_should_be_readable :brands, :create => true
+  it_should_be_readable :brands
+
+  # Deleted brands are still findable by id, but in the index action
+  it_should_be_deletable :find => nil
 end

data/spec/live/macro_spec.rb

@@ -13,15 +13,17 @@ describe ZendeskAPI::Macro, :delete_after do
   it_should_be_deletable
 
   describe "application", :vcr do
-    subject do
+    subject { @object }
+
+    before :all do
       VCR.use_cassette("#{described_class.to_s}_application_create") do
-        described_class.create(client, valid_attributes.merge(default_options))
+        @object = described_class.create(client, valid_attributes.merge(default_options))
       end
     end
 
     after :all do
       VCR.use_cassette("#{described_class.to_s}_application_delete") do
-        subject.destroy
+        @object.destroy
       end
     end
 

data/spec/live/ticket_spec.rb

@@ -21,7 +21,6 @@ describe ZendeskAPI::Ticket do
   it_should_be_readable user, :requested_tickets
   it_should_be_readable agent, :ccd_tickets
   it_should_be_readable organization, :tickets
-  it_should_be_readable brand, :tickets
 
   context "recent tickets" do
     before(:all) do

data/spec/macros/resource_macros.rb

@@ -96,14 +96,14 @@ module ResourceMacros
         end
       end
 
-      it "should be destroyable" do
+      it "should be destroyable" do |example|
         expect(@object.destroy).to be(true)
         expect(@object.destroyed?).to be(true)
 
         if (!options.key?(:find) || options[:find]) && !example.metadata[:not_findable]
           opts = default_options
           opts.merge!(:id => @object.id) unless described_class.ancestors.include?(ZendeskAPI::SingularResource)
-          obj = silence_logger{ described_class.find(client, opts) }
+          obj = described_class.find(client, opts)
 
           if options[:find]
             expect(obj.send(options[:find].first)).to eq(options[:find].last)
@@ -134,14 +134,23 @@ module ResourceMacros
         end
       end if create
 
-      it "should be findable" do
+      it "should be findable" do |example|
         result = klass
         args.each {|a| result = result.send(a, options) }
 
         if result.is_a?(ZendeskAPI::Collection)
-          expect(result.fetch(true)).to_not be_empty
-          expect(result.fetch).to include(@object) if create
-          object = result.first
+          if create
+            object = nil
+
+            result.all do |o|
+              object = o if @object == o
+            end
+
+            expect(object).to_not be_nil
+          else
+            expect(result.fetch(true)).to_not be_empty
+            object = result.first
+          end
         else
           expect(result).to_not be_nil
           expect(result).to eq(@object) if create

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_api
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.2
 platform: ruby
 authors:
 - Steven Davidovitz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump