rack_warden 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTE1MjJmZTU3OGMwMTA4MjQ5Y2M4OGMyMTRiMWNhOTJlNmQyYzYwOQ==
+    YmEzNjc1YzgzMjZmMzViZDIxNDliOTAzNDZlMzBkYmUzZTdlMDY4ZA==
   data.tar.gz: !binary |-
-    ODg1YTBmMGJjNWJiZWNkZjM3MTYwMTUyMjQ5ZjM0MTkwZmQwNDYxMg==
+    NjhlZGE3ZWY4OWI2MzM2MWVhNzY2YTZiNjcxOGI2ZDZkMjRlZDcxZA==
 SHA512:
   metadata.gz: !binary |-
-    NTY0MjcwMjdjZGUxODM3ODcxYWRhYzFkMzZlMzk2MWM2MTE3NDI1M2Y1Zjcy
-    N2VhZGEyMjE4NzEyYTYwZDRlMTk5ODQ5OTI1MjdlMDFlNzJjMjM5OWViNGM1
-    MjZjZDAwYTQzNWNlZDUwYzRkODQzNDU1MGFjYmY4YzY4NjRkMmU=
+    ZmU0NTYxZjc0ZDhjMDhmYWFkMzIzMDU3M2ZjYWI1MDhlMmExNTZhYjY5Mzk3
+    Njk0ZjA5OTdiYjZmODFiMGVkNThkYjYxODEzZDlkNDZiNTEwMGQzNGFiZGJj
+    OTIxOTQ0YjJjZWU3ZjRjYmJiZDE2MmFlYmI4OWY1M2ZhYWM5MzU=
   data.tar.gz: !binary |-
-    MjhlMWM4Y2RmZjMzYjdiOWE4MGZmNzhjMjU4MjU3N2ZlNTk2ZjYzYzM2ZDI0
-    NTY1M2I5NGRmNTE1NDM1YjBhMDFkZWQ4NWJjNGMwNGI0YWE3YTE3ZGY2OTc5
-    OTI4N2I4ZTA3NTMwMjMxMWJkM2VhNjkzOTY4Nzk4NzkzYmEwZWQ=
+    MGVkMzY5ODI2ZGYwZDg4NzNmNzBjMzI3M2VmZDBkMzIzMmRmNDY1MWU1Mzg5
+    NDI0NzExODY3NjM1Y2E1MDljYzI3MGU2ZGFlMjgzZjU5Y2Q1ZDU2NzllNzhj
+    NzA4MDE3NjBhNGU2NzhhYWQzZDVhMDIzYmM5YjI4ZjQ2NzU4MWI=

data/.gitignore

@@ -18,4 +18,5 @@ mkmf./log
 todo.txt
 *.bak
 *.gem
+rack_warden.y*ml
 

data/README.md

@@ -1,10 +1,10 @@
 # RackWarden
 
-RackWarden is a rack middleware mini-app that provides user authentication and management to any rack-based app. RackWarden uses Sinatra for the mini-app, Warden for authentication, and DataMapper for database connections.
+RackWarden is a rack middleware mini-app that provides user authentication and management to any rack-based app (currently supports Sinatra and Rails, with more on the way). This project is in its infancy. It is currently a great starter to get you going with plug-in authentication for your ruby app. Over time it will grow into a more fully featured package while maintaining a focus on simplicity, modularity, and transparency.
 
-RackWarden is in its infancy. It's currently a great starter to get you going with plug-in authentication for your ruby app. Over time it will grow into a more fully featured package while maintaining a focus on simplicity and transparency.
+RackWarden uses Sinatra for the mini-app, Warden for authentication, and DataMapper for database connections. It is based on the sinatra-warden-example at https://github.com/sklise/sinatra-warden-example. If you are new to warden or Sinatra, I highly recommend downloading and experimenting with that example.
 
