tumblr_client 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 928807e6f2d5769cdd3fb00545611a035f569575
-  data.tar.gz: f587e06329f739c36c3b8b66f4a0fc9ee48c45c3
+  metadata.gz: 8be1e20d35a7a006f0e6b99acd2edec883b8185b
+  data.tar.gz: d2bb7b98c0d01a881cca25c71a0f52e88000fcbe
 SHA512:
-  metadata.gz: 98c178bf683e4f627a8091a3f1a6fb1ce4eaed04b1ab67c1dfd369ea0df5a6fcad5cd9cf24d472939a9ad21bd849a131f7ed1031e29f398ede17251ce58efd7d
-  data.tar.gz: 452499e743723afd1b0fe30645a86423d4ad80c2a6f31d524e2ae194c03ccff0e35aa4b7639ea37bc369ab95cb05b4ff45d6a4b14e87a61670fd9bcccbbfa959
+  metadata.gz: a35845b69e889b99d07f130430eedda33d882dc5ad7ac78110a2c3d01a5a1365a9b142a003db5575990b2cf8ad5c666b7be66d3478f1d054fa3dd599d09d57ca
+  data.tar.gz: 4241c43f2640ba5a489740e06e20bb61bae303d4067df6c41da6510fb37e8223c3abcf4fdc4ed62149cc1f07337928c4a497e11727fabe0ada7a658e95cf709c

data/.gitignore

@@ -9,3 +9,5 @@ coverage
 .rspec
 
 Gemfile.lock
+
+.bundle

data/README.md

@@ -1,6 +1,6 @@
 # Tumblr Ruby Gem
 
