rack_my_openid 0.0.1 → 0.0.2

data/CHANGELOG

@@ -0,0 +1,3 @@
+# 2012-01-15 0.0.2
+
+First public release; fixed some stillborn bugs from 0.0.1

data/lib/rack_my_openid.rb

@@ -1,6 +1,10 @@
 require 'rack_my_openid/version'
 require 'rack_my_openid/provider'
 
+if Rack.release == '1.2'
+  require 'rack_my_openid/backported_rack_digest_fix'
+end
+
 module RackMyOpenid
 
 end

data/lib/rack_my_openid/backported_rack_digest_fix.rb

@@ -0,0 +1,19 @@
+require 'rack/auth/digest/request'
+
+module RackMyOpenid
+  module BackportedRackDigestFix
+    def self.included(klass)
+      klass.class_eval do
+        def request
+          @request ||= Rack::Request.new(@env)
+        end
+
+        def correct_uri?
+          request.fullpath == uri
+        end
+      end
+    end
+  end
+end
+
+Rack::Auth::Digest::Request.send(:include, RackMyOpenid::BackportedRackDigestFix)

data/lib/rack_my_openid/handler.rb

@@ -33,11 +33,11 @@ module RackMyOpenid
   private
     
     def openid_server
-      @openid_server ||= OpenID::Server::Server.new(@options[:endpoint_url], openid_store)
+      @openid_server ||= OpenID::Server::Server.new(openid_store, @options[:endpoint_url])
     end
 
     def openid_store
-      @openid_store ||= OpenID::Store::Memory 
+      @openid_store ||= OpenID::Store::Memory.new
     end
     
     # Handle a valid OpenID request
@@ -57,10 +57,10 @@ module RackMyOpenid
     def handle_check_id_request(request, session)
       if request_provided_invalid_openid?(request)
         return request.answer(false)
-      elsif trusted_realm?(request.realm, session)
+      elsif trusted_realm?(request.trust_root, session)
         return request.answer(true, nil, @options[:openid])
       else
-        raise UntrustedRealm.new(request.realm)
+        raise UntrustedRealm.new(request.trust_root)
       end
     end
     

data/lib/rack_my_openid/provider.rb

@@ -43,9 +43,10 @@ module RackMyOpenid
           status 400
           body 'Bad Request'
         rescue RackMyOpenid::Handler::UntrustedRealm => e
-          session[:openid_request_params] = params
+          params_without_default_proc = {}.merge params
+          session[:openid_request_params] = params_without_default_proc
           session[:realm] = e.realm
-          redirect to('/openid/decide'), 302 
+          redirect '/openid/decide', 302 
         end
       end
     end
@@ -55,7 +56,7 @@ module RackMyOpenid
       if @realm = session[:realm]
         erb :decide
       else
-        redirect to('/openid'), 302
+        redirect '/openid', 302
       end
     end
 

data/lib/rack_my_openid/version.rb

@@ -1,3 +1,3 @@
 module RackMyOpenid
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/rack_my_openid.gemspec

@@ -18,9 +18,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_runtime_dependency 'rack', '>=1.2'
   s.add_runtime_dependency 'sinatra'
   s.add_runtime_dependency 'ruby-openid'
 
+  s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'capybara'
 end

data/spec/handler_spec.rb

@@ -2,14 +2,14 @@ require 'spec_helper'
 
 shared_examples_for 'a valid request' do
   context 'when realm is trusted via options' do
-    let(:options_with_realm) { options.merge({:trusted_realms => [request.realm]}) }
+    let(:options_with_realm) { options.merge({:trusted_realms => [request.trust_root]}) }
     it 'should answer true' do
       described_class.new(options_with_realm).handle(params, session).should == 'answered true'
     end
   end
 
   context 'when realm is trusted via session' do
-    let(:session) { {:trusted_realms => [request.realm] } }
+    let(:session) { {:trusted_realms => [request.trust_root] } }
     it 'should answer true' do
       described_class.new(options).handle(params, session).should == 'answered true'
     end
@@ -64,7 +64,7 @@ describe RackMyOpenid::Handler do
     let(:params) { {:mode => 'check_id'} }
     let(:request) {
       request = OpenID::Server::CheckIDRequest.new(nil, nil, nil)
-      request.stub(:realm) { 'http://my.realm' }
+      request.stub(:trust_root) { 'http://my.realm' }
       request.stub(:answer).with(true, nil, options[:openid]) { 'answered true' }
       request.stub(:answer).with(false) { 'answered false' }
       request

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack_my_openid
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-14 00:00:00.000000000 Z
+date: 2012-01-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &70185625770120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70185625770120
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70135767507380 !ruby/object:Gem::Requirement
+  requirement: &70185625785420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70135767507380
+  version_requirements: *70185625785420
 - !ruby/object:Gem::Dependency
   name: ruby-openid
-  requirement: &70135767506760 !ruby/object:Gem::Requirement
+  requirement: &70185625783160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70135767506760
+  version_requirements: *70185625783160
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70185625780400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70185625780400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70135767506180 !ruby/object:Gem::Requirement
+  requirement: &70185625779160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70135767506180
+  version_requirements: *70185625779160
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70135767503520 !ruby/object:Gem::Requirement
+  requirement: &70185625777680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70135767503520
+  version_requirements: *70185625777680
 description: Would be useful to enable OpenID authorisation with your Ruby/Rails-based
   blog, personal website or whatever.
 email:
@@ -65,10 +87,12 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
+- CHANGELOG
 - Gemfile
 - README.md
 - Rakefile
 - lib/rack_my_openid.rb
+- lib/rack_my_openid/backported_rack_digest_fix.rb
 - lib/rack_my_openid/handler.rb
 - lib/rack_my_openid/provider.rb
 - lib/rack_my_openid/version.rb
@@ -95,12 +119,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1985348002294510017
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1985348002294510017
 requirements: []
 rubyforge_project: rack_my_openid
 rubygems_version: 1.8.11