tasks/merb.thor/app_script.rb tasks/merb.thor/common.rb tasks/merb.thor/gem_ext.rb tasks/merb.thor/main.thor tasks/merb.thor/ops.rb tasks/merb.thor/utils.rb @@ -17,4 +17,6 @@ src/* .hgignore .hg/* .svn/* -.gemrc \ No newline at end of file +.gemrc +gems/ +bin/ .gitignore @@ -1,8 +1,3 @@ -require File.dirname(__FILE__) + "/config/rubundler" -r = Rubundler.new -r.setup_env -r.setup_requirements - require 'rubygems' require 'rake/rdoctask' Rakefile @@ -9,4 +9,7 @@ class Exceptions < Merb::Controller render :format => :html end -end \ No newline at end of file + def unauthenticated + render + end +end app/controllers/exceptions.rb @@ -18,12 +18,12 @@ class OpenId < Merb::Controller redirect url(:user, session.user.id), :message => { :notice => 'Signup was successful' } else message[:error] = 'There was an error while creating your user account' - redirect(url(:login)) + redirect(url(:openid)) end end private def ensure_openid_url - throw :halt, redirect(url(:login)) if session['openid.url'].nil? + throw :halt, redirect(url(:openid)) if session['openid.url'].nil? end -end \ No newline at end of file +end app/controllers/open_id.rb @@ -1,27 +1,34 @@ -add_source "http://gems.rubyforge.org/" +# dependencies are generated using a strict version, don't forget to edit the dependency versions when upgrading. +merb_gems_version = "1.0.6" +dm_gems_version = "0.9.8" -add_gem 'rspec', '=1.1.11' -add_gem 'rake' -add_gem 'rcov' -add_gem 'mongrel' -add_gem 'hoe' -add_gem 'data_objects' -add_gem 'do_sqlite3' -add_gem 'ruby-openid', '=2.1.2' -add_gem 'rr', '=0.6.0' +# For more information about each component, please read http://wiki.merbivore.com/faqs/merb_components +dependency "merb-gen", merb_gems_version +dependency "merb-action-args", merb_gems_version +dependency "merb-assets", merb_gems_version +dependency "merb-cache", merb_gems_version +dependency "merb-helpers", merb_gems_version +dependency "merb-haml", merb_gems_version +dependency "merb-mailer", merb_gems_version +dependency "merb-slices", merb_gems_version +dependency "merb-auth-core", merb_gems_version +dependency "merb-auth-more", merb_gems_version +dependency "merb-auth-slice-password", merb_gems_version +dependency "merb-param-protection", merb_gems_version +dependency "merb-exceptions", merb_gems_version -add_dependency 'dm-core', '=0.9.7', :require => 'dm-core' -add_dependency 'dm-validations', '=0.9.7', :require => 'dm-validations' +dependency "merb-exceptions", merb_gems_version -add_dependency 'extlib', '=0.9.8', :require => 'extlib' -add_dependency 'merb-core', '=1.0.1', :require => 'merb-core' -add_dependency 'merb-gen', '=1.0.1' -add_dependency 'merb-auth-core', '=1.0.1', :require => 'merb-auth-core' -add_dependency 'merb-auth-more', '=1.0.1', :require => 'merb-auth-more' -add_dependency 'merb-auth-slice-password', '=1.0.1', :require => 'merb-auth-slice-password' -add_dependency 'merb-slices', '=1.0.1', :require => 'merb-slices' -add_dependency 'merb-param-protection', '=1.0.1', :require => 'merb-param-protection' -add_dependency 'merb_datamapper', '=1.0.1' +dependency 'do_sqlite3' +dependency "dm-core", dm_gems_version +dependency "dm-validations", dm_gems_version +dependency 'merb_datamapper', dm_gems_version -add_dependency 'nokogiri', '>=1.0.6' -add_dependency 'webrat', '=0.3.2' +dependency 'nokogiri', '>=1.0.6' +dependency 'webrat', '=0.3.2' +dependency 'rr' +dependency 'rcov' +dependency 'mongrel' +dependency 'ruby-debug', '=0.10.3' + +dependency "ruby-openid", '=2.1.2', :require_as => 'openid' config/dependencies.rb @@ -56,13 +56,13 @@ describe OpenId do describe "#register" do describe "a user with no session data" do before(:each) do - @response = request(url(:signup), :method => 'GET') + @response = request(url(:signup)) end it "should return http redirect" do @response.status.should == 302 end it "should redirect to the login screen" do - @response.body.to_s.should match(%r!href="/login"!) + @response.should have_selector('a[href="/openid/login"]') end end describe "valid user data returned" do @@ -95,10 +95,10 @@ describe OpenId do @response.status.should == 302 end it "should redirect to the login page" do - @response.body.should have_xpath("//a[@href='/login']") + @response.body.should have_xpath("//a[@href='/openid/login']") end it "should give the user a message about validation errors" end end -end \ No newline at end of file +end spec/requests/open_id_spec.rb @@ -7,116 +7,4 @@ describe Users do :identity_url => 'http://foo.myopenid.com' } User.create(@user_params) end - - describe "resource(:users)" do - describe "GET" do - - before(:each) do - @response = dispatch_to(Users, :index) do |controller| - stub(controller.session).user { User.first } - end - end - - it "responds successfully" do - @response.should be_successful - end - - it "contains a list of users" do - pending - @response.should have_xpath("//ul") - end - - end - - describe "GET" do - before(:each) do - @response = request(resource(:users)) - end - - it "has a list of users" do - pending - @response.should have_xpath("//ul/li") - end - end - - describe "a successful POST" do - before(:each) do - User.all.destroy! - @response = dispatch_to(Users, :create, { :user => @user_params }) do |controller| - mock(controller).ensure_authenticated { true } - end - end - - it "redirects to resource(:users)" do - @response.should redirect_to(url(:user, User.first.id), :message => {:notice => "user was successfully created"}) - end - - end - end - - describe "resource(@user)" do - describe "a successful DELETE" do - before(:each) do - @response = dispatch_to(Users, :destroy, {:id => User.first.id}) do |controller| - mock(controller).ensure_authenticated { true } - end - end - - it "should redirect to the index action" do - @response.should redirect_to(resource(:users)) - end - end - end - - describe "resource(:users, :new)" do - before(:each) do - @response = dispatch_to(Users, :new, {}) do |controller| - mock(controller).ensure_authenticated { true } - end - end - - it "responds successfully" do - @response.should be_successful - end - end - - describe "resource(@user, :edit)" do - before(:each) do - @response = dispatch_to(Users, :edit, {:id => User.first.id}) do |controller| - mock(controller).ensure_authenticated { true } - end - end - - it "responds successfully" do - @response.should be_successful - end - end - - describe "resource(@user)" do - - describe "GET" do - before(:each) do - @response = dispatch_to(Users, :show, {:id => User.first.id}) do |controller| - stub(controller.session).[](:user) { User.first.id } - mock(controller).ensure_authenticated { true } - end - end - - it "responds successfully" do - @response.should be_successful - end - end - - describe "PUT" do - before(:each) do - @response = dispatch_to(Users, :update, {:id => User.first.id, :user => {:id => User.first.id }}) do |controller| - mock(controller).ensure_authenticated { true } - end - end - - it "redirect to the article show action" do - @response.should redirect_to(url(:user, User.first.id), :message => {:notice => "User was successfully updated"}) - end - end - end end spec/requests/users_spec.rb autotest/discover.rb autotest/merb.rb autotest/merb_rspec.rb bin/merb bin/merb-gen bin/rake bin/spec doc/rdoc/generators/merb_generator.rb doc/rdoc/generators/template/merb/api_grease.js doc/rdoc/generators/template/merb/index.html.erb doc/rdoc/generators/template/merb/merb.css doc/rdoc/generators/template/merb/merb.rb doc/rdoc/generators/template/merb/merb_doc_styles.css doc/rdoc/generators/template/merb/prototype.js script/check script/update tasks/merb.thor 795cbe7bc8f6a93b9d719093f89a20a7322adf96 Corey Donohoe atmos@atmos.org http://github.com/atmos/merb-openid-example/commit/ba99b34e63292e14da5390571893c21492ad53d9 ba99b34e63292e14da5390571893c21492ad53d9 2008-12-16T22:21:17-08:00 2008-12-16T22:21:17-08:00 updating to merb 1.0.6. there was so much gross code in here. :\ 4e584a277e6b042cc70d9ebdcc500efe0e522128 Corey Donohoe atmos@atmos.org