zendesk_api 1.3.2 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cde723abc0cc58787561891e1538dc454f0a4ea
-  data.tar.gz: d8b0bfe0638257feb439ee6e9c2007797af5cc04
+  metadata.gz: f96cd9aa680347c9634cc608bc65f7affac55544
+  data.tar.gz: 0e5fafac15dbfe359c94b57ee2f124ae6795dd39
 SHA512:
-  metadata.gz: 2d3dded2e4e03b69ddd6d582d602be3079d432ccbeeb2f8e78ab1a8807d509dbdf74b15a9dc1f59fdba129da188d1e2ee8c6d0559591af448a476734cd22d47e
-  data.tar.gz: 6d647eae9f4b56ba947cb7c0a761f1d50cbd376c55865f5cbf31a0c00196649b166c476fa5e3e6a40cf8630034f754fedef44ff5ad67c3fdbe20de4cdbf4024e
+  metadata.gz: e0140e3e10c944a83b1edd18c2b11283d80dbbc23f6e45be3697d0cf480fd8bf8349b79e4394873091ae44e742436954817bba12c3ef41768d8b28a0c1371413
+  data.tar.gz: 9c32f20050b1d1d2b1531abb11cd52d9f197be15bd6a17c97598bd38721bbbce97faac675fa66cb233373ee6c672d4faea0a9fe19576f9655619ecb06025b4f9

data/Gemfile.lock

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

data/README.md

@@ -344,12 +344,12 @@ ZendeskAPI::App.destroy!(client, :id => 123)
 #### Installing an App
 
 ```ruby
-install = ZendeskAPI::App::Installation.new(client, :app_id => 123)
+install = ZendeskAPI::AppInstallation.new(client, :app_id => 123)
 install.save!
 
 client.apps.installations.create!(:app_id => 123)
 
-ZendeskAPI::App::Installation.create!(client, :app_id => 123)
+ZendeskAPI::AppInstallation.create!(client, :app_id => 123)
 ```
 
 #### List Installations
@@ -364,11 +364,11 @@ apps.fetch!
 ```ruby
 client.app.installations.update!(:id => 123, :settings => { :title => "My New Name" })
 
-install = ZendeskAPI::App::Installation.new(client, :id => 123)
+install = ZendeskAPI::AppInstallation.new(client, :id => 123)
 install.settings = { :title => "My New Name" }
 install.save!
 
-ZendeskAPI::App::Installation.update!(client, :id => 123, :settings => { :title => "My New Name" })
+ZendeskAPI::AppInstallation.update!(client, :id => 123, :settings => { :title => "My New Name" })
 ```
 
 #### Delete Installation
@@ -376,10 +376,10 @@ ZendeskAPI::App::Installation.update!(client, :id => 123, :settings => { :title
 ```ruby
 client.app.installations.destroy!(:id => 123)
 
-install = ZendeskAPI::App::Installation.new(client, :id => 123)
+install = ZendeskAPI::AppInstallation.new(client, :id => 123)
 install.destroy!
 
-ZendeskAPI::App::Installation.destroy!(client, :id => 123)
+ZendeskAPI::AppInstallation.destroy!(client, :id => 123)
 ```
 
 

data/lib/zendesk_api/middleware/request/upload.rb

@@ -38,6 +38,7 @@ module ZendeskAPI
           else
             if defined?(ActionDispatch) && file.is_a?(ActionDispatch::Http::UploadedFile)
               path = file.tempfile.path
+              mime_type = file.content_type
             else
               warn "WARNING: Passed invalid filename #{file} of type #{file.class} to upload"
             end
@@ -49,7 +50,7 @@ module ZendeskAPI
               hash = hash[key]
             end
 
-            mime_type = MIME::Types.type_for(path).first || "application/octet-stream"
+            mime_type ||= MIME::Types.type_for(path).first || "application/octet-stream"
 
             hash[:filename] ||= if file.respond_to?(:original_filename)
               file.original_filename

data/lib/zendesk_api/resources.rb

@@ -543,6 +543,14 @@ module ZendeskAPI
     class PhoneNumber < Resource
       namespace "channels/voice"
     end
+
+    class Greeting < Resource
+      namespace "channels/voice"
+    end
+
+    class GreetingCategory < Resource
+      namespace "channels/voice"
+    end
   end
 
   class TicketForm < Resource

data/lib/zendesk_api/version.rb

@@ -1,3 +1,3 @@
 module ZendeskAPI
-  VERSION = "1.3.2"
+  VERSION = "1.3.4"
 end

data/spec/core/client_spec.rb

@@ -240,7 +240,9 @@ describe ZendeskAPI::Client do
     end
 
     it "manages namespace correctly" do
-      ZendeskAPI::Voice::PhoneNumber.new(subject, {}).path.should match(/channels\/voice\/phone_numbers/)
+      client.phone_numbers.path.should match(/channels\/voice\/phone_numbers/)
+      client.greetings.path.should match(/channels\/voice\/greetings/)
+      client.greeting_categories.path.should match(/channels\/voice\/greeting_categories/)
     end
   end
 end

data/spec/core/middleware/request/upload_spec.rb

@@ -10,7 +10,7 @@ describe ZendeskAPI::Middleware::Request::Upload do
   end
 
   it "should handle body with no file" do
-    subject.call(:body => {})[:body].should == {} 
+    subject.call(:body => {})[:body].should == {}
   end
 
   it "should handle invalid types" do
@@ -58,7 +58,7 @@ describe ZendeskAPI::Middleware::Request::Upload do
 
     context "with an ActionDispatch::Http::UploadedFile" do
       before(:each) do
-        @upload = ActionDispatch::Http::UploadedFile.new(:filename => "hello", :tempfile => Tempfile.new(File.basename(filename)))
+        @upload = ActionDispatch::Http::UploadedFile.new(:filename => "hello.jpg", :tempfile => Tempfile.new(File.basename(filename)))
         @env = subject.call(:body => { :file => @upload })
       end
 
@@ -73,6 +73,14 @@ describe ZendeskAPI::Middleware::Request::Upload do
       it "should add filename if none exist" do
         @env[:body][:filename].should == "hello"
       end
+
+      context "when path does not resolve a mime_type" do
+        it "should use the content_type of ActionDispatch::Http::UploadedFile " do
+          @upload.tempfile.path = "XXX"
+          @env = subject.call(:body => { :file => @upload })
+          @env[:body][:uploaded_data][:content_type].should == "image/jpeg"
+        end
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_api
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.4
 platform: ruby
 authors:
 - Steven Davidovitz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump
@@ -511,7 +511,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0.rc.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Zendesk REST API Client