open_id_authentication 1.1.0 → 1.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5cce1e8f0cba4a96a9e4956b3b5fb382d3213c8b
+  data.tar.gz: fb3ce670dd73d0f373f595a438b1e7b0d0f72fc8
+SHA512:
+  metadata.gz: 842187004fe9a43cfed5ba12e244a44a96ba2b90d5656ba8061395c1dae5e900c7b283ead17448984365c8b0e07f4f268cd96ad8f98da07a3335bf28cb082995
+  data.tar.gz: 7ee055e647c265ab54e173c459dd9fd0b168f441cf610eae45127b9ab7e29ea491f95728912e998e3c926ea31e62c73700ca17f8f1c0719518fb6b642817920f

data/.gitignore

@@ -0,0 +1 @@
+*.gem

data/Gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+gemspec
+
+gem 'bump'
+gem 'rake'
+gem 'rspec', '~>2'

data/Gemfile.lock

@@ -0,0 +1,34 @@
+PATH
+  remote: .
+  specs:
+    open_id_authentication (1.2.0)
+      rack-openid (~> 1.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    bump (0.4.2)
+    diff-lcs (1.2.4)
+    rack (1.5.2)
+    rack-openid (1.3.1)
+      rack (>= 1.1.0)
+      ruby-openid (>= 2.1.8)
+    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.5)
+    rspec-expectations (2.14.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
+    ruby-openid (2.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bump
+  open_id_authentication!
+  rake
+  rspec (~> 2)

data/README.md

@@ -1,9 +1,7 @@
 OpenIdAuthentication
 ====================
 
-Provides a thin wrapper around the excellent ruby-openid gem from JanRan. Be sure to install that first:
-
-  gem install ruby-openid
+Provides a thin wrapper around the excellent ruby-openid gem from JanRan.
 
 To understand what OpenID is about and how it works, it helps to read the documentation for lib/openid/consumer.rb
 from that gem.
@@ -219,24 +217,22 @@ Some OpenID providers also support the OpenID AX (attribute exchange) protocol f
 Accessing AX data is very similar to the Simple Registration process, described above -- just add the URI identifier for the AX field to your :optional or :required parameters.  For example:
 
     authenticate_with_open_id(identity_url,
-      :required => [ :email, 'http://schema.openid.net/birthDate' ]) do 
+      :required => [ :email, 'http://schema.openid.net/birthDate' ]) do
         |result, identity_url, registration, ax|
 
 This would provide the sreg data for :email via registration, and the AX data for http://schema.openid.net/birthDate via ax.
 
-Contributing
-------------
+TODO
+----
+ - tests
 
-Please see the [contribution guidelines](http://github.com/Velir/open_id_authentication/blob/master/CONTRIBUTION_GUIDELINES.md).
 
 Credits
 -------
 
 open_id_authentication was written by David Heinemeier Hansson with a number of other [contributors](https://github.com/Velir/open_id_authentication/contributors).
 
-open_id_authentication maintenance is funded by [Velir](http://velir.com).
-
 
 License
 -------
-Copyright (c) 2007-2011 David Heinemeier Hansson, released under the MIT license
+Copyright (c) 2007-2011 David Heinemeier Hansson, released under the MIT license

data/Rakefile

@@ -0,0 +1,7 @@
+require 'bundler/setup'
+require 'bundler/gem_tasks'
+require 'bump/tasks'
+
+task :default do
+  sh "rspec spec/"
+end

data/lib/open_id_authentication.rb

@@ -1,146 +1,19 @@
-require 'uri'
-require 'openid'
-require 'rack/openid'
+require "open_id_authentication/version"
+require "open_id_authentication/middleware"
+require "open_id_authentication/controller_methods"
+require "open_id_authentication/railtie" if defined?(::Rails::Railtie)
 
 module OpenIdAuthentication
-  def self.new(app)
-    store = OpenIdAuthentication.store
-    if store.nil?
-      Rails.logger.warn "OpenIdAuthentication.store is nil. Using in-memory store."
-    end
-
-    ::Rack::OpenID.new(app, OpenIdAuthentication.store)
+  # deprecated middleware creation
+  def self.new(*args)
+    raise "Use OpenIdAuthentication::Middleware"
   end
 
   def self.store
-    @@store
-  end
-
-  def self.store=(*store_option)
-    store, *parameters = *([ store_option ].flatten)
-
-    @@store = case store
-    when :memory
-      require 'openid/store/memory'
-      OpenID::Store::Memory.new
-    when :file
-      require 'openid/store/filesystem'
-      OpenID::Store::Filesystem.new(Rails.root.join('tmp/openids'))
-    when :memcache
-      require 'memcache'
-      require 'openid/store/memcache'
-      OpenID::Store::Memcache.new(MemCache.new(parameters))
-    else
-      store
-    end
-  end
-
-  self.store = nil
-
-  if Rails.version >= '3'
-    class Railtie < ::Rails::Railtie
-      config.app_middleware.use OpenIdAuthentication
-
-      config.after_initialize do
-        OpenID::Util.logger = Rails.logger
-      end
-
-      ActiveSupport.on_load :action_controller do
-        ActionController::Base.send :include, ControllerMethods
-        #ActionController::Base.extend ControllerMethods
-      end
-    end
-  end
-
-  class Result
-    ERROR_MESSAGES = {
-      :missing      => "Sorry, the OpenID server couldn't be found",
-      :invalid      => "Sorry, but this does not appear to be a valid OpenID",
-      :canceled     => "OpenID verification was canceled",
-      :failed       => "OpenID verification failed",
-      :setup_needed => "OpenID verification needs setup"
-    }
-
-    def self.[](code)
-      new(code)
-    end
-
-    def initialize(code)
-      @code = code
-    end
-
-    def status
-      @code
-    end
-
-    ERROR_MESSAGES.keys.each { |state| define_method("#{state}?") { @code == state } }
-
-    def successful?
-      @code == :successful
-    end
-
-    def unsuccessful?
-      ERROR_MESSAGES.keys.include?(@code)
-    end
-
-    def message
-      ERROR_MESSAGES[@code]
-    end
+    Middleware.store
   end
 
-  module ControllerMethods
-    protected
-      # The parameter name of "openid_identifier" is used rather than
-      # the Rails convention "open_id_identifier" because that's what
-      # the specification dictates in order to get browser auto-complete
-      # working across sites
-      def using_open_id?(identifier = nil) #:doc:
-        identifier ||= open_id_identifier
-        !identifier.blank? || request.env[Rack::OpenID::RESPONSE]
-      end
-
-      def authenticate_with_open_id(identifier = nil, options = {}, &block) #:doc:
-        identifier ||= open_id_identifier
-
-        if request.env[Rack::OpenID::RESPONSE]
-          complete_open_id_authentication(&block)
-        else
-          begin_open_id_authentication(identifier, options, &block)
-        end
-      end
-
-    private
-      def open_id_identifier
-        params[:openid_identifier] || params[:openid_url]
-      end
-
-      def begin_open_id_authentication(identifier, options = {})
-        options[:identifier] = identifier
-        value = Rack::OpenID.build_header(options)
-        response.headers[Rack::OpenID::AUTHENTICATE_HEADER] = value
-        head :unauthorized
-      end
-
-      def complete_open_id_authentication
-        response   = request.env[Rack::OpenID::RESPONSE]
-        identifier = response.display_identifier
-
-        case response.status
-        when OpenID::Consumer::SUCCESS
-          yield Result[:successful], identifier,
-            OpenID::SReg::Response.from_success_response(response),
-            OpenID::AX::FetchResponse.from_success_response(response)
-        when :missing
-          yield Result[:missing], identifier, nil
-        when :invalid
-          yield Result[:invalid], identifier, nil
-        when OpenID::Consumer::CANCEL
-          yield Result[:canceled], identifier, nil
-        when OpenID::Consumer::FAILURE
-          yield Result[:failed], identifier, nil
-        when OpenID::Consumer::SETUP_NEEDED
-          yield Result[:setup_needed], response.setup_url, nil
-        end
-      end
+  def self.store=(*args)
+    Middleware.store = *args
   end
 end

data/lib/open_id_authentication/controller_methods.rb

@@ -0,0 +1,61 @@
+require "open_id_authentication/result"
+
+module OpenIdAuthentication
+  module ControllerMethods
+    protected
+
+    # The parameter name of "openid_identifier" is used rather than
+    # the Rails convention "open_id_identifier" because that's what
+    # the specification dictates in order to get browser auto-complete
+    # working across sites
+    def using_open_id?(identifier = nil) #:doc:
+      identifier ||= open_id_identifier
+      !identifier.blank? || request.env[Rack::OpenID::RESPONSE]
+    end
+
+    def authenticate_with_open_id(identifier = nil, options = {}, &block) #:doc:
+      identifier ||= open_id_identifier
+
+      if request.env[Rack::OpenID::RESPONSE]
+        complete_open_id_authentication(&block)
+      else
+        begin_open_id_authentication(identifier, options, &block)
+      end
+    end
+
+    private
+
+    def open_id_identifier
+      params[:openid_identifier] || params[:openid_url]
+    end
+
+    def begin_open_id_authentication(identifier, options = {})
+      options[:identifier] = identifier
+      value = Rack::OpenID.build_header(options)
+      response.headers[Rack::OpenID::AUTHENTICATE_HEADER] = value
+      head :unauthorized
+    end
+
+    def complete_open_id_authentication
+      response   = request.env[Rack::OpenID::RESPONSE]
+      identifier = response.display_identifier
+
+      case response.status
+      when OpenID::Consumer::SUCCESS
+        yield Result[:successful], identifier,
+          OpenID::SReg::Response.from_success_response(response),
+          OpenID::AX::FetchResponse.from_success_response(response)
+      when :missing
+        yield Result[:missing], identifier, nil
+      when :invalid
+        yield Result[:invalid], identifier, nil
+      when OpenID::Consumer::CANCEL
+        yield Result[:canceled], identifier, nil
+      when OpenID::Consumer::FAILURE
+        yield Result[:failed], identifier, nil
+      when OpenID::Consumer::SETUP_NEEDED
+        yield Result[:setup_needed], response.setup_url, nil
+      end
+    end
+  end
+end

data/lib/open_id_authentication/middleware.rb

@@ -0,0 +1,41 @@
+require 'uri'
+require 'openid'
+require 'rack/openid'
+
+module OpenIdAuthentication
+  class Middleware
+    # middleware creation
+    def self.new(app)
+      if store.nil?
+        Rails.logger.warn "OpenIdAuthentication.store is nil. Using in-memory store."
+      end
+
+      ::Rack::OpenID.new(app, store)
+    end
+
+    def self.store
+      @@store
+    end
+
+    def self.store=(*store_option)
+      store, *args = *([ store_option ].flatten)
+
+      @@store = case store
+      when :memory
+        require 'openid/store/memory'
+        OpenID::Store::Memory.new
+      when :file
+        require 'openid/store/filesystem'
+        OpenID::Store::Filesystem.new(Rails.root.join('tmp/openids'))
+      when :memcache
+        require 'memcache'
+        require 'openid/store/memcache'
+        OpenID::Store::Memcache.new(MemCache.new(args))
+      else
+        store
+      end
+    end
+
+    self.store = nil
+  end
+end

data/lib/open_id_authentication/railtie.rb

@@ -0,0 +1,13 @@
+module OpenIdAuthentication
+  class Railtie < ::Rails::Railtie
+    config.app_middleware.use OpenIdAuthentication::Middleware
+
+    config.after_initialize do
+      OpenID::Util.logger = Rails.logger
+    end
+
+    ActiveSupport.on_load :action_controller do
+      ActionController::Base.send :include, ControllerMethods
+    end
+  end
+end

data/lib/open_id_authentication/result.rb

@@ -0,0 +1,37 @@
+module OpenIdAuthentication
+  class Result
+    ERROR_MESSAGES = {
+      :missing      => "Sorry, the OpenID server couldn't be found",
+      :invalid      => "Sorry, but this does not appear to be a valid OpenID",
+      :canceled     => "OpenID verification was canceled",
+      :failed       => "OpenID verification failed",
+      :setup_needed => "OpenID verification needs setup"
+    }
+
+    def self.[](code)
+      new(code)
+    end
+
+    def initialize(code)
+      @code = code
+    end
+
+    def status
+      @code
+    end
+
+    ERROR_MESSAGES.keys.each { |state| define_method("#{state}?") { @code == state } }
+
+    def successful?
+      @code == :successful
+    end
+
+    def unsuccessful?
+      ERROR_MESSAGES.keys.include?(@code)
+    end
+
+    def message
+      ERROR_MESSAGES[@code]
+    end
+  end
+end

data/lib/open_id_authentication/version.rb

@@ -1,4 +1,4 @@
 module OpenIdAuthentication
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end
   

data/open_id_authentication.gemspec

@@ -0,0 +1,18 @@
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+name = "open_id_authentication"
+require "#{name}/version"
+
+Gem::Specification.new name, OpenIdAuthentication::VERSION do |s|
+  s.summary = "open_id_authentication provides a thin wrapper around the excellent rack-openid gem."
+  s.authors = ["Patrick Robertson", "Michael Grosser"]
+  s.email = "michael@grosser.it"
+  s.homepage = "https://github.com/grosser/#{name}"
+  s.files = `git ls-files`.split("\n")
+  s.license = "MIT"
+  key = File.expand_path("~/.ssh/gem-private_key.pem")
+  if File.exist?(key)
+    s.signing_key = key
+    s.cert_chain = ["gem-public_cert.pem"]
+  end
+  s.add_runtime_dependency "rack-openid", "~> 1.3"
+end

data/spec/open_id_authentication_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe OpenIdAuthentication do
+  before do
+    OpenIdAuthentication.store = :memory
+  end
+
+  it "has a version" do
+    OpenIdAuthentication::VERSION.should =~ /^\d+\.\d+\.\d+$/
+  end
+
+  describe ".new" do
+    it "creates a Rack::OpenID" do
+      OpenIdAuthentication::Middleware.new({}).class.should == Rack::OpenID
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1 @@
+require 'open_id_authentication'

metadata

@@ -1,87 +1,73 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: open_id_authentication
-version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 0
-  version: 1.1.0
+version: !ruby/object:Gem::Version
+  version: 1.2.0
 platform: ruby
-authors: 
+authors:
 - Patrick Robertson
+- Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-18 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-09-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rack-openid
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :runtime
-  version_requirements: *id001
-description: |-
-  open_id_authentication provides a thin wrapper around the excellent rack-openid
-                        gem.
-email: patrick.robertson@velir.com
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+description: 
+email: michael@grosser.it
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- CHANGELOG
-- CONTRIBUTION_GUIDELINES.md
+files:
+- .gitignore
+- Gemfile
+- Gemfile.lock
 - README.md
-- lib/open_id_authentication/version.rb
+- Rakefile
 - lib/open_id_authentication.rb
-has_rdoc: true
-homepage: https://github.com/Velir/open_id_authentication
-licenses: []
-
+- lib/open_id_authentication/controller_methods.rb
+- lib/open_id_authentication/middleware.rb
+- lib/open_id_authentication/railtie.rb
+- lib/open_id_authentication/result.rb
+- lib/open_id_authentication/version.rb
+- open_id_authentication.gemspec
+- spec/open_id_authentication_spec.rb
+- spec/spec_helper.rb
+homepage: https://github.com/grosser/open_id_authentication
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
-summary: open_id_authentication provides a thin wrapper around the excellent rack-openid gem.
+specification_version: 4
+summary: open_id_authentication provides a thin wrapper around the excellent rack-openid
+  gem.
 test_files: []
-

data/CHANGELOG

@@ -1,37 +0,0 @@
-* Dump heavy lifting off to rack-openid gem. OpenIdAuthentication is just a simple controller concern.
-
-* Fake HTTP method from OpenID server since they only support a GET. Eliminates the need to set an extra route to match the server's reply. [Josh Peek]
-
-* OpenID 2.0 recommends that forms should use the field name "openid_identifier" rather than "openid_url" [Josh Peek]
-
-* Return open_id_response.display_identifier to the application instead of .endpoints.claimed_id. [nbibler]
-
-* Add Timeout protection [Rick]
-
-* An invalid identity url passed through authenticate_with_open_id will no longer raise an InvalidOpenId exception. Instead it will return Result[:missing] to the completion block.
-
-* Allow a return_to option to be used instead of the requested url [Josh Peek]
-
-* Updated plugin to use Ruby OpenID 2.x.x [Josh Peek]
-
-* Tied plugin to ruby-openid 1.1.4 gem until we can make it compatible with 2.x [DHH]
-
-* Use URI instead of regexps to normalize the URL and gain free, better matching #8136 [dkubb]
-
-* Allow -'s in #normalize_url [Rick]
-
-* remove instance of mattr_accessor, it was breaking tests since they don't load ActiveSupport.  Fix Timeout test [Rick]
-
-* Throw a InvalidOpenId exception instead of just a RuntimeError when the URL can't be normalized [DHH]
-
-* Just use the path for the return URL, so extra query parameters don't interfere [DHH]
-
-* Added a new default database-backed store after experiencing trouble with the filestore on NFS. The file store is still available as an option [DHH]
-
-* Added normalize_url and applied it to all operations going through the plugin [DHH]
-
-* Removed open_id? as the idea of using the same input box for both OpenID and username has died -- use using_open_id? instead (which checks for the presence of params[:openid_url] by default) [DHH]
-
-* Added OpenIdAuthentication::Result to make it easier to deal with default situations where you don't care to do something particular for each error state [DHH]
-
-* Stop relying on root_url being defined, we can just grab the current url instead [DHH]

data/CONTRIBUTION_GUIDELINES.md

@@ -1,8 +0,0 @@
-Contributing to open_id_authentication:
-
-1. Fork the [official repository](http://github.com/Velir/open_id_authentication/tree/master).
-2. Make your changes in a topic branch.
-3. Send a pull request.
-
-Notes:
-* Please don't update the Gem version.