rasti-web 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5105988210acdb104ba5ad0088ab6b79083d43e27f29769a77d12c23c8af81f
-  data.tar.gz: 4d046ecf2410d04a1a655575c502d8c9b335f761820137ee96ff04fe51319484
+  metadata.gz: 250a8b04a93b51665f10b49206453b490ffc83c81b8684ca466d4259ea23e75a
+  data.tar.gz: 9c32ed8ab0506cb4a4b407bb50fa6f12dc19bafc457e05181f18ba16ad9c5032
 SHA512:
-  metadata.gz: 455368d0bd93f5c0b0a385a31165ecc089247d2c33359a328302556cb88201719c7103ded8a647cfbeda87badb280057e820d75eb9c178d7488c9f86375c6bb1
-  data.tar.gz: 8ab0436ee72e1a20f267cc2f7f87be68bffe46ce6438a870381ab94e4551e708c581841d1eda67d9de60445a5f2e598081d4c48e9f1499d87c2fdb6826bd08d3
+  metadata.gz: f30ddbfed0f369d8eb9bcabe5e43b2a9891b9a53d3be55bbe3b4d492cf1724984e25b6a1ca91285879bedc14b8ec691525a345bf62dff48cc72f2d47eab80a8f
+  data.tar.gz: 120e466b7433332064adcc6ebfaf8cfc337433221954fddeb867a91cc801e53e8856a1b00a331c6867a1845d3c248f9febe1ac24a4e1864d3cd08ec511d3326d

data/README.md

