cuba-contrib 3.1.0.rc2 → 3.1.0

data/README.markdown

@@ -3,7 +3,7 @@
 [Cuba][cuba] is probably one of the tiniest rack-based micro
 frameworks around. Weighing in at only __138 LOC__, it has proven
 itself to be a very resilient tool in various web application domains.
-Check [the list of sites][sites] built using Cuba in order to
+Check [the list of sites][cuba] built using Cuba in order to
 grasp the endless possibilities.
 
 ## STEP 1: Cuba::Prelude
@@ -61,6 +61,7 @@ We prefer to use our home-grown templating engine called
 ``` ruby
 require "cuba"
 require "cuba/contrib"
+require "mote"
 
 Cuba.plugin Cuba::Mote
 
@@ -72,20 +73,29 @@ Cuba.define do
   on "about" do
     res.write partial("about")
   end
+
+  # Or you can use `render` as a shortcut to `res.write view(...)`.
+  on "contact" do
+    render("contact")
+  end
 end
 ```
 
 This assumes that you have a `views` folder, containing a `home.mote`
-and an `about.mote`.
+and an `about.mote`. Your layout defaults to `layout.mote`.
 
 ### Classic templating needs
 
+**Note**: as of Cuba 3.0, the plugin architecture of `cuba-contrib` has
+been merged into the core codebase. The following example should work with
+Cuba 3.0 without even requiring `cuba-contrib`.
+
 ``` ruby
 require "cuba"
-require "cuba/contrib"
+require "cuba/render"
 
-Cuba.plugin Cuba::Rendering
-Cuba.set :template_engine, "haml"
+Cuba.plugin Cuba::Render
+Cuba.settings[:render][:template_engine] = "haml"
 
 Cuba.define do
   on "home" do
@@ -103,9 +113,11 @@ end
 Authoring your own plugins is pretty straightforward.
 
 ``` ruby
+require "bluecloth"
+
 module MyOwnHelper
   def markdown(str)
-    BlueCloth.new(str).to_html
+    Markdown.new(str).to_html
   end
 end
 
@@ -120,22 +132,22 @@ A more complicated plugin for example, will make use of
 `Cuba.settings` to provide default values:
 
 ``` ruby
-module Rendering
+module MarkdownView
   def self.setup(app)
-    app.settings[:template_engine] = "erb"
+    app.settings[:markdown_view] ||= {}
+    app.settings[:markdown_view][:views] = "markdown"
   end
 
-  def partial(template, locals = {})
-    render("#{template}.#{settings[:template_engine]}", locals)
+  def markdown_view(template)
+    data = File.read("#{settings[:markdown_view][:views]}/#{template}.markdown")
+
+    res.write Markdown.new(data).to_html
   end
 end
 
-Cuba.plugin Rendering
+Cuba.plugin MarkdownView
 ```
 
-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

data/cuba-contrib.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "cuba-contrib"
-  s.version           = "3.1.0.rc2"
+  s.version           = "3.1.0"
   s.summary           = "Cuba plugins and utilities."
   s.description       = "Includes various helper tools for Cuba."
   s.authors           = ["Cyril David"]
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
     "test/*.*"
   ]
 
-  s.add_dependency "cuba", "3.1.0.rc2"
+  s.add_dependency "cuba", "~> 3.1"
   s.add_development_dependency "cutest"
-  s.add_development_dependency "capybara"
+  s.add_development_dependency "mote", "~> 1.0"
 end

data/lib/cuba/mote.rb

@@ -11,7 +11,7 @@ class Cuba
     end
 
     def partial(template, locals = {})
-      mote(mote_path(template), locals.merge(this: self))
+      mote(mote_path(template), locals.merge(this: self), TOPLEVEL_BINDING)
     end
 
     def view(template, locals = {}, layout = settings[:mote][:layout])

data/test/mote.rb

@@ -36,6 +36,20 @@ Cuba.define do
   on "abs_path" do
     res.write view("./test/views/custom/abs_path.mote", title: "Absolute")
   end
+
+  def foo
+    req.path
+  end
+
+  on "foo" do
+    on "right" do
+      res.write partial("foo-right")
+    end
+
+    on "wrong" do
+      res.write partial("foo-wrong")
+    end
+  end
 end
 
 test "view" do
@@ -79,3 +93,13 @@ test "use of absolute mote path for the layout" do
 
   assert_response body, ["<title>Custom Layout: Hola</title>\n<h1>Home</h1>\n\n"]
 end
+
+test "attempting to use defined variables in cuba context is a problem" do
+  assert_raise NameError do
+    Cuba.call({ "PATH_INFO" => "/foo/wrong", "SCRIPT_NAME" => "" })
+  end
+
+  _, _, body = Cuba.call({ "PATH_INFO" => "/foo/right", "SCRIPT_NAME" => "" })
+
+  assert_response body, ["/foo/right\n"]
+end

metadata

@@ -1,32 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: cuba-contrib
 version: !ruby/object:Gem::Version
-  version: 3.1.0.rc2
-  prerelease: 6
+  version: 3.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Cyril David
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-18 00:00:00.000000000 Z
+date: 2012-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cuba
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0.rc2
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0.rc2
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: cutest
   requirement: !ruby/object:Gem::Requirement
@@ -44,21 +44,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: mote
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 description: Includes various helper tools for Cuba.
 email:
 - me@cyrildavid.com
@@ -94,9 +94,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23