rack_warden 0.0.6 → 0.0.7

data/lib/rack_warden/app.rb

@@ -5,15 +5,17 @@ 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, :'rw_layout.html'
     set :default_route, '/'
     set :database_config => nil  #, "sqlite3:///#{Dir.pwd}/rack_warden.sqlite3.db"
+    set :database_default => "sqlite3::memory:"   #"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')
+    set :user_table_name, nil
     
     # Load config from file, if any exist.
     Hash.new.tap do |hash|
@@ -34,7 +36,7 @@ module RackWarden
   	#
   	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]}"
+  		puts "RW 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 : {}
   		rack_warden_app_class = self.class
@@ -42,7 +44,8 @@ module RackWarden
   		  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)
+  			#rack_warden_app_class.set(:original_views, opts.has_key?(:views) ? rack_warden_app_class.views : nil)
+  			rack_warden_app_class.set(:original_views, rack_warden_app_class.views)
 
   			# Set app settings with remainder of opts.
   			rack_warden_app_class.set opts if opts.any?
@@ -52,24 +55,40 @@ module RackWarden
   			
   			# Do framework setup.
   			framework_module = Frameworks::Base.select_framework(binding)
+    		puts "RW framework_module #{framework_module}"
     		if framework_module
       		framework_module.setup_framework
         
           # Manipulate views
       		new_views = []
-      		original_views = self.class.original_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)
+      		#new_views << framework_module.views_path unless opts[:views]==false #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?
+      		#new_views << original_views if original_views
+      		#self.class.set(:views => [new_views, Array(self.class.views)].flatten.compact.uniq) if new_views.any?
+      		
+      		new_views.unshift rack_warden_app_class.original_views
+      		new_views.unshift framework_module.views_path unless rack_warden_app_class.views==false
+      		new_views.unshift rack_warden_app_class.views
+      		rack_warden_app_class.set :views, new_views.flatten.compact.uniq
+      		
       		puts "RW views: #{self.class.views}"
     		end
   		end
   		# finally, send parent app to super, but don't send the use-block (thus the empty proc)
   		super(parent_app_instance, &Proc.new{})
   	end
+  	
+  	# For testing interception of request.
+  	# This might be breaking older rails installations
+		# if development?
+		#   def call(env={})  
+		#   	puts "RW instance.app #{app}"
+		#     puts "RW instance.call(env) #{env.to_yaml}"
+		#     super(env)
+		#   end 
+		# end
 	
     use Warden::Manager do |config|
       # Tell Warden how to save our User info into a session.
@@ -83,11 +102,11 @@ module RackWarden
       config.scope_defaults :default,
         # "strategies" is an array of named methods with which to
         # attempt authentication. We have to define this later.
-        strategies: [:password],
+        :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'
+        :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

data/lib/rack_warden/frameworks.rb

@@ -7,7 +7,8 @@ module RackWarden
         # 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|
+          Frameworks.constants.dup.tap{|_constants| _constants.delete(:Base)}.each do |c|
+          	puts "RW framework constant #{c}"
             r = Frameworks.const_get(c).framework_selector(env) #rescue nil
             return r if r
           end
@@ -23,7 +24,7 @@ module RackWarden
 
       ###  Methods extended into framework module  ###
 
-      attr_accessor :parent_app_instance, :parent_app_class, :rack_warden_app_instance, :rack_warden_app_class
+      attr_accessor :parent_app_instance, :parent_app_class, :parent_app, :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.
@@ -33,6 +34,7 @@ module RackWarden
         @initialization_args = env.eval 'initialization_args'
         @parent_app_instance = env.eval 'parent_app_instance'
         @parent_app_class = @parent_app_instance.class
+        @parent_app = @parent_app_instance.is_a?(Class) ? @parent_app_instance : @parent_app_class
         @rack_warden_app_instance = env.eval 'self'
         @rack_warden_app_class = @rack_warden_app_instance.class
         selector && self

data/lib/rack_warden/frameworks/rails.rb

@@ -5,8 +5,8 @@ module RackWarden
       extend Base
 
       def selector
-        puts "RW Rails.selector"
-        parent_app_class.parents.find{|x| x.to_s=='ActionDispatch'}
+        puts "RW Rails.selector parent_app.ancestors #{parent_app.ancestors}"
+        parent_app.ancestors.find{|x| x.to_s[/Rails|ActionDispatch/]}     #{|x| x.to_s=='ActionDispatch'}
       end
       
       def views_path
@@ -14,7 +14,7 @@ module RackWarden
       end
       
       def setup_framework
-        puts "RW Rails.setup_framework parent_app_class #{parent_app_class}"
+        puts "RW Rails.setup_framework parent_app #{parent_app}"
     		ApplicationController.send(:include, RackWarden::App::RackWardenHelpers)
     			      
 	      # Define class method 'require_login' on framework controller.

data/lib/rack_warden/frameworks/sinatra.rb

@@ -5,27 +5,29 @@ module RackWarden
       extend Base
             
       def selector
-        puts "RW Sinatra.selector"
-        parent_app_class.ancestors.find{|x| x.to_s=='Sinatra::Base'}
+        puts "RW Sinatra.selector parent_app.ancestors #{parent_app.ancestors}"
+        parent_app.ancestors.find{|x| x.to_s=='Sinatra::Base'}
       end
       
       def views_path
-        [File.join(Dir.pwd, "views/rack_warden"), File.join(Dir.pwd,"views")
+        [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)
+        puts "RW Sinatra.setup_framework parent_app #{parent_app}"
+  			parent_app.helpers(RackWarden::App::RackWardenHelpers)
   			  			
         # Define class method 'require_login' on framework controller.
-  			parent_app_class.instance_eval do
+  			parent_app.instance_eval do
   			  def self.require_login(*args)
+  			  	puts "RW class #{self}.require_login #{args}"
   			    before(*args) do
+	  			    puts "RW instance #{self}.require_login #{request.path_info}"
   			      require_login
   			    end
   			  end
 			  end
-  			parent_app_class.require_login(rack_warden_app_class.require_login) if rack_warden_app_class.require_login != false
+  			parent_app.require_login(rack_warden_app_class.require_login) if rack_warden_app_class.require_login != false
     	end
     	
     end # Sinatra

data/lib/rack_warden/models.rb

@@ -1,13 +1,16 @@
-
+# Setup the database connection, schema, etc.
 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"
+    case
+    when App.database_config.to_s.downcase == 'auto';
+	    (ActiveRecord::Base.connection_config rescue nil) ||
+	    (DataMapper.repository(:default).adapter[:options] rescue nil) ||
+    	App.database_default
+    when App.database_config; App.database_config
+    else App.database_default
+    end
   end
   
   puts "RW DataMapper using log_path #{App.log_path}"
@@ -20,7 +23,7 @@ module RackWarden
   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"
+  puts "RW DataMapper.finalize"
   # Tell DataMapper the models are done being defined
   DataMapper.finalize
 

data/lib/rack_warden/models/user.rb

@@ -4,10 +4,12 @@ module RackWarden
   class User
     include DataMapper::Resource
     include BCrypt
+    
+    storage_names[:default] = App.user_table_name if App.user_table_name
 
-    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 :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
     
@@ -30,7 +32,7 @@ module RackWarden
   
   # # Create a test User
   # if User.count == 0
-  #   @user = User.create(username: "admin")
+  #   @user = User.create(:username => "admin")
   #   @user.password = "admin"
   #   @user.save
   # end

data/lib/rack_warden/version.rb

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

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

@@ -1,3 +1,9 @@
 <p>
 	<h2>Protected Page Example</h2>
+</p>
+
+<p>
+	<%= DataMapper.repository.adapter.to_yaml.gsub(/\n|\r/, '<br>') %>
+	<%= DataMapper.repository.adapter.select('select * from SQLITE_MASTER').to_yaml.gsub(/\n|\r/, '<br>').gsub(/  /, '&nbsp;&nbsp;') %>
+	
 </p>

metadata

@@ -1,163 +1,174 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rack_warden
-version: !ruby/object:Gem::Version
-  version: 0.0.6
+version: !ruby/object:Gem::Version 
+  hash: 17
+  prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 7
+  version: 0.0.7
 platform: ruby
-authors:
+authors: 
 - William Richardson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-05 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+
+date: 2015-01-07 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 7
+        version: "1.7"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: *id001
+  name: bundler
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.7'
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 35
+        segments: 
+        - 10
+        - 0
+        version: "10.0"
+  prerelease: false
+  requirement: *id002
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '10.0'
   type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
+  requirement: *id003
   name: tux
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: *id004
   name: thin
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: *id005
   name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: *id006
   name: sinatra-flash
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: *id007
   name: bcrypt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: *id008
   name: data_mapper
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: *id009
   name: dm-sqlite-adapter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: *id010
   name: warden
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: A warden/sinatra mini-app providing authentication and user management
-  for any rack-based app.
-email:
+description: A warden/sinatra mini-app providing authentication and user management for any rack-based app.
+email: 
 - wbr@mac.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - LICENSE.txt
@@ -179,29 +190,38 @@ files:
 - lib/rack_warden/views/rw_new_user.html.erb
 - lib/rack_warden/views/rw_protected.html.erb
 - rack_warden.gemspec
-homepage: ''
-licenses:
+homepage: ""
+licenses: 
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-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'
+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"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.30
 signing_key: 
-specification_version: 4
-summary: A warden/sinatra mini-app providing authentication and user management for
-  any rack-based app
+specification_version: 3
+summary: A warden/sinatra mini-app providing authentication and user management for any rack-based app
 test_files: []
+

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NDMyOGMzYTQzNmVlODAwMTRjMDIxZGE4ZmQyNmJjNDRmNDIxNGUwZA==
-  data.tar.gz: !binary |-
-    NzIwMTkzZWNhMmFkYjk5MmE4MGRhYzMxODE3MTA1MjMwZWFlMmI4MA==
-SHA512:
-  metadata.gz: !binary |-
-    YmUzYWRkMDZjZWI4MTBiZmYxZGMyZGE1M2ZmMGI3ZTU0ZDA4NDZkYzAzOThm
-    YjE3NTI1ZmViNDZmMmJkNDBmMTAxZGU4NTUyYWJhNDY0YzRkYzkxODJlYWI5
-    MDA4MTJlNTM0YTk1MDc0NzlmNTQ3YTdhMTk4M2MwNTY2M2E3Njk=
-  data.tar.gz: !binary |-
-    ZjMyZjgwNzlmYWZkOTllODA2OTVhNDZmMzM4ZjU2ZTlhYzA1ZmIzZTVkMDdl
-    MjMzODU4ZTVjOWYyNGEwNmFmYzY2NGI0ZWVhNjY0MjZmOTlhZTQ0OTAyODYz
-    YTEwMjZkYzdkZDM1M2ZlOTMxZjBiMzBmNjdjMjQyOTM0NTllNDI=