roy 0.3.0 → 0.3.1

data/Gemfile.lock

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

data/Rakefile

@@ -2,5 +2,5 @@ require "bundler/gem_tasks"
 require 'rake/testtask'
 
 Rake::TestTask.new do |t|
-  t.pattern = 'test/*_test.rb'
+  t.pattern = 'test/{plugins/,}*_test.rb'
 end

data/lib/roy/plugin/after.rb

@@ -0,0 +1,12 @@
+module Roy
+  module Plugin
+    module After
+      def call(env)
+        status, header, body = super
+        resp = Rack::Response.new(body, status, header)
+        (roy.conf.after || lambda {|x| x }).(resp)
+        resp.finish
+      end
+    end
+  end
+end

data/lib/roy/plugin/basic_auth.rb

@@ -0,0 +1,23 @@
+module Roy
+  module Plugin
+    module BasicAuth
+      def protected!
+        unless authorized?
+          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'}
+
+        @auth.provided? && @auth.basic? && @auth.credentials &&
+          roy.conf.auth[:credentials].any? do |user, password|
+            [user, password] == @auth.credentials
+          end
+      end
+    end
+  end
+end

data/lib/roy/plugin/before.rb

@@ -0,0 +1,10 @@
+module Roy
+  module Plugin
+    module Before
+      def call(env)
+        (roy.conf.before || lambda {|x| x }).(env)
+        super
+      end
+    end
+  end
+end

data/lib/roy/plugin/render.rb

@@ -0,0 +1,23 @@
+require 'tilt'
+
+module Roy
+  module Plugin
+    module Render
+
+      def render(engine, view_or_string, params={}, &block)
+        options = roy.conf.render || {}
+        template = case view_or_string
+          when Symbol
+            file = [view_or_string.to_s, engine].map(&:to_s).join('.')
+            dir = roy.conf.views || 'views'
+            Tilt.new(File.join(dir, file), nil, options)
+          else
+            Tilt[engine].new(nil, nil, options) { view_or_string.to_s }
+          end
+
+        template.render(self, params, &block)
+      end
+
+    end
+  end
+end

data/lib/roy/plugins.rb

@@ -1,10 +1,12 @@
 module Roy
+  module Plugin; end
+
   def self.Plugins(*names)
     return Module.new.tap do |mod|
       names.each do |name|
         if name.is_a?(Symbol)
-          require "roy/#{name}"
-          name = Roy.const_get("#{name}".capitalize.to_sym)
+          require "roy/plugin/#{name}"
+          name = Roy::Plugin.const_get("#{name}".capitalize.to_sym)
         end
         mod.send(:include, name)
       end

data/lib/roy/version.rb

@@ -1,3 +1,3 @@
 module Roy
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/roy.rb

@@ -2,6 +2,7 @@ require 'set'
 require 'rack'
 require 'ostruct'
 require 'roy/version'
+require 'roy/plugins'
 
 module Roy
   Env = Struct.new(:env, :request, :response, :headers, :params, :conf)

data/test/{after_test.rb → plugins/after_test.rb}

@@ -1,9 +1,9 @@
-require_relative 'helper'
-require 'roy/after'
+require_relative '../helper'
+require 'roy/plugin/after'
 
 class AfterTestObject
   include Roy
-  include Roy::After
+  include Roy::Plugin::After
 
   roy allow: [:get],
       after: lambda { |response|

data/test/plugins/basic_auth_test.rb

@@ -0,0 +1,49 @@
+require_relative '../helper'
+require 'roy/plugin/basic_auth'
+
+class BasicAuthTestObject
+  include Roy
+  include Roy::Plugin::BasicAuth
+
+  roy allow: [:get],
+      auth: {
+        realm: "Custom",
+        credentials: {'user' => 'password'}
+      }
+
+  def get(path)
+    protected!
+    'success'
+  end
+end
+
+class BasicAuthTest < MiniTest::Unit::TestCase
+  include Rack::Test::Methods
+
+  def app
+    BasicAuthTestObject.new
+  end
+
+  def test_basic_auth_realm
+    get '/'
+    assert_match /Custom/, last_response['WWW-Authenticate']
+  end
+
+  def test_basic_auth_protected
+    get '/'
+    assert_equal 401, last_response.status
+  end
+
+  def test_basic_auth_authorized
+    authorize 'user', 'password'
+    get '/'
+    ok!
+  end
+
+  def test_basic_auth_unauthorized
+    authorize 'foo', 'bar'
+    get '/'
+    fail!
+  end
+
+end

data/test/{before_test.rb → plugins/before_test.rb}

@@ -1,9 +1,9 @@
-require_relative 'helper'
-require 'roy/before'
+require_relative '../helper'
+require 'roy/plugin/before'
 
 class BeforeTestObject
   include Roy
-  include Roy::Before
+  include Roy::Plugin::Before
 
   roy allow: [:get],
       before: lambda { |env|

data/test/{plugins_test.rb → plugins/plugins_test.rb}

@@ -1,10 +1,10 @@
-require_relative 'helper'
+require_relative '../helper'
 require 'roy/plugins'
-require 'roy/before'
+require 'roy/plugin/before'
 
 class PluginsTestObject
   include Roy
-  include Roy::Plugins(Before, :after)
+  include Roy::Plugins(Plugin::Before, :after)
 
   roy allow: [:get],
       before: lambda { |env|

data/test/{render_test.rb → plugins/render_test.rb}

@@ -1,5 +1,5 @@
-require_relative 'helper'
-require 'roy/render'
+require_relative '../helper'
+require 'roy/plugin/render'
 
 Templates = {
   simple: %q(<%= "Hello world!" %>),
@@ -10,7 +10,7 @@ Templates = {
 
 class RenderTestObject
   include Roy
-  include Roy::Render
+  include Roy::Plugin::Render
 
   roy allow: [:get],
       views: 'test/views'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roy
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-16 00:00:00.000000000 Z
+date: 2011-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &6811460 !ruby/object:Gem::Requirement
+  requirement: &19902600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6811460
+  version_requirements: *19902600
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &6810920 !ruby/object:Gem::Requirement
+  requirement: &19902080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6810920
+  version_requirements: *19902080
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &6810380 !ruby/object:Gem::Requirement
+  requirement: &19901580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6810380
+  version_requirements: *19901580
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &6809880 !ruby/object:Gem::Requirement
+  requirement: &19901080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6809880
+  version_requirements: *19901080
 description: ! 'roy is a small library which allows every Ruby object to be used
 
   as a Rack application.'
@@ -70,21 +70,23 @@ files:
 - README.md
 - Rakefile
 - lib/roy.rb
-- lib/roy/after.rb
-- lib/roy/before.rb
+- lib/roy/plugin/after.rb
+- lib/roy/plugin/basic_auth.rb
+- lib/roy/plugin/before.rb
+- lib/roy/plugin/render.rb
 - lib/roy/plugins.rb
-- lib/roy/render.rb
 - lib/roy/version.rb
 - roy.gemspec
-- test/after_test.rb
 - test/base_test.rb
-- test/before_test.rb
 - test/custom_options_test.rb
 - test/defaults_test.rb
 - test/helper.rb
-- test/plugins_test.rb
+- test/plugins/after_test.rb
+- test/plugins/basic_auth_test.rb
+- test/plugins/before_test.rb
+- test/plugins/plugins_test.rb
+- test/plugins/render_test.rb
 - test/prefix_test.rb
-- test/render_test.rb
 - test/views/layout.erb
 - test/views/test.erb
 homepage: https://github.com/madx/roy
@@ -112,14 +114,15 @@ signing_key:
 specification_version: 3
 summary: make your objects REST-friendly
 test_files:
-- test/after_test.rb
 - test/base_test.rb
-- test/before_test.rb
 - test/custom_options_test.rb
 - test/defaults_test.rb
 - test/helper.rb
-- test/plugins_test.rb
+- test/plugins/after_test.rb
+- test/plugins/basic_auth_test.rb
+- test/plugins/before_test.rb
+- test/plugins/plugins_test.rb
+- test/plugins/render_test.rb
 - test/prefix_test.rb
-- test/render_test.rb
 - test/views/layout.erb
 - test/views/test.erb

data/lib/roy/after.rb

@@ -1,10 +0,0 @@
-module Roy
-  module After
-    def call(env)
-      status, header, body = super
-      resp = Rack::Response.new(body, status, header)
-      (roy.conf.after || lambda {|x| x }).(resp)
-      resp.finish
-    end
-  end
-end

data/lib/roy/before.rb

@@ -1,8 +0,0 @@
-module Roy
-  module Before
-    def call(env)
-      (roy.conf.before || lambda {|x| x }).(env)
-      super
-    end
-  end
-end

data/lib/roy/render.rb

@@ -1,21 +0,0 @@
-require 'tilt'
-
-module Roy
-  module Render
-
-    def render(engine, view_or_string, params={}, &block)
-      options = roy.conf.render || {}
-      template = case view_or_string
-      when Symbol
-        file = [view_or_string.to_s, engine].map(&:to_s).join('.')
-        dir = roy.conf.views || 'views'
-        Tilt.new(File.join(dir, file), nil, options)
-      else
-        Tilt[engine].new(nil, nil, options) { view_or_string.to_s }
-      end
-
-      template.render(self, params, &block)
-    end
-
-  end
-end