zendesk_api 1.2.7 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b708ede7536d57bf478b3996a2fe60e120467cdf
-  data.tar.gz: 41b1c164d771677c0fce17aa20ed777b171876a8
+  metadata.gz: e146239de70d0901e0639c008355d837f8bc03d6
+  data.tar.gz: 423b3b9ceda7c77bb7a96869d2c1637f413f280f
 SHA512:
-  metadata.gz: 39907df667359d40f0cb235a24893997795858f927fb70418142eb4834cafa2ba76dffad2ec128fab7a31f943232b92a181c83303b7550320d3676041a6e5e9c
-  data.tar.gz: 36b3afeeee9c2688016f15188d2a414c5915c3dc38fe60a01728718890c673981deeb4f93dfa4a51ba9f7bb72713314f3fffa3a6877d2dda738df804c3eba299
+  metadata.gz: bf95b0aeb33d7c20943d6a552d40ef441de14123c39727d838750d70a404a6b79a13c01725c8169b4dbddf86273a0f0670a1b3e37db0dc348db843bd9c6e8468
+  data.tar.gz: 5d1f6776c38ea889b645a0b8265a57f37dfd429a690bc97875a7bc7e5e73c8d96ac71520a79711614429e8cdc0a0700cd4a9ebe153bdc95bee1010bffbb95b1d

data/Gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: .
   specs:
-    zendesk_api (1.2.7)
+    zendesk_api (1.2.8)
       faraday (~> 0.8.0)
       faraday_middleware (~> 0.8.7)
       hashie (>= 1.2)
@@ -56,7 +56,7 @@ GEM
     fssm (0.2.10)
     haml (4.0.3)
       tilt
-    hashie (2.0.5)
+    hashie (2.1.1)
     i18n (0.6.1)
     inflection (1.0.0)
     jruby-openssl (0.8.8)

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/version.rb

@@ -1,3 +1,3 @@
 module ZendeskAPI
-  VERSION = "1.2.7"
+  VERSION = "1.2.8"
 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.2.7
+  version: 1.2.8
 platform: ruby
 authors:
 - Steven Davidovitz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump