scorched 0.21 → 0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be73ae01518b83ec6ae0d6d84b693810dad8be8f
-  data.tar.gz: 67a18fa26a948a71c9c283deec4d064fc1575746
+  metadata.gz: 3f796c21d65c86f604be0aea1a3dbcecdff2abe0
+  data.tar.gz: 7c192c6f91c1e00fd97cb32865b5c8f610cc1916
 SHA512:
-  metadata.gz: bb3f359dcbe1f20fdfe70c029ab4beb8bcfc28c8242b5ceb7b9d8b239738c9b2a49f771a11524aaf232b896c7f4b4342ebad996cbf7ae4c06f7bbc307621a4c9
-  data.tar.gz: f89933d08e8e8f3348221b8e16471433c2819de51ad4ed1088505edfa0ec9aef6a21aefbed6d00443e472c5182ae54dd42f7b29e61572cf88662cc60302e0738
+  metadata.gz: 506421a43fcc2fa091978a349d910b3e016696b437ab26aaca12e258219455ba38f9a3483e99f83970df030c649ce2965598eff7c885b5185adfad7dc06d66b9
+  data.tar.gz: cc0b1638943da206f905d46834ae0f2df3151459a1de60ff537028f3fd69f5732f57ae8d8e921bed302d639e7047a4239e9a5aa42edd4d181900f27fa628be2a

data/.yardopts

@@ -0,0 +1 @@
+--protected lib/**/*.rb - README.md TODO.md LICENSE

data/CHANGES.md

@@ -1,7 +1,11 @@
 Changelog
 =========
 
-_Note that Scorched is yet to reach a v1.0 release. This means breaking changes may still be made. If upgrading Scorched version for your project, review this changelog carefully._
+_Note that Scorched is yet to reach a v1.0 release. This means breaking changes may still be made. If upgrading the version of Scorched for your project, review this changelog carefully._
+
+### v0.22
+* The `redirect` method now passes the given URL through `absolute`.
+* The error page filter now always runs at the end-point controller so `:show_http_error_pages` behaves as expected when overriden in sub-controllers.
 
 ### v0.21
 * Named captures have changed again. The values are now passed as arguments to route proc's in favor of using the new `captures` convenience method for accessing named arguments as a hash.

data/docs/02_fundamentals/04_requests_and_responses.md

@@ -34,4 +34,4 @@ If a target passes a request, the request is still considered _unmatched_ or _un
 
 Redirections
 ------------
-A common requirement of many applications is to redirect requests to another URL based on some kind of condition. Scorched offers the very simple `redirect` method which takes one required argument - the absolute or relative URL to redirect to - and an optional response status, which defaults to either 303 or 302 depending on the HTTP protocol version used for the request.
+A common requirement of many applications is to redirect requests to another URL based on some kind of condition. Scorched offers the very simple `redirect` method which takes one required argument - the absolute or relative URL to redirect to - and an optional response status, which defaults to either a 303 or 302 response status depending on the HTTP protocol version used for the request.

data/examples/file_upload.ru

@@ -1,9 +1,9 @@
 require File.expand_path('../../lib/scorched.rb', __FILE__)
+require 'mimemagic'
 
 class MediaTypesExample < Scorched::Controller
   
   get '/' do
-    response['Content-Type'] = 'text/html'
     <<-HTML
       <form method="POST" action="#{absolute(request.matched_path)}" enctype="multipart/form-data">
         <input type="file" name="example_file" />
@@ -14,28 +14,25 @@ class MediaTypesExample < Scorched::Controller
   
   post '/' do
     example_file = request[:example_file]
+    mime = MimeMagic.by_magic(example_file[:tempfile])
     <<-HTML
       We know the following about the received file.
       <ul>
         <li><strong>Name:</strong> #{example_file[:filename]}</li>
         <li><strong>Supposed Type:</strong> #{example_file[:type]}</li>
-        <li><strong>Actual Type:</strong> <em>Just pretend we are using MimeMagic</em></li>
+        <li><strong>Actual Type:</strong> #{mime ? mime.type : "Unknown"}</li>
         <li><strong>Size:</strong> #{format_byte_size example_file[:tempfile].size}</li>
       </ul>
     HTML
   end
   
-  after do
-    response['Content-Type'] = 'text/html; charset=utf-8' unless response['Content-Type']
-  end
-  
   # My self-proclaimed awesome byte size formatter: https://gist.github.com/Wardrop/4952405
   def format_byte_size(bytes, opts = {})
     opts = {binary: true, precision: 2, as_bits: false}.merge(opts)
     suffixes = ['bytes', 'KB', 'MB', 'GB', 'TB', 'PB','EB', 'ZB', 'YB']
     opts[:as_bits] && suffixes[0] = 'bits' && suffixes[1..-1].each { |v| v.downcase! } && bytes *= 8
     opts[:binary] ? base = 1024 : (base = 1000) && suffixes[1..-1].each { |v| v.insert(1,'i') }
