tumble 0.0.2 → 0.0.3

data/lib/tumble/client.rb

@@ -7,29 +7,27 @@ module Tumble
     # Initialize a client to use for making requests
     #
     # @param [String] oauth_token
-    # @param [Hash] options
-    # @option options Hash   :ssl Additional SSL options (like the path to certificate file)
-    def initialize(oauth_token, options={})
-      @oauth_token = options[:oauth_token]
-      @ssl = options[:ssl].nil? ? Hash.new : options[:ssl]
-    end
-    
-    def ssl
-      @ssl
+    # @param [String] oauth_secret
+    def initialize(access_token, access_secret)
+      @access_token = access_token
+      @access_secret = access_secret
     end
     
     def connection
       options = {
         :url => api_url,
-        :ssl => @ssl,
         :params => { :oauth_token => @oauth_token },
-        :headers => default_headers
+        :headers => {
+          :accept =>  'application/json',
+          :user_agent => 'tumble'
+        }
       }
       @connection ||= Faraday::Connection.new(options) do |builder|
         builder.use Faraday::Request::Multipart
         builder.use Faraday::Request::UrlEncoded
         builder.use FaradayMiddleware::Mashify
         builder.use FaradayMiddleware::ParseJson
+        builder.use Tumble::Request::TumblrOAuth, credentials
         builder.adapter Faraday.default_adapter
       end
     end
@@ -42,13 +40,17 @@ module Tumble
       Blog.new(self, blog_name)
     end
 
-    private
-
-    def default_headers
-      headers = {
-        :accept =>  'application/json',
-        :user_agent => 'tumble'
+    def credentials
+      {
+        :consumer_key => Config.consumer_key,
+        :consumer_secret => Config.consumer_secret,
+        :token => @access_token,
+        :token_secret => @access_secret,
       }
     end
+
+    def user_info
+      @connection.post('http://api.tumblr.com/v2/user/info')
+    end
   end
 end

data/lib/tumble/config.rb

@@ -0,0 +1,19 @@
+module Tumble
+  module Config
+    def self.consumer_key=(key)
+      @consumer_key = key
+    end
+
+    def self.consumer_key
+      @consumer_key
+    end
+
+    def self.consumer_secret=(secret)
+      @consumer_secret = secret
+    end
+
+    def self.consumer_secret
+      @consumer_secret
+    end
+  end
+end

data/lib/tumble/request/oauth.rb

@@ -0,0 +1,25 @@
+require 'faraday'
+require 'simple_oauth'
+
+module Tumble
+  module Request
+    class TumblrOAuth < Faraday::Middleware
+
+      def call(env)
+        params = env[:body] || {}
+        signature_params = params
+        params.each do |key, value|
+          signature_params = {} if value.respond_to?(:content_type)
+        end
+        header = SimpleOAuth::Header.new(env[:method], env[:url], signature_params, @options)
+        env[:request_headers]['Authorization'] = header.to_s
+
+        @app.call(env)
+      end
+
+      def initialize(app, options)
+        @app, @options = app, options
+      end
+    end
+  end
+end

data/lib/tumble.rb

@@ -1,7 +1,12 @@
-%w(blog client).each do |file|
+%w(blog client config request/oauth).each do |file|
   require File.join(File.dirname(__FILE__), 'tumble', file)
 end
 
 module Tumble
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
+
+  def self.config
+    yield Config
+    Config
+  end
 end

data/spec/config_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe Tumble::Config do
+  it 'should allow me to set the consumer key and secret' do
+    Tumble.config do |config|
+      config.consumer_key = 'abc'
+      config.consumer_secret = '123'
+    end
+    Tumble::Config.consumer_key.should == 'abc'
+    Tumble::Config.consumer_secret.should == '123'
+  end
+end
+

data/spec/oauth_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe Tumble::Request::TumblrOAuth do
+  let(:oauth) { Tumble::Request::TumblrOAuth.new(lambda{ |env| env }, Hash.new) }
+  let(:request) do
+    {
+      :method => 'post', 
+      :url => 'http://test.com/test.json', 
+      :request_headers => {}, 
+      :body => { :status => 'Test' }
+    }
+  end
+
+  it 'should sign requests correctly' do
+    response = SimpleOAuth::Header.parse(oauth.call(request)[:request_headers]['Authorization'])
+    signature = response.delete(:signature)
+    header = SimpleOAuth::Header.new(:post, "http://test.com/test.json", { :status => 'Test' }, response)
+    signature.should == SimpleOAuth::Header.parse(header.to_s)[:signature]
+  end
+end

data/tumble.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.5") if s.respond_to? :required_rubygems_version=
 
   s.name    = 'tumble'
-  s.version = '0.0.2'
+  s.version = '0.0.3'
 
   s.summary     = 'Library for accessing the Tumblr api v2'
   # TODO: s.description
@@ -25,8 +25,12 @@ Gem::Specification.new do |s|
     lib/tumble.rb
     lib/tumble/blog.rb
     lib/tumble/client.rb
+    lib/tumble/config.rb
+    lib/tumble/request/oauth.rb
     spec/blog_spec.rb
     spec/client_spec.rb
+    spec/config_spec.rb
+    spec/oauth_spec.rb
     spec/spec_helper.rb
     tumble.gemspec
   ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tumble
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70198851703960 !ruby/object:Gem::Requirement
+  requirement: &70176759564620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70198851703960
+  version_requirements: *70176759564620
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70198851703500 !ruby/object:Gem::Requirement
+  requirement: &70176759563740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70198851703500
+  version_requirements: *70176759563740
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70198851703080 !ruby/object:Gem::Requirement
+  requirement: &70176759555780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70198851703080
+  version_requirements: *70176759555780
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70198851702660 !ruby/object:Gem::Requirement
+  requirement: &70176759555040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70198851702660
+  version_requirements: *70176759555040
 description: 
 email: aubreyholland@gmail.com
 executables: []
@@ -68,8 +68,12 @@ files:
 - lib/tumble.rb
 - lib/tumble/blog.rb
 - lib/tumble/client.rb
+- lib/tumble/config.rb
+- lib/tumble/request/oauth.rb
 - spec/blog_spec.rb
 - spec/client_spec.rb
+- spec/config_spec.rb
+- spec/oauth_spec.rb
 - spec/spec_helper.rb
 - tumble.gemspec
 has_rdoc: true