-RackWarden is based on the sinatra-warden-example at https://github.com/sklise/sinatra-warden-example. If you're new to warden and/or sinatra, I highly recommend downloading and experimenting with that example.
+My goal in developing this software is to have drop-in authentication containing most of the features you see in user/account management sections of a typical web site. But I don't want to be strapped by this module in any of my projects, so it must be customizable. Or rather, overridable. The basics of this flexibility are already in place, and it will be a central theme throughout. See below for examples on overriding and customizing RackWarden.
 
 
 ## Installation
@@ -29,7 +29,7 @@ A few simple steps will have your entire app protected.
 ### Sinatra
 
 		class MySinatraApp < Sinatra::Base
-			use RackWarden
+			use RackWarden::App
 			
 			before do
 				require_login
@@ -44,20 +44,45 @@ A few simple steps will have your entire app protected.
 
 application.rb or environment.rb
 
-		config.middleware.use RackWarden
+		config.middleware.use RackWarden::App
 		
 application-controller.rb
 
 		before_filter :require_login
 		
-### Others...
 
-## How it works
 
-...
+## Configuration
+
+Pass configuration settings to RackWarden through your ``use`` method. The params hash will be translated directly to the app's settings. You can currently specify :database, :views, and :default_route. You can also specify any of the standard Sinatra settings, like :views.
+
+If you pass a block with the ``use`` method, the block will be evaluated in the context of the RackWarden::App class. Anything you do in that block is just as if you were writing code in the app class itself. While in the block, you also have access to two relevant objects.
+
+		use RackWarden::App do |rack_warden_app_instance, parent_app_instance|
+			set :somesetting, 'some_value'
+		end
+
+
+## Customization
+
+To customize RackWarden for your specific project, you can set :views to point to a directory within your project. Then create templates that match the names of RackWarden templates, and they will be picked up and rendered. RackWarden looks for templates at the top level of your views directory as a default. You can change or add to this when you define the middleware in your project.
+
+		use RackWarden::App, :views => File.join(Dir.pwd, 'app/views/rack_warden')
+		
+Or if you simply want RackWarden to use your own custom layout, pass it a file path in the :layout parameter.
+
+		use RackWarden::App, :layout => :'layouts/rack_warden_layout.html'
+		
+Just remember that RackWarden is Sinatra, and any templates you pass must use Sinatra-specific code. For example, Sinatra uses ``url`` instead of Rails' ``url_for``. Also remember that template names in Sinatra must always be symbols.
+
+Another way to customize RackWarden is to override its classes and methods, as you would with any other ruby code.
+
+And if you want to customize RackWarden more extensively, you can always download the source from github and directly modify the app file and templates. Then point to this modified gem in your project Gemfile.
+
+		gem 'rack_warden', :path => "../RackWarden/"
+
+
 
-## Customizing
 
-...
 
 

data/Rakefile

@@ -1,6 +1,6 @@
 require "bundler/gem_tasks"
 
-require './lib/rack_warden'
+require File.expand_path('../lib/rack_warden', __FILE__)
 
 desc "Get version"
 task :version do

data/config.ru

@@ -1,8 +1,11 @@
+::RACK_WARDEN_STANDALONE = true
+
 require 'bundler'
 
 Bundler.require
 
+require File.expand_path('../lib/rack_warden', __FILE__)
 
-require File.join(File.dirname(__FILE__), 'rack_warden')
-
-run RackWarden
+map ENV['BASE_URI'] || '/' do
+	run RackWarden::App
+end

data/lib/rack_warden.rb

@@ -13,6 +13,6 @@ require "rack_warden/app"
 require "rack_warden/model"
 require "rack_warden/version"
 
-# module RackWarden
-#   # Your code goes here...
-# end
+module RackWarden
+  # Your code goes here...
+end

data/lib/rack_warden/app.rb

@@ -1,232 +1,248 @@
 # require 'bundler'
 # Bundler.require
 
