cuba-contrib 0.1.0.rc2 → 3.0.0.rc1

data/cuba-contrib.gemspec

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

data/lib/cuba/contrib.rb

@@ -1,22 +1,9 @@
 class Cuba
   CONTRIB_ROOT = File.expand_path("../../", File.dirname(__FILE__))
 
-  def self.plugin(mixin)
-    include mixin
-    extend  mixin::ClassMethods if defined?(mixin::ClassMethods)
-
-    mixin.setup(self) if mixin.respond_to?(:setup)
-  end
-
-  # TODO: remove this as soon as cuba core implements this.
-  def session
-    env["rack.session"]
-  end
-
-  autoload :Prelude,    "cuba/contrib/prelude"
-  autoload :Rendering,  "cuba/contrib/rendering"
-  autoload :Settings,   "cuba/contrib/settings"
-  autoload :Mote,       "cuba/contrib/mote"
+  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"
-end
+end

data/lib/cuba/contrib/mote.rb

@@ -5,17 +5,15 @@ class Cuba
     include ::Mote::Helpers
 
     def self.setup(app)
-      app.plugin Cuba::Settings
-
-      app.set :views,  File.expand_path("views", Dir.pwd)
-      app.set :layout, "layout"
+      app.settings[:views]  = File.expand_path("views", Dir.pwd)
+      app.settings[:layout] = "layout"
     end
 
     def partial(template, locals = {})
       mote(mote_path(template), locals)
     end
 
-    def view(template, locals = {}, layout = settings.layout)
+    def view(template, locals = {}, layout = settings[:layout])
       raise NoLayout.new(self) unless layout
 
       partial(layout, locals.merge(mote_vars(partial(template, locals))))
@@ -24,7 +22,7 @@ class Cuba
     def mote_path(template)
       return template if template.end_with?(".mote")
 
-      File.expand_path("#{template}.mote", settings.views)
+      File.join(settings[:views], "#{template}.mote")
     end
 
     def mote_vars(content)
@@ -39,8 +37,8 @@ class Cuba
       end
 
       def message
-        "Missing Layout: Try doing #{instance.class}.set :layout, 'layout'"
+        "Missing Layout: Try doing #{instance.class}.settings[:layout] = 'layout'"
       end
     end
   end
-end
+end

data/lib/cuba/contrib/rendering.rb

@@ -3,17 +3,17 @@ require "tilt"
 class Cuba
   module Rendering
     def self.setup(app)
-      app.plugin Cuba::Settings
-      app.set :template_engine, "erb"
-      app.set :views, File.expand_path("views", Dir.pwd)
+      app.settings[:template_engine] = "erb"
+      app.settings[:views] = File.expand_path("views", Dir.pwd)
+      app.settings[:layout] = "layout"
     end
 
-    def view(template, locals = {}, layout = "layout")
+    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}",
+      render("#{settings[:views]}/#{template}.#{settings[:template_engine]}",
         locals, default_encoding: Encoding.default_external)
     end
 
@@ -34,9 +34,16 @@ class Cuba
     #   render("layout.haml") { render("home.haml") }
     #
     def render(template, locals = {}, options = {}, &block)
-      _cache.fetch(template, locals) {
+      _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
+end

data/test/caching.rb

@@ -0,0 +1,17 @@
+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

@@ -0,0 +1,16 @@
+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/mote.rb

@@ -1,8 +1,8 @@
 require_relative "helper"
 
 Cuba.plugin Cuba::Mote
-
-Cuba.set :views, "./test/views"
+Cuba.use Rack::Session::Cookie
+Cuba.settings[:views] = "./test/views"
 
 Cuba.define do
   on "frag" do

data/test/rendering.rb

@@ -1,7 +1,7 @@
 require_relative "helper"
 
 Cuba.plugin Cuba::Rendering
-Cuba.views = "./test/views"
+Cuba.settings[:views] = "./test/views"
 
 Cuba.define do
   on "home" do
@@ -26,7 +26,7 @@ test "view" do
 end
 
 test "partial with str as engine" do
-  Cuba.template_engine = "str"
+  Cuba.settings[:template_engine] = "str"
 
   _, _, body = Cuba.call({ "PATH_INFO" => "/about", "SCRIPT_NAME" => "/" })
 
@@ -34,9 +34,9 @@ test "partial with str as engine" do
 end
 
 test "view with str as engine" do
-  Cuba.template_engine = "str"
+  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
+end

data/test/test.erb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cuba-contrib
 version: !ruby/object:Gem::Version
-  version: 0.1.0.rc2
+  version: 3.0.0.rc1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-23 00:00:00.000000000 Z
+date: 2012-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cuba
-  requirement: &2152386760 !ruby/object:Gem::Requirement
+  requirement: &2152386960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152386760
+  version_requirements: *2152386960
 - !ruby/object:Gem::Dependency
   name: cutest
-  requirement: &2152385600 !ruby/object:Gem::Requirement
+  requirement: &2152385700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152385600
+  version_requirements: *2152385700
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2152401420 !ruby/object:Gem::Requirement
+  requirement: &2152401460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152401420
+  version_requirements: *2152401460
 description: Includes various helper tools for Cuba.
 email:
 - me@cyrildavid.com
@@ -58,15 +58,15 @@ files:
 - lib/cuba/contrib/mote.rb
 - lib/cuba/contrib/prelude.rb
 - lib/cuba/contrib/rendering.rb
-- lib/cuba/contrib/settings.rb
 - lib/cuba/contrib/text_helpers.rb
 - lib/cuba/contrib.rb
 - cuba-contrib.gemspec
-- test/contrib.rb
+- test/caching.rb
 - test/helper.rb
+- test/layout.rb
 - test/mote.rb
 - test/rendering.rb
-- test/settings.rb
+- test/test.erb
 - test/text_helper.rb
 - views/field.mote
 - views/file.mote

data/lib/cuba/contrib/settings.rb

@@ -1,25 +0,0 @@
-class Cuba
-  module Settings
-    def settings
-      self.class
-    end
-
-    module ClassMethods
-      def set(key, value)
-        metaclass.send :attr_writer, key
-        metaclass.module_eval %{
-          def #{key}
-            @#{key} ||= #{value.inspect}
-          end
-        }
-
-        send :"#{key}=", value
-      end
-
-    private
-      def metaclass
-        class << self; self; end
-      end
-    end
-  end
-end

data/test/contrib.rb

@@ -1,68 +0,0 @@
-require_relative "helper"
-
-scope do
-  module Helper
-    def clean(str)
-      str.strip
-    end
-  end
-
-  Cuba.plugin Helper
-
-  Cuba.define do
-    on default do
-      res.write clean " foo "
-    end
-  end
-
-  test do
-    _, _, body = Cuba.call({ "PATH_INFO" => "", "SCRIPT_NAME" => "" })
-
-    assert_response body, ["foo"]
-  end
-end
-
-scope do
-  module Number
-    def num
-      1
-    end
-  end
-
-  module Plugin
-    def self.setup(app)
-      app.plugin Number
-    end
-
-    def bar
-      "baz"
-    end
-
-    module ClassMethods
-      def foo
-        "bar"
-      end
-    end
-  end
-
-  Cuba.reset!
-
-  Cuba.plugin Plugin
-
-  Cuba.define do
-    on default do
-      res.write bar
-      res.write num
-    end
-  end
-
-  test do
-    assert_equal "bar", Cuba.foo
-  end
-
-  test do
-    _, _, body = Cuba.call({ "PATH_INFO" => "", "SCRIPT_NAME" => "" })
-
-    assert_response body, ["baz", "1"]
-  end
-end

data/test/settings.rb

@@ -1,38 +0,0 @@
-require_relative "helper"
-
-Cuba.plugin Cuba::Settings
-Cuba.set :foo, "bar"
-
-Cuba.define do
-  on default do
-    res.write settings.foo
-  end
-end
-
-class Admin < Cuba
-end
-
-test do
-  assert_equal "bar", Cuba.foo
-end
-
-test do
-  _, _, body = Cuba.call({ "PATH_INFO" => "", "SCRIPT_NAME" => "" })
-  assert_response body, ["bar"]
-end
-
-test do
-  assert_equal "bar", Admin.foo
-
-  Admin.foo = "baz"
-
-  assert_equal "baz", Admin.foo
-  assert_equal "bar", Cuba.foo  
-end
-
-test do
-  Cuba.foo = "baz"
-  assert_equal "baz", Cuba.foo
-end
-
-