-    exp = Math.log(bytes, base).floor
+    exp = bytes.zero? ? bytes : Math.log(bytes, base).floor
     "#{(bytes.to_f / (base ** exp)).round(opts[:precision])} #{suffixes[exp]}"
   end
   

data/examples/less_simple.ru

@@ -0,0 +1,46 @@
+require File.expand_path('../../lib/scorched.rb', __FILE__)
+require 'sequel'
+
+Sequel::Model.db = Sequel.sqlite("development.db")
+
+class Tasks < Sequel::Model
+  db.create_table? :tasks do
+    primary_key :id
+    String :name
+    DateTime :completed_at
+  end
+end
+
+class App < Scorched::Controller
+  controller '/tasks' do
+    get '/' do
+      @tasks = Tasks.all
+      render :index
+    end
+
+    get '/:id' do
+      render :task, locals: {task: task}
+    end
+
+    post '/' do
+      id = Tasks.insert(:name => request.POST['name'])
+      redirect "/tasks/#{id}" 
+    end
+
+    put '/:id' do
+      task.update(completed_at: (request.POST['completed'] ? Time.now : nil), name: request.POST['name'])
+      redirect "/tasks/#{captures[:id]}" 
+    end
+
+    delete '/:id' do
+      task.delete
+      redirect "/tasks" 
+    end
+    
+    def task(id = captures[:id])
+      Tasks[id] || halt(404)
+    end
+  end
+end
+
+run App

data/examples/rails_style_routing.ru

@@ -6,6 +6,7 @@ end
 class Base < App
   def self.inherited(klass)
     klass.get('/') { invoke_action :index }
+    klass.get('/new') { invoke_action :new }
     klass.post('/') { invoke_action :create }
     klass.get('/:id') { invoke_action :show }
     klass.get('/:id/edit') { invoke_action :edit }

data/examples/simple.ru

@@ -1,9 +1,14 @@
-require File.expand_path('../../lib/scorched.rb', __FILE__)
+require 'scorched'
 
 class App < Scorched::Controller
-  get '/' do
-    'hello world'
+  get '/:name' do
+    @message = greeting(captures[:name])
+    render :hello
+  end
+  
+  def greeting(name)
+    "Howdy #{name}"
   end
 end
 
-run App
+run App

data/lib/scorched/controller.rb

@@ -370,8 +370,9 @@ module Scorched
       invert ? !retval : !!retval
     end
     
+    # Redirects to the specified path or URL. An optional HTTP status is also accepted.
     def redirect(url, status = (env['HTTP_VERSION'] == 'HTTP/1.1') ? 303 : 302)
-      response['Location'] = url
+      response['Location'] = absolute(url)
       halt(status)
     end
     
@@ -524,8 +525,10 @@ module Scorched
       return_path[0] == '/' ? return_path : return_path.insert(0, '/')
     end
     
-    after config: {show_http_error_pages: true}, status: 400..599 do
-      if response.empty?
+    # We always want this filter to run at the end-point controller, hence we include the conditions within the body of
+    # the filter.
+    after do
+      if response.empty? && !check_for_failed_condition(config: {show_http_error_pages: true}, status: 400..599)
         response.body = <<-HTML
           <!DOCTYPE html>
           <html>

data/lib/scorched/version.rb

@@ -1,3 +1,3 @@
 module Scorched
-  VERSION = '0.21'
+  VERSION = '0.22'
 end

data/scorched.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new 'scorched', Scorched::VERSION do |s|
   s.license           = 'MIT'
   s.files             = Dir.glob(`git ls-files`.split("\n") - %w[.gitignore])
   s.test_files        = Dir.glob('spec/**/*_spec.rb')
-  s.rdoc_options      = %w[--line-numbers --inline-source --title Scorched --encoding=UTF-8]
+  s.has_rdoc          = 'yard'
 
   s.required_ruby_version = '>= 2.0.0'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scorched
 version: !ruby/object:Gem::Version
-  version: '0.21'
+  version: '0.22'
 platform: ruby
 authors:
 - Tom Wardrop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -101,6 +101,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .yardopts
 - CHANGES.md
 - Gemfile
 - LICENSE
@@ -122,6 +123,7 @@ files:
 - docs/03_further_reading/live_console.md
 - docs/03_further_reading/running_unit_tests.md
 - examples/file_upload.ru
+- examples/less_simple.ru
 - examples/media_types.ru
 - examples/rails_style_routing.ru
 - examples/simple.ru
@@ -153,12 +155,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: 
-rdoc_options:
-- --line-numbers
-- --inline-source
-- --title
-- Scorched
-- --encoding=UTF-8
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement