cuba-contrib 3.0.1 → 3.1.0.rc1

data/cuba-contrib.gemspec

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

data/lib/cuba/contrib/mote.rb

@@ -5,28 +5,33 @@ class Cuba
     include ::Mote::Helpers
 
     def self.setup(app)
-      app.settings[:views]  ||= File.expand_path("views", Dir.pwd)
-      app.settings[:layout] ||= "layout"
+      app.settings[:mote] ||= {}
+      app.settings[:mote][:views]  ||= File.expand_path("views", Dir.pwd)
+      app.settings[:mote][:layout] ||= "layout"
     end
 
     def partial(template, locals = {})
-      mote(mote_path(template), locals)
+      mote(mote_path(template), locals.merge(this: self))
     end
 
-    def view(template, locals = {}, layout = settings[:layout])
+    def view(template, locals = {}, layout = settings[:mote][:layout])
       raise NoLayout.new(self) unless layout
 
       partial(layout, locals.merge(mote_vars(partial(template, locals))))
     end
 
+    def render(template, locals = {}, layout = settings[:mote][:layout])
+      res.write view(template, locals, layout)
+    end
+
     def mote_path(template)
       return template if template.end_with?(".mote")
 
-      File.join(settings[:views], "#{template}.mote")
+      File.join(settings[:mote][:views], "#{template}.mote")
     end
 
     def mote_vars(content)
-      { content: content, session: session }
+      { content: content }
     end
 
     class NoLayout < StandardError

data/test/mote.rb

@@ -1,19 +1,20 @@
 require_relative "helper"
 
 test "doesn't override already existing settings" do
-  Cuba.settings[:views] = "./templates"
-  Cuba.settings[:layout] = "guest"
+  Cuba.settings[:mote] ||= {}
+  Cuba.settings[:mote][:views] = "./templates"
+  Cuba.settings[:mote][:layout] = "guest"
 
   Cuba.plugin Cuba::Mote
 
-  assert_equal "./templates", Cuba.settings[:views]
-  assert_equal "guest", Cuba.settings[:layout]
+  assert_equal "./templates", Cuba.settings[:mote][:views]
+  assert_equal "guest", Cuba.settings[:mote][:layout]
 end
 
 Cuba.plugin Cuba::Mote
 Cuba.use Rack::Session::Cookie
-Cuba.settings[:views] = "./test/views"
-Cuba.settings[:layout] = "layout"
+Cuba.settings[:mote][:views] = "./test/views"
+Cuba.settings[:mote][:layout] = "layout"
 
 Cuba.define do
   on "frag" do
@@ -24,25 +25,57 @@ Cuba.define do
     res.write view("home", title: "Hola")
   end
 
+  on "render" do
+    render("home", title: "Hola")
+  end
+
+  on "partial-fu" do
+    res.write partial("partial1")
+  end
+
   on "abs_path" do
     res.write view("./test/views/custom/abs_path.mote", title: "Absolute")
   end
 end
 
-test do
+test "view" do
   _, _, body = Cuba.call({ "PATH_INFO" => "/", "SCRIPT_NAME" => "" })
 
   assert_response body, ["<title>Hola</title>\n<h1>Home</h1>\n\n"]
 end
 
-test do
+test "render" do
+  _, _, body = Cuba.call({ "PATH_INFO" => "/render", "SCRIPT_NAME" => "" })
+
+  assert_response body, ["<title>Hola</title>\n<h1>Home</h1>\n\n"]
+end
+
+test "partial-fu" do
+  # We verify that nesting partials and contexts are passed along properly.
+  _, _, body = Cuba.call({ "PATH_INFO" => "/partial-fu/A", "SCRIPT_NAME" => "" })
+  assert_response body, ["partial1\npartial2\n/partial-fu/A\n\n"]
+
+  # And that we're able to use req.path in the inner partials without an issue.
+  _, _, body = Cuba.call({ "PATH_INFO" => "/partial-fu/B", "SCRIPT_NAME" => "" })
+  assert_response body, ["partial1\npartial2\n/partial-fu/B\n\n"]
+end
+
+test "partial" do
   _, _, body = Cuba.call({ "PATH_INFO" => "/frag", "SCRIPT_NAME" => "" })
 
   assert_response body, ["<h1>Bar</h1>\n"]
 end
 
-test do
+test "use of absolute mote path" do
   _, _, body = Cuba.call({ "PATH_INFO" => "/abs_path", "SCRIPT_NAME" => "" })
 
   assert_response body, ["<title>Absolute</title>\n<h1>Abs Path</h1>\n\n"]
 end
+
+test "use of absolute mote path for the layout" do
+  Cuba.settings[:mote][:layout] = "./test/views/custom_layout.mote"
+
+  _, _, body = Cuba.call({ "PATH_INFO" => "/", "SCRIPT_NAME" => "" })
+
+  assert_response body, ["<title>Custom Layout: Hola</title>\n<h1>Home</h1>\n\n"]
+end

metadata

@@ -1,30 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: cuba-contrib
 version: !ruby/object:Gem::Version
-  version: 3.0.1
-  prerelease: 
+  version: 3.1.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Cyril David
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-20 00:00:00.000000000 Z
+date: 2012-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cuba
-  requirement: &70149650848280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.1.rc3
   type: :runtime
   prerelease: false
-  version_requirements: *70149650848280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.1.rc3
 - !ruby/object:Gem::Dependency
   name: cutest
-  requirement: &70149650847560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70149650847560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70149650846740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70149650846740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Includes various helper tools for Cuba.
 email:
 - me@cyrildavid.com
@@ -87,12 +102,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Cuba plugins and utilities.