cuba 3.9.2 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7eab2e59d038c8c841524498b060412e0a608c7c
-  data.tar.gz: 35004e311b5df0deed594667027096b375551f49
+SHA256:
+  metadata.gz: 7d1132f58ee467460030f12c618ab68ec947bb83d8b20df22588475d37e95994
+  data.tar.gz: 7e73fb3214fa781d9a5564d780d3a0a4e6e32ba1833ce55e286ab62b75002b04
 SHA512:
-  metadata.gz: 38acf4e7fb1a06a0709e2c907f974a3b2aa51776742e709ec1d0149fd08e8160a5a2388c4bb98adfe1590aaa0e0b87a0240cac7f9432bc9f21350f5db885458c
-  data.tar.gz: db8ad6eecea1c976bc893c5cb20dada8926e2387a9a9c07c04ef835e6eccaaa48645aac8b62c5d70b66ab53ab835c44b68d437890b7a4233096eb4cb8048ab01
+  metadata.gz: 046baecf8b875441123af6279840efa324757e9579324e5accc5f39b5d5f1df01be38c07af2e08c164f2a55e611c7653282239bbc3fd558feb6290a658c46eb1
+  data.tar.gz: b2812bc154953daa7e84972d1380aaaf68612e3f7162389315932404614e625a0a002ab21ba13c76c77727694a6b4696810206927a7798c600cce0aff70fa3c2

data/.gems

@@ -1,4 +1,5 @@
-cutest -v 1.2.2
-tilt -v 2.0.1
-rack-test -v 0.6.3
-rack -v 2.0.1
+cutest -v 1.2.3
+tilt -v 2.0.10
+rack -v 3.0.2
+rack-test -v 2.0.2
+rack-session -v 0.3.0

data/README.md

@@ -761,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.9.2"
+  s.version           = "4.0.0"
   s.summary           = "Microframework for web applications."
   s.description       = "Cuba is a microframework for web applications."
   s.authors           = ["Michel Martens"]
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
 
   s.files = `git ls-files`.split("\n")
 
-  s.add_dependency "rack", ">= 1.6.0"
+  s.add_dependency "rack", ">= 3.0.0"
   s.add_development_dependency "cutest"
   s.add_development_dependency "rack-test"
   s.add_development_dependency "tilt"

data/lib/cuba/safe/csrf.rb

@@ -22,7 +22,7 @@ class Cuba
 
         def safe?
           return req.get? || req.head? ||
-            req[:csrf_token] == token ||
+            req.params["csrf_token"] == token ||
             req.env["HTTP_X_CSRF_TOKEN"] == token
         end
 

data/lib/cuba.rb

@@ -1,4 +1,6 @@
+require "delegate"
 require "rack"
+require "rack/session"
 
 class Cuba
   SLASH   = "/".freeze
@@ -10,6 +12,12 @@ class Cuba
   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 +46,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

data/test/accept.rb

@@ -3,7 +3,7 @@ require File.expand_path("helper", File.dirname(__FILE__))
 test "accept mimetypes" do
   Cuba.define do
     on accept("application/xml") do
-      res.write res["Content-Type"]
+      res.write res["content-type"]
     end
   end
 
@@ -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/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", "bar=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=bar", "foo=; max-age=0; expires=Thu, 01 Jan 1970 00:00:00 GMT"],
+    headers["set-cookie"]
 end

data/test/csrf.rb

@@ -13,7 +13,8 @@ scope do
   setup do
     Cuba.reset!
 
-    Cuba.use(Rack::Session::Cookie, secret: "_this_must_be_secret")
+    Cuba.use(Rack::Session::Cookie,
+      secret: "R6zSBQWz0VGVSwvT8THurhJwaVqzpnsH27J5FoI58pxoIciDQYvE4opVvDTLMyfjj7c5inIc6PDNaQWvArMvK3")
     Cuba.plugin(Cuba::Safe::CSRF)
   end
 

data/test/integration.rb

@@ -78,7 +78,7 @@ test "reset and use" do
   status, headers, resp = Cuba.call(env)
 
   assert_equal 200, status
-  assert "text/html; charset=utf-8" == headers["Content-Type"]
+  assert "text/html; charset=utf-8" == headers["content-type"]
   assert_response resp, ["2nd Default"]
 
   assert "1" == env["m.first"]
@@ -109,6 +109,6 @@ test "custom response" do
   status, headers, resp = Cuba.call(env)
 
   assert 200 == status
-  assert "text/html; charset=utf-8" == headers["Content-Type"]
+  assert "text/html; charset=utf-8" == headers["content-type"]
   assert_response resp, ["Default"]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cuba
 version: !ruby/object:Gem::Version
-  version: 3.9.2
+  version: 4.0.0
 platform: ruby
 authors:
 - Michel Martens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-17 00:00:00.000000000 Z
+date: 2023-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: cutest
   requirement: !ruby/object:Gem::Requirement
@@ -152,8 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Microframework for web applications.