-class RackWarden < Sinatra::Base
-  enable :sessions
-  register Sinatra::Flash
-  
-  set :layout, :'rack_warden_layout.html'
-  set :default_route, '/'
-  set :database, "sqlite://#{Dir.pwd}/rack_warden.sqlite.db"
+module RackWarden
+  class App < Sinatra::Base
+    enable :sessions
+    register Sinatra::Flash
+    set :config_files, [ENV['RACK_WARDEN_CONFIG_FILE'], 'rack_warden.yml', 'rack_warden.yaml'].compact.uniq
+    set :layout, :'rack_warden_layout.html'
+    set :default_route, '/'
+    set :database, "sqlite://#{Dir.pwd}/rack_warden.sqlite.db"
+    
+    # Load config from file, if any exist.
+    Hash.new.tap do |hash|
+      config_files.each {|c| hash.merge! Psych.load_file(c) rescue nil}
+      set hash
+    end
   
   
-  # WBR - This will receive params and a block from the parent "use" statement.
-  # This middleware app has been modified to process the parent use-block in
-  # the context of the RackWarden class. So you can set settings on RackWarden,
-  # when you call "use RackWarden"
-  # Example:
-  #
-  # use RackWarden :layout=>:'my_layout' do |rack_warden_instance, parent_app_instance|
-	# 	set :myvar, 'something'
-	#	end
-	#
-	def initialize(parent_app=nil, *args, &block)
-		#puts "INITIALIZE RackWarden INSTANCE [parent_app, self, args, block]: #{[parent_app, self, args, block]}"
-		# extract options.
-		opts = args.last.is_a?(Hash) ? args.pop : {}
-		klass = self.class
-		if parent_app
-			# append views from opts.
-			klass.set(:original_views, opts.has_key?(:views) ? klass.views : nil)
-			#klass.set(:views => [Array(klass.views), opts.delete(:views)].flatten) if opts[:views]
-			# set app settings with remainder of opts.
-			klass.set opts if opts.any?
-			# eval the use-block from the parent app, in context of this app.
-			klass.instance_exec(self, parent_instance, &block) if block_given?
-			# do parent_app setup.
-			setup_parent_app(parent_app, args, opts)
-			#parent_app.class.helpers(RackWardenHelpers) rescue ApplicationController.send(:include, RackWardenHelpers)
-		end
-		# finally, send parent app to super, but don't send the use-block (thus the empty proc)
-		super(parent_app, &Proc.new{})
-	end
+    # WBR - This will receive params and a block from the parent "use" statement.
+    # This middleware app has been modified to process the parent use-block in
+    # the context of the RackWarden class. So you can set settings on RackWarden,
+    # when you call "use RackWarden::App"
+    # Example:
+    #
+    # use RackWarden::App :layout=>:'my_layout' do |rack_warden_instance, parent_app_instance|
+  	# 	set :myvar, 'something'
+  	#	end
+  	#
+  	def initialize(parent_app=nil, *args, &block)
+  		#puts "INITIALIZE RackWarden::App INSTANCE [parent_app, self, args, block]: #{[parent_app, self, args, block]}"
+  		# extract options.
+  		opts = args.last.is_a?(Hash) ? args.pop : {}
+  		klass = self.class
+  		if parent_app
+  			# append views from opts.
+  			klass.set(:original_views, opts.has_key?(:views) ? klass.views : nil)
+  			#klass.set(:views => [Array(klass.views), opts.delete(:views)].flatten) if opts[:views]
+  			# set app settings with remainder of opts.
+  			klass.set opts if opts.any?
+  			# eval the use-block from the parent app, in context of this app.
+  			klass.instance_exec(self, parent_instance, &block) if block_given?
+  			# do parent_app setup.
+  			setup_parent_app(parent_app, args, opts)
+  			#parent_app.class.helpers(RackWardenHelpers) rescue ApplicationController.send(:include, RackWardenHelpers)
+  		end
+  		# finally, send parent app to super, but don't send the use-block (thus the empty proc)
+  		super(parent_app, &Proc.new{})
+  	end
 	
