cuba 3.8.0 → 3.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c41182a06c40d94e076e5cd07b77a1b6b09c2129
-  data.tar.gz: 33cedd76ce5cea5a70a0db7ec33b405e5b0153ba
+  metadata.gz: 6428d24a19fc99881ffad1b18f7757fe6c3656d8
+  data.tar.gz: 22adf9cf4289ff9976cb364a3c4b9795e7225015
 SHA512:
-  metadata.gz: 7093091a3b5e98389553d608bf4e7cedb9818141d0e09fbd6132c27e5783f04b97e9d151ba7234e5dd81a41d28d9e9dd80547e4d878bf4a098a6ebdfd886740a
-  data.tar.gz: 829c737f9dc612a532a0650a8a84a3a46671e153f74dfb10faead95de4e378afc6778c2ac8b3371d1e72a6c250f392f0f10dc5e30aa945c04d0083afdbf1abc7
+  metadata.gz: 27074004e24756499709bd7c6272e54e2d4c60e6ced2831f893872a514a8ef85d2d91f6c5a4eb70f39565f5059be84e407ffb45a82e66244e3b9521c3c219ae8
+  data.tar.gz: c4e893414f0cfa688a583bccf516e646514ae635cb37ee79a74f3b2bbd48eb886623a8447eab39f2840057bb5706676d9c302ca896f98b6d50c844df344b670b

data/README.md

@@ -360,7 +360,7 @@ Cuba.define do
     csrf.reset!
 
     res.status = 403
-    res.write("Not authorized")
+    res.write("Forbidden")
 
     halt(res.finish)
   end
@@ -514,6 +514,47 @@ Cuba.define do
 end
 ```
 
+## Embedding routes from other modules
+
+While the `run` command allows you to handle over the control to a
+sub app, sometimes you may want to just embed routes defined in
+another module. There's no built-in method to do it, but if you are
+willing to experiment you can try the following.
+
+Let's say you have defined routes in modules `A` and `B`, and you
+want to mount those routes in your application.
+
+First, you will have to extend Cuba with this code:
+
+```ruby
+class Cuba
+  def mount(app)
+    result = app.call(req.env)
+    halt result if result[0] != 404
+  end
+end
+```
+
+It doesn't matter where you define it as long as Cuba has already
+been required. For instance, you could extract that to a plugin and
+it would work just fine.
+
+Then, in your application, you can use it like this:
+
+```ruby
+Cuba.define do
+  on default do
+    mount A 
+    mount B
+  end
+end
+```
+
+It should halt the request only if the resulting status from calling
+the mounted app is not 404. If you run into some unexpected behavior,
+let me know by creating an issue and we'll look at how to workaround
+any difficulties.
+
 Testing
 -------
 

data/cuba.gemspec

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

data/lib/cuba.rb

@@ -1,5 +1,4 @@
 require "rack"
-require "time"
 
 class Cuba
   SLASH   = "/".freeze

data/test/composition.rb

@@ -1,11 +1,11 @@
 require File.expand_path("helper", File.dirname(__FILE__))
 
 test "composing on top of a PATH" do
-  Services = Cuba.new {
+  Services = Cuba.new do
     on "services/:id" do |id|
       res.write "View #{id}"
     end
-  }
+  end
 
   Cuba.define do
     on "provider" do
@@ -67,3 +67,37 @@ test "redefining not_found" do
   assert_response resp, ["Error 404"]
   assert_equal status,  404
 end
+
+test "multi mount" do
+  A = Cuba.new do
+    on "a" do
+      res.write "View a"
+    end
+  end
+
+  B = Cuba.new do
+    on "b" do
+      res.write "View b"
+    end
+  end
+
+  class Cuba
+    def mount(app)
+      result = app.call(req.env)
+      halt result if result[0] != 404
+    end
+  end
+
+  Cuba.define do
+    on default do
+      mount A 
+      mount B
+    end
+  end
+
+  env = { "SCRIPT_NAME" => "/", "PATH_INFO" => "/b" }
+
+   _, _, resp = Cuba.call(env)
+
+   assert_response resp, ["View b"]
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cuba
 version: !ruby/object:Gem::Version
-  version: 3.8.0
+  version: 3.8.1
 platform: ruby
 authors:
 - Michel Martens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2017-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Microframework for web applications.