kawaii-core 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d81d0ba32a44a5b7eceec6b3979cd33f58970ec3
-  data.tar.gz: 8da2f45e4fc4e5291372f5f5c46edfb1139e849e
+  metadata.gz: 34266b059482427cf4b508d369a3a82eee1c13b9
+  data.tar.gz: a44b19872324040f54441b625dd107452e7e88af
 SHA512:
-  metadata.gz: 4b583cd1e65bbbc8b8f73ea402fde6e5a706d31778ebfdfd801590af617ee74dd2b3cd8985f1eaa3c42c562610f7f47b181b27a8a45fce7d53c595a9f425f1fb
-  data.tar.gz: 368d2864fe554d1923dea8e4cb438694c522eb618316d8feca27554ba3f25578eac98dbf884463bd1e1117cce89017d70697d7a74f108b28e57d431830328294
+  metadata.gz: f608c27a33e224eee46f7a3f6d9adb3b9e5cda66c1d98847077ec80b6667b5aba4fbdcf953f685a879f1fdf33db9cdc195485fe541dfa24c4d1a18fc232ae3f8
+  data.tar.gz: 62f772e16fd0b43d6d7adfc3a038eb247a3c3100dc1999d1f6fc8abafc15be4bb714e2c8f6286c2d4c3b613493901291b76960a3bfe16fd4e1166e9ecfbbe64d

data/README.md

@@ -348,6 +348,37 @@ end
 
 Just like with `not_found`, you need to return a well-formed Rack response Array.
 
+## Middleware
+
+To use Rack middleware, you have two options. You can either use a rackup file or use the `use` method in a
+class deriving from `Kawaii::Base`. For the former, there's plenty of information on the Internet
+including this [more advanced tutorial](https://blog.engineyard.com/2015/understanding-rack-apps-and-middleware).
+
+To use middleware in `Kawaii::Base`-derived class, use the `use` method (no pun intended). Example:
+
+```ruby
+class AppendWorld
+  def initialize(app)
+  @app = app
+  end
+  def call(env)
+    status, headers, response = @app.call(env)
+    response[0] += 'world!' # Quick & dirty.
+    [status, headers, response]
+  end
+end
+
+class MyApp < Kawaii::Base
+  get '/' do
+    'Hello, '
+  end
+
+  use AppendWorld
+end
+```
+
+Visiting the `/` path will render 'Hello, world!'.
+
 ## Resources
 
 1. [API reference](http://bilus.github.io/kawaii/Kawaii.html).
@@ -422,13 +453,13 @@ X Custom error handling (intercept exceptions, 404 what else?).
 
 X Rubocop-compliant.
 
-O Update and push.
+X Update and push.
 
-O Code review
+X Code review
 
-O Rack/custom global middleware.
+X Rack/custom global middleware.
 
-O Route-specific middleware.
+X Route-specific middleware.
 
 ## Known issues
 

data/lib/kawaii/base.rb

@@ -20,8 +20,8 @@ module Kawaii
 
     # Instances of classes derived from [Kawaii::Base] are Rack applications.
     def call(env)
-      matching = self.class.match(env)
-      matching.call(env)
+      h = self.class.build(env)
+      h.call(env)
     rescue => e
       self.class.handle_error(e)
     end
@@ -41,8 +41,10 @@ module Kawaii
         @error_handler = block
       end
 
-      def match(env)
-        super(env) || not_found_handler
+      def build(env)
+        h = match(env) || not_found_handler
+        builder.run h
+        builder.to_app
       end
 
       # Make it runnable via `run MyApp`.
@@ -56,6 +58,14 @@ module Kawaii
         handler.call(e)
       end
 
+      def use(middleware, *args, &block)
+        builder.use(middleware, *args, &block)
+      end
+
+      def builder
+        @builder ||= Rack::Builder.new
+      end
+
       protected
 
       def not_found_handler

data/lib/kawaii/version.rb

@@ -1,4 +1,4 @@
 # Gem version.
 module Kawaii
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kawaii-core
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Marcin Bilski
@@ -199,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A simple web framework based on Rack