tumblr_client 0.7.5 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48cdbef82268950444d9073fadec9f7306383b32
-  data.tar.gz: 563633e9486c24191d1ceef952412858d544c1b4
+  metadata.gz: 85e2a013fa7e390e522e3832dbaae337e3a4ff88
+  data.tar.gz: a250c8be007a9165f57ab0b69fb1f790da93f78c
 SHA512:
-  metadata.gz: 29d29fd7d20ecc63a083414270defa0b408855136747cdbe808ecb8f1f4327fd60382f76884a31a66efd318bc9d4d2bde912a4f4ac45b86c2863cde0fb01e91a
-  data.tar.gz: 3fee7e452d11a5a873ced187174f25a6b7171ca6be908795d475e9319a4416dace8a5ca33f824467ec3461e334f678cf09513e6f36a6fc88760bfe9da786a532
+  metadata.gz: b33406cfec5727d2f3c7960843b00d0bcfa79e3042d90739b08e98fcb33c0abeebe469283b89918b9a3960140e96ca3380065c9b8a9e546cdccebbeb12128499
+  data.tar.gz: 588baf76498eb98cc75ba6a83ab8d1c2df1adaf939d99b7a5736f9a5fa1ee3b57a3bbce4bd0a7d19e3e752add705b32b4754236246be41b1b08ef42ba5af32ef

data/README.md

@@ -33,6 +33,11 @@ Once you have your configuration squared away it's time to make some requests!
 
 That's it! You now have a client that can make any request to the Tumblr API.
 
