cuba 3.0.1.rc2 → 3.1.0.rc1

data/CHANGELOG

@@ -1,3 +1,10 @@
+3.1.0.rc1
+
+* Do a deep clone of the settings object during inheritance.
+* Start namespacing plugins (i.e. settings[:render]).
+* Use rack/test when doing equire 'cuba/test'.
+* Capybara available via equire 'cuba/capybara'.
+
 3.0.0
 
 * Remove Cuba.build. Use subclassing instead.

data/cuba.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "cuba"
-  s.version           = "3.0.1.rc2"
+  s.version           = "3.1.0.rc1"
   s.summary           = "Microframework for web applications."
   s.description       = "Cuba is a microframework for web applications."
   s.authors           = ["Michel Martens"]

data/lib/cuba.rb

@@ -84,10 +84,17 @@ class Cuba
     @settings ||= {}
   end
 
+  def self.deepclone(obj)
+    Marshal.load(Marshal.dump(obj))
+  end
+
   def self.inherited(child)
-    child.settings.replace(settings)
+    child.settings.replace(deepclone(settings))
   end
 
+  attr :env
+  attr :req
+  attr :res
   attr :captures
 
   def initialize(&blk)
@@ -103,22 +110,10 @@ class Cuba
     dup.call!(env)
   end
 
-  def req
-    Thread.current[:_cuba_req]
-  end
-
-  def res
-    Thread.current[:_cuba_res]
-  end
-
-  def env
-    Thread.current[:_cuba_env]
-  end
-
   def call!(env)
-    Thread.current[:_cuba_env] = env
-    Thread.current[:_cuba_req] = Rack::Request.new(env)
-    Thread.current[:_cuba_res] = Cuba::Response.new
+    @env = env
+    @req = Rack::Request.new(env)
+    @res = Cuba::Response.new
 
     # This `catch` statement will either receive a
     # rack response tuple via a `halt`, or will

data/lib/cuba/capybara.rb

@@ -0,0 +1,13 @@
+require "cuba"
+require "cutest"
+require "capybara/dsl"
+
+class Cutest::Scope
+  if defined? Capybara::DSL
+    include Capybara::DSL
+  else
+    include Capybara
+  end
+end
+
+Capybara.app = Cuba

data/lib/cuba/render.rb

@@ -3,17 +3,28 @@ require "tilt"
 class Cuba
   module Render
     def self.setup(app)
-      app.settings[:template_engine] ||= "erb"
-      app.settings[:views] ||= File.expand_path("views", Dir.pwd)
+      app.settings[:render] ||= {}
+      app.settings[:render][:template_engine] ||= "erb"
+      app.settings[:render][:views] ||= File.expand_path("views", Dir.pwd)
+      app.settings[:render][:options] ||= {
+        default_encoding: Encoding.default_external
+      }
     end
 
     def view(template, locals = {}, layout = "layout")
       partial(layout, { content: partial(template, locals) }.merge(locals))
     end
 
+    def template_path(template)
+      "%s/%s.%s" % [
+        settings[:render][:views],
+        template,
+        settings[:render][:template_engine]
+      ]
+    end
+
     def partial(template, locals = {})
-      render("#{settings[:views]}/#{template}.#{settings[:template_engine]}",
-        locals, default_encoding: Encoding.default_external)
+      render(template_path(template), locals, settings[:render][:options])
     end
 
     # Render any type of template file supported by Tilt.
