zendesk_api 0.1.1 → 0.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zendesk_api (0.1.0)
+    zendesk_api (0.1.2)
       faraday (>= 0.8.0)
       faraday_middleware (>= 0.8.7)
       hashie
@@ -16,7 +16,7 @@ GEM
     addressable (2.2.8)
     crack (0.3.1)
     diff-lcs (1.1.3)
-    faraday (0.8.1)
+    faraday (0.8.2)
       multipart-post (~> 1.1)
     faraday_middleware (0.8.8)
       faraday (>= 0.7.4, < 0.9)

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

@@ -29,12 +29,16 @@ module ZendeskAPI
           end
 
           case file
-          when File
+          when File, Tempfile
             path = file.path
           when String
             path = file
           else
-            warn "WARNING: Passed invalid filename #{file} of type #{file.class} to upload"
+            if defined?(ActionDispatch) && file.is_a?(ActionDispatch::Http::UploadedFile)
+              path = file.tempfile.path
+            else
+              warn "WARNING: Passed invalid filename #{file} of type #{file.class} to upload"
+            end
           end
 
           if path
@@ -45,7 +49,12 @@ module ZendeskAPI
 
             mime_type = MIME::Types.type_for(path).first || "application/octet-stream"
 
-            hash[:filename] ||= File.basename(path)
+            hash[:filename] ||= if file.respond_to?(:original_filename)
+              file.original_filename
+            else
+              File.basename(path)
+            end
+
             hash[:uploaded_data] = Faraday::UploadIO.new(path, mime_type)
           end
         end

data/lib/zendesk_api/version.rb

@@ -1,3 +1,3 @@
 module ZendeskAPI
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/middleware/request/upload_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'tempfile'
 
 describe ZendeskAPI::Middleware::Request::Upload do
   subject { ZendeskAPI::Middleware::Request::Upload.new(lambda {|env| env}) }
@@ -44,6 +45,56 @@ describe ZendeskAPI::Middleware::Request::Upload do
     end
   end
 
+  begin
+    require 'action_dispatch'
+  rescue LoadError
+    warn "Could not load ActionDispatch; not running ActionDispatch::Http::UploadedFile tests"
+  end
+
+  if defined?(ActionDispatch)
+    class String
+      def encoding_aware?; false; end
+    end
+
+    context "with an ActionDispatch::Http::UploadedFile" do
+      before(:each) do
+        @upload = ActionDispatch::Http::UploadedFile.new(:filename => "hello", :tempfile => Tempfile.new(filename))
+        @env = subject.call(:body => { :file => @upload })
+      end
+
+      it "should convert file string to UploadIO" do
+        @env[:body][:uploaded_data].should be_instance_of(Faraday::UploadIO)
+      end
+
+      it "should remove file string" do
+        @env[:body][:file].should be_nil
+      end
+
+      it "should add filename if none exist" do
+        @env[:body][:filename].should == "hello"
+      end
+    end
+  end
+
+  context "with a Tempfile" do
+    before(:each) do
+      @tempfile = Tempfile.new(filename)
+      @env = subject.call(:body => { :file => @tempfile })
+    end
+
+    it "should convert file string to UploadIO" do
+      @env[:body][:uploaded_data].should be_instance_of(Faraday::UploadIO)
+    end
+
+    it "should remove file string" do
+      @env[:body][:file].should be_nil
+    end
+
+    it "should add filename if none exist" do
+      @env[:body][:filename].should == File.basename(@tempfile.path)
+    end
+  end
+
   context "with file instance" do
     context "top-level" do
       before(:each) do

data/zendesk_api.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.name        = "zendesk_api"
   s.version     = ZendeskAPI::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Steven Davidovitz"]
-  s.email       = ["sdavidovitz@zendesk.com"]
+  s.authors     = ["Steven Davidovitz", "Michael Grosser"]
+  s.email       = ["support@zendesk.com"]
   s.homepage    = "http://developer.zendesk.com"
   s.summary     = %q{Zendesk REST API Client}
   s.description = %q{Ruby wrapper for the REST API at http://www.zendesk.com. Documentation at http://developer.zendesk.com.}
@@ -24,6 +24,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
   s.add_development_dependency "yard"
 
+# Optional. Only used for uploads testing.
+#  s.add_development_dependency "actionpack"
+
   s.add_runtime_dependency "faraday", ">= 0.8.0"
   s.add_runtime_dependency "faraday_middleware", ">= 0.8.7"
   s.add_runtime_dependency "hashie"

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_api
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
 - Steven Davidovitz
+- Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-23 00:00:00.000000000 Z
+date: 2012-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -206,7 +207,7 @@ dependencies:
 description: Ruby wrapper for the REST API at http://www.zendesk.com. Documentation
   at http://developer.zendesk.com.
 email:
-- sdavidovitz@zendesk.com
+- support@zendesk.com
 executables: []
 extensions: []
 extra_rdoc_files: []