rack_warden 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjdjY2YyZWIwODFiZWVhY2FiNGNiOTNjNGE3ZGRiYjI0OWFlNWExMA==
+    NDMyOGMzYTQzNmVlODAwMTRjMDIxZGE4ZmQyNmJjNDRmNDIxNGUwZA==
   data.tar.gz: !binary |-
-    ZjFjZTkwOTFhNWY5NTRlOTQxODM1NmZjOTAyNDlkMGE2OTFlMTk4NA==
+    NzIwMTkzZWNhMmFkYjk5MmE4MGRhYzMxODE3MTA1MjMwZWFlMmI4MA==
 SHA512:
   metadata.gz: !binary |-
-    ODRhZDRjZTMyNGNmYmRkZTdmYzIyYWM5NGU3ZjcwZjEwOTdhNzI5OWZiOTg4
-    ZDZmMDdhYjA4ZWJhYWYzNTE4ZDNkNWJlZDZhZjg4MzcyZmNjMzYzN2U0YzUx
-    N2YxNDQyZjhmMjIzOTU3NjEzOTNjZDIzYzhmYzcyYTE3Mzc0NDQ=
+    YmUzYWRkMDZjZWI4MTBiZmYxZGMyZGE1M2ZmMGI3ZTU0ZDA4NDZkYzAzOThm
+    YjE3NTI1ZmViNDZmMmJkNDBmMTAxZGU4NTUyYWJhNDY0YzRkYzkxODJlYWI5
+    MDA4MTJlNTM0YTk1MDc0NzlmNTQ3YTdhMTk4M2MwNTY2M2E3Njk=
   data.tar.gz: !binary |-
-    ZDdlMjNiMmIzMjU3N2Q3MGU2ZGQzYWU2ODY2NDJjZjM5MmVlZDk3MGEwYjZl
-    Zjc1NDI4YTQ5YTEzOWY1YmQzNmM0NTdhOTZmNGZjOTUyOWE0M2YzNDFhODU5
-    MTFhNDM3ZGQ5YjRjZmJiMmNjZDE1MzM2YmQ0M2JlNzdiZjZjMzg=
+    ZjMyZjgwNzlmYWZkOTllODA2OTVhNDZmMzM4ZjU2ZTlhYzA1ZmIzZTVkMDdl
+    MjMzODU4ZTVjOWYyNGEwNmFmYzY2NGI0ZWVhNjY0MjZmOTlhZTQ0OTAyODYz
+    YTEwMjZkYzdkZDM1M2ZlOTMxZjBiMzBmNjdjMjQyOTM0NTllNDI=

data/.gitignore

@@ -20,3 +20,6 @@ todo.txt
 *.gem
 rack_warden.y*ml
 .DS_Store
+log/**
+scratch.rb
+

data/README.md

@@ -2,17 +2,19 @@
 
 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 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 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.
 
 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.
 
+Please note that RackWarden is a work-in-progress. The gemspec, the files, the code, and the documentation can and will change over time. Follow on github for the latest fixes, changes, and developments.
+
 ## What Does it Do?
 
 RackWarden acts as a self-sufficient gatekeeper for your ruby web app. Once you enable RackWarden in your rack-based project, all routes/actions in your project will require a login and will redirect browsers to an authentication page. RackWarden provides its own view & layout templates to facilitate user authentication. RackWarden also provides it's own tables to store user data.
 
 Once RackWarden authenticates a user, it gets out of the way, and the user is returned to your application. RackWarden also provides a number of user management tools for common actions like creating, updating, and deleting users.
 
-Most of the RackWarden features can be customized. You can override the views, the database, the actions, and even the authentication logic with your own. The easiest (and possibly the most dramatic) customization is to provide RackWarden with your own layout template, giving RackWarden the look-and-feel of your own application.
+Most of the RackWarden features can be customized. You can override the views, the database, the actions, and even the authentication logic with your own templates and code. The easiest (and possibly the most dramatic) customization is to provide RackWarden with your own layout template, giving RackWarden the look-and-feel of your own application.
 
 
 ## Installation
@@ -56,31 +58,39 @@ application.rb or environment.rb
 
 ## Configuration
 
-Pass configuration settings to RackWarden through the ``use`` method of your framework. The params hash of ``use`` will be translated directly to RackWarden's settings. In addition to RackWarden's specific configuration options, you can also pass in any settings that Sinatra recognizes.
+RackWarden will look for a configuration file named rack\_warden.yml in your project root or in your project/config/ directory. 
+
+		---
+		database: sqlite3:///usr/local/some_other_database.sqlite3.db
+		layout: :'my_custom_layout.html.erb'
+
 
-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 the current instance of RackWarden::App and the current instance of the parent app.
+You an also pass configuration settings to RackWarden through the ```use``` method of your framework. The params hash of ```use``` will be translated directly to RackWarden's settings. In addition to RackWarden's specific configuration options, you can also pass in any standard Sinatra settings.
+
+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 the current instance of RackWarden::App and the current instance of the parent app.
 
     use RackWarden::App do |rack_warden_app_instance, parent_app_instance|
       set :somesetting, 'some_value'
     end
+		
 
-### Configuration Options
+## Configuration Options
 
 Current list of settings specific to rack\_warden, with defaults.
 
-#### :layout
+### :layout
 
 A symbol representing a layout file in any of the view paths.
     
     layout: :'rack_warden_layout.html'
     
-#### :default\_route
+### :default\_route
 
 A Sinatra route to fall back on after logout, errors, or any action that has no specified route.
 
     default_route: '/'
     
-#### :database\_config
+### :database\_config
 
 A database specification hash or or url string.
 
@@ -97,7 +107,7 @@ A database specification hash or or url string.
       host: 127.0.0.1
       port: 3306
 
-#### :require\_login
+### :require\_login
 
 Parameters to pass to the before/before\_filter for require\_login.
 So if you're main app is Sinatra,
@@ -124,16 +134,16 @@ For Rails, you would be passing a hash of :only or :except keys.
       except: :index
     
 The default for :require\_login is nil, which means require login on every route or action.
-To disable automatic activation of require\_login, pass it ``false``.
+To disable automatic activation of require\_login, pass it ```false```.
 
-#### :allow\_public\_signup
+### :allow\_public\_signup
 
 Allows public access to the account creation view & action.
 
     allow_public_signup: false
     
     
-#### :recaptcha
+### :recaptcha
 
 Settings for Google's recaptcha service
 
@@ -142,21 +152,40 @@ Settings for Google's recaptcha service
       :secret  => ''
     }
 
+### :log\_path
+
+		File.join(Dir.pwd, 'log', 'rack_warden.log')
+
 ## Customization
 
+### Views
+
 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')
+Update: also looks in views/rack\_warden/ for view templates.
+
+    use RackWarden::App, :views => File.join(Dir.pwd, 'app/views/another_directory')
     
 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. Have a look at the readme on Sinatra's web site for more details on Sinatra's DSL.
+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. Have a look at the readme on Sinatra's web site for more details on Sinatra's DSL.
+
+
+### Database
+
+As a default, RackWarden will use the database specified in your project. You can also pass a database specification with the ```:database_config``` setting.
+		
+		# As a url
+		database_config: 'sqlite3:///path/to/my/database.sqlite3.db'
+		
+		# As a hash
+		database_config: {adapter: 'sqlite3', database: '/path/to/my/database.sqlite3.db'}
+		
+If your project has no database, or if you pass ```false``` to the ```:database_config``` setting, RackWarden will create its own database in the working directory as 'rack_warden.sqlite3.db'.
 
-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/"
 
 
 

data/lib/rack_warden.rb

@@ -1,3 +1,10 @@
+module RackWarden
+  # Incase you are using this library without the gem loaded.
+  PATH = File.expand_path(File.dirname(__FILE__))
+  puts "RW PATH #{PATH}"
+  $LOAD_PATH.unshift(PATH) unless $LOAD_PATH.include?(PATH)
+end
+
 require "sinatra/base"
 require "sinatra/flash"
 require 'bcrypt'
@@ -9,11 +16,17 @@ require 'open-uri'
 # gem 'dm-sqlite-adapter'
 # gem 'warden'
 
-require "rack_warden/app"
-require "rack_warden/version"
-autoload :User, "rack_warden/model"
-
+# require "rack_warden/app"
+# require "rack_warden/version"
 
 module RackWarden
-  # Your code goes here...
+  autoload :App, 'rack_warden/app'
+  autoload :User, "rack_warden/models"
+  autoload :Pref, "rack_warden/models"
+  autoload :VERSION, "rack_warden/version"
+  module Frameworks
+    autoload :Base, 'rack_warden/frameworks'
+    autoload :Sinatra, 'rack_warden/frameworks/sinatra'
+    autoload :Rails, 'rack_warden/frameworks/rails'
+  end
 end

data/lib/rack_warden/app.rb

@@ -5,13 +5,15 @@ module RackWarden
   class App < Sinatra::Base
     enable :sessions
     register Sinatra::Flash
+    
     set :config_files, [ENV['RACK_WARDEN_CONFIG_FILE'], 'rack_warden.yml', 'config/rack_warden.yml'].compact.uniq
-    set :layout, :'rack_warden_layout.html'
+    set :layout, :'rw_layout.html'
     set :default_route, '/'
-    set :database_config, "sqlite3:///#{Dir.pwd}/rack_warden.sqlite3.db"
+    set :database_config => nil  #, "sqlite3:///#{Dir.pwd}/rack_warden.sqlite3.db"
     set :recaptcha, Hash.new
     set :require_login, nil
     set :allow_public_signup, false
+    set :log_path, File.join(Dir.pwd, 'log', 'rack_warden.log')
     
     # Load config from file, if any exist.
     Hash.new.tap do |hash|
@@ -30,69 +32,43 @@ module RackWarden
   	# 	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]}"
+  	def initialize(parent_app_instance=nil, *args, &block)
+  	  initialization_args = args.dup
+  		puts "INITIALIZE middleware instance [parent_app_instance, self, args, block]: #{[parent_app_instance, 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")
+  		rack_warden_app_class = self.class
+  		if parent_app_instance
+  		  puts "RW has parent: #{parent_app_instance}"
+  		  
+  			# Save original views from opts.
+  			rack_warden_app_class.set(:original_views, opts.has_key?(:views) ? rack_warden_app_class.views : nil)
+
+  			# Set app settings with remainder of opts.
+  			rack_warden_app_class.set opts if opts.any?
   			
-  			parent_app.class.instance_eval do
-  			  def self.require_login(*args)
-    			  #options = args.last.is_a?(Hash) ? args.pop : Hash.new
-  			    before(*args) do
-  			      require_login
-  			    end
-  			  end
-			  end
-  			parent_app.class.require_login(klass.require_login) if klass.require_login != false
-  		when parent_app.class.parents.find{|x| x.to_s=='ActionDispatch'}
-  			ApplicationController.send(:include, RackWardenHelpers)
-  			default_parent_views = File.join(Dir.pwd, "app/views")
+  			# Eval the use-block from the parent app, in context of this app.
+  			rack_warden_app_class.instance_exec(self, parent_instance, &block) if block_given?
   			
-  			parent_app.class.instance_eval do
-  			  def self.require_login(*args)
-    			  #options = args.last.is_a?(Hash) ? args.pop : Hash.new
-  			    before_filter(:require_login, *args) do
-  			      require_login
-  			    end
-  			  end
-			  end
-  			(ApplicationController.before_filter :require_login, *Array(klass.require_login).flatten) if klass.require_login != false
+  			# Do framework setup.
+  			framework_module = Frameworks::Base.select_framework(binding)
+    		if framework_module
+      		framework_module.setup_framework
+        
+          # Manipulate views
+      		new_views = []
+      		original_views = self.class.original_views
+      		# append parent rails views folder unless opts.has_key?(:views)
+      		#new_views << default_parent_views unless opts.has_key?(:views)
+      		new_views << framework_module.views_path unless opts.has_key?(:views)
+      		# append original_views, if original_views
+      		new_views << original_views if original_views
+      		self.class.set(:views => [new_views, Array(self.class.views)].flatten.compact.uniq) if new_views.any?
+      		puts "RW views: #{self.class.views}"
+    		end
   		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}"
+  		# finally, send parent app to super, but don't send the use-block (thus the empty proc)
+  		super(parent_app_instance, &Proc.new{})
   	end
 	
     use Warden::Manager do |config|
@@ -127,7 +103,7 @@ module RackWarden
       end
 
       def authenticate!
-        user = User.first(username: params['user']['username'])
+        user = User.first(['username = ? or email = ?', params['user']['username'], params['user']['username']])  #(username: params['user']['username'])
 
         if user.nil?
           fail!("The username you entered does not exist.")
@@ -174,16 +150,15 @@ module RackWarden
   	    params['user'] && params['user']['email'] && params['user']['password']
   	  end
 	  
-  		def create_user
-		
-  			verify_recaptcha if settings.recaptcha[:secret]
-		
-  			return unless valid_user_input?
-        #user = User.create(username: params['user']['username'])
-        @user = User.new(params['user'])
-  			#user.password = params['user']['password']
-  			@user.save && warden.set_user(@user)
-  		end
+      # def create_user
+      #     
+      #   verify_recaptcha if settings.recaptcha[:secret]
+      #     
+      #   #return unless valid_user_input?
+      #         
+      #         @user = User.new(params['user'])
+      #   @user.save #&& warden.set_user(@user)
+      # end
 		
    		def verify_recaptcha(skip_redirect=false, ip=request.ip, response=params['g-recaptcha-response'])
    		  secret = settings.recaptcha[:secret]
@@ -197,7 +172,7 @@ module RackWarden
   	  end
 	  
   	  def default_page
-  	  	erb :'rack_warden_index.html', :layout=>settings.layout
+  	  	erb :'rw_index.html', :layout=>settings.layout
   	  end
 		
     end # RackWardenHelpers
@@ -214,7 +189,12 @@ module RackWarden
     end
 
     get '/auth/login' do
-      erb :'login_user.html', :layout=>settings.layout
+      if User.count > 0
+        erb :'rw_login.html', :layout=>settings.layout
+      else
+        flash(:rwarden)[:error] = warden.message || "Please create an admin account"
+        redirect url('/auth/new', false)
+      end
     end
 
     post '/auth/login' do
@@ -239,37 +219,43 @@ module RackWarden
 
   	get '/auth/new' do
   	  halt 403 unless settings.allow_public_signup or !(User.count > 0)
-      erb :'create_user.html', :layout=>settings.layout, :locals=>{:recaptcha_sitekey=>settings.recaptcha['sitekey']}
+      erb :'rw_new_user.html', :layout=>settings.layout, :locals=>{:recaptcha_sitekey=>settings.recaptcha['sitekey']}
     end
 
     post '/auth/create' do
-      if create_user
+      verify_recaptcha if settings.recaptcha[:secret]
+      Halt "Could not create account", :layout=>settings.layout unless params[:user]
+      params[:user].delete_if {|k,v| v.nil? || v==''}
+      @user = User.new(params['user'])
+      if @user.save
+        warden.set_user(@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"
+  	  	flash(:rwarden)[:error] = "#{warden.message} => #{@user.errors.entries.join('. ')}"
+  	  	puts "RW /auth/create #{@user.errors.entries}"
   	  	redirect back #url('/auth/new', 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/]
+      session[:return_to] = env['warden.options'][:attempted_path] if !request.xhr? && !env['warden.options'][:attempted_path][/login|new|create/]
       puts "WARDEN ATTEMPTED PATH: #{env['warden.options'][:attempted_path]}"
       puts warden
-      if User.count > 0
+      # if User.count > 0
         flash(:rwarden)[:error] = warden.message || "Please login to continue"
         redirect url('/auth/login', false)
-      else
-        flash(:rwarden)[:error] = warden.message || "Please create an admin account"
-        redirect url('/auth/new', false)
-      end
+      # else
+      #   flash(:rwarden)[:error] = warden.message || "Please create an admin account"
+      #   redirect url('/auth/new', false)
+      # end
     end
 
     get '/auth/protected' do
       warden.authenticate!
 
-      erb :'rack_warden_protected.html', :layout=>settings.layout
+      erb :'rw_protected.html', :layout=>settings.layout
     end
     
     get '/auth/admin' do
@@ -280,3 +266,4 @@ module RackWarden
   end # App 
 end # RackWarden
 
+

data/lib/rack_warden/frameworks.rb

@@ -0,0 +1,51 @@
+module RackWarden
+  module Frameworks
+    module Base
+      
+      # Module methods to be called on Base from RackWarden::App (and instance).
+      class << self
+        # Select the framework of the parent app.
+        def select_framework(env)
+          puts "RW framework constants: #{Frameworks.constants}"
+          Frameworks.constants.dup.tap{|_constants| _constants.delete(Base)}.each do |c|
+            r = Frameworks.const_get(c).framework_selector(env) #rescue nil
+            return r if r
+          end
+          nil
+        end
+        
+        # Extend target with target (like saying 'extend self').
+        def extended(target)
+          target.extend target
+        end
+      end
+      
+
+      ###  Methods extended into framework module  ###
+
+      attr_accessor :parent_app_instance, :parent_app_class, :rack_warden_app_instance, :rack_warden_app_class
+
+      # Sets framework module with variables from env (the scope of the parent app's initializer),
+      # and runs the framework selector logic.
+      # Returns the framework module or nil.
+      def framework_selector(env)
+        #puts "BASE.framework_selector #{self} env: #{env.eval 'self'} locals: #{env.eval 'local_variables'}"
+        @initialization_args = env.eval 'initialization_args'
+        @parent_app_instance = env.eval 'parent_app_instance'
+        @parent_app_class = @parent_app_instance.class
+        @rack_warden_app_instance = env.eval 'self'
+        @rack_warden_app_class = @rack_warden_app_instance.class
+        selector && self
+      end
+      
+      # # Best guess at framework database settings.
+      # def get_database_config
+      #   ActiveRecord::Base.connection_config rescue nil ||
+      #   DataMapper.repository(:default).adapter[:options] rescue nil
+      # end
+
+      ###  End methods extended into framework module  ###
+    	
+    end
+  end
+end

data/lib/rack_warden/frameworks/rails.rb

@@ -0,0 +1,35 @@
+module RackWarden
+  module Frameworks
+    module Rails
+      
+      extend Base
+
+      def selector
+        puts "RW Rails.selector"
+        parent_app_class.parents.find{|x| x.to_s=='ActionDispatch'}
+      end
+      
+      def views_path
+        [File.join(Dir.pwd, "app/views/rack_warden"), File.join(Dir.pwd, "app/views")]
+      end
+      
+      def setup_framework
+        puts "RW Rails.setup_framework parent_app_class #{parent_app_class}"
+    		ApplicationController.send(:include, RackWarden::App::RackWardenHelpers)
+    			      
+	      # Define class method 'require_login' on framework controller.
+    		#parent_app_class.instance_eval do        #This seems to work too.
+    		ApplicationController.instance_eval do
+    		  def self.require_login(*args)
+    		    before_filter(:require_login, *args) do
+    		      require_login
+    		    end
+    		  end
+    	  end
+    		(ApplicationController.before_filter :require_login, *Array(rack_warden_app_class.require_login).flatten) if rack_warden_app_class.require_login != false
+      end
+            
+    end
+  end
+end
+

data/lib/rack_warden/frameworks/sinatra.rb

@@ -0,0 +1,33 @@
+module RackWarden
+  module Frameworks
+    module Sinatra
+      
+      extend Base
+            
+      def selector
+        puts "RW Sinatra.selector"
+        parent_app_class.ancestors.find{|x| x.to_s=='Sinatra::Base'}
+      end
+      
+      def views_path
+        [File.join(Dir.pwd, "views/rack_warden"), File.join(Dir.pwd,"views")
+      end
+      
+      def setup_framework
+        puts "RW Sinatra.setup_framework parent_app_class #{parent_app_class}"
+  			parent_app_class.helpers(RackWarden::App::RackWardenHelpers)
+  			  			
+        # Define class method 'require_login' on framework controller.
+  			parent_app_class.instance_eval do
+  			  def self.require_login(*args)
+  			    before(*args) do
+  			      require_login
+  			    end
+  			  end
+			  end
+  			parent_app_class.require_login(rack_warden_app_class.require_login) if rack_warden_app_class.require_login != false
+    	end
+    	
+    end # Sinatra
+  end # Frameworks
+end # RackWarden

data/lib/rack_warden/models.rb

@@ -0,0 +1,33 @@
+
+module RackWarden
+  
+  # Best guess at framework database settings.
+  def self.get_database_config
+    App.database_config ||
+    (App.database_config == false && "sqlite3:///#{Dir.pwd}/rack_warden.sqlite3.db") ||
+    (ActiveRecord::Base.connection_config rescue nil) ||
+    (DataMapper.repository(:default).adapter[:options] rescue nil) ||
+    "sqlite3:///#{Dir.pwd}/rack_warden.sqlite3.db"
+  end
+  
+  puts "RW DataMapper using log_path #{App.log_path}"
+  DataMapper::Logger.new(App.log_path)
+  
+  puts "RW get_database_config #{get_database_config}"
+  DataMapper.setup(:default, get_database_config)
+  # Do DataMapper.repository.adapter to get connection info for this connection.
+
+  puts "RW requiring model files in #{File.join(File.dirname(__FILE__), 'models/*')}"
+  Dir.glob(File.join(File.dirname(__FILE__), 'models/*')).each {|f| puts f; require f}
+
+  puts "RW finalizing"
+  # Tell DataMapper the models are done being defined
+  DataMapper.finalize
+
+  puts "RW DataMapper.auto_upgrade!"
+  # Update the database to match the properties of User.
+  DataMapper.auto_upgrade!
+  
+  puts "RW DataMapper repository #{DataMapper.repository.adapter.options}"
+  
+end # module

data/lib/rack_warden/models/user.rb

@@ -0,0 +1,37 @@
+
+module RackWarden
+
+  class User
+    include DataMapper::Resource
+    include BCrypt
+
+    property :id, Serial, key: true
+    property :username, String, length: 128, unique: true, required: true, default: lambda {|r,v| r.instance_variable_get :@email}
+    property :email, String, length: 128, unique: true, required: true #, default: 'error'
+
+    property :password, BCryptHash
+    
+    # before :valid?, :set_username
+    # before :save, :set_username
+    
+    # def set_username
+    #   puts "SETTING USERNAME"
+    #   @username = @email unless @username
+    # end
+
+    def authenticate(attempted_password)
+      if self.password == attempted_password
+        true
+      else
+        false
+      end
+    end
+  end
+  
+  # # Create a test User
+  # if User.count == 0
+  #   @user = User.create(username: "admin")
+  #   @user.password = "admin"
+  #   @user.save
+  # end
+end # module

data/lib/rack_warden/version.rb

@@ -1,3 +1,3 @@
 module RackWarden
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

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

@@ -1,18 +1,20 @@
 <% @section_title = "RackWarden Admin" %>
-<table>
-	<thead>
-		<tr>
-			<th>Email</th>
-			<th>User</th>
-			<th>Id</th>
-		</tr>
-	<tbody>
-		<% User.all(:limit=>100).each do |user| %>
+<p>
+	<table>
+		<thead>
 			<tr>
-				<td><%=user.email%></td>
-				<td><%=user.username%></td>
-				<td><%=user.id%></td>
+				<th>Email</th>
+				<th>User</th>
+				<th>Id</th>
 			</tr>
-		<% end %>
-	</tbody>
-</table>
+		<tbody>
+			<% RackWarden::User.all(:limit=>100).each do |user| %>
+				<tr>
+					<td><%=user.email%></td>
+					<td><%=user.username%></td>
+					<td><%=user.id%></td>
+				</tr>
+			<% end %>
+		</tbody>
+	</table>
+</p>

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

@@ -0,0 +1,3 @@
+<p>
+	<h2>Warden authentication for rack based apps<h2>
+</p>

data/lib/rack_warden/views/{rack_warden_layout.html.erb → rw_layout.html.erb}

@@ -18,21 +18,25 @@
     <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>
+			<a href="<%=url('/auth/protected', false)%>">Test Protected Page</a> |
+			<a href="<%=url('/auth/admin', false)%>">RackWarden Admin</a> |
+			<a href="<%=url('/auth/logout', false)%>">Log Out</a>
+		</p>
 
     <% if flash(:rwarden)[:success] %>
-    <div style="color:green;">
-      <%= flash(:rwarden)[:success] %>
-    </div>
+	    <div style="color:green;">
+	      <%= flash(:rwarden)[:success] %>
+	    </div>
     <% end %>
 
     <% if flash(:rwarden)[:error] %>
-    <div style="color:red;">
-      <%= flash(:rwarden)[:error] %>
-    </div>
+	    <div style="color:red;">
+	      <%= flash(:rwarden)[:error] %>
+	    </div>
     <% end %>
 
-    <%= yield %>
+		<div id="content">
+	    <%= yield %>
+		</div>
   </body>
 </html>

data/lib/rack_warden/views/{login_user.html.erb → rw_login.html.erb}

@@ -1,7 +1,7 @@
 <% @section_title = "Login" %>
 <form action="<%=url('/auth/login', false)%>" method="post">
-  <p>Username: <input type="text" name="user[username]" /></p>
-  <p>Password: <input type="password" name="user[password]" /></p>
+  <p>Username or Email <input type="text" name="user[username]" /></p>
+  <p>Password <input type="password" name="user[password]" /></p>
   <input type="submit" value="Log In" />
 	<% if settings.allow_public_signup %>
 		or <a href="<%=url('/auth/new', false)%>">Create a new account</a>

data/lib/rack_warden/views/{create_user.html.erb → rw_new_user.html.erb}

@@ -1,9 +1,9 @@
 <% @section_title = "Create Account" %>
 <form action="<%=url('/auth/create', false)%>" method="post">
-	<p>Email: <input type="text" name="user[email]" /></p>
-  <p>Username: <input type="text" name="user[username]" /></p>
-  <p>Password: <input type="password" name="user[password]" /></p>
-  <% if recaptcha_sitekey && User.count > 0 %>
+	<p>Email <input type="text" name="user[email]" /></p>
+  <p>Username <input type="text" name="user[username]" /></p>
+  <p>Password <input type="password" name="user[password]" /></p>
+  <% if recaptcha_sitekey && RackWarden::User.count > 0 %>
 	  <div class="g-recaptcha control text-control" data-sitekey="<%=recaptcha_sitekey%>"></div>
   <% end %>
   <input type="submit" value="Create" />

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

@@ -0,0 +1,3 @@
+<p>
+	<h2>Protected Page Example</h2>
+</p>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack_warden
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - William Richardson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-31 00:00:00.000000000 Z
+date: 2015-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -166,14 +166,18 @@ files:
 - config.ru
 - lib/rack_warden.rb
 - lib/rack_warden/app.rb
-- lib/rack_warden/model.rb
+- lib/rack_warden/frameworks.rb
+- lib/rack_warden/frameworks/rails.rb
+- lib/rack_warden/frameworks/sinatra.rb
+- lib/rack_warden/models.rb
+- lib/rack_warden/models/user.rb
 - lib/rack_warden/version.rb
-- lib/rack_warden/views/create_user.html.erb
-- lib/rack_warden/views/login_user.html.erb
-- lib/rack_warden/views/rack_warden_index.html.erb
-- lib/rack_warden/views/rack_warden_layout.html.erb
-- lib/rack_warden/views/rack_warden_protected.html.erb
 - lib/rack_warden/views/rw_admin.html.erb
+- lib/rack_warden/views/rw_index.html.erb
+- lib/rack_warden/views/rw_layout.html.erb
+- lib/rack_warden/views/rw_login.html.erb
+- lib/rack_warden/views/rw_new_user.html.erb
+- lib/rack_warden/views/rw_protected.html.erb
 - rack_warden.gemspec
 homepage: ''
 licenses:

data/lib/rack_warden/model.rb

@@ -1,37 +0,0 @@
-#require 'bcrypt'
-DataMapper::Logger.new(File.join(Dir.pwd, 'log', 'rack_warden.log'))
-DataMapper.setup(:default, RackWarden::App.database_config)
-
-# Do DataMapper.repository.adapter to get connection info for this connection.
-
-class User
-  include DataMapper::Resource
-  include BCrypt
-
-  property :id, Serial, key: true
-  property :username, String, length: 128, required: true, unique: true, default: lambda {|r,v| r.instance_variable_get :@email}
-  property :email, String, length: 128, required: true, unique: true, default: 'error'
-
-  property :password, BCryptHash
-
-  def authenticate(attempted_password)
-    if self.password == attempted_password
-      true
-    else
-      false
-    end
-  end
-end
-
-# Tell DataMapper the models are done being defined
-DataMapper.finalize
-
-# Update the database to match the properties of User.
-DataMapper.auto_upgrade!
-
-# # Create a test User
-# if User.count == 0
-#   @user = User.create(username: "admin")
-#   @user.password = "admin"
-#   @user.save
-# end

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

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

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

@@ -1 +0,0 @@
-<h2>Protected Page Example</h2>