@@ -34,7 +45,7 @@ class Cuba
     #
     def render(template, locals = {}, options = {}, &block)
       _cache.fetch(template) {
-        Tilt.new(template, 1, options.merge(outvar: '@_output')
+        Tilt.new(template, 1, options.merge(outvar: '@_output'))
       }.render(self, locals, &block)
     end
 

data/lib/cuba/test.rb

@@ -1,13 +1,11 @@
 require "cuba"
 require "cutest"
-require "capybara/dsl"
+require "rack/test"
 
 class Cutest::Scope
-  if defined? Capybara::DSL
-    include Capybara::DSL
-  else
-    include Capybara
+  include Rack::Test::Methods
+
+  def app
+    Cuba
   end
 end
-
-Capybara.app = Cuba

data/test/rack.rb

@@ -0,0 +1,22 @@
+require File.expand_path("helper", File.dirname(__FILE__))
+require "cuba/test"
+
+scope do
+  test do
+    Cuba.define do
+      on root do
+        res.write "home"
+      end
+
+      on "about" do
+        res.write "about"
+      end
+    end
+
+    get "/"
+    assert_equal "home", last_response.body
+
+    get "/about"
+    assert_equal "about", last_response.body
+  end
+end

data/test/render.rb

@@ -3,20 +3,22 @@ require_relative "helper"
 require "cuba/render"
 
 test "doesn't override the settings if they already exist" do
-  Cuba.settings[:views] = "./test/views"
-  Cuba.settings[:template_engine] = "haml"
+  Cuba.settings[:render] = {
+    :views => "./test/views",
+    :template_engine => "haml"
+  }
 
   Cuba.plugin Cuba::Render
 
-  assert_equal "./test/views", Cuba.settings[:views]
-  assert_equal "haml", Cuba.settings[:template_engine]
+  assert_equal "./test/views", Cuba.settings[:render][:views]
+  assert_equal "haml", Cuba.settings[:render][:template_engine]
 end
 
 scope do
   setup do
     Cuba.plugin Cuba::Render
-    Cuba.settings[:views] = "./test/views"
-    Cuba.settings[:template_engine] = "erb"
+    Cuba.settings[:render][:views] = "./test/views"
+    Cuba.settings[:render][:template_engine] = "erb"
 
     Cuba.define do
       on "home" do
@@ -42,7 +44,7 @@ scope do
   end
 
   test "partial with str as engine" do
-    Cuba.settings[:template_engine] = "str"
+    Cuba.settings[:render][:template_engine] = "str"
 
     _, _, body = Cuba.call({ "PATH_INFO" => "/about", "SCRIPT_NAME" => "/" })
 
@@ -50,7 +52,7 @@ scope do
   end
 
   test "view with str as engine" do
-    Cuba.settings[:template_engine] = "str"
+    Cuba.settings[:render][:template_engine] = "str"
 
     _, _, body = Cuba.call({ "PATH_INFO" => "/home", "SCRIPT_NAME" => "/" })
 
@@ -62,7 +64,7 @@ test "caching behavior" do
   Thread.current[:_cache] = nil
 
   Cuba.plugin Cuba::Render
-  Cuba.settings[:views] = "./test/views"
+  Cuba.settings[:render][:views] = "./test/views"
 
   Cuba.define do
     on "foo/:i" do |i|

data/test/settings.rb

@@ -37,3 +37,16 @@ test do
 
   assert_equal ["Hello World"], body
 end
+
+# The following tests the settings clone bug where
+# we share the same reference. Deep cloning is the solution here.
+Cuba.settings[:mote] ||= {}
+Cuba.settings[:mote][:layout] ||= "layout"
+
+class Login < Cuba
+  settings[:mote][:layout] = "layout/guest"
+end
+
+test do
+  assert Login.settings[:mote].object_id != Cuba.settings[:mote].object_id
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cuba
 version: !ruby/object:Gem::Version
-  version: 3.0.1.rc2
+  version: 3.1.0.rc1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000 Z
+date: 2012-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2151841760 !ruby/object:Gem::Requirement
+  requirement: &2152007660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151841760
+  version_requirements: *2152007660
 - !ruby/object:Gem::Dependency
   name: cutest
-  requirement: &2151838500 !ruby/object:Gem::Requirement
+  requirement: &2152007040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151838500
+  version_requirements: *2152007040
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2151837080 !ruby/object:Gem::Requirement
+  requirement: &2152006120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151837080
+  version_requirements: *2152006120
 description: Cuba is a microframework for web applications.
 email:
 - michel@soveran.com
@@ -55,6 +55,7 @@ files:
 - CHANGELOG
 - README.md
 - Rakefile
+- lib/cuba/capybara.rb
 - lib/cuba/render.rb
 - lib/cuba/test.rb
 - lib/cuba.rb
@@ -74,6 +75,7 @@ files:
 - test/param.rb
 - test/path.rb
 - test/plugin.rb
+- test/rack.rb
 - test/redirect.rb
 - test/render.rb
 - test/root.rb