+Also since the client is created with the amazing library [Faraday](https://github.com/lostisland/faraday), you can
+configure it to use any HTTP Client it supports.
+    
+    >> client = Tumblr::Client.new(:client => :httpclient)
+
 ### Some quick examples
 
 Getting user information:
@@ -53,10 +58,6 @@ Posting some photos to Tumblr:
     # Uploads a great photoset
     >> client.photo("codingjester.tumblr.com", {:data => ['/path/to/pic.jpg', '/path/to/pic.jpg']}) 
 
-    # You can also post with the raw data
-    >> raw = File.open('/path/to/pic.jpg', 'rb').read
-    >> client.photo('codingjester.tumblr.com', :data_raw => [raw]
-
 ### The irb Console
 
 Finally, there is an irb console packaged with the gem that should help you test any calls you want to make.

data/lib/tumblr/config.rb

@@ -5,7 +5,8 @@ module Tumblr
       :consumer_key,
       :consumer_secret,
       :oauth_token,
-      :oauth_token_secret
+      :oauth_token_secret,
+      :client
     ]
 
     attr_accessor *VALID_OPTIONS_KEYS

data/lib/tumblr/connection.rb

@@ -1,27 +1,30 @@
 require 'faraday'
 require 'faraday_middleware'
-require 'tumblr/request/oauth'
 
 module Tumblr
   module Connection
 
     def connection(options={})
-      host = api_host
+      
       default_options = {
         :headers => {
           :accept => 'application/json',
           :user_agent => "tumblr_client (ruby) - #{Tumblr::VERSION}"
         },
-        :url => "http://#{host}/"
+        :url => "http://#{api_host}/"
       }
-      Faraday.new("http://#{host}/", default_options.merge(options)) do |builder|
-        data = { :api_host => host }.merge(credentials)
+
+      client = options[:client] ||= Faraday.default_adapter
+
+      Faraday.new("http://#{api_host}/", default_options.merge(options)) do |conn|
+        data = { :api_host => api_host }.merge(credentials)
         unless credentials.empty?
-          builder.use Tumblr::Request::TumblrOAuth, data
+          conn.request :oauth, data
         end
-        builder.use Faraday::Request::UrlEncoded
-        builder.use FaradayMiddleware::ParseJson, :content_type => 'application/json'
-        builder.use Faraday::Adapter::NetHttp
+        conn.request :multipart
+        conn.request :url_encoded
+        conn.response :json, :content_type => /\bjson$/
+        conn.adapter client
       end
     end
 

data/lib/tumblr/post.rb

@@ -1,3 +1,5 @@
+require 'mime/types'
+
 module Tumblr
   module Post
 
@@ -17,7 +19,7 @@ module Tumblr
     end
 
     def photo(blog_name, options = {})
-      valid_opts = STANDARD_POST_OPTIONS + [:caption, :link, :data, :data_raw, :source, :photoset_layout]
+      valid_opts = STANDARD_POST_OPTIONS + [:caption, :link, :data, :source, :photoset_layout]
       validate_options(valid_opts, options)
       validate_no_collision options, [:data, :source]
       convert_source_array :source, options
@@ -60,7 +62,7 @@ module Tumblr
     end
 
     def audio(blog_name, options = {})
-      valid_opts = STANDARD_POST_OPTIONS + [:data, :data_raw, :caption, :external_url]
+      valid_opts = STANDARD_POST_OPTIONS + [:data, :caption, :external_url]
       validate_options(valid_opts, options)
       validate_no_collision options, [:data, :external_url]
 
@@ -70,7 +72,7 @@ module Tumblr
     end
 
     def video(blog_name, options = {})
-      valid_opts = STANDARD_POST_OPTIONS + [:data, :data_raw, :embed, :caption]
+      valid_opts = STANDARD_POST_OPTIONS + [:data, :embed, :caption]
       validate_options(valid_opts, options)
       validate_no_collision options, [:data, :embed]
 
@@ -98,18 +100,17 @@ module Tumblr
     # Look for the various ways that data can be passed, and normalize
     # the result in this hash
     def extract_data!(options)
-      validate_no_collision options, [:data, :data_raw]
       if options.has_key?(:data)
         data = options.delete :data
         data = [data] unless Array === data
         data.each.with_index do |filepath, idx|
-          options["data[#{idx}]"] = File.open(filepath, 'rb').read
-        end
-      elsif options.has_key?(:data_raw)
-        data_raw = options.delete :data_raw
-        data_raw = [data_raw] unless Array === data_raw
-        data_raw.each.with_index do |dr, idx|
-          options["data[#{idx}]"] = dr
+          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"
+          end
+          options["data[#{idx}]"] = Faraday::UploadIO.new(filepath, mime_type)
         end
       end
     end

data/lib/tumblr/version.rb

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

data/spec/examples/post_spec.rb

@@ -108,30 +108,20 @@ describe Tumblr::Post do
 
         before do
           fakefile = OpenStruct.new :read => file_data
-          File.stub(:open).with(file_path, 'rb').and_return(fakefile)
+          File.stub(:open).with(file_path + '.jpg').and_return(fakefile)
           client.should_receive(:post).once.with("v2/blog/#{blog_name}/post", {
-            'data[0]' => file_data,
+            'data[0]' => kind_of(Faraday::UploadIO),
             :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]
+          r = client.send type, blog_name, :data => [file_path + ".jpg"]
           r.should == 'post'
         end
 
         it 'should be able to pass data as a single filepath' do
-          r = client.send type, blog_name, :data => file_path
-          r.should == 'post'
-        end
-
-        it 'should be able to pass an array of raw data' do
-          r = client.send type, blog_name, :data_raw => [file_data]
-          r.should == 'post'
-        end
-
-        it 'should be able to pass raw data' do
-          r = client.send type, blog_name, :data_raw => file_data
+          r = client.send type, blog_name, :data => file_path + ".jpg"
           r.should == 'post'
         end
 
@@ -180,12 +170,6 @@ describe Tumblr::Post do
           }.should raise_error ArgumentError
         end
 
-        it 'should get an error when passing data & raw_data' do
-          lambda {
-            client.send type, blog_name, :raw_data => 'hi', :data => 'bye'
-          }.should raise_error ArgumentError
-        end
-
       end
 
     end

data/tumblr_client.gemspec

@@ -5,7 +5,9 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'faraday', '>= 0.8'
   gem.add_dependency 'faraday_middleware', '>= 0.8'
   gem.add_dependency 'json'
+  gem.add_dependency 'simple_oauth'
   gem.add_dependency 'oauth'
+  gem.add_dependency 'mime-types'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'webmock'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tumblr_client
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.8.1
 platform: ruby
 authors:
 - John Bunting
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -53,6 +53,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simple_oauth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +81,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +174,6 @@ files:
 - lib/tumblr/helpers.rb
 - lib/tumblr/post.rb
 - lib/tumblr/request.rb
-- lib/tumblr/request/oauth.rb
 - lib/tumblr/tagged.rb
 - lib/tumblr/user.rb
 - lib/tumblr/version.rb

data/lib/tumblr/request/oauth.rb

@@ -1,72 +0,0 @@
-require 'faraday'
-require 'time'
-require 'uri'
-require 'openssl'
-require 'base64'
-
-module Tumblr
-  module Request
-    class TumblrOAuth < Faraday::Middleware
-
-      def call(env)
-        if env[:method].to_s == 'get'
-          params = Faraday::Utils.parse_query(env[:url].query) || {}
-          url = "#{env[:url].scheme}://#{env[:url].host}#{env[:url].path}"
-        else
-          params = env[:body] || {}
-          url = env[:url]
-        end
-        signature_params = params
-        params.each do |key, value|
-          signature_params = {} if value.respond_to?(:content_type)
-        end
-        env[:request_headers]['Authorization'] = self.oauth_gen(env[:method], url, signature_params)
-        env[:request_headers]['Content-type'] = 'application/x-www-form-urlencoded'
-        env[:request_headers]['Host'] = @options[:api_host]
-
-        @app.call(env)
-      end
-
-      def initialize(app, options={})
-        @app, @options = app, options
-      end
-
-      def oauth_gen(method, url, params)
-         params[:oauth_consumer_key] = @options[:consumer_key]
-         params[:oauth_nonce] = Base64.encode64(OpenSSL::Random.random_bytes(32)).gsub(/\W/, '')
-         params[:oauth_signature_method] = 'HMAC-SHA1'
-         params[:oauth_timestamp] = Time.now.to_i
-         params[:oauth_token] = @options[:token]
-         params[:oauth_version] = '1.0'
-         params[:oauth_signature] = self.oauth_sig(method, url, params)
-
-         header = []
-         params.each do |key, value|
-           if key.to_s.include?('oauth')
-             header << "#{key.to_s}=#{value}"
-           end
-         end
-
-         "OAuth #{header.join(", ")}"
-      end
-
-      def oauth_sig(method, url, params)
-        parts = [method.upcase, URI.encode(url.to_s, /[^a-z0-9\-\.\_\~]/i)]
-
-        #sort the parameters
-        params = Hash[params.sort_by{ |key, value| key.to_s}]
-
-        encoded = []
-        params.each do |key, value|
-          encoded << "#{key.to_s}=#{URI.encode(value.to_s, /[^a-z0-9\-\.\_\~]/i)}"
-        end
-
-        parts << URI.encode(encoded.join('&'), /[^a-z0-9\-\.\_\~]/i)
-        signature_base = parts.join('&')
-        secret = "#{@options[:consumer_secret]}&#{@options[:token_secret]}"
-        Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest::SHA1.new, secret, signature_base)).chomp.gsub(/\n/, '')
-      end
-
-    end
-  end
-end