exvo-auth 0.9.3 → 0.9.4

data/Gemfile

@@ -0,0 +1,4 @@
+source :gemcutter
+
+# Specify your gem's dependencies in exvo-auth.gemspec
+gemspec

data/README

@@ -96,3 +96,11 @@ If scopes are empty, then provider app should not present any resources to consu
 
 before_filter {|c| c.authenticate_app_in_scope!("payments") }
 
+
+Dejavu - replay non-GET requests after authentication redirects
+===============================================================
+
+Limitations: 
+
+* doesn't work with file uploads
+* all request params become query params when replayed

data/Rakefile

@@ -1,55 +1,11 @@
-require 'rubygems'
-require 'rake'
+require 'bundler'
+require 'rake/testtask'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "exvo-auth"
-    gem.description = gem.summary = %Q{Sign in with Exvo account}
-    gem.email = "jacek.becela@gmail.com"
-    gem.homepage = "http://github.com/Exvo/Auth"
-    gem.authors = ["Jacek Becela"]
-    gem.add_dependency "oa-oauth", "~> 0.0.4"
-    gem.add_dependency "httparty", "~> 0.6.1"
-    gem.add_development_dependency "mocha", "~> 0.9.8"
-    gem.add_development_dependency "test-unit", "~> 2.1.0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+Bundler::GemHelper.install_tasks
 
-require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :test => :check_dependencies
-
 task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "exvo-auth #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/exvo-auth.gemspec

@@ -1,80 +1,27 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+require File.expand_path("../lib/exvo_auth/version", __FILE__)
 
 Gem::Specification.new do |s|
-  s.name = %q{exvo-auth}
-  s.version = "0.9.3"
+  s.name        = "exvo-auth"
+  s.version     = ExvoAuth::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Jacek Becela"]
+  s.email       = ["jacek.becela@gmail.com"]
+  s.homepage    = "http://rubygems.org/gems/exvo-auth"
+  s.summary     = "Sign in with Exvo account"
+  s.description = "Sign in with Exvo account"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jacek Becela"]
-  s.date = %q{2010-09-06}
-  s.description = %q{Sign in with Exvo account}
-  s.email = %q{jacek.becela@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README"
-  ]
-  s.files = [
-    ".gitignore",
-     "LICENSE",
-     "README",
-     "Rakefile",
-     "VERSION",
-     "exvo-auth.gemspec",
-     "lib/exvo-auth.rb",
-     "lib/exvo_auth/autonomous/auth.rb",
-     "lib/exvo_auth/autonomous/base.rb",
-     "lib/exvo_auth/autonomous/cache.rb",
-     "lib/exvo_auth/autonomous/consumer.rb",
-     "lib/exvo_auth/autonomous/http.rb",
-     "lib/exvo_auth/autonomous/provider.rb",
-     "lib/exvo_auth/config.rb",
-     "lib/exvo_auth/controllers/base.rb",
-     "lib/exvo_auth/controllers/merb.rb",
-     "lib/exvo_auth/controllers/rails.rb",
-     "lib/exvo_auth/dejavu.rb",
-     "lib/exvo_auth/middleware.rb",
-     "lib/exvo_auth/oauth2.rb",
-     "lib/exvo_auth/strategies/base.rb",
-     "lib/exvo_auth/strategies/interactive.rb",
-     "lib/exvo_auth/strategies/non_interactive.rb",
-     "test/helper.rb",
-     "test/test_exvo_auth.rb",
-     "test/test_integration.rb"
-  ]
-  s.homepage = %q{http://github.com/Exvo/Auth}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Sign in with Exvo account}
-  s.test_files = [
-    "test/helper.rb",
-     "test/test_exvo_auth.rb",
-     "test/test_integration.rb"
-  ]
+  s.required_rubygems_version = ">= 1.3.6"
+  s.rubyforge_project         = "exvo-auth"
+  
+  s.add_dependency "oa-oauth", "~> 0.0.4"
+  s.add_dependency "httparty", "~> 0.6.1"
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_development_dependency "mocha",     "~> 0.9.8"
+  s.add_development_dependency "test-unit", "~> 2.1.0"
+  s.add_development_dependency "bundler",   "~> 1.0.0"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<oa-oauth>, ["~> 0.0.4"])
-      s.add_runtime_dependency(%q<httparty>, ["~> 0.6.1"])
-      s.add_development_dependency(%q<mocha>, ["~> 0.9.8"])
-      s.add_development_dependency(%q<test-unit>, ["~> 2.1.0"])
-    else
-      s.add_dependency(%q<oa-oauth>, ["~> 0.0.4"])
-      s.add_dependency(%q<httparty>, ["~> 0.6.1"])
-      s.add_dependency(%q<mocha>, ["~> 0.9.8"])
-      s.add_dependency(%q<test-unit>, ["~> 2.1.0"])
-    end
-  else
-    s.add_dependency(%q<oa-oauth>, ["~> 0.0.4"])
-    s.add_dependency(%q<httparty>, ["~> 0.6.1"])
-    s.add_dependency(%q<mocha>, ["~> 0.9.8"])
-    s.add_dependency(%q<test-unit>, ["~> 2.1.0"])
-  end
+  s.files        = `git ls-files`.split("\n")
+  s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
+  s.require_path = 'lib'
 end
