zendesk_api 1.2.8 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e146239de70d0901e0639c008355d837f8bc03d6
-  data.tar.gz: 423b3b9ceda7c77bb7a96869d2c1637f413f280f
+  metadata.gz: 7d8919d87724c64c07d0166ff2f172e6f7d9a295
+  data.tar.gz: a330cb0fd9a7eefbadbbaed1e2d9a72259784c57
 SHA512:
-  metadata.gz: bf95b0aeb33d7c20943d6a552d40ef441de14123c39727d838750d70a404a6b79a13c01725c8169b4dbddf86273a0f0670a1b3e37db0dc348db843bd9c6e8468
-  data.tar.gz: 5d1f6776c38ea889b645a0b8265a57f37dfd429a690bc97875a7bc7e5e73c8d96ac71520a79711614429e8cdc0a0700cd4a9ebe153bdc95bee1010bffbb95b1d
+  metadata.gz: 5f7282b33e2cdd913a3a26cc0f233bfbaf7f70bfa9c11eec9a93b4ace46dd81cd07a65eb523e56dd822f2e2c6b1b4b83a7693181dc6c24298c178cd3b27e82d8
+  data.tar.gz: 1994bfe7e2733195335d42c7722e3bbf204f4659660274767ae89eb415e1ee275487ed53e2cef23c04b9fed4c03b491397aaaaa9d2e7de35706003c116e10435

data/.travis.yml

@@ -2,7 +2,8 @@ rvm:
   - ree
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1.1
   - jruby
 bundler_args: --without=server console
+before_install: gem i bundler
 cache: bundler

data/Gemfile

@@ -5,7 +5,6 @@ source 'https://rubygems.org'
 
 gem "simplecov", :platforms => :ruby_19, :group => :test
 gem "jruby-openssl", :platforms => :jruby
-gem "multipart-post", :git => "https://github.com/steved555/multipart-post.git"
 
 group :server do
   gem "thin"

data/Gemfile.lock

@@ -1,20 +1,14 @@
-GIT
-  remote: https://github.com/steved555/multipart-post.git
-  revision: 57c66998c05143a684c13694937c8adfd335cae1
-  specs:
-    multipart-post (1.1.5)
-
 PATH
   remote: .
   specs:
-    zendesk_api (1.2.8)
+    zendesk_api (1.2.9)
       faraday (~> 0.8.0)
       faraday_middleware (~> 0.8.7)
       hashie (>= 1.2)
       inflection
       mime-types (~> 1.0)
       multi_json
-      multipart-post
+      multipart-post (~> 1.1)
 
 GEM
   remote: https://rubygems.org/
@@ -49,8 +43,8 @@ GEM
     diff-lcs (1.2.4)
     eventmachine (1.0.3)
     eventmachine (1.0.3-java)
-    faraday (0.8.7)
-      multipart-post (~> 1.1)
+    faraday (0.8.9)
+      multipart-post (~> 1.2.0)
     faraday_middleware (0.8.8)
       faraday (>= 0.7.4, < 0.9)
     fssm (0.2.10)
@@ -70,6 +64,7 @@ GEM
       tzinfo (~> 0.3.22)
     moped (1.5.0)
     multi_json (1.7.7)
+    multipart-post (1.2.0)
     newrelic_rpm (3.6.4.122)
     origin (1.1.0)
     rack (1.5.2)
@@ -134,7 +129,6 @@ DEPENDENCIES
   jruby-openssl
   json
   mongoid
-  multipart-post!
   newrelic_rpm
   rack-ssl-enforcer
   rake

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

@@ -58,7 +58,7 @@ module ZendeskAPI
               File.basename(path)
             end
 
-            hash[:uploaded_data] = Faraday::UploadIO.new(path, mime_type)
+            hash[:uploaded_data] = Faraday::UploadIO.new(path, mime_type, hash[:filename])
           end
         end
 

data/lib/zendesk_api/resources.rb

@@ -543,6 +543,10 @@ module ZendeskAPI
       namespace "channels/voice"
     end
 
+    class Address < Resource
+      namespace "channels/voice"
+    end
+
     class Greeting < Resource
       namespace "channels/voice"
     end

data/lib/zendesk_api/version.rb

@@ -1,3 +1,3 @@
 module ZendeskAPI
-  VERSION = "1.2.8"
+  VERSION = "1.2.9"
 end

data/spec/core/client_spec.rb

@@ -240,6 +240,7 @@ describe ZendeskAPI::Client do
     end
 
     it "manages namespace correctly" do
+      client.addresses.path.should match(/channels\/voice\/addresses/)
       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/)

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

@@ -71,16 +71,21 @@ describe ZendeskAPI::Middleware::Request::Upload do
       end
 
       it "should add filename if none exist" do
-        @env[:body][:filename].should == "hello"
+        @env[:body][:filename].should == "hello.jpg"
       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
+      it "should pass correct filename to Faraday::UploadIO" do
+        @env[:body][:filename].should == "hello.jpg"
+        @env[:body][:uploaded_data].original_filename.should == @env[:body][:filename]
       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
 

data/zendesk_api.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "webmock", "~> 1.9.0"
   s.add_development_dependency "yard"
 
-# Optional. Only used for uploads testing.
-#  s.add_development_dependency "actionpack"
+  # Optional. Only used for uploads testing.
+  # s.add_development_dependency "actionpack", "~> 3.2.0"
 
   s.add_runtime_dependency "faraday", "~> 0.8.0"
   s.add_runtime_dependency "faraday_middleware", "~> 0.8.7"
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "inflection"
   s.add_runtime_dependency "multi_json"
   s.add_runtime_dependency "mime-types", "~> 1.0"
-  s.add_runtime_dependency "multipart-post"
+  s.add_runtime_dependency "multipart-post", "~> 1.1"
 
   s.files              = `git ls-files -x Gemfile.lock`.split("\n") rescue ''
   s.test_files         = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_api
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors:
 - Steven Davidovitz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump
@@ -183,16 +183,16 @@ dependencies:
   name: multipart-post
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 description: Ruby wrapper for the REST API at http://www.zendesk.com. Documentation
   at http://developer.zendesk.com.
 email: