easy-rack-open-id 0.2.2 → 0.3.0

data/.gitignore

@@ -1,3 +1,4 @@
 Manifest
 pkg/*
-vendor/*
+vendor/*
+.bundle/*

data/Gemfile

@@ -0,0 +1,10 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in easy-rack-open-id.gemspec
+gemspec
+
+# Extra gems for use in the config.ru demo
+group :demo do
+  gem 'openid_mongodb_store'
+  gem "shotgun"
+end

data/Gemfile.lock

@@ -0,0 +1,38 @@
+PATH
+  remote: .
+  specs:
+    easy-rack-open-id (0.3.0)
+      rack-openid (~> 1.3)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    bson (1.3.1)
+    columnize (0.3.2)
+    linecache (0.43)
+    mongo (1.3.1)
+      bson (>= 1.3.1)
+    openid_mongodb_store (0.3.0)
+      mongo (~> 1.3)
+      ruby-openid (~> 2.1)
+    rack (1.3.0)
+    rack-openid (1.3.1)
+      rack (>= 1.1.0)
+      ruby-openid (>= 2.1.8)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    ruby-openid (2.1.8)
+    shotgun (0.9)
+      rack (>= 1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  easy-rack-open-id!
+  openid_mongodb_store
+  ruby-debug
+  shotgun

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2009 Sam Schenkman-Moore
+
+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/README.rdoc

@@ -57,4 +57,4 @@ Right now allowed_identifiers and identity_match cannot both be used at once.
 :policy_url
 
 == OpenID Selector, Real-selector
-This package includes nice-looking default login forms from the "openid-selector" and "real-openid-selector" projects. This gem will serve the necessary javascript/images, but it may be more efficient to copy public/easy-rack-openid-assets into your application's public directory so that Apache/Nginx/whatever can serve those file directly.
+This package includes nice-looking default login forms from the "openid-selector" and "real-openid-selector" projects. This gem will serve the necessary javascript/images, but it may be more efficient to copy public/easy-rack-open-id-assets into your application's public directory so that Apache/Nginx/whatever can serve those file directly.

data/Rakefile

@@ -1,28 +1,2 @@
-# Rakefile
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "easy-rack-open-id"
-    gem.summary = "Super easy OpenID protection for Rack."
-    gem.description = "You supply OpenIDs, this keeps anyone but people with access to those ids from getting through. You don't even have to make a form. :)"
-    gem.email = "samsm@samsm.com"
-    gem.homepage = "http://github.com/samsm/Easy-Rack-OpenID"
-    gem.authors = ["Sam Schenkman-Moore"]
-    gem.add_development_dependency "yard", ">= 0"
-    gem.add_runtime_dependency 'rack-openid'
-  end
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
-
-begin
-  require 'yard'
-  YARD::Rake::YardocTask.new
-rescue LoadError
-  task :yardoc do
-    abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
-  end
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks

data/config.ru

@@ -1,23 +1,21 @@
 require 'rubygems'
 require 'rack'
-# require 'rack/openid'
-require 'vendor/rack-openid/lib/rack/openid'
-require 'lib/easy_rack_open_id'
+require 'rack/openid'
+require 'lib/easy-rack-open-id'
 
 use Rack::ShowExceptions
 
 class HelloWorld
   def call(env)
-    [200, {"Content-Type" => "text/plain"}, ["Made it through!"]]
+    [200, {"Content-Type" => "text/html"}, ["Made it through! (<a href='/logout'>logout</a>)"]]
   end
 end
 
-
 # require 'openid_mongodb_store'
-# MongoMapper.database = 'testorama'
+
 puts "Remember shotgun won't work with memory store!"
 
 use Rack::Session::Cookie
-use Rack::OpenID #, OpenidMongodbStore::Store.new
-use EasyRackOpenID, :allowed_identifiers => ['http://samsm.com/'], :after_logout_path => '/login', :required => ['nickname']
+use Rack::OpenID #, OpenidMongodbStore::Store.new(Mongo::Connection.new.db('testorama'))
+use EasyRackOpenId::Server, :allowed_identifiers => ['http://samsm.com/'], :after_logout_path => '/login', :required => ['nickname']
 run HelloWorld.new

data/easy-rack-open-id.gemspec

@@ -1,79 +1,23 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "easy-rack-open-id/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{easy-rack-open-id}
-  s.version = "0.2.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Sam Schenkman-Moore"]
-  s.date = %q{2010-01-17}
+  s.name        = "easy-rack-open-id"
+  s.version     = Easy::Rack::Openid::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Sam Schenkman-Moore"]
+  s.email       = ["samsm@samsm.com"]
+  s.homepage    = "http://github.com/samsm/easy-rack-open-id"
+  s.summary     = %q{Super easy OpenID protection for Rack.}
   s.description = %q{You supply OpenIDs, this keeps anyone but people with access to those ids from getting through. You don't even have to make a form. :)}
-  s.email = %q{samsm@samsm.com}
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "config.ru",
-     "easy-rack-open-id.gemspec",
-     "lib/easy_rack_open_id.rb",
-     "lib/easy_rack_open_id_processing.rb",
-     "lib/generic_openid_form.html.erb",
-     "lib/nice_openid_form.html.erb",
-     "lib/nicer_openid_form.html.erb",
-     "public/easy-rack-openid-assets/openid-realselector/css/style.css",
-     "public/easy-rack-openid-assets/openid-realselector/demo.html",
-     "public/easy-rack-openid-assets/openid-realselector/img/balloon.png",
-     "public/easy-rack-openid-assets/openid-realselector/img/indicator.gif",
-     "public/easy-rack-openid-assets/openid-realselector/img/openid-icons.png",
-     "public/easy-rack-openid-assets/openid-realselector/js/jquery.openid.js",
-     "public/easy-rack-openid-assets/openid-realselector/js/jquery.openid.min.js",
-     "public/easy-rack-openid-assets/openid-selector/css/openid.css",
-     "public/easy-rack-openid-assets/openid-selector/demo.html",
-     "public/easy-rack-openid-assets/openid-selector/images/aol.gif",
-     "public/easy-rack-openid-assets/openid-selector/images/blogger.ico",
-     "public/easy-rack-openid-assets/openid-selector/images/claimid.ico",
-     "public/easy-rack-openid-assets/openid-selector/images/facebook.gif",
-     "public/easy-rack-openid-assets/openid-selector/images/flickr.ico",
-     "public/easy-rack-openid-assets/openid-selector/images/google.gif",
-     "public/easy-rack-openid-assets/openid-selector/images/livejournal.ico",
-     "public/easy-rack-openid-assets/openid-selector/images/myopenid.ico",
-     "public/easy-rack-openid-assets/openid-selector/images/openid-inputicon.gif",
-     "public/easy-rack-openid-assets/openid-selector/images/openid.gif",
-     "public/easy-rack-openid-assets/openid-selector/images/technorati.ico",
-     "public/easy-rack-openid-assets/openid-selector/images/verisign.ico",
-     "public/easy-rack-openid-assets/openid-selector/images/vidoop.ico",
-     "public/easy-rack-openid-assets/openid-selector/images/wordpress.ico",
-     "public/easy-rack-openid-assets/openid-selector/images/yahoo.gif",
-     "public/easy-rack-openid-assets/openid-selector/js/jquery-1.2.6.min.js",
-     "public/easy-rack-openid-assets/openid-selector/js/openid-jquery.js"
-  ]
-  s.homepage = %q{http://github.com/samsm/Easy-Rack-OpenID}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Super easy OpenID protection for Rack.}
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.rubyforge_project = "easy-rack-open-id"
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<yard>, [">= 0"])
-      s.add_runtime_dependency(%q<rack-openid>, [">= 0"])
-    else
-      s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<rack-openid>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<rack-openid>, [">= 0"])
-  end
-end
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 
+  s.add_dependency 'rack-openid', ['~> 1.3']
+end

data/lib/easy-rack-open-id/processing.rb

@@ -0,0 +1,195 @@
+module EasyRackOpenId
+  class Processing
+
+    attr_accessor :env, :options
+
+    def initialize(app, options ={})
+      @app = app
+      @options = options
+    end
+
+    def call(env)
+      @env = env
+      if logout_path == path
+        logout_result = logout
+        return logout_result if logout_result
+      end
+      if asset?
+        content_type_lookup = {'css' => 'text/css','html'=> 'text/html','js'=>'text/javascript','gif'=>'image/gif','ico' => 'image/vnd.microsoft.icon', 'png'=> 'image/png'}
+        ok(IO.read(gem_public_path + path), content_type_lookup[File.extname(path)[1..-1]])
+      elsif allowed?
+        # pass through
+        @app.call(env)
+      else
+        # break chain, start open_id_login
+        open_id_login
+      end
+    end
+
+    def asset?
+      0 == path.index(asset_prefix)
+    end
+
+    def asset_prefix
+      '/easy-rack-open-id-assets'
+    end
+
+    def gem_public_path
+      File.dirname(__FILE__) + '/../../public/'
+    end
+
+    def open_id_login
+      if resp = env["rack.openid.response"]
+        case resp.status
+        when :success
+          # Load in any registration data gathered
+          profile_data = {}
+          # merge the SReg data and the AX data into a single hash of profile data
+          [ OpenID::SReg::Response, OpenID::AX::FetchResponse ].each do |data_response|
+            if data_response.from_success_response( resp )
+              profile_data.merge! data_response.from_success_response( resp ).data
+            end
+          end
+
+          profile_data['identifier'] = resp.identity_url
+          #... save id and registration and forward to ...
+          self.verified_identity = profile_data
+          forward_to(protected_path)
+        when :failure
+          present_login_options
+        end
+      else
+        if identitifier_to_verify && valid_identifier?
+          self.protected_path = path
+          header_hash =  {:identifier => identitifier_to_verify}
+            header_hash.merge!(:required => options[:required]) if options[:required]
+            header_hash.merge!(:required => options[:optional]) if options[:optional]
+            header_hash.merge!(:required => options[:policy_url]) if options[:policy_url]
+          [401, {"WWW-Authenticate" => Rack::OpenID.build_header(header_hash)}, []]
+        else
+          present_login_options
+        end
+      end
+    end
+
+    def path
+      env['REQUEST_PATH']
+    end
+
+    def present_login_options
+      if login_path
+        forward_to(login_path)
+      else
+        dir = File.dirname(__FILE__) + '/../'
+        form = case options[:form]
+        when 'boring'
+          IO.read(dir + '/generic_openid_form.html.erb')
+        when 'selector'
+          IO.read(dir + '/nice_openid_form.html.erb')
+        else # use default, real-openid selector
+          IO.read(dir + '/nicer_openid_form.html.erb')
+        end
+        ok(form)
+      end
+    end
+
+    def forward_to(url)
+      [302, {'Location' => url,'Content-Type' => 'text/html'}, ["Forwarding to #{url}"]]
+    end
+
+    def allowed?
+      if allowed_identifiers
+        allowed_identifiers.include? verified_identifier
+      elsif identity_match
+        identity_match === verified_identifier
+      else
+        verified_identifier
+      end
+    end
+
+    def identity_match
+      options[:identity_match]
+    end
+
+    def allowed_identifiers
+      options[:allowed_identifiers]
+    end
+
+    def logout_path
+      options[:logout_path] || '/logout'
+    end
+
+    def logout
+      self.verified_identity = nil
+      if after_logout_path
+        forward_to(after_logout_path)
+      end
+    end
+
+    def after_logout_path
+      options[:after_logout_path]
+    end
+
+    def login_path
+      options[:login_path]
+    end
+
+    def identitifier_to_verify
+      @identitifier_to_verify ||=
+      if env["rack.request.query_hash"] && env["rack.request.query_hash"]["openid_identifier"]
+        env["rack.request.query_hash"]["openid_identifier"]
+      elsif posted_data = CGI.parse(env['rack.input'].read)
+        env['rack.input'].rewind
+        identifier = posted_data['openid_identifier']
+        if identifier.kind_of? Array
+          identifier.last
+        else
+          identifier
+        end
+      end
+    end
+
+    def valid_identifier?
+      uri = URI.parse(identitifier_to_verify.to_s.strip)
+      uri = URI.parse("http://#{uri}") unless uri.scheme
+      uri.scheme = uri.scheme.downcase  # URI should do this
+      uri.normalize.to_s
+    rescue URI::InvalidURIError
+      # raise InvalidOpenId.new("#{url} is not an OpenID URL")
+      false # Quietly fail for now.
+    end
+
+    def verified_identity=(hash)
+      session['verified_identity'] = hash
+    end
+
+    def verified_identity
+      session['verified_identity']
+    end
+
+    def verified_identifier
+      verified_identity  && verified_identity['identifier']
+    end
+
+    def session
+      env['rack.session']
+    end
+
+    def protected_path=(path)
+      session['return_to'] = path
+    end
+
+    def protected_path
+      session['return_to'] || default_return_to
+    end
+
+    def default_return_to
+      options[:default_return_to] || '/'
+    end
+
+    def ok(text, content_type = 'text/html')
+      [200,{"Content-Type" => content_type, 'Content-Length'=> text.length.to_s},[text]]
+    end
+
+  end
+end

data/lib/easy-rack-open-id/server.rb

@@ -0,0 +1,12 @@
+module EasyRackOpenId
+  class Server
+    def initialize(app, options ={})
+      @app = app
+      @options = options
+    end
+
+    def call(env)
+      Processing.new(@app,@options).call(env)
+    end
+  end
+end

data/lib/easy-rack-open-id/version.rb

@@ -0,0 +1,7 @@
+module Easy
+  module Rack
+    module Openid
+      VERSION = "0.3.0"
+    end
+  end
+end

data/lib/easy-rack-openid.rb

@@ -0,0 +1,13 @@
+require File.dirname(__FILE__) + '/easy-rack-open-id/server'
+require File.dirname(__FILE__) + '/easy-rack-open-id/processing'
+
+module EasyRackOpenId
+  def initialize(app, options ={})
+    @app = app
+    @options = options
+  end
+
+  def call(env)
+    Processing.new(@app,@options).call(env)
+  end
+end

data/lib/nice_openid_form.html.erb

@@ -5,9 +5,9 @@
 	<title>Log In!</title>
 	
 	<!-- Simple OpenID Selector -->
-  <link rel="stylesheet" href="/easy-rack-openid-assets/openid-selector/css/openid.css" />
-	<script type="text/javascript" src="/easy-rack-openid-assets/openid-selector/js/jquery-1.2.6.min.js"></script>
-	<script type="text/javascript" src="/easy-rack-openid-assets/openid-selector/js/openid-jquery.js"></script>
+  <link rel="stylesheet" href="/easy-rack-open-id-assets/openid-selector/css/openid.css" />
+	<script type="text/javascript" src="/easy-rack-open-id-assets/openid-selector/js/jquery-1.2.6.min.js"></script>
+	<script type="text/javascript" src="/easy-rack-open-id-assets/openid-selector/js/openid-jquery.js"></script>
 	<script type="text/javascript">
 	$(document).ready(function() {
 	    openid.init('openid_identifier');

data/lib/nicer_openid_form.html.erb

@@ -4,9 +4,9 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <title>Log In</title>
-    <link rel="stylesheet" href="/easy-rack-openid-assets/openid-realselector/css/style.css" type="text/css" media="screen" charset="utf-8" />
+    <link rel="stylesheet" href="/easy-rack-open-id-assets/openid-realselector/css/style.css" type="text/css" media="screen" charset="utf-8" />
     <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.2.6/jquery.min.js"></script>
-    <script type="text/javascript" src="/easy-rack-openid-assets/openid-realselector/js/jquery.openid.js"></script>
+    <script type="text/javascript" src="/easy-rack-open-id-assets/openid-realselector/js/jquery.openid.js"></script>
     <script type="text/javascript"><!--//
     $(function() {
       $('#openid').openid({

data/public/{easy-rack-openid-assets → easy-rack-open-id-assets}/openid-selector/js/openid-jquery.js

@@ -85,7 +85,7 @@ var openid = {
 	cookie_name: 'openid_provider',
 	cookie_path: '/',
 	
-	img_path: '/easy-rack-openid-assets/openid-selector/images/',
+	img_path: '/easy-rack-open-id-assets/openid-selector/images/',
 	
 	input_id: null,
 	provider_url: null,

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: easy-rack-open-id
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  hash: 19
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Sam Schenkman-Moore
@@ -9,100 +15,106 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-17 00:00:00 -05:00
+date: 2011-05-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: yard
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: rack-openid
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
+  type: :runtime
+  version_requirements: *id001
 description: You supply OpenIDs, this keeps anyone but people with access to those ids from getting through. You don't even have to make a form. :)
-email: samsm@samsm.com
+email: 
+- samsm@samsm.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - .gitignore
+- Gemfile
+- Gemfile.lock
+- LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - config.ru
 - easy-rack-open-id.gemspec
-- lib/easy_rack_open_id.rb
-- lib/easy_rack_open_id_processing.rb
+- lib/easy-rack-open-id/processing.rb
+- lib/easy-rack-open-id/server.rb
+- lib/easy-rack-open-id/version.rb
+- lib/easy-rack-openid.rb
 - lib/generic_openid_form.html.erb
 - lib/nice_openid_form.html.erb
 - lib/nicer_openid_form.html.erb
-- public/easy-rack-openid-assets/openid-realselector/css/style.css
-- public/easy-rack-openid-assets/openid-realselector/demo.html
-- public/easy-rack-openid-assets/openid-realselector/img/balloon.png
-- public/easy-rack-openid-assets/openid-realselector/img/indicator.gif
-- public/easy-rack-openid-assets/openid-realselector/img/openid-icons.png
-- public/easy-rack-openid-assets/openid-realselector/js/jquery.openid.js
-- public/easy-rack-openid-assets/openid-realselector/js/jquery.openid.min.js
-- public/easy-rack-openid-assets/openid-selector/css/openid.css
-- public/easy-rack-openid-assets/openid-selector/demo.html
-- public/easy-rack-openid-assets/openid-selector/images/aol.gif
-- public/easy-rack-openid-assets/openid-selector/images/blogger.ico
-- public/easy-rack-openid-assets/openid-selector/images/claimid.ico
-- public/easy-rack-openid-assets/openid-selector/images/facebook.gif
-- public/easy-rack-openid-assets/openid-selector/images/flickr.ico
-- public/easy-rack-openid-assets/openid-selector/images/google.gif
-- public/easy-rack-openid-assets/openid-selector/images/livejournal.ico
-- public/easy-rack-openid-assets/openid-selector/images/myopenid.ico
-- public/easy-rack-openid-assets/openid-selector/images/openid-inputicon.gif
-- public/easy-rack-openid-assets/openid-selector/images/openid.gif
-- public/easy-rack-openid-assets/openid-selector/images/technorati.ico
-- public/easy-rack-openid-assets/openid-selector/images/verisign.ico
-- public/easy-rack-openid-assets/openid-selector/images/vidoop.ico
-- public/easy-rack-openid-assets/openid-selector/images/wordpress.ico
-- public/easy-rack-openid-assets/openid-selector/images/yahoo.gif
-- public/easy-rack-openid-assets/openid-selector/js/jquery-1.2.6.min.js
-- public/easy-rack-openid-assets/openid-selector/js/openid-jquery.js
+- public/easy-rack-open-id-assets/openid-realselector/css/style.css
+- public/easy-rack-open-id-assets/openid-realselector/demo.html
+- public/easy-rack-open-id-assets/openid-realselector/img/balloon.png
+- public/easy-rack-open-id-assets/openid-realselector/img/indicator.gif
+- public/easy-rack-open-id-assets/openid-realselector/img/openid-icons.png
+- public/easy-rack-open-id-assets/openid-realselector/js/jquery.openid.js
+- public/easy-rack-open-id-assets/openid-realselector/js/jquery.openid.min.js
+- public/easy-rack-open-id-assets/openid-selector/css/openid.css
+- public/easy-rack-open-id-assets/openid-selector/demo.html
+- public/easy-rack-open-id-assets/openid-selector/images/aol.gif
+- public/easy-rack-open-id-assets/openid-selector/images/blogger.ico
+- public/easy-rack-open-id-assets/openid-selector/images/claimid.ico
+- public/easy-rack-open-id-assets/openid-selector/images/facebook.gif
+- public/easy-rack-open-id-assets/openid-selector/images/flickr.ico
+- public/easy-rack-open-id-assets/openid-selector/images/google.gif
+- public/easy-rack-open-id-assets/openid-selector/images/livejournal.ico
+- public/easy-rack-open-id-assets/openid-selector/images/myopenid.ico
+- public/easy-rack-open-id-assets/openid-selector/images/openid-inputicon.gif
+- public/easy-rack-open-id-assets/openid-selector/images/openid.gif
+- public/easy-rack-open-id-assets/openid-selector/images/technorati.ico
+- public/easy-rack-open-id-assets/openid-selector/images/verisign.ico
+- public/easy-rack-open-id-assets/openid-selector/images/vidoop.ico
+- public/easy-rack-open-id-assets/openid-selector/images/wordpress.ico
+- public/easy-rack-open-id-assets/openid-selector/images/yahoo.gif
+- public/easy-rack-open-id-assets/openid-selector/js/jquery-1.2.6.min.js
+- public/easy-rack-open-id-assets/openid-selector/js/openid-jquery.js
 has_rdoc: true
-homepage: http://github.com/samsm/Easy-Rack-OpenID
+homepage: http://github.com/samsm/easy-rack-open-id
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.5
+rubyforge_project: easy-rack-open-id
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Super easy OpenID protection for Rack.

data/VERSION

@@ -1 +0,0 @@
-0.2.2

data/lib/easy_rack_open_id.rb

@@ -1,138 +0,0 @@
-require File.dirname(__FILE__) + '/easy_rack_open_id_processing'
-class EasyRackOpenID
-  
-  # attr_accessor :env, :options
-  
-  def initialize(app, options ={})
-    @app = app
-    @options = options
-  end
-  
-  def call(env)
-    EasyRackOpenIDProcessing.new(@app,@options).call(env)
-  end
-  
-  def asset?
-    0 == path.index(asset_prefix)
-  end
-  
-  def asset_prefix
-    '/easy-rack-openid-assets'
-  end
-  
-  def gem_public_path
-    File.dirname(__FILE__) + '/../public/'
-  end
-  
-  def open_id_login
-    if resp = env["rack.openid.response"]
-      case resp.status
-      when :success
-        #... save id and forward to ...
-        self.verified_identity = resp.identity_url
-        forward_to(protected_path)
-      when :failure
-        present_login_options
-      end
-    else
-      if identitifier_to_verify
-        self.protected_path = path
-        [401, {"WWW-Authenticate" => "OpenID identifier=\"#{identitifier_to_verify}\""}, []]
-      else
-        present_login_options
-      end
-    end
-    
-  end
-  
-  def path
-    env['REQUEST_PATH']
-  end
-  
-  def present_login_options
-    if login_path
-      forward_to(login_path)
-    else
-      dir = File.dirname(__FILE__)
-      # form = IO.read(dir + '/generic_openid_form.html.erb')
-      form = IO.read(dir + '/nice_openid_form.html.erb')
-      ok(form)
-    end
-  end
-  
-  def forward_to(url)
-    [302, {'Location' => url}, ["Forwarding to #{url}"]]
-  end
-  
-  def allowed?
-    if allowed_identifiers
-      allowed_identifiers.include? verified_identity
-    elsif identity_match
-      identity_match === verified_identity
-    else
-      verified_identity
-    end
-  end
-  
-  def identity_match
-    options[:identity_match]
-  end
-  
-  def allowed_identifiers
-    options[:allowed_identifiers]
-  end
-  
-  def logout_path
-    options[:logout_path] || '/logout'
-  end
-  
-  def logout
-    self.verified_identity = nil
-    if after_logout_path
-      forward_to(after_logout_path)
-    end
-  end
-  
-  def after_logout_path
-    options[:after_logout_path]
-  end
-  
-  def login_path
-    options[:login_path]
-  end
-  
-  def identitifier_to_verify
-    env["rack.request.query_hash"]["openid_identifier"]
-  end
-  
-  def verified_identity=(url)
-    session['verified_identity'] = url
-  end
-  
-  def verified_identity
-    session['verified_identity']
-  end
-  
-  def session
-    env['rack.session']
-  end
-  
-  def protected_path=(path)
-    session['return_to'] = path
-  end
-  
-  def protected_path
-    session['return_to'] || default_return_to
-  end
-  
-  def default_return_to
-    options[:default_return_to] || '/'
-  end
-  
-  def ok(text, content_type = 'text/html')
-    puts
-    puts "2. Content type: #{content_type} for #{path}"
-    [200,{"Content-Type" => content_type, 'Content-Length'=> text.length},[text]]
-  end
-
-end

data/lib/easy_rack_open_id_processing.rb

@@ -1,193 +0,0 @@
-class EasyRackOpenIDProcessing
-
-  attr_accessor :env, :options
-
-  def initialize(app, options ={})
-    @app = app
-    @options = options
-  end
-
-  def call(env)
-    @env = env
-    if logout_path == path
-      logout_result = logout
-      return logout_result if logout_result
-    end
-    if asset?
-      content_type_lookup = {'css' => 'text/css','html'=> 'text/html','js'=>'text/javascript','gif'=>'image/gif','ico' => 'image/vnd.microsoft.icon', 'png'=> 'image/png'}
-      ok(IO.read(gem_public_path + path), content_type_lookup[File.extname(path)[1..-1]])
-    elsif allowed?
-      # pass through
-      @app.call(env)
-    else
-      # break chain, start open_id_login
-      open_id_login
-    end
-  end
-
-  def asset?
-    0 == path.index(asset_prefix)
-  end
-
-  def asset_prefix
-    '/easy-rack-openid-assets'
-  end
-
-  def gem_public_path
-    File.dirname(__FILE__) + '/../public/'
-  end
-
-  def open_id_login
-    if resp = env["rack.openid.response"]
-      case resp.status
-      when :success
-        # Load in any registration data gathered
-        profile_data = {}
-        # merge the SReg data and the AX data into a single hash of profile data
-        [ OpenID::SReg::Response, OpenID::AX::FetchResponse ].each do |data_response|
-          if data_response.from_success_response( resp )
-            profile_data.merge! data_response.from_success_response( resp ).data
-          end
-        end
-
-        profile_data['identifier'] = resp.identity_url
-        #... save id and registration and forward to ...
-        self.verified_identity = profile_data
-        forward_to(protected_path)
-      when :failure
-        present_login_options
-      end
-    else
-      if identitifier_to_verify && valid_identifier?
-        self.protected_path = path
-        header_hash =  {:identifier => identitifier_to_verify}
-          header_hash.merge!(:required => options[:required]) if options[:required]
-          header_hash.merge!(:required => options[:optional]) if options[:optional]
-          header_hash.merge!(:required => options[:policy_url]) if options[:policy_url]
-        [401, {"WWW-Authenticate" => Rack::OpenID.build_header(header_hash)}, []]
-      else
-        present_login_options
-      end
-    end
-  end
-
-  def path
-    env['REQUEST_PATH']
-  end
-
-  def present_login_options
-    if login_path
-      forward_to(login_path)
-    else
-      dir = File.dirname(__FILE__)
-      form = case options[:form]
-      when 'boring'
-        IO.read(dir + '/generic_openid_form.html.erb')
-      when 'selector'
-        IO.read(dir + '/nice_openid_form.html.erb')
-      else # use default, real-openid selector
-        IO.read(dir + '/nicer_openid_form.html.erb')
-      end
-      ok(form)
-    end
-  end
-
-  def forward_to(url)
-    [302, {'Location' => url,'Content-Type' => 'text/html'}, ["Forwarding to #{url}"]]
-  end
-
-  def allowed?
-    if allowed_identifiers
-      allowed_identifiers.include? verified_identifier
-    elsif identity_match
-      identity_match === verified_identifier
-    else
-      verified_identifier
-    end
-  end
-
-  def identity_match
-    options[:identity_match]
-  end
-
-  def allowed_identifiers
-    options[:allowed_identifiers]
-  end
-
-  def logout_path
-    options[:logout_path] || '/logout'
-  end
-
-  def logout
-    self.verified_identity = nil
-    if after_logout_path
-      forward_to(after_logout_path)
-    end
-  end
-
-  def after_logout_path
-    options[:after_logout_path]
-  end
-
-  def login_path
-    options[:login_path]
-  end
-
-  def identitifier_to_verify
-    @identitifier_to_verify ||=
-    if env["rack.request.query_hash"] && env["rack.request.query_hash"]["openid_identifier"]
-      env["rack.request.query_hash"]["openid_identifier"]
-    elsif posted_data = CGI.parse(env['rack.input'].read)
-      env['rack.input'].rewind
-      identifier = posted_data['openid_identifier']
-      if identifier.kind_of? Array
-        identifier.last
-      else
-        identifier
-      end
-    end
-  end
-
-  def valid_identifier?
-    uri = URI.parse(identitifier_to_verify.to_s.strip)
-    uri = URI.parse("http://#{uri}") unless uri.scheme
-    uri.scheme = uri.scheme.downcase  # URI should do this
-    uri.normalize.to_s
-  rescue URI::InvalidURIError
-    # raise InvalidOpenId.new("#{url} is not an OpenID URL")
-    false # Quietly fail for now.
-  end
-
-  def verified_identity=(hash)
-    session['verified_identity'] = hash
-  end
-
-  def verified_identity
-    session['verified_identity']
-  end
-
-  def verified_identifier
-    verified_identity  && verified_identity['identifier']
-  end
-
-  def session
-    env['rack.session']
-  end
-
-  def protected_path=(path)
-    session['return_to'] = path
-  end
-
-  def protected_path
-    session['return_to'] || default_return_to
-  end
-
-  def default_return_to
-    options[:default_return_to] || '/'
-  end
-
-  def ok(text, content_type = 'text/html')
-    [200,{"Content-Type" => content_type, 'Content-Length'=> text.length.to_s},[text]]
-  end
-
-end