-

data/lib/exvo-auth.rb

@@ -9,6 +9,7 @@ module ExvoAuth
   autoload :Middleware, 'exvo_auth/middleware'
   autoload :Config,     'exvo_auth/config'
   autoload :Dejavu,     'exvo_auth/dejavu'
+  autoload :VERSION,    'exvo_auth/version'
   
   module Strategies
     autoload :Base,           'exvo_auth/strategies/base'

data/lib/exvo_auth/controllers/base.rb

@@ -85,13 +85,14 @@ module ExvoAuth::Controllers::Base
   end
 
   def current_request
-    {
-      :script_name  => request.script_name,
-      :path_info    => request.path_info,
-      :method       => request_method,
-      :params       => request.params, # GET + POST params together. no uploads and other crazy shit please ;)
-      :content_type => request.content_type
-    }
+    request.params.merge(
+      :_dejavu => {
+        :script_name  => request.script_name,
+        :path_info    => request.path_info,
+        :method       => request_method,
+        :content_type => request.content_type
+      }
+    )
   end
 
   def store_request!
@@ -100,12 +101,12 @@ module ExvoAuth::Controllers::Base
   
   def request_replay_url
     if stored_request = session.delete(:stored_request)
-      decoded = MultiJson.decode(Base64.decode64(stored_request))
-      if decoded["method"] == "GET"
-        qs = decoded["query_string"]
-        decoded["script_name"] + decoded["path_info"] + (qs ? "?" + qs : "")
+      params = MultiJson.decode(Base64.decode64(stored_request))
+      dejavu = params.delete("_dejavu")
+      if dejavu["method"] == "GET"
+        dejavu["script_name"] + dejavu["path_info"] + (params.any? ? "?" + Rack::Utils.build_nested_query(params) : "")
       else
-        "/auth/dejavu?" + Rack::Utils.build_query(:stored_request => stored_request)
+        "/auth/dejavu?" + Rack::Utils.build_nested_query(params.merge(:_dejavu => dejavu))
       end
     end
   end

data/lib/exvo_auth/dejavu.rb

@@ -11,12 +11,13 @@ class ExvoAuth::Dejavu
   private
   
   def dejavu(env)
-    data = MultiJson.decode(Base64.decode64(Rack::Request.new(env).params["stored_request"]))
+    params = Rack::Request.new(env).params
+    dejavu = params.delete("_dejavu")
 
-    env["QUERY_STRING"]   = Rack::Utils.build_nested_query(data["params"]) # Will not work with file uploads.
-    env["SCRIPT_NAME"]    = data["script_name"]
-    env["PATH_INFO"]      = data["path_info"]
-    env["REQUEST_METHOD"] = data["method"]
-    env["CONTENT_TYPE"]   = data["content_type"]
+    env["QUERY_STRING"]   = Rack::Utils.build_nested_query(params) # Will not work with file uploads.
+    env["SCRIPT_NAME"]    = dejavu["script_name"]
+    env["PATH_INFO"]      = dejavu["path_info"]
+    env["REQUEST_METHOD"] = dejavu["method"]
+    env["CONTENT_TYPE"]   = dejavu["content_type"]
   end
 end

data/lib/exvo_auth/version.rb

@@ -0,0 +1,3 @@
+module ExvoAuth
+  VERSION = "0.9.4"
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: exvo-auth
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 51
   prerelease: false
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - Jacek Becela
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-06 00:00:00 +02:00
+date: 2010-09-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,21 +82,36 @@ dependencies:
         version: 2.1.0
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :development
+  version_requirements: *id005
 description: Sign in with Exvo account
-email: jacek.becela@gmail.com
+email: 
+- jacek.becela@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README
+extra_rdoc_files: []
+
 files: 
 - .gitignore
-- LICENSE
+- Gemfile
 - README
 - Rakefile
-- VERSION
 - exvo-auth.gemspec
 - lib/exvo-auth.rb
 - lib/exvo_auth/autonomous/auth.rb
@@ -115,16 +130,17 @@ files:
 - lib/exvo_auth/strategies/base.rb
 - lib/exvo_auth/strategies/interactive.rb
 - lib/exvo_auth/strategies/non_interactive.rb
+- lib/exvo_auth/version.rb
 - test/helper.rb
 - test/test_exvo_auth.rb
 - test/test_integration.rb
 has_rdoc: true
-homepage: http://github.com/Exvo/Auth
+homepage: http://rubygems.org/gems/exvo-auth
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -141,18 +157,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 23
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: exvo-auth
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Sign in with Exvo account
-test_files: 
-- test/helper.rb
-- test/test_exvo_auth.rb
-- test/test_integration.rb
+test_files: []
+

data/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2010 Jacek Becela
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/VERSION

@@ -1 +0,0 @@
-0.9.3