moguera-authentication 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d6a12e8bf765eea7438dc1cb9553a02dff5ccc0
-  data.tar.gz: 4273174cdfebf58dc6b90ba5e420686cf6da2035
+  metadata.gz: 9c9ccff400b781421408c21d83821a8ca3c3e672
+  data.tar.gz: 88e99e22e2dfb9239577910591da4e4840aabeca
 SHA512:
-  metadata.gz: 648d0938793be93bf7ae8de811b5108d4019e39c72444c20f692678b73a03c6cfcaa1ad55135b4268ed7a46ecb57ed392a048b42c570be8a9a4ce4a539e2ccf1
-  data.tar.gz: 55ccb61e61572a27bb4da245c0f9e76e3064faa1447d6c2e169d82010bdf2992ca6599e2f09946c8b5509b4fdf5da64f65e8950b1c794013d938387bfb0848c9
+  metadata.gz: 6ed915f53a94c7cb4a51c08cc8f562b7adc027269e84147797aaf16663fcb0aab46e9faf465a4a0abf99c0e8978b9838234458e09ef32f6dd1c242323e006586
+  data.tar.gz: 6a837da2a49a40e2c613e704df27bb414801e27d4749af350f849d279ced8622fe7474fe76e3833c3c467b972f416d8eada832875ffce50cb3f02d303f816707

data/.gitignore

@@ -1,6 +1,7 @@
 /.bundle/
 /.yardoc
 /Gemfile.lock
+/sample/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/Gemfile

@@ -5,15 +5,10 @@ gemspec
 
 group :test do
   gem 'timecop'
-  gem 'pry'
+  gem 'pry', '< 0.10.0'
   gem 'pry-byebug'
   gem 'simplecov'
   gem 'simplecov-rcov'
   gem 'coveralls'
   gem 'rack-test'
 end
-
-group :development do
-  gem 'rest-client'
-  gem 'sinatra'
-end

data/README.md

@@ -125,46 +125,27 @@ end
 
 ### Cilent
 
-example rest-client
+example client-faraday.rb
 
 ```ruby
-require 'moguera/authentication'
-require 'rest-client'
-require 'time'
-require 'json'
-require 'uri'
+require 'faraday/moguera_authentication'
 
 url = ARGV[0]
-abort "Usage: ruby #{__FILE__} http://localhost:4567/login" unless url
-
-request_path = URI.parse(url).path
-request_path = '/' if request_path.empty?
-http_date = Time.now.httpdate
-content_type = 'application/json'
-
-params = {
-    access_key: 'user01',
-    secret_access_key: 'secret',
-    request_path: request_path,
-    request_method: 'POST',
-    content_type: content_type,
-    http_date: http_date
-}
-
-request = Moguera::Authentication::Request.new(params)
-
-headers = {
-    Authorization: request.token,
-    content_type: content_type,
-    Date: http_date
-}
-
-begin
-  res = RestClient.post(url, {key:'value'}.to_json, headers)
-  puts res.body
-rescue => e
-  puts e.message
+abort "Usage: ruby #{__FILE__} http://localhost:9292/login/hello" unless url
+
+access_key = 'user01'
+secret_access_key = 'secret'
+
+conn = Faraday.new do |faraday|
+  faraday.use Faraday::MogueraAuthentication, access_key, secret_access_key
+  faraday.response :logger
+  faraday.adapter Faraday.default_adapter
 end
+
+payload = '{ "key" : "value" }'
+response = conn.post(url, payload, 'Content-Type' => 'application/json')
+
+puts response.body
 ```
 
 ### Quick Run
@@ -178,10 +159,10 @@ $ rackup sample/config.ru
 client
 
 ```
-$ sample/client.rb http://localhost:9292/hello
+$ sample/client-faraday.rb http://localhost:9292/hello
 Hello World!
 
-$ sample/client.rb http://localhost:9292/login/hello
+$ sample/client-faraday.rb http://localhost:9292/login/hello
 Hello user01!
 ```
 
@@ -195,6 +176,6 @@ Hello user01!
 
 ## Copyright
 
-Copyright (c) 2014 hiro-su.
+Copyright (c) 2015 hiro-su.
 
-MIT License
+MIT License

data/lib/faraday/moguera_authentication.rb

