roy 0.3.2 → 0.3.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    roy (0.3.1)
+    roy (0.3.2)
       rack
 
 GEM

data/lib/roy.rb

@@ -31,15 +31,14 @@ module Roy
     }
 
     method = roy.env['REQUEST_METHOD'].downcase.to_sym
-    path = roy.env['PATH_INFO']
-    path = "/#{path}" unless path[0] == '/'
+    roy.env['PATH_INFO'].sub!(/^([^\/])/, '/\1')
 
     method, was_head = :get, true if method == :head
 
     roy.response.status, body = catch(:halt) do
       halt(405) unless roy.conf.allow.include?(method)
       prefixed_method = :"#{roy.conf.prefix}#{method}"
-      [roy.response.status, send(prefixed_method, path)]
+      [roy.response.status, send(prefixed_method, roy.env['PATH_INFO'])]
     end
 
     roy.response.write(body) unless was_head

data/lib/roy/plugin/basic_auth.rb

@@ -1,22 +1,21 @@
 module Roy
   module Plugin
     module BasicAuth
-      def protected!
-        unless authorized?
+      def protected!(data=nil)
+        unless authorized?(data)
           realm = roy.conf.auth && roy.conf.auth[:realm] || 'Realm'
           roy.response['WWW-Authenticate'] = %(Basic realm="#{realm}")
           halt 401
         end
       end
 
-      def authorized?
-        @auth ||=  Rack::Auth::Basic::Request.new(roy.request.env)
-        (roy.conf.auth ||= {})[:credentials] ||= {'admin' => 'password'}
+      def authorized?(data=nil)
+        @auth ||= Rack::Auth::Basic::Request.new(roy.request.env)
 
         @auth.provided? && @auth.basic? && @auth.credentials &&
-          roy.conf.auth[:credentials].any? do |user, password|
-            [user, password] == @auth.credentials
-          end
+          (roy.conf.auth[:logic] || ->(data, u, p) {
+            %w(admin password) == [u, p]
+           }).(data, *@auth.credentials)
       end
     end
   end

data/lib/roy/version.rb

@@ -1,3 +1,3 @@
 module Roy
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/test/plugins/basic_auth_test.rb

@@ -8,7 +8,7 @@ class BasicAuthTestObject
   roy allow: [:get],
       auth: {
         realm: "Custom",
-        credentials: {'user' => 'password'}
+        logic: ->(_, u, p) { %w(user password) == [u, p] }
       }
 
   def get(path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roy
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-17 00:00:00.000000000 Z
+date: 2011-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &9732340 !ruby/object:Gem::Requirement
+  requirement: &8277780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9732340
+  version_requirements: *8277780
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &9731800 !ruby/object:Gem::Requirement
+  requirement: &8277280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9731800
+  version_requirements: *8277280
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &9731300 !ruby/object:Gem::Requirement
+  requirement: &8276780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9731300
+  version_requirements: *8276780
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &9730800 !ruby/object:Gem::Requirement
+  requirement: &8276280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9730800
+  version_requirements: *8276280
 description: ! 'roy is a small library which allows every Ruby object to be used
 
   as a Rack application.'