saddle 0.0.34 → 0.0.35

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 1.9.3
+  - jruby-19mode # JRuby in 1.9 mode
+
+script: rspec

data/Gemfile

@@ -6,10 +6,12 @@ gem 'faraday', '~> 0.8.7'
 gem 'faraday_middleware', '~> 0.9.0'
 
 group :test do
-  gem 'rspec', '~> 2.13.0'
+  gem 'rake'
+  gem 'rspec', '~> 2.14.1'
   gem 'rspec-instafail', '~> 0.2'
 
   gem 'airbrake'
+  gem 'simple_oauth', '~> 0.2.0' # Optional dependency
   gem 'statsd-ruby', :require => ['statsd']
 end
 

data/Gemfile.lock

@@ -24,15 +24,17 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
+    rake (10.1.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.2)
+    rspec-expectations (2.14.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-instafail (0.2.4)
-    rspec-mocks (2.13.1)
+    rspec-mocks (2.14.1)
+    simple_oauth (0.2.0)
     slop (3.4.5)
     statsd-ruby (1.2.0)
 
@@ -45,6 +47,8 @@ DEPENDENCIES
   faraday (~> 0.8.7)
   faraday_middleware (~> 0.9.0)
   pry
-  rspec (~> 2.13.0)
+  rake
+  rspec (~> 2.14.1)
   rspec-instafail (~> 0.2)
+  simple_oauth (~> 0.2.0)
   statsd-ruby

data/README.md

@@ -60,3 +60,15 @@ Saddle enables you to create beautifully stable and functionaly API clients, in
 
 ## todo
 * xml posting/parsing
+
+
+## Code Status
+
+* [![Build Status](https://travis-ci.org/mLewisLogic/saddle.png?branch=master)](https://travis-ci.org/mLewisLogic/saddle)
+* [![Code Climate](https://codeclimate.com/github/mLewisLogic/saddle.png)](https://codeclimate.com/github/mLewisLogic/saddle)
+* [![Dependency Status](https://gemnasium.com/mLewisLogic/saddle.png)](https://gemnasium.com/mLewisLogic/saddle)
+
+
+## License
+
+Saddle is released under the [MIT License](http://www.opensource.org/licenses/MIT).

data/lib/saddle/middleware/authentication/oauth1.rb

@@ -0,0 +1,54 @@
+require 'faraday'
+require 'simple_oauth'
+
+
+
+module Saddle
+  module Middleware
+    module Authentication
+
+      ## Add OAuth 1.0 authentication tokens to requests
+      #
+      class OAuth1 < Faraday::Middleware
+
+        TYPE_URLENCODED = 'application/x-www-form-urlencoded'.freeze
+
+        def call(env)
+          if env[:request][:client_options][:oauth1] &&
+             env[:request][:client_options][:oauth1][:consumer_key] &&
+             env[:request][:client_options][:oauth1][:consumer_secret] &&
+             env[:request][:client_options][:oauth1][:token] &&
+             env[:request][:client_options][:oauth1][:token_secret]
+
+            env[:request_headers]['Authorization'] ||= SimpleOAuth::Header.new(
+              env[:method],
+              env[:url].to_s,
+              filtered_body_params(env),
+              env[:request][:client_options][:oauth1]
+            ).to_s
+          end
+
+          @app.call(env)
+        end
+
+        def body_params(env)
+          # Only process body params if it's url-encoded or missing it's Content-Type
+          # see RFC 5489, section 3.4.1.3.1 for details
+          if !(type = env[:request_headers]['Content-Type']) or type == TYPE_URLENCODED
+            if env[:body].respond_to?(:to_str)
+              Faraday::Utils::parse_nested_query(env[:body])
+            else
+              env[:body]
+            end
+          end || {}
+        end
+
+        def filtered_body_params(env)
+          body_params(env).reject {|k,v| v.respond_to?(:content_type) }
+        end
+
+      end
+
+    end
+  end
+end

data/lib/saddle/middleware/authentication/oauth2.rb

@@ -0,0 +1,33 @@
+require 'faraday'
+
+
+
+module Saddle
+  module Middleware
+    module Authentication
+
+      ## Add OAuth 2.0 authentication tokens to requests
+      #
+      class OAuth2 < Faraday::Middleware
+
+        def initialize(app, key_name='access_token')
+          super(app)
+          @key_name = key_name
+        end
+
+        def call(env)
+          if env[:request][:client_options][@key_name.to_sym]
+            new_query = []
+            new_query << env[:url].query if env[:url].query
+            new_query << "#{@key_name}=#{CGI.escape(env[:request][:client_options][@key_name.to_sym].to_s)}"
+            env[:url].query = new_query.join('&')
+          end
+
+          @app.call(env)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/saddle/version.rb

@@ -1,3 +1,3 @@
 module Saddle
-  VERSION = '0.0.34'
+  VERSION = '0.0.35'
 end

data/spec/middleware/authentication/oauth2_authentication_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+require 'saddle/middleware/authentication/oauth2'
+
+
+describe Saddle::Middleware::Authentication::OAuth2 do
+
+  context "Test authentication middleware" do
+
+    it 'should attach the oauth2 access token' do
+      TEST_ACCESS_TOKEN = 'testes'
+
+      stubs = Faraday::Adapter::Test::Stubs.new do |stub|
+        stub.get("/test?oauth2_access_token=#{TEST_ACCESS_TOKEN}") {
+          [
+            200,
+            {},
+            'Party on!',
+          ]
+        }
+      end
+
+      class OAuth2Client < Saddle::Client
+        add_middleware({
+          :klass => Saddle::Middleware::Authentication::OAuth2,
+          :args => ['oauth2_access_token'],
+        })
+      end
+
+      client = OAuth2Client.create(
+        :oauth2_access_token => TEST_ACCESS_TOKEN,
+        :stubs => stubs
+      )
+      client.requester.get('/test').should == 'Party on!'
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saddle
 version: !ruby/object:Gem::Version
-  version: 0.0.34
+  version: 0.0.35
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -67,6 +67,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -76,6 +77,8 @@ files:
 - lib/saddle/endpoint.rb
 - lib/saddle/errors.rb
 - lib/saddle/method_tree_builder.rb
+- lib/saddle/middleware/authentication/oauth1.rb
+- lib/saddle/middleware/authentication/oauth2.rb
 - lib/saddle/middleware/logging/airbrake.rb
 - lib/saddle/middleware/logging/rails.rb
 - lib/saddle/middleware/logging/statsd.rb
@@ -91,6 +94,7 @@ files:
 - lib/saddle/requester.rb
 - lib/saddle/version.rb
 - saddle.gemspec
+- spec/middleware/authentication/oauth2_authentication_spec.rb
 - spec/middleware/instrumentation_spec.rb
 - spec/middleware/logging/airbrake_spec.rb
 - spec/middleware/logging/rails_spec.rb
@@ -128,6 +132,7 @@ specification_version: 3
 summary: A full-featured, generic consumer layer for you to build API client implementations
   with.
 test_files:
+- spec/middleware/authentication/oauth2_authentication_spec.rb
 - spec/middleware/instrumentation_spec.rb
 - spec/middleware/logging/airbrake_spec.rb
 - spec/middleware/logging/rails_spec.rb