roy 0.1.0 → 0.2.2

data/Gemfile.lock

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

data/README.md

@@ -2,16 +2,16 @@ Roy
 ===
 
 Roy is a tiny module that aims to make any Ruby object Rack-friendly and
-provides it with a REST-like interface.
+provide it with a REST-like interface.
 
 Roy tries to be as less invasive as possible. It provides your objects with a
-`#call` method that takes a Rack environment and dispatchs to a regular method
+`#call` method that takes a Rack environment and dispatches to a regular method
 named after the HTTP method you want to catch.
 
 ## Tests
 
 You can execute the tests by running `rake test`. They are written with
-Minitest.
+MiniTest.
 
 ## Example
 
@@ -59,10 +59,10 @@ class Example
   end
 end
 ```
-### Environement
+### Environment
 
 Inside your handler methods, you have access to a `roy` readable attribute which
-is a struct containing the following fields:
+is a Struct containing the following fields:
 
 * `env`: the Rack environment
 * `response`: a `Rack::Response` object that will be returned by `call`
@@ -82,3 +82,15 @@ composed of a status code and a message.
 Roy provides a `halt` method that takes a status code and an optional message.
 If there is no message it uses the default message from
 `Rack::Utils::HTTP_STATUS_CODES`
+
+### Plugins
+
+Various plugins are shipped with Roy, here is the full list:
+
+* **after**: modify the response after the app has been called
+* **before**: modify the environment before calling the app
+* **render**: integration with Tilt
+* **plugins**: a simple plugin loader
+
+Each plugin is designed to do only one thing. Thus it is very easy to take a
+look at the code and see how the plugin works.

data/lib/roy.rb

@@ -5,6 +5,7 @@ require 'roy/version'
 
 module Roy
   Env = Struct.new(:env, :request, :response, :headers, :params, :conf)
+  Defaults = OpenStruct.new(allow: Set.new, prefix: :'')
 
   def self.included(base)
     base.send(:extend, ClassMethods)
@@ -52,16 +53,16 @@ module Roy
   module ClassMethods
     attr_reader :conf
 
-    def roy(options={})
-      @conf ||= OpenStruct.new(allow: Set.new, prefix: :'')
+    def self.extended(base)
+      base.instance_eval { @conf ||= Defaults.dup }
+    end
 
+    def roy(options={})
       options.each do |k,v|
         case k
         when :allow
           conf.allow.merge(v)
           conf.allow.add(:head) if v.member?(:get)
-        when :prefix
-          conf.prefix = v
         else
           conf.send(:"#{k}=", v)
         end

data/lib/roy/plugins.rb

@@ -2,6 +2,10 @@ module Roy
   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)
+        end
         mod.send(:include, name)
       end
     end

data/lib/roy/render.rb

@@ -2,14 +2,20 @@ require 'tilt'
 
 module Roy
   module Render
-    def render(engine, template_or_string, params={}, &block)
-      case template_or_string
+
+    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 {
-          template_or_string.to_s
-        }.render(self, params, &block)
+        Tilt[engine].new(nil, nil, options) { view_or_string.to_s }
       end
+
+      template.render(self, params, &block)
     end
+
   end
 end

data/lib/roy/version.rb

@@ -1,3 +1,3 @@
 module Roy
-  VERSION = "0.1.0"
+  VERSION = "0.2.2"
 end

data/test/defaults_test.rb

@@ -0,0 +1,25 @@
+require_relative 'helper'
+
+defaults = Roy::Defaults.dup
+Roy::Defaults.prefix = :http_
+
+class DefaultsTestObject
+  include Roy
+
+  def http_get(*args)
+    'success'
+  end
+end
+
+class DefaultsTest < MiniTest::Unit::TestCase
+  include Rack::Test::Methods
+
+  def app
+    DefaultsTestObject.new
+  end
+
+  def test_default_settings
+    get '/'
+    assert_equal 'success', last_response.body
+  end
+end

data/test/plugins_test.rb

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

data/test/render_test.rb

@@ -12,12 +12,17 @@ class RenderTestObject
   include Roy
   include Roy::Render
 
-  roy allow: [:get]
+  roy allow: [:get],
+      views: 'test/views'
 
   def get(*args)
     case args.first
     when 'template'
-      halt 403
+      render :erb, :test
+    when 'template_layout'
+      render :erb, :layout do
+        render :erb, :test
+      end
     when 'inline'
       render :erb, Templates[:simple]
     when 'locals'
@@ -45,7 +50,12 @@ class RenderTest < MiniTest::Unit::TestCase
 
   def test_render_file_template
     get '/template'
-    fail!
+    assert_equal inline(:simple), last_response.body
+  end
+
+  def test_render_file_layout
+    get '/template_layout'
+    assert_equal inline(:simple), last_response.body
   end
 
   def test_render_inline_template

data/test/views/layout.erb

@@ -0,0 +1 @@
+<%= yield %>

data/test/views/test.erb

@@ -0,0 +1 @@
+<%= "Hello world!" %>

metadata

@@ -2,7 +2,7 @@
 name: roy
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.2.2
 platform: ruby
 authors: 
 - madx
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-23 00:00:00 Z
+date: 2011-10-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -84,10 +84,13 @@ files:
 - 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/prefix_test.rb
 - test/render_test.rb
+- test/views/layout.erb
+- test/views/test.erb
 homepage: https://github.com/madx/roy
 licenses: []
 
@@ -120,7 +123,10 @@ test_files:
 - 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/prefix_test.rb
 - test/render_test.rb
+- test/views/layout.erb
+- test/views/test.erb