tumblr_client 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85e2a013fa7e390e522e3832dbaae337e3a4ff88
-  data.tar.gz: a250c8be007a9165f57ab0b69fb1f790da93f78c
+  metadata.gz: 928807e6f2d5769cdd3fb00545611a035f569575
+  data.tar.gz: f587e06329f739c36c3b8b66f4a0fc9ee48c45c3
 SHA512:
-  metadata.gz: b33406cfec5727d2f3c7960843b00d0bcfa79e3042d90739b08e98fcb33c0abeebe469283b89918b9a3960140e96ca3380065c9b8a9e546cdccebbeb12128499
-  data.tar.gz: 588baf76498eb98cc75ba6a83ab8d1c2df1adaf939d99b7a5736f9a5fa1ee3b57a3bbce4bd0a7d19e3e752add705b32b4754236246be41b1b08ef42ba5af32ef
+  metadata.gz: 98c178bf683e4f627a8091a3f1a6fb1ce4eaed04b1ab67c1dfd369ea0df5a6fcad5cd9cf24d472939a9ad21bd849a131f7ed1031e29f398ede17251ce58efd7d
+  data.tar.gz: 452499e743723afd1b0fe30645a86423d4ad80c2a6f31d524e2ae194c03ccff0e35aa4b7639ea37bc369ab95cb05b4ff45d6a4b14e87a61670fd9bcccbbfa959

data/lib/tumblr/post.rb

@@ -102,18 +102,28 @@ module Tumblr
     def extract_data!(options)
       if options.has_key?(:data)
         data = options.delete :data
-        data = [data] unless Array === data
-        data.each.with_index do |filepath, idx|
-          mime = MIME::Types.type_for(filepath)
-          if (!mime.empty?)
-            mime_type = MIME::Types.type_for(filepath)[0].content_type
-          else
-            mime_type = "application/octet-stream"
+        
+        if Array === data
+          data.each.with_index do |filepath, idx|
+            mime_type = extract_mimetype(filepath)
+            options["data[#{idx}]"] = Faraday::UploadIO.new(filepath, mime_type)
           end
-          options["data[#{idx}]"] = Faraday::UploadIO.new(filepath, mime_type)
+        else
+          mime_type = extract_mimetype(data)
+          options["data"] = Faraday::UploadIO.new(data, mime_type)
         end
       end
     end
 
+    def extract_mimetype(filepath)
+      mime = MIME::Types.type_for(filepath)
+      if (mime.empty?)
+        mime_type = "application/octet-stream"
+      else
+        mime_type = MIME::Types.type_for(filepath)[0].content_type
+      end
+      mime_type
+    end
+
   end
 end

data/lib/tumblr/version.rb

@@ -1,5 +1,5 @@
 module Tumblr
 
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 
 end

data/spec/examples/post_spec.rb

@@ -104,8 +104,7 @@ describe Tumblr::Post do
 
       end
 
-      context 'when passing data different ways' do
-
+      context 'when passing data as an array of filepaths' do
         before do
           fakefile = OpenStruct.new :read => file_data
           File.stub(:open).with(file_path + '.jpg').and_return(fakefile)
@@ -114,12 +113,25 @@ describe Tumblr::Post do
             :type => type.to_s
           }).and_return('post')
         end
-
+        
         it 'should be able to pass data as an array of filepaths' do
           r = client.send type, blog_name, :data => [file_path + ".jpg"]
           r.should == 'post'
         end
 
+      end
+
+      context 'when passing data different ways' do
+
+        before do
+          fakefile = OpenStruct.new :read => file_data
+          File.stub(:open).with(file_path + '.jpg').and_return(fakefile)
+          client.should_receive(:post).once.with("v2/blog/#{blog_name}/post", {
+            'data' => kind_of(Faraday::UploadIO),
+            :type => type.to_s
+          }).and_return('post')
+        end
+
         it 'should be able to pass data as a single filepath' do
           r = client.send type, blog_name, :data => file_path + ".jpg"
           r.should == 'post'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tumblr_client
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - John Bunting
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday