rack_warden 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmEzNjc1YzgzMjZmMzViZDIxNDliOTAzNDZlMzBkYmUzZTdlMDY4ZA==
+    MzJhMzZlZDM3YTVkYjE4MDczZTM2ZjhlYmU0MTQ0NmYyMjVkMmY3Mg==
   data.tar.gz: !binary |-
-    NjhlZGE3ZWY4OWI2MzM2MWVhNzY2YTZiNjcxOGI2ZDZkMjRlZDcxZA==
+    NzIwOGNlNTQzZDBkZjk4NTgwYTllOTM3MTJkMzM2Y2EyNWUzNmY0NA==
 SHA512:
   metadata.gz: !binary |-
-    ZmU0NTYxZjc0ZDhjMDhmYWFkMzIzMDU3M2ZjYWI1MDhlMmExNTZhYjY5Mzk3
-    Njk0ZjA5OTdiYjZmODFiMGVkNThkYjYxODEzZDlkNDZiNTEwMGQzNGFiZGJj
-    OTIxOTQ0YjJjZWU3ZjRjYmJiZDE2MmFlYmI4OWY1M2ZhYWM5MzU=
+    ZGFlMzk2OTNiYWU0OGJjYmUxNjAyN2U1MTU0Y2YzMTUyZGI0NDg1MTEzYjgz
+    NGFkOGU1ZDk5YjcxOGI5MTNlMmNkMjc2Nzk4OWQzZGY2MjM5NzFkMjgyODcw
+    MTI4OGU3YTQxMDI1OTNlYTAwN2Q1MTYwMTFiZDQyMTQ5MzRkODc=
   data.tar.gz: !binary |-
-    MGVkMzY5ODI2ZGYwZDg4NzNmNzBjMzI3M2VmZDBkMzIzMmRmNDY1MWU1Mzg5
-    NDI0NzExODY3NjM1Y2E1MDljYzI3MGU2ZGFlMjgzZjU5Y2Q1ZDU2NzllNzhj
-    NzA4MDE3NjBhNGU2NzhhYWQzZDVhMDIzYmM5YjI4ZjQ2NzU4MWI=
+    Yjk0MWUyMTBjZmMyNmEwNjZlNTAwZmM1M2Q2NmJkYjViNzllYTlhMGIwNDA2
+    YTc1NzY0MGY0NDQ4YmExMDA1NzQyYTNiM2YxZDE4ZWJhMmE0MTU4OTg3MGEx
+    MWI1MDE5ZjNkOGRjNTUyNjBmMzU0YThkY2JkNzgzMmM0ZDFjNzg=

data/README.md

@@ -54,7 +54,7 @@ application-controller.rb
 
 ## 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.
+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 :layout, :database, :default_route, and :recaptcha. 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.
 
@@ -62,6 +62,36 @@ If you pass a block with the ``use`` method, the block will be evaluated in the
 			set :somesetting, 'some_value'
 		end
 
+### Configuration Options
+
+Current list of settings specific to rack_warden, with defaults.
+
+#### :layout
+
+A symbol representing a layout file in any of the view paths.
+		
+		:layout => :'rack_warden_layout.html'
+		
+#### :default_route
+
+A Sinatra route to fall back on after logout, errors, or any action that has no specified route.
+
+		:default_route => '/'
+		
+#### :database
+
+A DataMapper database specification
+
+		:database => "sqlite:///Absolute/path/to/your/project/rack_warden.sqlite.db"
+		
+#### :recaptcha
+
+Settings for Google's recaptcha service
+
+		:recaptcha => {
+			:sitekey => '',
+			:secret  => ''
+		}
 
 ## Customization
 

data/lib/rack_warden/app.rb

@@ -5,10 +5,11 @@ 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 :config_files, [ENV['RACK_WARDEN_CONFIG_FILE'], 'rack_warden.yml', 'config/rack_warden.yml'].compact.uniq
     set :layout, :'rack_warden_layout.html'
     set :default_route, '/'
     set :database, "sqlite://#{Dir.pwd}/rack_warden.sqlite.db"
+    set :recaptcha, Hash.new
     
     # Load config from file, if any exist.
     Hash.new.tap do |hash|
@@ -151,10 +152,9 @@ module RackWarden
   	    params['user'] && params['user']['username'] && params['user']['password']
   	  end
 	  
-  	  # TODO: This doesn't work.
   		def create_user
 		
-  			recaptcha
+  			verify_recaptcha if settings.recaptcha[:secret]
 		
   			return unless valid_user_input?
   			user = User.create(username: params['user']['username'])
@@ -162,14 +162,14 @@ module RackWarden
   			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)
+   		def verify_recaptcha(skip_redirect=false, ip=request.ip, response=params['g-recaptcha-response'])
+   		  secret = settings.recaptcha[:secret]
+  	 		_recaptcha = ActiveSupport::JSON.decode(open("https://www.google.com/recaptcha/api/siteverify?secret=#{secret}&response=#{response}&remoteip=#{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 
+  	    unless _recaptcha['success']
+  	    	flash(:rwarden)[:error] = "Please confirm you are human"
+  	    	redirect back unless skip_redirect
+  	    	Halt "You appear to be a robot."
   	    end
   	  end
 	  
@@ -215,7 +215,7 @@ module RackWarden
     end
 
   	get '/auth/create' do
-      erb :'create_user.html', :layout=>settings.layout
+      erb :'create_user.html', :layout=>settings.layout, :locals=>{:recaptcha_sitekey=>settings.recaptcha[:sitekey]}
     end
 
     post '/auth/create' do

data/lib/rack_warden/version.rb

@@ -1,3 +1,3 @@
 module RackWarden
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

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

@@ -2,8 +2,8 @@
 <form action="<%=url('/auth/create', false)%>" method="post">
   <p>Username: <input type="text" name="user[username]" /></p>
   <p>Password: <input type="password" name="user[password]" /></p>
-  <% if @recapture_key %>
-	  <div class="g-recaptcha control text-control" data-sitekey="<%=@recapture_key%>"></div>
+  <% if recaptcha_sitekey %>
+	  <div class="g-recaptcha control text-control" data-sitekey="<%=recaptcha_sitekey%>"></div>
   <% end %>
   <input type="submit" value="Create" />
 </form>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack_warden
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - William Richardson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-28 00:00:00.000000000 Z
+date: 2014-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler