roy 0.4.0 → 0.5.1

data/Gemfile.lock

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

data/lib/roy/base.rb

@@ -9,7 +9,7 @@ require 'ostruct'
 require 'roy/version'
 
 module Roy
-  Defaults = OpenStruct.new(allow: Set.new, prefix: :'')
+  Defaults = {allow: [:get], prefix: :'', use: [:halt]}
 
   def self.included(base)
     base.send(:extend, ClassMethods)
@@ -19,9 +19,8 @@ module Roy
     @roy ||= OpenStruct.new.tap {|r|
       r.app  = self
       r.conf = self.class.conf
-
-      def r.halt(code, message=nil)
-        throw :halt, [code, message || Rack::Utils::HTTP_STATUS_CODES[code]]
+      self.class.ancestors.reverse.each do |mod|
+        mod.setup(r) if mod.respond_to?(:setup)
       end
     }
   end
@@ -57,14 +56,17 @@ module Roy
     attr_reader :conf
 
     def self.extended(base)
-      base.instance_eval { @conf ||= Defaults.dup }
+      base.instance_eval do
+        @conf ||= OpenStruct.new
+        roy Defaults
+      end
     end
 
     def roy(options={})
       options.each do |key,value|
         case key
         when :allow
-          conf.allow.merge(value)
+          (conf.allow ||= Set.new).merge(value)
           conf.allow.add(:head) if value.member?(:get)
         when :use
           value.each do |name|

data/lib/roy/halt.rb

@@ -0,0 +1,13 @@
+module Roy
+  module Halt
+
+    def self.setup(roy)
+      class << roy
+        def halt(code, message=nil)
+          throw :halt, [code, message || Rack::Utils::HTTP_STATUS_CODES[code]]
+        end
+      end
+    end
+
+  end
+end

data/lib/roy/render.rb

@@ -3,8 +3,7 @@ require 'tilt'
 module Roy
   module Render
 
-    def initialize
-      super
+    def self.setup(roy)
       class << roy
         def render(engine, view_or_string, params={}, &block)
           options = conf.render || {}
@@ -21,5 +20,6 @@ module Roy
         end
       end
     end
+
   end
 end

data/lib/roy/version.rb

@@ -1,3 +1,3 @@
 module Roy
-  VERSION = "0.4.0"
+  VERSION = "0.5.1"
 end

data/test/defaults_test.rb

@@ -1,11 +1,17 @@
 require_relative 'helper'
 
-defaults = Roy::Defaults.dup
-Roy::Defaults.prefix = :http_
+Roy::Defaults.tap do |conf|
+  conf[:prefix] = :http_
+  conf[:use]    = [:halt, :after]
+end
 
 class DefaultsTestObject
   include Roy
 
+  roy after: lambda { |response|
+    response.status = 404
+  }
+
   def http_get(path)
     'success'
   end
@@ -20,6 +26,7 @@ class DefaultsTest < MiniTest::Unit::TestCase
 
   def test_default_settings
     get '/'
+    assert_equal 404, last_response.status
     assert_equal 'success', last_response.body
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roy
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-05 00:00:00.000000000 Z
+date: 2012-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &6178220 !ruby/object:Gem::Requirement
+  requirement: &14552840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6178220
+  version_requirements: *14552840
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &6177760 !ruby/object:Gem::Requirement
+  requirement: &14552240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6177760
+  version_requirements: *14552240
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &6177200 !ruby/object:Gem::Requirement
+  requirement: &14551720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6177200
+  version_requirements: *14551720
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &6176320 !ruby/object:Gem::Requirement
+  requirement: &14551200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6176320
+  version_requirements: *14551200
 description: ! 'roy is a small library which allows every Ruby object to be used
 
   as a Rack application.'
@@ -74,6 +74,7 @@ files:
 - lib/roy/base.rb
 - lib/roy/basic_auth.rb
 - lib/roy/before.rb
+- lib/roy/halt.rb
 - lib/roy/render.rb
 - lib/roy/version.rb
 - roy.gemspec