cuba 3.8.0 → 3.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c41182a06c40d94e076e5cd07b77a1b6b09c2129
-  data.tar.gz: 33cedd76ce5cea5a70a0db7ec33b405e5b0153ba
+SHA256:
+  metadata.gz: 0dd5ceaab614b795ad92e63b73c2d1d3359455a7970c703a366c781fc2b983ea
+  data.tar.gz: aa14c451bcfff884a710dd41105f1fc1ec24d03ab2dfb3ec25b264f3a136f2c7
 SHA512:
-  metadata.gz: 7093091a3b5e98389553d608bf4e7cedb9818141d0e09fbd6132c27e5783f04b97e9d151ba7234e5dd81a41d28d9e9dd80547e4d878bf4a098a6ebdfd886740a
-  data.tar.gz: 829c737f9dc612a532a0650a8a84a3a46671e153f74dfb10faead95de4e378afc6778c2ac8b3371d1e72a6c250f392f0f10dc5e30aa945c04d0083afdbf1abc7
+  metadata.gz: 970cab90c32a0c39862e79087f5740debd0d5d264b6bca0c6d94d60fee73645dc34e9c634459d9c952316f6000328f23f137d2f908a4e6e08a7040fecf1f667d
+  data.tar.gz: cbc70d253a2951d31d6f82c0fb8bb25e687817d687a0508d8ddd960bec9f43d062b680bd9221503a58f60fb3d594b51ff51668f594e4022b04c416148169d5c1

data/.gems

@@ -1,4 +1,4 @@
-cutest -v 1.2.2
-tilt -v 2.0.1
-rack-test -v 0.6.3
-rack -v 2.0.1
+rack -v 2.2.3
+rack-test -v 1.1.0
+cutest -v 1.2.3
+tilt -v 2.0.10

data/CHANGELOG

@@ -1,3 +1,11 @@
+3.9.0
+
+* Cache regular expressions
+
+3.8.1
+
+* Remove requirement on Time
+
 3.8.0
 
 * Change gemspec to allow Rack 2.

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
@@ -416,6 +416,14 @@ on get, "api" do ... end
 Actually, `get` is syntax sugar for `req.get?`, which in turn is syntax sugar
 for `env["REQUEST_METHOD"] == "GET"`.
 
+Headers
+-------
+
+You can set the headers by assigning values to the hash `req.headers`.
+If you want to inspect the incoming headers, you have to read from
+the `env` hash. For example, if you want to know the referrer you
+can check `env["HTTP_REFERER"]`.
+
 Request and Response
 --------------------
 
@@ -514,6 +522,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
 -------
 
@@ -712,7 +761,7 @@ Contributing
 ------------
 
 A good first step is to meet us on IRC and discuss ideas. If that's
-not possible, you can create an issue explaning the proposed change
+not possible, you can create an issue explaining the proposed change
 and a use case. We pay a lot of attention to use cases, because our
 goal is to keep the code base simple. In many cases, the result of
 a conversation will be the creation of another tool, instead of the

data/cuba.gemspec

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

data/lib/cuba.rb

@@ -1,15 +1,22 @@
+require "delegate"
 require "rack"
-require "time"
 
 class Cuba
   SLASH   = "/".freeze
   EMPTY   = "".freeze
   SEGMENT = "([^\\/]+)".freeze
   DEFAULT = "text/html; charset=utf-8".freeze
