sinatra-backstage 0.2.3.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fe6aa6d4025104f3cd16efd4c0c2a5ce3d61f68
-  data.tar.gz: 0b8006c04ee79a60c4a32a46633570674e3cf229
+  metadata.gz: b83633623dbf543d85186a19488832fcd7ec46bc
+  data.tar.gz: 282236a8b6055e173583e34a4803df1855e51587
 SHA512:
-  metadata.gz: a013460aa8eae9b4d8034a3abf539915348433c6d6eb3b31a28c5da4c2604ddd9e708cdaa4362ee7c2e47bc69f34c9e06c1dd2b0c71d1528029e8303097eb8b1
-  data.tar.gz: 8db14557af72b3e2132583448ab21211171877b8c5169d1092545adaf07a6de19152ad486d52e346af37c974d17cf5d9b35cf157c16c1d5db1b9d31f9faa8319
+  metadata.gz: fa5d87d94f1c11f8af4aac892bfa9b0191fbe494cd1aa9a32b50019baff5a45ddb92d007f91d46e289b3cddf6016db2b5b0ee9732a6e45320088cce39e78f07f
+  data.tar.gz: 83cdbaea1046c545090f9f62b4c3ea70543266ba7f942c9928c02f1a14c82f2057d84dc763134bf1524ceb4d3b6bc7d871a0aec9356c3bc4f5c9e6e932fd0ba7

data/lib/sinatra/backstage/rest/rest_routes.rb

@@ -1,3 +1,7 @@
+## gorilla-patch
+require 'gorilla-patch'
+
+## datamapper
 require 'dm-serializer'
 
 module Sinatra
@@ -5,6 +9,10 @@ module Sinatra
 		module REST
 			module Routing
 
+				using GorillaPatch::ArrayExt
+				using GorillaPatch::HashExt
+				using GorillaPatch::ModuleExt
+
 				def self.included(controller)
 					controller.extend self
 				end
@@ -18,7 +26,7 @@ module Sinatra
 						# puts "-- REST.Routing get namespace ( params = #{params})"
 						format = params.delete('format') || 'html'
 						# puts "-- REST.Routing get namespace after format ( params = #{params})"
-						format = 'json' if request.accept.include?('text/json') || request.accept.include?('application/json')
+						format = 'json' if request.accept.include_any?('text/json', 'application/json')
 						## get json options
 						json_method = params.delete('json_method')
 						json_opts = {:methods => ([json_method] || [])}
@@ -31,7 +39,7 @@ module Sinatra
 						## return
 						case format
 						when 'html'
-							halt eval "#{settings.render_engine} '#{demodulize(klass).downcase}/list'"
+							halt eval "#{settings.render_engine} '#{klass.demodulize.downcase}/list'"
 						when 'json'
 							halt @objects.to_json(json_opts)
 						end
@@ -40,10 +48,10 @@ module Sinatra
 
 					### get add-form
 					get "#{namespace}/new" do
-						template = ["#{demodulize(klass).downcase}/new"]
+						template = ["#{klass.demodulize.downcase}/new"]
 						if display_list
 							@objects = rest_get_all(klass)
-							template.unshift "#{demodulize(klass).downcase}/list"
+							template.unshift "#{klass.demodulize.downcase}/list"
 						end
 						eval "#{settings.render_engine} ['#{template.join('\',\'')}']"
 					end
@@ -70,10 +78,10 @@ module Sinatra
 
 					get "#{namespace}/:id" do |id|
 						@object = klass.get!(id)
-						template = ["#{demodulize(klass).downcase}/edit"]
+						template = ["#{klass.demodulize.downcase}/edit"]
 						if display_list
 							@objects = rest_get_all(klass)
-							template.unshift "#{demodulize(klass).downcase}/list"
+							template.unshift "#{klass.demodulize.downcase}/list"
 						end
 						eval "#{settings.render_engine} ['#{template.join('\',\'')}']"
 					end
@@ -93,7 +101,7 @@ module Sinatra
 				end
 
 				def rest_get_all(klass, params = {})
-					klass.all params.inject({}){ | hash_sym, (key, val) | hash_sym[key.to_sym] = val; hash_sym }
+					klass.all params.to_sym_keys
 				end
 
 			end

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

@@ -1,3 +1,6 @@
+## gorilla-patch
+require 'gorilla-patch'
+
 ## sinatra gems
 require 'sinatra'
 
@@ -8,25 +11,30 @@ module Sinatra
 		module User
 			module Helper
 
+				using GorillaPatch::ArrayExt
+
 				def self.included(app)
 					if app.ancestors.include? Sinatra::Base
-						app.set(:user_routes) do |bool|
+						app.set(:user_access) do |roles|
 							condition do
-								(request.path =~ ( bool ?
-									/^\/(login|signup)/ :
-									/^(?!\/(login|signup))/
-								)) != nil
+								settings.site_routes.each do |controller, hash|
+									if request.path =~ /^(#{hash['href']}$|#{hash['href']}\/.*$)/
+										# puts "-- Backstage::UserHelper :user_access ( controller = #{controller} )"
+										# puts "-- Backstage::UserHelper :user_access ( hash = #{hash} )"
+										return hash['access'].compare(roles)
+									end
+								end
 							end
 						end
 
 						## Hooks
-						app.before :user_routes => true do
-							# puts "-- Backstage::User login|signup authorized? = #{authorized?}"
+						app.before :user_access => [:anon] do
+							# puts "-- Backstage::User before authorized? = #{authorized?}"
 							redirect '/' if authorized?
 							# settings.site_routes[request.path]['active'] = true if settings.site_routes[request.path]
 						end
 
-						# app.after :user_routes => true do
+						# app.after :user_access => [:anon] do
 						# 	settings.site_routes[request.path]['active'] = false if settings.site_routes[request.path]
 						# end
 					end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-backstage
 version: !ruby/object:Gem::Version
-  version: 0.2.3.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Alexander Popov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-25 00:00:00.000000000 Z
-dependencies: []
+date: 2015-05-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: gorilla-patch
+  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: Sinatra-Backstage simplifies the use of the basic routes and models for
   Sinatra and DataMapper. Currently it includes REST and User.
 email: alex.wayfer@gmail.com