-	def setup_parent_app(parent_app, args, opts)
-		puts "RACKWARDEN initializing parent app: #{parent_app}"
-		puts "RACKWARDEN parent app parents: #{parent_app.class.parents}"
-		puts "RACKWARDEN parent app ancestors: #{parent_app.class.ancestors}"
-		klass = self.class
-		case
-		when parent_app.class.ancestors.find{|x| x.to_s=='Sinatra::Base'}
-			parent_app.class.helpers(RackWardenHelpers)
-			default_parent_views = File.join(Dir.pwd,"views")
-		when parent_app.class.parents.find{|x| x.to_s=='ActionDispatch'}
-			ApplicationController.send(:include, RackWardenHelpers)
-			default_parent_views = File.join(Dir.pwd, "app/views")
-		end
+  	def setup_parent_app(parent_app, args, opts)
+  		puts "RACKWARDEN initializing parent app: #{parent_app}"
+  		#puts "RACKWARDEN parent app parents: #{parent_app.class.parents}"
+  		#puts "RACKWARDEN parent app ancestors: #{parent_app.class.ancestors}"
+  		klass = self.class
+  		case
+  		when parent_app.class.ancestors.find{|x| x.to_s=='Sinatra::Base'}
+  			parent_app.class.helpers(RackWardenHelpers)
+  			default_parent_views = File.join(Dir.pwd,"views")
+  		when parent_app.class.parents.find{|x| x.to_s=='ActionDispatch'}
+  			ApplicationController.send(:include, RackWardenHelpers)
+  			default_parent_views = File.join(Dir.pwd, "app/views")
+  		end
 		
-		new_views = []
-		original_views = klass.original_views
-		# append parent rails views folder unless opts.has_key?(:views)
-		new_views << default_parent_views unless opts.has_key?(:views)
-		# append original_views, if original_views
-		new_views << original_views if original_views
-		klass.set(:views => [Array(klass.views), new_views].flatten.compact.uniq) if new_views.any?
-		puts "RACKWARDEN views: #{klass.views}"
-	end
+  		new_views = []
+  		original_views = klass.original_views
+  		# append parent rails views folder unless opts.has_key?(:views)
+  		new_views << default_parent_views unless opts.has_key?(:views)
+  		# append original_views, if original_views
+  		new_views << original_views if original_views
+  		klass.set(:views => [Array(klass.views), new_views].flatten.compact.uniq) if new_views.any?
+  		puts "RACKWARDEN views: #{klass.views}"
+  	end
 	
-  use Warden::Manager do |config|
-    # Tell Warden how to save our User info into a session.
-    # Sessions can only take strings, not Ruby code, we'll store
-    # the User's `id`
-    config.serialize_into_session{|user| user.id }
-    # Now tell Warden how to take what we've stored in the session
-    # and get a User from that information.
-    config.serialize_from_session{|id| User.get(id) }
-
-    config.scope_defaults :default,
-      # "strategies" is an array of named methods with which to
-      # attempt authentication. We have to define this later.
-      strategies: [:password],
-      # The action is a route to send the user to when
-      # warden.authenticate! returns a false answer. We'll show
-      # this route below.
-      action: 'auth/unauthenticated'
-    # When a user tries to log in and cannot, this specifies the
-    # app to send the user to.
-    config.failure_app = self
-  end
-
-  Warden::Manager.before_failure do |env,opts|
-    env['REQUEST_METHOD'] = 'POST'
-  end
-
-  Warden::Strategies.add(:password) do
-    def valid?
-      params['user'] && params['user']['username'] && params['user']['password']
+    use Warden::Manager do |config|
+      # Tell Warden how to save our User info into a session.
+      # Sessions can only take strings, not Ruby code, we'll store
+      # the User's `id`
+      config.serialize_into_session{|user| user.id }
+      # Now tell Warden how to take what we've stored in the session
+      # and get a User from that information.
+      config.serialize_from_session{|id| User.get(id) }
+
+      config.scope_defaults :default,
+        # "strategies" is an array of named methods with which to
+        # attempt authentication. We have to define this later.
+        strategies: [:password],
+        # The action is a route to send the user to when
+        # warden.authenticate! returns a false answer. We'll show
+        # this route below.
+        action: 'auth/unauthenticated'
+      # When a user tries to log in and cannot, this specifies the
+      # app to send the user to.
+      config.failure_app = self
     end
 
-    def authenticate!
-      user = User.first(username: params['user']['username'])
+    Warden::Manager.before_failure do |env,opts|
+      env['REQUEST_METHOD'] = 'POST'
+    end
 
-      if user.nil?
-        fail!("The username you entered does not exist.")
-      elsif user.authenticate(params['user']['password'])
-        success!(user)
-      else
-        fail!("Could not log in")
+    Warden::Strategies.add(:password) do
+      def valid?
+        params['user'] && params['user']['username'] && params['user']['password']
+      end
+
+      def authenticate!
+        user = User.first(username: params['user']['username'])
+
+        if user.nil?
+          fail!("The username you entered does not exist.")
+        elsif user.authenticate(params['user']['password'])
+          success!(user)
+        else
+          fail!("Could not log in")
+        end
       end
-    end
     
-  end
+    end
   
-  # Also bring these into your main app helpers.
-  module RackWardenHelpers
-	  # WBR - override. This passes block to be rendered to first template that matches.
-		def find_template(views, name, engine, &block)
-			# puts "THE VIEWS: #{views}"
-			# puts "THE NAME: #{name}"
-			# puts "THE ENGINE: #{engine}"
-			# puts "THE BLOCK: #{block}"
-	    Array(views).each { |v| super(v, name, engine, &block) }
-	  end
+    # Also bring these into your main app helpers.
+    module RackWardenHelpers
+  	  # WBR - override. This passes block to be rendered to first template that matches.
+  		def find_template(views, name, engine, &block)
+  			# puts "THE VIEWS: #{views}"
+  			# puts "THE NAME: #{name}"
+  			# puts "THE ENGINE: #{engine}"
+  			# puts "THE BLOCK: #{block}"
+  	    Array(views).each { |v| super(v, name, engine, &block) }
+  	  end
 	  
-		def require_login
-			warden.authenticate!
-	  end
+  		def require_login
+  			warden.authenticate!
+  	  end
 		
-		def warden
-	    env['warden']
-		end
+  		def warden
+  	    env['warden']
+  		end
 
-		def current_user
-	    warden.user
-		end
+  		def current_user
+  	    warden.user
+  		end
 		
-		def logged_in?
-	    warden.authenticated?
-		end
+  		def logged_in?
+  	    warden.authenticated?
+  		end
 		
 		
-	  # TODO: Shouldn't these be in warden block above? But they don't work there for some reason.
+  	  # TODO: Shouldn't these be in warden block above? But they don't work there for some reason.
 	  
-	  def valid_user_input?
-	    params['user'] && params['user']['username'] && params['user']['password']
-	  end
+  	  def valid_user_input?
+  	    params['user'] && params['user']['username'] && params['user']['password']
+  	  end
 	  
-	  # TODO: This doesn't work.
-		def create_user
+  	  # TODO: This doesn't work.
+  		def create_user
 		
-			recaptcha
+  			recaptcha
 		
-			return unless valid_user_input?
-			user = User.create(username: params['user']['username'])
-			user.password = params['user']['password']
-			user.save && warden.set_user(user)
-		end
+  			return unless valid_user_input?
+  			user = User.create(username: params['user']['username'])
+  			user.password = params['user']['password']
+  			user.save && warden.set_user(user)
+  		end
 		
- 		# reCAPTCHA. See https://www.google.com/recaptcha/admin#site/318693958?setup
- 		def recaptcha(skip_redirect=false)
-	 		_recaptcha = ActiveSupport::JSON.decode(open("https://www.google.com/recaptcha/api/siteverify?secret=6LdG4v4SAAAAAJxwcS8pZRG371ZucyYg5yVUji_V&response=#{params['g-recaptcha-response']}&remoteip=#{request.ip}").read)
-	    puts "RECAPTCHA", _recaptcha
-	    #(render action and return) unless recaptcha['success']
-	    unless _recaptcha['success'] || skip_redirect
-	    	flash(:rwarden)[:error] = "Please confirm you are human."
-	    	redirect back 
-	    end
-	  end
+   		# reCAPTCHA. See https://www.google.com/recaptcha/admin#site/318693958?setup
+   		def recaptcha(skip_redirect=false)
+  	 		_recaptcha = ActiveSupport::JSON.decode(open("https://www.google.com/recaptcha/api/siteverify?secret=6LdG4v4SAAAAAJxwcS8pZRG371ZucyYg5yVUji_V&response=#{params['g-recaptcha-response']}&remoteip=#{request.ip}").read)
+  	    puts "RECAPTCHA", _recaptcha
+  	    #(render action and return) unless recaptcha['success']
+  	    unless _recaptcha['success'] || skip_redirect
+  	    	flash(:rwarden)[:error] = "Please confirm you are human."
+  	    	redirect back 
+  	    end
+  	  end
+	  
+  	  def default_page
+  	  	erb :'rack_warden_index.html', :layout=>settings.layout
+  	  end
 		
-  end # RackWardenHelpers
-  helpers RackWardenHelpers
+    end # RackWardenHelpers
+    helpers RackWardenHelpers
   
+  	if defined? ::RACK_WARDEN_STANDALONE
+  		get '/?' do
+  			default_page
+  		end
+  	end
+	
+    get '/auth/?' do
+      default_page
+    end
+
+    get '/auth/login' do
+      erb :'login_user.html', :layout=>settings.layout
+    end
 
-	# WBR. I disabled this so upstream apps would work.
-  get '/auth' do
-    erb "Warden authentication for any rack based app", :layout=>settings.layout
-  end
+    post '/auth/login' do
+      warden.authenticate!
 
-  get '/auth/login' do
-    erb :'login_user.html', :layout=>settings.layout
-  end
+      flash(:rwarden)[:success] = warden.message || "Successful login"
 
-  post '/auth/login' do
-    warden.authenticate!
+  		puts "RETURN_TO #{session[:return_to]}"
+      if session[:return_to].nil?
+        redirect url(settings.default_route, false)
+      else
+        redirect session[:return_to]
+      end
+    end
 
-    flash(:rwarden)[:success] = warden.message || "Successful login"
+    get '/auth/logout' do
+      warden.raw_session.inspect
+      warden.logout
+      flash(:rwarden)[:success] = 'You have been logged out'
+      redirect url(settings.default_route, false)
+    end
 
-		puts "RETURN_TO #{session[:return_to]}"
-    if session[:return_to].nil?
-      redirect settings.default_route
-    else
-      redirect session[:return_to]
+  	get '/auth/create' do
+      erb :'create_user.html', :layout=>settings.layout
     end
-  end
-
-  get '/auth/logout' do
-    warden.raw_session.inspect
-    warden.logout
-    flash(:rwarden)[:success] = 'You have been logged out'
-    redirect settings.default_route
-  end
-
-	get '/auth/create' do
-    erb :'create_user.html', :layout=>settings.layout
-  end
-
-  post '/auth/create' do
-    if create_user
-    	flash(:rwarden)[:success] = warden.message || "Account created"
-	    redirect session[:return_to] || settings.default_route
-	  else
-	  	flash(:rwarden)[:error] = warden.message || "Could not create account"
-	  	redirect url('/auth/create', false)
-	  end
-  end
-
-  post '/auth/unauthenticated' do
-  	# I had to remove the condition, since it was not updating return path when it should have.
-    session[:return_to] = env['warden.options'][:attempted_path] if !request.xhr? && !env['warden.options'][:attempted_path][/login/]
-    puts "WARDEN ATTEMPTED PATH: #{env['warden.options'][:attempted_path]}"
-    puts warden
-    flash(:rwarden)[:error] = warden.message || "Please login to continue"
-    redirect url('/auth/login', false)
-  end
-
-  get '/auth/protected' do
-    warden.authenticate!
-
-    erb :'rack_warden_protected.html', :layout=>settings.layout
-  end
-  
+
+    post '/auth/create' do
+      if create_user
+      	flash(:rwarden)[:success] = warden.message || "Account created"
+  	    redirect session[:return_to] || url(settings.default_route, false)
+  	  else
+  	  	flash(:rwarden)[:error] = warden.message || "Could not create account"
+  	  	redirect url('/auth/create', false)
+  	  end
+    end
+
+    post '/auth/unauthenticated' do
+    	# I had to remove the condition, since it was not updating return path when it should have.
+      session[:return_to] = env['warden.options'][:attempted_path] if !request.xhr? && !env['warden.options'][:attempted_path][/login/]
+      puts "WARDEN ATTEMPTED PATH: #{env['warden.options'][:attempted_path]}"
+      puts warden
+      flash(:rwarden)[:error] = warden.message || "Please login to continue"
+      redirect url('/auth/login', false)
+    end
+
+    get '/auth/protected' do
+      warden.authenticate!
+
+      erb :'rack_warden_protected.html', :layout=>settings.layout
+    end
+
+  end # App 
 end # RackWarden
 