@@ -4,7 +4,6 @@
 [![Build Status](https://travis-ci.org/gabynaiman/rasti-web.svg?branch=master)](https://travis-ci.org/gabynaiman/rasti-web)
 [![Coverage Status](https://coveralls.io/repos/gabynaiman/rasti-web/badge.svg?branch=master)](https://coveralls.io/r/gabynaiman/rasti-web?branch=master)
 [![Code Climate](https://codeclimate.com/github/gabynaiman/rasti-web.svg)](https://codeclimate.com/github/gabynaiman/rasti-web)
-[![Dependency Status](https://gemnasium.com/gabynaiman/rasti-web.svg)](https://gemnasium.com/gabynaiman/rasti-web)
 
 Web blocks to build robust applications
 

data/lib/rasti/web.rb

@@ -16,6 +16,7 @@ require_relative 'web/application'
 require_relative 'web/template'
 require_relative 'web/view_context'
 require_relative 'web/render'
+require_relative 'web/headers'
 require_relative 'web/request'
 require_relative 'web/controller'
 require_relative 'web/version'

data/lib/rasti/web/controller.rb

@@ -1,7 +1,7 @@
 module Rasti
   module Web
     class Controller
-      
+
       extend Forwardable
 
       def_delegators :request, :params, :session
@@ -19,7 +19,7 @@ module Rasti
 
         def action(action_name)
           raise "Undefined action '#{action_name}' in #{name}" unless instance_methods.include? action_name.to_sym
-          
+
           Endpoint.new do |req, res, render|
             controller = new req, res, render
             begin

data/lib/rasti/web/endpoint.rb

@@ -1,7 +1,7 @@
 module Rasti
   module Web
     class Endpoint
-      
+
       def initialize(&block)
         @block = block
       end

data/lib/rasti/web/headers.rb

@@ -0,0 +1,48 @@
+module Rasti
+  module Web
+    class Headers
+
+      CONTENT_TYPES = {
+        text: 'text/plain',
+        html: 'text/html',
+        json: 'application/json',
+        js:   'application/javascript',
+        css:  'text/css'
+      }
+
+      class << self
+
+        CONTENT_TYPES.each do |key, value|
+          define_method "for_#{key}" do |charset:'utf-8'|
+            content_type value, charset: charset
+          end
+        end
+
+        def for_file(filename, attachment:true, charset:'utf-8')
+          merge content_type(MIME::Types.of(filename).first.content_type, charset: charset),
+                content_disposition(filename, attachment: attachment)
+        end
+
+        private
+
+        def content_type(type, charset:'utf-8')
+          {'Content-Type' => "#{type}; charset=#{charset}"}
+        end
+
+        def content_disposition(filename, attachment:true)
+          args = []
+          args << 'attachment' if attachment
+          args << "filename=\"#{File.basename(filename)}\""
+          {'Content-Disposition' => args.join("; ")}
+        end
+
+        def merge(*poperties)
+          poperties.inject({}) do |result, prop|
+            result.merge prop
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/rasti/web/render.rb

@@ -11,60 +11,63 @@ module Rasti
       end
 
       def status(status, *args)
-        respond_with status, 
-                     extract_headers(args), 
+        respond_with status,
+                     extract_headers(args),
                      extract_body(args)
       end
 
       def text(text, *args)
-        respond_with extract_status(args), 
-                     extract_headers(args).merge('Content-Type' => 'text/plain; charset=utf-8'), 
+        respond_with extract_status(args),
+                     extract_headers(args).merge(Headers.for_text),
                      text
       end
 
       def html(html, *args)
-        respond_with extract_status(args), 
-                     extract_headers(args).merge('Content-Type' => 'text/html; charset=utf-8'), 
+        respond_with extract_status(args),
+                     extract_headers(args).merge(Headers.for_html),
                      html
       end
 
       def json(object, *args)
-        respond_with extract_status(args), 
-                     extract_headers(args).merge('Content-Type' => 'application/json; charset=utf-8'), 
+        respond_with extract_status(args),
+                     extract_headers(args).merge(Headers.for_json),
                      object.is_a?(String) ? object : JSON.dump(object)
       end
 
       def js(script, *args)
-        respond_with extract_status(args), 
-                     extract_headers(args).merge('Content-Type' => 'application/javascript; charset=utf-8'), 
+        respond_with extract_status(args),
+                     extract_headers(args).merge(Headers.for_js),
                      script
       end
 
       def css(stylesheet, *args)
-        respond_with extract_status(args), 
-                     extract_headers(args).merge('Content-Type' => 'text/css; charset=utf-8'), 
+        respond_with extract_status(args),
+                     extract_headers(args).merge(Headers.for_css),
                      stylesheet
       end
 
       def file(filename, *args)
-        content_type = MIME::Types.of(filename).first.content_type
-        body = File.read filename
+        respond_with extract_status(args),
+                     Headers.for_file(filename).merge(extract_headers(args)),
+                     File.read(filename)
+      end
 
-        respond_with extract_status(args), 
-                     extract_headers(args).merge('Content-Type' => content_type), 
-                     body
+      def data(content, *args)
+        respond_with extract_status(args),
+                     extract_headers(args),
+                     content
       end
 
       def partial(template, locals={})
-        response['Content-Type'] = 'text/html; charset=utf-8'
+        response.headers.merge! Headers.for_html
         response.write view_context.render(template, locals)
       end
 
       def layout(template=nil, &block)
         content = block.call if block
         layout = view_context.render(template || Web.default_layout) { content }
-        
-        response['Content-Type'] = 'text/html; charset=utf-8'
+
+        response.headers.merge! Headers.for_html
         response.write layout
       end
 

data/lib/rasti/web/request.rb

@@ -12,7 +12,7 @@ module Rasti
       end
 
       def body_text
-        @body_text ||= begin 
+        @body_text ||= begin
           text = body.read
           body.rewind
           text
@@ -20,8 +20,8 @@ module Rasti
       end
 
       def json?
-        !content_type.nil? && ContentType.parse(content_type).mime_type == 'application/json' 
-      rescue 
+        !content_type.nil? && ContentType.parse(content_type).mime_type == 'application/json'
+      rescue
         false
       end
 

data/lib/rasti/web/router.rb

@@ -17,7 +17,7 @@ module Rasti
       end
 
       def call(env)
-        route = route_for env 
+        route = route_for env
         env[ROUTE_PARAMS] = route.extract_params env['PATH_INFO']
         route.call env
       end

data/lib/rasti/web/template.rb

@@ -7,7 +7,7 @@ module Rasti
         template_file = files.detect { |f| File.exists? f }
 
         raise "Missing template #{template} [#{files.join(', ')}]" unless template_file
-                                  
+
         tilt = cache.fetch(template_file) { Tilt.new template_file }
         tilt.render(context, locals, &block)
       end
@@ -17,7 +17,7 @@ module Rasti
       def self.cache
         Thread.current[:templates_cache] ||= Tilt::Cache.new
       end
-      
+
     end
   end
 end

data/lib/rasti/web/version.rb

@@ -1,5 +1,5 @@
 module Rasti
   module Web
-    VERSION = '2.0.1'
+    VERSION = '2.1.0'
   end
 end

data/spec/application_spec.rb

@@ -8,7 +8,7 @@ class TestMiddleware
   def call(env)
     if env['PATH_INFO'] == '/private'
       [403, {}, ['Permission denied']]
-    else      
+    else
       @app.call env
     end
   end
@@ -50,7 +50,7 @@ describe Rasti::Web::Application do
 
   it 'Defined route' do
     get '/'
-    
+
     last_response.status.must_equal 200
     last_response['Content-Type'].must_equal 'text/html; charset=utf-8'
     last_response.body.must_equal 'Page content'
@@ -58,7 +58,7 @@ describe Rasti::Web::Application do
 
   it 'Not found' do
     get '/not_found'
-    
+
     last_response.status.must_equal 404
     last_response.body.must_equal 'Page not found'
   end
@@ -77,5 +77,5 @@ describe Rasti::Web::Application do
     last_response['Content-Type'].must_equal 'application/json; charset=utf-8'
     last_response.body.must_equal '{"id":123}'
   end
-  
+
 end

data/spec/controller_spec.rb

@@ -1,7 +1,7 @@
 require 'minitest_helper'
 
 class TestController < Rasti::Web::Controller
-  
+
   CustomError = Class.new StandardError
 
   def self.hooks_log
@@ -16,14 +16,14 @@ class TestController < Rasti::Web::Controller
     self.class.hooks_log << "After all: #{action_name}"
   end
 
-  before_action :test do 
+  before_action :test do
     self.class.hooks_log << 'Before single: test'
   end
 
-  after_action :test do 
+  after_action :test do
     self.class.hooks_log << 'After single: test'
   end
-  
+
   def test
     render.html 'Test HTML'
   end
@@ -55,7 +55,7 @@ describe Rasti::Web::Controller do
   before do
     TestController.hooks_log.clear
   end
-  
+
   it 'Action endpoint' do
     action = TestController.action :test
     env = Rack::MockRequest.env_for '/test'
@@ -65,7 +65,7 @@ describe Rasti::Web::Controller do
     status.must_equal 200
     headers['Content-Type'].must_equal 'text/html; charset=utf-8'
     response.body.must_equal ['Test HTML']
-    
+
     TestController.hooks_log.must_equal [
       'Before single: test',
       'After single: test'
@@ -84,6 +84,7 @@ describe Rasti::Web::Controller do
     status, headers, response = action.call env
 
     status.must_equal 500
+    headers['Content-Type'].must_be_nil
     response.body.must_equal ['Explicit error']
 
     TestController.hooks_log.must_equal [
@@ -98,6 +99,7 @@ describe Rasti::Web::Controller do
     status, headers, response = action.call env
 
     status.must_equal 500
+    headers['Content-Type'].must_be_nil
     response.body.must_equal ['Implicit error']
 
     TestController.hooks_log.must_equal [
@@ -109,7 +111,7 @@ describe Rasti::Web::Controller do
   it 'Unexpected exception' do
     action = TestController.action :exception
     env = Rack::MockRequest.env_for '/exception'
-    
+
     error = proc { action.call env }.must_raise RuntimeError
     error.message.must_equal 'Unexpected error'
 

data/spec/endpoint_spec.rb

@@ -8,7 +8,7 @@ describe Rasti::Web::Endpoint do
       res.must_be_instance_of Rack::Response
 
       render.text 'Content'
-    end    
+    end
 
     env = Rack::MockRequest.env_for '/'
 

data/spec/render_spec.rb

@@ -10,7 +10,7 @@ describe Rasti::Web::Render do
 
     it 'Code' do
       render.status 404
-      
+
       response.status.must_equal 404
       response['Content-Type'].must_be_nil
       response.body.must_equal []
@@ -18,7 +18,7 @@ describe Rasti::Web::Render do
 
     it 'Code and body' do
       render.status 500, 'Internal server error'
-      
+
       response.status.must_equal 500
       response['Content-Type'].must_be_nil
       response.body.must_equal ['Internal server error']
@@ -167,7 +167,7 @@ describe Rasti::Web::Render do
   end
 
   describe 'Javascript' do
-    
+
     it 'Body' do
       render.js 'alert("hello");'
 
@@ -205,7 +205,7 @@ describe Rasti::Web::Render do
   end
 
   describe 'CSS' do
-    
+
     it 'Body' do
       render.css 'body{margin:0}'
 
@@ -250,7 +250,8 @@ describe Rasti::Web::Render do
       render.file filename
 
       response.status.must_equal 200
-      response['Content-Type'].must_equal 'application/zip'
+      response['Content-Type'].must_equal 'application/zip; charset=utf-8'
+      response['Content-Disposition'].must_equal 'attachment; filename="sample_file.zip"'
       response.body.must_equal [File.read(filename)]
     end
 
@@ -258,7 +259,8 @@ describe Rasti::Web::Render do
       render.file filename, 206
 
       response.status.must_equal 206
-      response['Content-Type'].must_equal 'application/zip'
+      response['Content-Type'].must_equal 'application/zip; charset=utf-8'
+      response['Content-Disposition'].must_equal 'attachment; filename="sample_file.zip"'
       response.body.must_equal [File.read(filename)]
     end
 
@@ -266,7 +268,7 @@ describe Rasti::Web::Render do
       render.file filename, 'Content-Disposition' => 'attachment; filename=test_file.zip'
 
       response.status.must_equal 200
-      response['Content-Type'].must_equal 'application/zip'
+      response['Content-Type'].must_equal 'application/zip; charset=utf-8'
       response['Content-Disposition'].must_equal 'attachment; filename=test_file.zip'
       response.body.must_equal [File.read(filename)]
     end
@@ -275,13 +277,53 @@ describe Rasti::Web::Render do
       render.file filename, 206, 'Content-Disposition' => 'attachment; filename=test_file.zip'
 
       response.status.must_equal 206
-      response['Content-Type'].must_equal 'application/zip'
+      response['Content-Type'].must_equal 'application/zip; charset=utf-8'
       response['Content-Disposition'].must_equal 'attachment; filename=test_file.zip'
       response.body.must_equal [File.read(filename)]
     end
 
   end
 
+  describe 'Data' do
+
+    let(:content) { 'Response data' }
+
+    it 'Body' do
+      render.data content
+
+      response.status.must_equal 200
+      response['Content-Type'].must_be_nil
+      response.body.must_equal [content]
+    end
+
+    it 'Body and status' do
+      render.data content, 206
+
+      response.status.must_equal 206
+      response['Content-Type'].must_be_nil
+      response.body.must_equal [content]
+    end
+
+    it 'Body and headers' do
+      render.data content, Rasti::Web::Headers.for_file('test_file.txt')
+
+      response.status.must_equal 200
+      response['Content-Type'].must_equal 'text/plain; charset=utf-8'
+      response['Content-Disposition'].must_equal 'attachment; filename="test_file.txt"'
+      response.body.must_equal [content]
+    end
+
+    it 'Body, status and headers' do
+      render.data content, 206, Rasti::Web::Headers.for_file('test_file.txt')
+
+      response.status.must_equal 206
+      response['Content-Type'].must_equal 'text/plain; charset=utf-8'
+      response['Content-Disposition'].must_equal 'attachment; filename="test_file.txt"'
+      response.body.must_equal [content]
+    end
+
+  end
+
   it 'Partial' do
     render.partial 'context_and_locals', title: 'Welcome', text: 'Hello world'
 
@@ -291,7 +333,7 @@ describe Rasti::Web::Render do
   end
 
   describe 'Layout' do
-    
+
     it 'Default' do
       render.layout { 'Page content' }
 
@@ -322,7 +364,7 @@ describe Rasti::Web::Render do
 
     it 'Default layout' do
       render.view 'context_and_locals', title: 'Welcome', text: 'Hello world'
-      
+
       response.status.must_equal 200
       response['Content-Type'].must_equal 'text/html; charset=utf-8'
       response.body.must_equal ['<html><body><h1>Welcome</h1><div>Hello world</div></body></html>']
@@ -330,7 +372,7 @@ describe Rasti::Web::Render do
 
     it 'Custom layout' do
       render.view 'context_and_locals', {title: 'Welcome', text: 'Hello world'}, 'custom_layout'
-      
+
       response.status.must_equal 200
       response['Content-Type'].must_equal 'text/html; charset=utf-8'
       response.body.must_equal ['<html><body class="custom"><h1>Welcome</h1><div>Hello world</div></body></html>']

data/spec/request_spec.rb

@@ -1,7 +1,7 @@
 require 'minitest_helper'
 
 describe Rasti::Web::Request do
-  
+
   it 'Route params' do
     env = Rack::MockRequest.env_for '/10/20'
     env[Rasti::Web::ROUTE_PARAMS] = {'lat' => '10', 'lon' => '20'}

data/spec/route_spec.rb

@@ -3,12 +3,12 @@ require 'minitest_helper'
 describe Rasti::Web::Route do
 
   ROUTES = [
-    '/', 
+    '/',
     '/*/wildcard/action',
     '/wildcard/*/action',
     '/wildcard/*/action/:id',
     '/wildcard/*',
-    '/resource', 
+    '/resource',
     '/resource/:id/:action',
     '/:resource(/:id(/:action))'
   ]
@@ -72,7 +72,7 @@ describe Rasti::Web::Route do
 
       route.pattern.must_equal '/*/wildcard/action'
       route.extract_params(path).must_equal wildcard: 'section/sub_section'
-      route.call({}).must_equal RESPONSE      
+      route.call({}).must_equal RESPONSE
     end
 
     it 'Middle' do
@@ -97,7 +97,7 @@ describe Rasti::Web::Route do
 
     it 'Params' do
       path = '/wildcard/section/sub_section/action/123'
-      
+
       route = route_for path
 
       route.pattern.must_equal '/wildcard/*/action/:id'

data/spec/router_spec.rb

@@ -11,7 +11,7 @@ describe Rasti::Web::Router do
   def post(path)
     Rack::MockRequest.env_for path, method: :post
   end
-  
+
   it 'Verbs' do
     %w(delete get head options patch post put).each do |verb|
       router.must_respond_to verb

data/spec/template_spec.rb

@@ -5,7 +5,7 @@ describe Rasti::Web::Template do
   class Context
     include ContextMethodHelper
   end
-  
+
   it 'Plain HTML' do
     Rasti::Web::Template.render('plain_html').must_equal '<div>Hello world</div>'
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasti-web
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-27 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -247,6 +247,7 @@ files:
 - lib/rasti/web/application.rb
 - lib/rasti/web/controller.rb
 - lib/rasti/web/endpoint.rb
+- lib/rasti/web/headers.rb
 - lib/rasti/web/render.rb
 - lib/rasti/web/request.rb
 - lib/rasti/web/route.rb