+  REGEXES = Hash.new { |h, pattern| h[pattern] = /\A\/(#{pattern})(\/|\z)/ }
 
   class Response
     LOCATION = "Location".freeze
 
+    module ContentType
+      HTML = "text/html".freeze        # :nodoc:
+      TEXT = "text/plain".freeze       # :nodoc:
+      JSON = "application/json".freeze # :nodoc:
+    end
+
     attr_accessor :status
 
     attr :body
@@ -38,6 +45,24 @@ class Cuba
       @body << s
     end
 
+    # Write response body as text/plain
+    def text(str)
+      @headers[Rack::CONTENT_TYPE] = ContentType::TEXT
+      write(str)
+    end
+
+    # Write response body as text/html
+    def html(str)
+      @headers[Rack::CONTENT_TYPE] = ContentType::HTML
+      write(str)
+    end
+
+    # Write response body as application/json
+    def json(str)
+      @headers[Rack::CONTENT_TYPE] = ContentType::JSON
+      write(str)
+    end
+
     def redirect(path, status = 302)
       @headers[LOCATION] = path
       @status  = status
@@ -212,7 +237,7 @@ class Cuba
   private :try
 
   def consume(pattern)
-    matchdata = env[Rack::PATH_INFO].match(/\A\/(#{pattern})(\/|\z)/)
+    matchdata = env[Rack::PATH_INFO].match(REGEXES[pattern])
 
     return false unless matchdata
 
@@ -262,7 +287,7 @@ class Cuba
   #     # If not provided, username == "guest"
   #   end
   def param(key, default = nil)
-    value = req[key] || default
+    value = req.params[key.to_s] || default
 
     lambda { captures << value unless value.to_s.empty? }
   end

data/test/accept.rb

@@ -30,3 +30,48 @@ test "tests don't fail when you don't specify an accept type" do
 
   assert_response body, ["Default action"]
 end
+
+test "accept HTML mimetype" do
+  Cuba.define do
+    on accept("text/html") do
+      res.write Cuba::Response::ContentType::HTML
+    end
+  end
+
+  env = { "HTTP_ACCEPT" => "text/html",
+          "SCRIPT_NAME" => "/", "PATH_INFO" => "/post" }
+
+   _, _, body = Cuba.call(env)
+
+  assert_response body, ["text/html"]
+end
+
+test "accept TEXT mimetype" do
+  Cuba.define do
+    on accept("text/plain") do
+      res.write Cuba::Response::ContentType::TEXT
+    end
+  end
+
+  env = { "HTTP_ACCEPT" => "text/plain",
+          "SCRIPT_NAME" => "/", "PATH_INFO" => "/post" }
+
+   _, _, body = Cuba.call(env)
+
+  assert_response body, ["text/plain"]
+end
+
+test "accept JSON mimetype" do
+  Cuba.define do
+    on accept("application/json") do
+      res.write Cuba::Response::ContentType::JSON
+    end
+  end
+
+  env = { "HTTP_ACCEPT" => "application/json",
+          "SCRIPT_NAME" => "/", "PATH_INFO" => "/get" }
+
+   _, _, body = Cuba.call(env)
+
+  assert_response body, ["application/json"]
+end

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

data/test/cookie.rb

@@ -11,9 +11,9 @@ test "set cookie" do
 
   env = { "SCRIPT_NAME" => "/", "PATH_INFO" => "/" }
 
-   _, headers, body = Cuba.call(env)
+  _, headers, body = Cuba.call(env)
 
-   assert_equal "foo=bar\nbar=baz", headers["Set-Cookie"]
+  assert_equal "foo=bar\nbar=baz", headers["Set-Cookie"]
 end
 
 test "delete cookie" do
@@ -27,8 +27,8 @@ test "delete cookie" do
 
   env = { "SCRIPT_NAME" => "/", "PATH_INFO" => "/" }
 
-   _, headers, body = Cuba.call(env)
+  _, headers, body = Cuba.call(env)
 
-   assert_equal "foo=; max-age=0; expires=Thu, 01 Jan 1970 00:00:00 -0000",
-     headers["Set-Cookie"]
+  assert_equal "foo=; max-age=0; expires=Thu, 01 Jan 1970 00:00:00 GMT",
+    headers["Set-Cookie"]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cuba
 version: !ruby/object:Gem::Version
-  version: 3.8.0
+  version: 3.9.3
 platform: ruby
 authors:
 - Michel Martens
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2020-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -137,7 +137,7 @@ homepage: https://github.com/soveran/cuba
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -152,9 +152,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Microframework for web applications.
 test_files: []