data/lib/rack_warden/model.rb

@@ -1,5 +1,5 @@
 #require 'bcrypt'
-DataMapper.setup(:default, RackWarden.database)
+DataMapper.setup(:default, RackWarden::App.database)
 
 class User
   include DataMapper::Resource

data/lib/rack_warden/version.rb

@@ -1,3 +1,3 @@
-class RackWarden < Sinatra::Base
-  VERSION = "0.0.2"
+module RackWarden
+  VERSION = "0.0.3"
 end

data/lib/rack_warden/views/rack_warden_index.html.erb

@@ -0,0 +1 @@
+<h2>Warden authentication for any rack based app<h2>

data/lib/rack_warden/views/rack_warden_layout.html.erb

@@ -15,7 +15,11 @@
   <body>
     <h1>Rack Warden</h1>
 
-    <p><a href="<%=url('/auth/login', false)%>">Log In</a> | <a href="<%=url('/auth/protected', false)%>">Protected Page</a> | <a href="<%=url('/auth/logout', false)%>">Log Out</a></p>
+    <p>
+			<a href="<%=url('/auth/login', false)%>">Log In</a> |
+			<a href="<%=url('/', false)%>">Home</a> |
+			<a href="<%=url('/auth/protected', false)%>">Protected Page</a> |
+			<a href="<%=url('/auth/logout', false)%>">Log Out</a></p>
 
     <% if flash(:rwarden)[:success] %>
     <div style="color:green;">

data/rack_warden.gemspec

@@ -1,7 +1,8 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'sinatra/base'
+# This breaks bundle-install
+#require 'sinatra/base'
 require 'rack_warden/version'
 
 Gem::Specification.new do |spec|
@@ -9,8 +10,8 @@ Gem::Specification.new do |spec|
   spec.version       = RackWarden::VERSION
   spec.authors       = ["William Richardson"]
   spec.email         = ["wbr@mac.com"]
-  spec.summary       = %q{A warden/sinatra micro-app providing authentication and user management to any rack-based app}
-  spec.description   = %q{A warden/sinatra micro-app providing authentication and user management to any rack-based app.}
+  spec.summary       = %q{A warden/sinatra mini-app providing authentication and user management for any rack-based app}
+  spec.description   = %q{A warden/sinatra mini-app providing authentication and user management for any rack-based app.}
   spec.homepage      = ""
   spec.license       = "MIT"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack_warden
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - William Richardson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-26 00:00:00.000000000 Z
+date: 2014-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,8 +150,8 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: A warden/sinatra micro-app providing authentication and user management
-  to any rack-based app.
+description: A warden/sinatra mini-app providing authentication and user management
+  for any rack-based app.
 email:
 - wbr@mac.com
 executables: []
@@ -197,6 +197,6 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: A warden/sinatra micro-app providing authentication and user management to
+summary: A warden/sinatra mini-app providing authentication and user management for
   any rack-based app
 test_files: []