danwrong-merb_openid 0.0.2 → 0.0.3

data/README

@@ -9,7 +9,7 @@ Installation
 
 Easy:
 
-   gem install danwrong-merb_openid --source http://gems.github.com
+   gem install merb_openid
    
 Then in your application's init.rb:
 

data/Rakefile

@@ -1,16 +1,70 @@
 require 'rubygems'
 require 'rake/gempackagetask'
+require 'rake/contrib/rubyforgepublisher'
 
 spec = eval(File.read(File.join(File.dirname(__FILE__), 'merb_openid.gemspec')))
 
 Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
+  pkg.need_zip = true
+  pkg.need_tar = true
 end
 
 task :install => [:package] do
   sh %{sudo gem install pkg/#{spec.name}-#{spec.version} --no-update-sources}
 end
 
+task :verify_user do
+  raise "RUBYFORGE_USER environment variable not set!" unless ENV['RUBYFORGE_USER']
+end
+
+desc "Publish gem+tgz+zip on RubyForge. You must make sure lib/version.rb is aligned with the CHANGELOG file"
+task :publish_packages => [:verify_user, :package] do
+  package_name = [spec.name, spec.version].join '-'
+  
+  release_files = FileList[
+    "pkg/#{package_name}.gem",
+    "pkg/#{package_name}.tgz",
+    "pkg/#{package_name}.zip"
+  ]
+  unless spec.version =~ /RC[0-9]$/
+    require 'meta_project'
+    require 'rake/contrib/xforge'
+
+    Rake::XForge::Release.new(MetaProject::Project::XForge::RubyForge.new('merbopenid')) do |xf|
+      # Never hardcode user name and password in the Rakefile!
+      xf.user_name = ENV['RUBYFORGE_USER']
+      xf.files = release_files.to_a
+      xf.release_name = "Merb OpenID #{spec.version}"
+      xf.release_notes = ''
+      xf.release_changes = ''
+    end
+  else
+    puts "SINCE THIS IS A PRERELEASE, FILES ARE UPLOADED WITH SSH, NOT TO THE RUBYFORGE FILE SECTION"
+    puts "YOU MUST TYPE THE PASSWORD #{release_files.length} TIMES..."
+
+    host = "merbopenid-website@rubyforge.org"
+    remote_dir = "/var/www/gforge-projects/merbopenid"
+
+    publisher = Rake::SshFilePublisher.new(
+      host,
+      remote_dir,
+      File.dirname(__FILE__),
+      *release_files
+    )
+    publisher.upload
+
+    puts "UPLOADED THE FOLLOWING FILES:"
+    release_files.each do |file|
+      name = file.match(/pkg\/(.*)/)[1]
+      puts "* http://merbopenid.rubyforge.org/#{name}"
+    end
+
+    puts "They are not linked to anywhere, so don't forget to tell people!"
+  end
+end
+
+
 namespace :jruby do
 
   desc "Run :package and install the resulting .gem with jruby"

data/lib/merb_openid/controller_extensions.rb

@@ -15,7 +15,7 @@ module MerbOpenID
   module ControllerExtensions
     
     def openid_request?(open_id_param=params[:openid_url])
-      !!((open_id_param && !open_id_param.blank?) || params[:openid_complete])
+      !!((open_id_param && !open_id_param.strip.empty?) || params[:openid_complete])
     end
     
     def openid_authenticate(options={}, &block)
@@ -28,12 +28,12 @@ module MerbOpenID
       end
     end
     
+    private
+    
     def openid_consumer
       @@openid_consumer ||= OpenID::Consumer.new session, MerbOpenID.store
     end
     
-    private
-    
     def begin_openid_authentication(openid_url, options={})
       fields = options[:sreg] || {}
       immediate = (options[:immediate] === true)
@@ -63,7 +63,8 @@ module MerbOpenID
           when OpenID::Consumer::FAILURE
             yield :failed, identity_url, nil
           when OpenID::Consumer::SETUP_NEEDED
-            yield :setup_needed, identity_url, response.setup_url
+            # get around ruby openid 2.x bug
+            yield :setup_needed, identity_url, response.instance_variable_get(:@setup_url)
         end
       rescue Timeout::Error
         yield :failed
@@ -92,19 +93,13 @@ module MerbOpenID
     end
     
     def openid_trust_root
-      @openid_trust_root ||= [request.protocol, request.host, "/"].join
+      @openid_trust_root ||= [request.protocol, '://', request.host, "/"].join
     end
     
     def openid_return_to
-      @openid_return_to ||= [request.protocol, request.host, request.uri].join
+      @openid_return_to ||= [request.protocol, '://', request.host, request.uri].join
     end
     
   end
   
-end
-
-Merb::Controller.class_eval do
-  include MerbOpenID::ControllerExtensions
-end
-
-MerbOpenID.store = (Merb::Config[:merb_openid] && Merb::Config[:merb_openid][:store]) || OpenID::Store::Memory.new
+end

data/lib/merb_openid.rb

@@ -7,6 +7,9 @@ if defined?(Merb::Plugins)
   
   Merb::BootLoader.after_app_loads do
     require 'merb_openid/controller_extensions'
+    
+    Merb::Controller.class_eval { include MerbOpenID::ControllerExtensions }
+    MerbOpenID.store = (Merb::Config[:merb_openid] && Merb::Config[:merb_openid][:store]) || OpenID::Store::Memory.new
   end
   
 end

data/spec/merb_openid_spec.rb

@@ -1,7 +1,90 @@
 require File.dirname(__FILE__) + '/spec_helper'
+require 'merb_openid/controller_extensions'
 
-describe "merb_openid" do
-  it "should do nothing" do
-    true.should == true
+describe "Controller with merb_openid mixed in" do
+  before(:each) do
+    mock_consumer = mock('openid_consumer')
+    
+    mock_openid_request = mock('openid_request')
+    mock_openid_request.stub!(:return_to_args).and_return({})
+    mock_openid_request.stub!(:add_extension)
+    mock_openid_request.stub!(:redirect_url).and_return('http://openidprovider.com')
+    
+    
+    @controller = Class.new {
+      include MerbOpenID::ControllerExtensions
+      
+      attr_accessor :params, :session, :mock_consumer, :mock_request
+      
+      def initialize
+        @params, @session = {}, {}
+      end
+      
+      def openid_consumer
+        @mock_openid_consumer ||= begin 
+          c = mock_consumer
+          c.stub!(:begin).and_return(mock_request)
+          c
+        end
+      end
+      
+      def request
+        Struct.new(:protocol, :host, :uri).new('http://', 'danwebb.net', '/foreskin')
+      end
+      
+      def redirect(url)
+      end
+      
+    }.new
+    
+    @controller.mock_consumer = mock_consumer
+    @controller.mock_request = mock_openid_request
   end
+  
+  it 'should be an OpenID request if openid_url param provided' do
+    @controller.params[:openid_url] = 'aurl.com'
+    
+    @controller.should be_openid_request
+  end
+  
+  it 'should be an OpenID request if open_id_complete param is provided' do
+    @controller.params[:openid_complete] = '1'
+    
+    @controller.should be_openid_request
+  end
+  
+  it 'should not be an openid request if openid_url is provided but its blank' do
+    @controller.params[:openid_url] = '   '
+    
+    @controller.should_not be_openid_request
+  end
+  
+  it 'openid_authenticate should begin a OpenID request if openid_complete is not in the params hash' do
+    @controller.params[:openid_url] = 'danwebb.net'
+    @controller.should_receive(:begin_openid_authentication)
+    @controller.openid_authenticate
+  end
+  
+  it 'openid_authenticate should complete a OpenID request if openid_complete is in the params hash' do
+    @controller.params[:openid_complete] = '1'
+    @controller.should_receive(:complete_openid_authentication)
+    @controller.openid_authenticate
+  end
+  
+  it 'should add sreg fields if fields option given' do
+    @controller.params[:openid_url] = 'danwebb.net'
+    
+    @controller.mock_request.should_receive(:add_extension)
+    
+    @controller.openid_authenticate(:sreg => [:email])
+  end
+  
+  it 'should redirect to OpenID provider' do
+     @controller.params[:openid_url] = 'danwebb.net'
+     
+     @controller.should_receive(:redirect).with('http://openidprovider.com')
+     
+     @controller.openid_authenticate
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: danwrong-merb_openid
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Dan Webb
@@ -9,7 +9,7 @@ autorequire: merb_openid
 bindir: bin
 cert_chain: []
 
-date: 2008-06-13 00:00:00 -07:00
+date: 2008-08-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: A Merb plugin for consuming OpenID