cuba-contrib 3.0.0.rc1 → 3.0.0.rc2

data/README.markdown

@@ -117,17 +117,16 @@ that's exactly how the `markdown` helper is written in
 `Cuba::TextHelpers`.
 
 A more complicated plugin for example, will make use of
-`Cuba::Settings` to provide default values:
+`Cuba.settings` to provide default values:
 
 ``` ruby
 module Rendering
   def self.setup(app)
-    app.plugin Cuba::Settings # we need this for default values
-    app.set :template_engine, "erb"
+    app.settings[:template_engine] = "erb"
   end
 
   def partial(template, locals = {})
-    render("#{template}.#{settings.template_engine}", locals)
+    render("#{template}.#{settings[:template_engine]}", locals)
   end
 end
 
@@ -139,4 +138,4 @@ This sample plugin actually resembles how `Cuba::Rendering` works.
 [cuba]: http://cuba.is
 [sites]: http://cuba.is/sites
 [mote]: http://github.com/soveran/mote
-[unix]: http://en.wikipedia.org/wiki/Unix_philosophy
+[unix]: http://en.wikipedia.org/wiki/Unix_philosophy

data/cuba-contrib.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "cuba-contrib"
-  s.version           = "3.0.0.rc1"
+  s.version           = "3.0.0.rc2"
   s.summary           = "Cuba plugins and utilities."
   s.description       = "Includes various helper tools for Cuba."
   s.authors           = ["Cyril David"]

data/lib/cuba/contrib.rb

@@ -2,7 +2,6 @@ class Cuba
   CONTRIB_ROOT = File.expand_path("../../", File.dirname(__FILE__))
 
   autoload :Prelude,     "cuba/contrib/prelude"
-  autoload :Rendering,   "cuba/contrib/rendering"
   autoload :Mote,        "cuba/contrib/mote"
   autoload :TextHelpers, "cuba/contrib/text_helpers"
   autoload :FormHelpers, "cuba/contrib/form_helpers"

data/test/mote.rb

@@ -21,17 +21,17 @@ end
 test do
   _, _, body = Cuba.call({ "PATH_INFO" => "/", "SCRIPT_NAME" => "" })
 
-  assert_response body, ["<title>Hola</title>\n<h1>Home</h1>"]
+  assert_response body, ["<title>Hola</title>\n<h1>Home</h1>\n\n"]
 end
 
 test do
   _, _, body = Cuba.call({ "PATH_INFO" => "/frag", "SCRIPT_NAME" => "" })
 
-  assert_response body, ["<h1>Bar</h1>"]
+  assert_response body, ["<h1>Bar</h1>\n"]
 end
 
 test do
   _, _, body = Cuba.call({ "PATH_INFO" => "/abs_path", "SCRIPT_NAME" => "" })
 
-  assert_response body, ["<title>Absolute</title>\n<h1>Abs Path</h1>"]
+  assert_response body, ["<title>Absolute</title>\n<h1>Abs Path</h1>\n\n"]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cuba-contrib
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc1
+  version: 3.0.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-14 00:00:00.000000000 Z
+date: 2012-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cuba
-  requirement: &2152386960 !ruby/object:Gem::Requirement
+  requirement: &2152117720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152386960
+  version_requirements: *2152117720
 - !ruby/object:Gem::Dependency
   name: cutest
-  requirement: &2152385700 !ruby/object:Gem::Requirement
+  requirement: &2152116800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152385700
+  version_requirements: *2152116800
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2152401460 !ruby/object:Gem::Requirement
+  requirement: &2152116280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152401460
+  version_requirements: *2152116280
 description: Includes various helper tools for Cuba.
 email:
 - me@cyrildavid.com
@@ -57,16 +57,11 @@ files:
 - lib/cuba/contrib/form_helpers.rb
 - lib/cuba/contrib/mote.rb
 - lib/cuba/contrib/prelude.rb
-- lib/cuba/contrib/rendering.rb
 - lib/cuba/contrib/text_helpers.rb
 - lib/cuba/contrib.rb
 - cuba-contrib.gemspec
-- test/caching.rb
 - test/helper.rb
-- test/layout.rb
 - test/mote.rb
-- test/rendering.rb
-- test/test.erb
 - test/text_helper.rb
 - views/field.mote
 - views/file.mote
@@ -95,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Cuba plugins and utilities.

data/lib/cuba/contrib/rendering.rb

@@ -1,49 +0,0 @@
-require "tilt"
-
-class Cuba
-  module Rendering
-    def self.setup(app)
-      app.settings[:template_engine] = "erb"
-      app.settings[:views] = File.expand_path("views", Dir.pwd)
-      app.settings[:layout] = "layout"
-    end
-
-    def view(template, locals = {}, layout = settings[:layout])
-      partial(layout, { content: partial(template, locals) }.merge(locals))
-    end
-
-    def partial(template, locals = {})
-      render("#{settings[:views]}/#{template}.#{settings[:template_engine]}",
-        locals, default_encoding: Encoding.default_external)
-    end
-
-    # Render any type of template file supported by Tilt.
-    #
-    # @example
-    #
-    #   # Renders home, and is assumed to be HAML.
-    #   render("home.haml")
-    #
-    #   # Renders with some local variables
-    #   render("home.haml", site_name: "My Site")
-    #
-    #   # Renders with HAML options
-    #   render("home.haml", {}, ugly: true, format: :html5)
-    #
-    #   # Renders in layout
-    #   render("layout.haml") { render("home.haml") }
-    #
-    def render(template, locals = {}, options = {}, &block)
-      _cache.fetch(template) {
-        Tilt.new(template, 1, options)
-      }.render(self, locals, &block)
-    end
-
-    # @private Used internally by #render to cache the
-    #          Tilt templates.
-    def _cache
-      Thread.current[:_cache] ||= Tilt::Cache.new
-    end
-    private :_cache
-  end
-end

data/test/caching.rb

@@ -1,17 +0,0 @@
-require File.expand_path("helper", File.dirname(__FILE__))
-
-test "executes on true" do
-  Cuba.plugin Cuba::Rendering
-
-  Cuba.define do
-    on "foo/:i" do |i|
-      res.write render("test/test.erb", title: i)
-    end
-  end
-
-  1000.times do |i|
-    _, _, resp = Cuba.call({ "PATH_INFO" => "/foo/#{i}", "SCRIPT_NAME" => "" })
-  end
-
-  assert_equal 1, Thread.current[:_cache].instance_variable_get(:@cache).size
-end

data/test/layout.rb

@@ -1,16 +0,0 @@
-require File.expand_path("helper", File.dirname(__FILE__))
-
-test "simple layout support" do
-  Cuba.plugin Cuba::Rendering
-  Cuba.define do
-    on true do
-      res.write render("test/fixtures/layout.erb") {
-        render("test/fixtures/content.erb")
-      }
-    end
-  end
-
-  _, _, resp = Cuba.call({})
-
-  assert_equal ["alfa beta\n\n"], resp.body
-end

data/test/rendering.rb

@@ -1,42 +0,0 @@
-require_relative "helper"
-
-Cuba.plugin Cuba::Rendering
-Cuba.settings[:views] = "./test/views"
-
-Cuba.define do
-  on "home" do
-    res.write view("home", name: "Agent Smith", title: "Home")
-  end
-
-  on "about" do
-    res.write partial("about", title: "About Cuba")
-  end
-end
-
-test "partial" do
-  _, _, body = Cuba.call({ "PATH_INFO" => "/about", "SCRIPT_NAME" => "/" })
-
-  assert_response body, ["<h1>About Cuba</h1>"]
-end
-
-test "view" do
-  _, _, body = Cuba.call({ "PATH_INFO" => "/home", "SCRIPT_NAME" => "/" })
-
-  assert_response body, ["<title>Cuba: Home</title>\n<h1>Home</h1>\n<p>Hello Agent Smith</p>"]
-end
-
-test "partial with str as engine" do
-  Cuba.settings[:template_engine] = "str"
-
-  _, _, body = Cuba.call({ "PATH_INFO" => "/about", "SCRIPT_NAME" => "/" })
-
-  assert_response body, ["<h1>About Cuba</h1>"]
-end
-
-test "view with str as engine" do
-  Cuba.settings[:template_engine] = "str"
-
-  _, _, body = Cuba.call({ "PATH_INFO" => "/home", "SCRIPT_NAME" => "/" })
-
-  assert_response body, ["<title>Cuba: Home</title>\n<h1>Home</h1>\n<p>Hello Agent Smith</p>"]
-end

data/test/test.erb

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