-[![Build Status](https://secure.travis-ci.org/tumblr/tumblr_client.png)](http://travis-ci.org/tumblr/tumblr_client)
+[![Gem Version](https://badge.fury.io/rb/tumblr_client.png)](http://badge.fury.io/rb/tumblr_client) [![Build Status](https://secure.travis-ci.org/tumblr/tumblr_client.png)](http://travis-ci.org/tumblr/tumblr_client)
 
 This is the official Ruby wrapper for the Tumblr v2 API. It supports all
 endpoints currently available on the

data/lib/tumblr/connection.rb

@@ -5,7 +5,8 @@ module Tumblr
   module Connection
 
     def connection(options={})
-      
+      options = options.clone
+
       default_options = {
         :headers => {
           :accept => 'application/json',
@@ -14,7 +15,7 @@ module Tumblr
         :url => "http://#{api_host}/"
       }
 
-      client = options[:client] ||= Faraday.default_adapter
+      client = options.delete(:client) || Faraday.default_adapter
 
       Faraday.new("http://#{api_host}/", default_options.merge(options)) do |conn|
         data = { :api_host => api_host }.merge(credentials)

data/lib/tumblr/post.rb

@@ -4,9 +4,13 @@ module Tumblr
   module Post
 
     STANDARD_POST_OPTIONS = [:state, :tags, :tweet, :date, :markdown, :slug, :format]
+    DATA_POST_TYPES = [:audio, :video, :photo]
+    VALID_POST_TYPES = DATA_POST_TYPES + [:quote, :text, :link, :chat]
 
     def edit(blog_name, options = {})
       convert_source_array :source, options
+      extract_data!(options) if DATA_POST_TYPES.include?(options[:type])
+
       post(blog_path(blog_name, 'post/edit'), options)
     end
 
@@ -81,6 +85,14 @@ module Tumblr
       post(post_path(blog_name), options)
     end
 
+    def create_post(type, blog_name, options = {})
+      if VALID_POST_TYPES.include?(type)
+        send(type, blog_name, options)
+      else
+        raise ArgumentError.new "\"#{type}\" is not a valid post type"
+      end
+    end
+
     private
 
     def post_path(blog_name)
@@ -105,9 +117,15 @@ module Tumblr
         
         if Array === data
           data.each.with_index do |filepath, idx|
-            mime_type = extract_mimetype(filepath)
-            options["data[#{idx}]"] = Faraday::UploadIO.new(filepath, mime_type)
+            if filepath.is_a?(Faraday::UploadIO)
+              options["data[#{idx}]"] = filepath
+            else
+              mime_type = extract_mimetype(filepath)
+              options["data[#{idx}]"] = Faraday::UploadIO.new(filepath, mime_type)
+            end
           end
+        elsif data.is_a?(Faraday::UploadIO)
+          options["data"] = data
         else
           mime_type = extract_mimetype(data)
           options["data"] = Faraday::UploadIO.new(data, mime_type)

data/lib/tumblr/version.rb

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

data/spec/examples/post_spec.rb

@@ -28,6 +28,56 @@ describe Tumblr::Post do
   end
 
   describe :edit do
+    [:photo, :audio, :video].each do |type|
+      describe type 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)
+            client.should_receive(:post).once.with("v2/blog/#{blog_name}/post/edit", {
+              'data[0]' => kind_of(Faraday::UploadIO),
+                :id => 123,
+                :type => type
+            }).and_return('response')
+          end
+
+          it 'should be able to pass data as an array of filepaths' do
+            r = client.edit blog_name, :data => [file_path + ".jpg"], :id => 123, :type => type
+            r.should == 'response'
+          end
+
+          it 'should be able to pass data as an array of uploadios' do
+            r = client.edit blog_name, :data => [Faraday::UploadIO.new(StringIO.new, 'image/jpeg')], :id => 123, :type => type
+            r.should == 'response'
+          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/edit", {
+              'data' => kind_of(Faraday::UploadIO),
+                :id => 123,
+                :type => type
+            }).and_return('response')
+          end
+
+          it 'should be able to pass data as a single filepath' do
+            r = client.edit blog_name, :data => file_path + ".jpg", :id => 123, :type => type
+            r.should == 'response'
+          end
+
+          it 'should be able to pass data as a single uploadio' do
+            r = client.edit blog_name, :data => Faraday::UploadIO.new(StringIO.new, 'image/jpeg'), :id => 123, :type => type
+            r.should == 'response'
+          end
+
+        end
+      end
+    end
 
     it 'should make the correct call' do
       client.should_receive(:post).once.with("v2/blog/#{blog_name}/post/edit", {
@@ -36,7 +86,6 @@ describe Tumblr::Post do
       r = client.edit blog_name, :id => 123
       r.should == 'response'
     end
-
   end
 
   describe :reblog do
@@ -89,6 +138,35 @@ describe Tumblr::Post do
 
   end
 
+  describe :create_post do
+
+    let(:blog_name) { 'seejohnrun' }
+    let(:args) { { :source => 'somesource' } }
+
+    context 'with a valid post type' do
+
+      before do
+        client.should_receive(:photo).with(blog_name, args).and_return 'hi'
+      end
+
+      it 'should call the right method and grab the return' do
+        client.create_post(:photo, blog_name, args).should == 'hi'
+      end
+
+    end
+
+    context 'with an invalid post type' do
+
+      it 'should raise an error' do
+        lambda do
+          client.create_post(:fake, blog_name, args)
+        end.should raise_error ArgumentError, '"fake" is not a valid post type'
+      end
+
+    end
+
+  end
+
   # Complex post types
   [:photo, :audio, :video].each do |type|
 
@@ -119,6 +197,11 @@ describe Tumblr::Post do
           r.should == 'post'
         end
 
+        it 'should be able to pass data as an array of uploadios' do
+          r = client.send type, blog_name, :data => [Faraday::UploadIO.new(StringIO.new, 'image/jpeg')]
+          r.should == 'post'
+        end
+
       end
 
       context 'when passing data different ways' do
@@ -137,6 +220,11 @@ describe Tumblr::Post do
           r.should == 'post'
         end
 
+        it 'should be able to pass data as a single uploadio' do
+          r = client.send type, blog_name, :data => Faraday::UploadIO.new(StringIO.new, 'image/jpeg')
+          r.should == 'post'
+        end
+
       end
 
       # Only photos have source

data/tumblr_client.gemspec

@@ -2,8 +2,8 @@
 require File.join(File.dirname(__FILE__), 'lib/tumblr/version')
 
 Gem::Specification.new do |gem|
-  gem.add_dependency 'faraday', '>= 0.8'
-  gem.add_dependency 'faraday_middleware', '>= 0.8'
+  gem.add_dependency 'faraday', '~> 0.8.9'
+  gem.add_dependency 'faraday_middleware', '~> 0.8'
   gem.add_dependency 'json'
   gem.add_dependency 'simple_oauth'
   gem.add_dependency 'oauth'
@@ -21,7 +21,6 @@ Gem::Specification.new do |gem|
   gem.license = "Apache"
   gem.name = "tumblr_client"
   gem.require_paths = ["lib"]
-  gem.required_rubygems_version = Gem::Requirement.new('>= 1.3.6')
   gem.summary = %q{Tumblr API wrapper}
   gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.version = Tumblr::VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tumblr_client
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - John Bunting
@@ -9,34 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2014-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.8.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.8.9
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
@@ -203,10 +203,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Tumblr API wrapper