@@ -0,0 +1,41 @@
+require 'faraday'
+require 'moguera/authentication'
+require 'time'
+
+module Faraday
+  class MogueraAuthentication < Faraday::Middleware
+    def initialize(app, access_key, secret_access_key)
+      super(app) # @app = app
+      @access_key = access_key
+      @secret_access_key = secret_access_key
+    end
+
+    def call(env)
+      params = build_parameter(env)
+      request = Moguera::Authentication::Request.new(params)
+      headers = {
+          'Authorization' => request.token,
+          'Content-Type' => params[:content_type],
+          'Date' => params[:http_date]
+      }
+      env.request_headers.merge!(headers)
+      @app.call(env)
+    end
+
+    private
+
+    def build_parameter(env)
+      path = env.url.path
+      method = "#{env.method}".upcase
+      headers = env.request_headers
+      {
+          access_key: @access_key,
+          secret_access_key: @secret_access_key,
+          request_path: path,
+          request_method: method,
+          content_type: headers['Content-Type'],
+          http_date: headers['Date'] || Time.now.httpdate
+      }
+    end
+  end
+end

data/lib/moguera/authentication/version.rb

@@ -1,5 +1,5 @@
 module Moguera
   class Authentication
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/lib/rack/moguera_authentication.rb

@@ -19,9 +19,9 @@ module Rack
     def call(env)
       begin
         request_token = Moguera::Authentication.new(env['HTTP_AUTHORIZATION'])
-        auth = request_token.authenticate! do |key|
-          secret = @secret_block.call(key)
-          params = build_parameter(key, secret, env)
+        auth = request_token.authenticate! do |access_key|
+          secret_access_key = @secret_block.call(access_key)
+          params = build_parameter(access_key, secret_access_key, env)
 
           Moguera::Authentication::Request.new(params)
         end
@@ -36,10 +36,10 @@ module Rack
 
     private
 
-    def build_parameter(key, secret, env)
+    def build_parameter(access_key, secret_access_key, env)
       {
-          access_key: key,
-          secret_access_key: secret,
+          access_key: access_key,
+          secret_access_key: secret_access_key,
           request_path: env['REQUEST_PATH'],
           request_method: env['REQUEST_METHOD'],
           content_type: env['CONTENT_TYPE'],

data/sample/Gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'faraday'
+gem 'httpclient'
+gem 'sinatra'

data/sample/client-faraday.rb

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), %w(.. lib)))
+
+require 'faraday/moguera_authentication'
+
+url = ARGV[0]
+abort "Usage: ruby #{__FILE__} http://localhost:9292/login/hello" unless url
+
+access_key = 'user01'
+secret_access_key = 'secret'
+
+conn = Faraday.new do |faraday|
+  faraday.use Faraday::MogueraAuthentication, access_key, secret_access_key
+  faraday.response :logger
+  faraday.adapter Faraday.default_adapter
+end
+
+payload = '{ "key" : "value" }'
+response = conn.post(url, payload, 'Content-Type' => 'application/json')
+
+puts response.body

data/sample/client.rb

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), %w(.. lib)))
 
 require 'moguera/authentication'
-require 'rest-client'
+require 'httpclient'
 require 'time'
 require 'json'
 require 'uri'
@@ -12,6 +12,9 @@ require 'uri'
 url = ARGV[0]
 abort "Usage: ruby #{__FILE__} http://localhost:4567/login" unless url
 
+http_client = HTTPClient.new
+http_client.debug_dev = STDERR
+
 request_path = URI.parse(url).path
 request_path = '/' if request_path.empty?
 http_date = Time.now.httpdate
@@ -29,14 +32,10 @@ params = {
 request = Moguera::Authentication::Request.new(params)
 
 headers = {
-    Authorization: request.token,
-    content_type: content_type,
-    Date: http_date
+    'Authorization' => request.token,
+    'Content-Type' => content_type,
+    'Date' => http_date
 }
 
-begin
-  res = RestClient.post(url, {key:'value'}.to_json, headers)
-  puts res.body
-rescue => e
-  puts e.response
-end
+response = http_client.post(url, {key:'value'}.to_json, headers)
+puts response.body

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moguera-authentication
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - hiro-su
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,6 +81,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/faraday/moguera_authentication.rb
 - lib/moguera/authentication.rb
 - lib/moguera/authentication/exception.rb
 - lib/moguera/authentication/request.rb
@@ -91,6 +92,8 @@ files:
 - lib/rails/moguera_authentication/install.rb
 - lib/rails/moguera_authentication/railtie.rb
 - moguera-authentication.gemspec
+- sample/Gemfile
+- sample/client-faraday.rb
 - sample/client.rb
 - sample/config.ru
 - sample/credential.json
@@ -120,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Simple REST API Authentication.