sinatra-backstage 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f6181adcb3d172b124dceba665cae5c8d99a3a7
-  data.tar.gz: cb5e02188b48fdbd21610bed1fe900b3b1ba5bb2
+  metadata.gz: 8ece14fd900a01402c3bce2e19de3e6bd6773bf3
+  data.tar.gz: 3d241c4fcee4b46a4e160a1ae1e77f543d979267
 SHA512:
-  metadata.gz: da09eedd9134b50a83f216c9461aca84659110738d1127fe3f29baa740083206826d8679cce7e2d7270ddbf7f762994c4654abda182dacca39abf2e821d2766b
-  data.tar.gz: 19dab607897fd7a9471e7f4dda372405e868ad23c01360d76c9469b1a040550b39238a9cc16339a3aeccfe2fae50b4ed4014d3f6300397fd10582ee2226ba81f
+  metadata.gz: 28c3d0f14840b2bfa679c28092264f95c3e0becb624ba7077dabd7338665f307733019419e385b5fc5b2387a1957709d347cba86228b8dfdc0ac02532995b889
+  data.tar.gz: b2d0b615d96bc594642279cb0aa644fcd4850d9ec9cbf8f403c48568d20c75922955ac22a2b25cf5abd7e9830dcb4e04322273c95f5c37f62841e396d8ad136f

data/lib/sinatra/backstage/user/user_middleware.rb

@@ -28,7 +28,7 @@ module Sinatra
 				app.post '/signup' do
 					# puts "params = #{params}"
 					# halt
-					@errors = []
+					@errors = {}
 					begin
 						user = settings.user_class.create(
 							params[:user].merge({:role => :user})
@@ -36,13 +36,19 @@ module Sinatra
 						set_session user
 						redirect '/'
 					rescue DataMapper::SaveFailureError => e
-						puts e.resource.errors.inspect
-						e.resource.errors.each do |error|
-							puts error.inspect
-							@errors << error
+						# puts e.resource.errors.inspect
+						# puts "-- Backstage::UserMiddleware /signup rescue ( e.resource.errors.keys = #{e.resource.errors.keys} )"
+						# puts "-- Backstage::UserMiddleware /signup rescue ( e.resource.errors.to_hash = #{e.resource.errors.to_hash} )"
+						e.resource.errors.to_hash.each do |key, error|
+							# puts "-- Backstage::UserMiddleware /signup rescue each ( key = #{key} )"
+							# puts "-- Backstage::UserMiddleware /signup rescue each ( error[0].to_s = #{error[0].to_s} )"
+							@errors[key.to_s] = {
+								'text' => error[0].to_s,
+								'autofocus' => true
+							}
 						end
-						@errors.flatten!
-						puts @errors.inspect
+						# @errors.flatten!
+						# puts @errors.inspect
 						params[:user].delete_if do |key, val|
 							['password', 'password_confirmation'].include? key
 						end
@@ -53,19 +59,26 @@ module Sinatra
 
 				### login user
 				app.post '/login' do
-					@errors = []
+					@errors = {}
 					password = params[:user].delete('password')
 					user = settings.user_class.first params[:user]
 					# puts "User::Middleware post '/login' ( params[:user] = #{params[:user]} )"
 					# puts "User::Middleware post '/login' ( user = #{user} )"
+					ident_field = params[:user].keys.first
 					if user.nil?
-						@errors << "Incorrect #{params[:user].keys.join(' or ')}"
+						@errors[ident_field] = {
+							'text' => "Incorrect #{params[:user].keys.join(' or ')}",
+							'autofocus' => true
+						}
 					else
 						if user.password == password
 							set_session user
 							redirect '/'
 						else
-							@errors << "Incorrect password"
+							@errors['password'] = {
+								'text' => "Incorrect password",
+								'autofocus' => true
+							}
 						end
 					end
 					eval "#{settings.render_engine} 'user/login'"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-backstage
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Alexander Popov