scorched 0.6 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e4ea3f73fb031a956003067b827230358bb5f0e
-  data.tar.gz: e8e9ff7012cd3cfaf471b855daab89f915ce285d
+  metadata.gz: bbeb1df9d3b27b4e455d9c0ee30d282da0875a58
+  data.tar.gz: bf7ee84acc65b7bd2cd355afdca30150ac8b8f6a
 SHA512:
-  metadata.gz: 2d0da75971382d0108cf9585a55c95a13ce918d9f10ead66eac0c6cd182e710e821456a633830a16728b7d2d37ea3e81f37132dc1a9f5a6ae94ac3466a4eaaf7
-  data.tar.gz: d78bcf8bf3ee287f2fc880da0c6e4d956f2e1b1bb1a34f121127dfe8402eb0f2ebd66f14922e47d3cbd0f5407330fa5a5a4e33f7f4c029b2524cfff28f54d4d8
+  metadata.gz: a546b0e44c56adb26cc23d5d0fe40a60485467a50639c05fd36fadd8ce7dab591de8ff06b73c73756739ace69ab34a56402e9179d49e56b7a4920993050292d4
+  data.tar.gz: 3f85d181a8db836196db23099b6d5b49a424bad7d2f56c9e714021127ddcb9c4cf61664ec24b251d0affbd2aa4ea7fd0ea542b87f2a5124ba3100bd202938611

data/Milestones.md

@@ -3,7 +3,17 @@ Milestones
 
 Changelog
 ---------
-<<<<<<< HEAD
+### v0.7
+* Logging preparations made. Now just have to decide on a logging strategy, such as what to log, how verbose the messages should be, etc.
+* Environment-specific defaults added. The environment variable ``RACK_ENV`` is used to determine the current environment.
+  * Non-Development
+    * ``config[:static_dir] = false``
+  * Development
+    * ``config[:show_exceptions] = true``
+    * ``config[:logger] = Logger.new(STDOUT)``
+    * Add developer-friendly 404 error page. This is implemented as an after filter, and won't have any effect if the response body is set.
+* ``absolute`` method now returns forward slash if script name is empty.
+
 ### v0.6
 * ``view_config`` options hash renamed to ``render_defaults`` which better reflects its function.
 
@@ -70,7 +80,8 @@ Some of these remaining features may be broken out into a separate contributor l
     
 Unlikely
 --------
-* Mutex locking option? I'm of the opinion that the web server should be configured for the concurrency model of the application, rather than the framework.
+* Mutex locking option - I'm of the opinion that the web server should be configured for the concurrency model of the application, rather than the framework.
+* Using Rack::Protection by default - The problem here is that a good portion of Rack::Protection involves sessions, and given that Scorched doesn't itself load any session middleware, these components of Rack::Protection would have to be excluded. I wouldn't want to invoke a false sense of security
+
 
-    
 More things will be added to these lists as they're thought of and considered.

data/README.md

@@ -32,23 +32,23 @@ _**Note**: Scorched requires Ruby 2.0 as it makes use of a couple of new feature
 
 The Errors of Our Past
 ----------------------
-One of the big mistakes made by a lot of other Ruby frameworks, was to not leverage the power of the class. The consequences of this made for some awkwardness. Helpers for example, are a classical reinvention of what classes and modules were already made to solve. Scorched implements Controllers as Classes, which in addition to having their own DSL, allow defining and calling traditional class methods. The decision to allow developers to implement helpers and other common functionality as proper methods not only makes Controllers somewhat more predictable and familiar, but of course allow such helpers to be inheritable via plain-old Class inheritance.
+One of the mistakes made by a lot of other Ruby frameworks, was to not leverage the power of the class. The consequences of this made for some awkwardness. Helpers for example, are a classical reinvention of what classes and modules were already made to solve. Scorched implements Controllers as classes, which in addition to having their own DSL, allow defining and calling traditional instance methods. The decision to allow developers to implement helpers and other common functionality as proper methods not only makes Controllers somewhat more predictable and familiar, but of course allow such helpers to be inheritable via plain-old class inheritance.
 
 Perhaps another design oversight of other frameworks, has been the lack of consideration for the hierarchical nature of websites, and the fact that sub-directories are often expected to inherit attributes of their parents. Scorched supports sub-controllers to any arbitrary depth, with each controllers configuration, filters, route conditions, etc, applied along the way. This can assist many areas of web development, including security, restful interfaces, and interchangeable content types.
 
 
 Design Philosophy
 -----------------
-Scorched has a relatively simple design philosophy. The main objective is to keep Scorched lean and generic. Scorched refrains from expressing too much opinion. The general idea behind Scorched is to give developers all the tools to quickly put together small, medium and perhaps even large websites and applications.
+Scorched has a relatively simple design philosophy. The main objective is to keep Scorched lean and generic. Scorched refrains from expressing any opinion about how you design and structure your application. The general idea is to give developers the constructs to quickly put together small, medium and even large websites and applications.
 
-There's little need for a framework to be opinionated if the opinions of the developer can be quickly and easily built into it on a per-application basis. To do this effectively, developers really need to understand Scorched, and the best way to lower facilitate that is to lower the learning curve by keeping the core design, logical, predictable, and concise.
+There's little need for a framework to be opinionated if the opinions of the developer can be quickly and easily built into it on a per-application basis. To do this effectively, developers really need to understand Scorched, and the best way to facilitate that is to lower the learning curve by keeping the core design logical, predictable, and concise.
 
 
 Magicians Not Welcome
 ---------------------
-Scorched aims to be raw and transparent. Magic has no place, or need, in the world of Scorched. A thoughtful and simple design means there's no requirement for magic. Because of that, most developers should be able to master scorched in an evening, if that.
+Scorched aims to be raw and transparent. Magic has no place. A thoughtful and simple design means there's no requirement for magic. Because of that, most developers should be able to master scorched in an evening.
 
-Part of what keeps Scorched lightweight, is that unlike other lightweight web frameworks that attempt to hide Rack in the background, Scorched makes no such attempts, very rarely providing functionality that overlaps with that already provided by Rack. In fact, familiarity is somewhat of a pre-requisite to mastering Scorched.
+Part of what keeps Scorched lightweight, is that unlike other lightweight web frameworks that attempt to hide Rack in the background, Scorched makes no such attempts, very rarely providing functionality that overlaps with what's already provided by Rack. In fact, familiarity with Rack is somewhat of a pre-requisite to mastering Scorched.
 
 
 First Impressions

data/docs/01_preface.md

@@ -3,4 +3,4 @@ Preface
 
 _This is where I share with you all my infinite wisdom. It will come. In the mean time, know that the documentation is currently incomplete, and likely the victim of quite a few typos._
 
-_As an early adopter, feel free to use the Github issue tracker to ask questions and request assistance._
+_As an early adopter, feel free to use the Github issue tracker to ask questions and request assistance. Such questions will be used to further refine the documentation._

data/docs/02_fundamentals/08_views.md

@@ -6,9 +6,17 @@ Scorched uses Tilt to render templates in various supported formats. Because of
 ``render`` can take a file path or a string as the template. If a symbol is given, it assumes it's a file path, were as a string is assumed to be the template markup. ``render`` can also takes a set of options.
 
 * ``:dir`` - The directory containing the views. This can be absolute or relative to the current working directory.
-* ``:layout`` - The template to render _around_ the view. This results in a subsequent call to ``render``, where this value is sent as the first argument. Layout's inherit the settings of the main template being rendered.
+* ``:layout`` - The template to render _around_ the view.
 * ``:engine`` - The template engine to use if it can't be derived from the file name. This is always required for string templates. Can be any string or symbol that Tilt recognises, e.g :erb, :haml, :sass, etc.
 
-Any unrecognised options are passed through to Tilt and the corresponding rendering engine.
+Any unrecognised options are passed through to Tilt and the corresponding rendering engine. A common example being the ``:locals`` option, used to set local variables made available within the scope of the view.
 
-Finally, ``render`` takes an optional block to be _yielded_ within the view being rendered, if supported by the rendering engine.
+Finally, ``render`` takes an optional block to be _yielded_ within the view being rendered, if supported by the rendering engine. Layout's use this feature.
+
+Layouts
+-------
+When a layout is given, a subsequent call to ``render`` is made, with the rendered result of the main template given as the block to be yielded. The defined ``:layout`` is provided as the first argument on the sub-sequent call to ``render``, so the same rules apply. Layouts inherit the options of the main template being rendered.
+
+Partials
+--------
+There are cases where a you may want a view to be composed of more than just a layout and a single view. The view may contain one or more sub-views, commonly referred to as partials. Scorched makes provisions for this by ignoring the default layout when ``render`` is called within a view, hence negating the requirement to explicitly override the layout.

data/docs/03_further_reading/be_creative.md

@@ -42,4 +42,4 @@ An DRY way to serve multiple content-types:
 Authentication and Permissions
 ------------------------------
 
-_Example coming soon._
+_Example coming soon I hope._

data/docs/03_further_reading/code_reloading.md

@@ -0,0 +1,24 @@
+Code Reloading
+==============
+
+The difficulties, or rather impossibilities, of doing in-process code reloading in Ruby have been well-documented. Scorched therefore makes no attempt to implement in form of such code reloading. There are many out-of-process reloading solutions. These all essentially reboot your application, reloading all dependancies. This provides an obvious incentive to keep your application boot times as fast as possible.
+
+A sub-set of the most popular application reloaders are detailed below.
+
+Rerun
+-----
+Rerun is a general purpose gem (``gem install rerun``) for watching files and rerunning some command when any of those files change. The following example uses rerun to watch for changes to ".rb" and ".ru" files anywhere in the current directory tree. If a change is made, any previous instance of ``rackup`` are shutdown and restarted.
+
+    rerun -p "**/*.{rb,ru}" rackup
+
+Shotgun
+-------
+Unlike Rerun, Shotgun doesn't do any file watching. It instead reloads your application on every request. This sounds slow, but rerun uses an efficient technique of forking the application server and reloading your application. For applications that are quick to start, this method is generally preferred. Shotgun was used for example while developing http://scorchedrb.com.
+
+    shotgun
+
+Phusion Passenger
+-----------------
+The popular Apache/Nginx module for hosting Rack applications, Phusion Passenger, can be configured to reload your application on every request much like Shotgun does. Passenger can be faster that Shogun, as you can let the underlying web server (Apache or Nginx) to take care of the static file serving, which avoids having to reload your application for every static file request.
+
+To have Passenger automatically restart your application on every request, create a file named ``tmp/always_restart.txt`` in the root of your application directory. Passenger will automatically detect this file and behave as intended.

data/docs/03_further_reading/running_unit_tests.md

@@ -0,0 +1,6 @@
+Running Unit Tests
+==================
+
+If doing any development on Scorched, such as if you want to fork it or contribute patches to it, you will probably want to run the suite of tests that accompany it. The few dependancies required for running the Scorched unit tests are installed either when you install the Scorched gem, or by running ``bundle`` in the root of the Scorched source tree.
+
+All unit tests have been written using RSpec. To run the tests, ``cd`` into the root of the Scorched source tree from a terminal, and run ``rspec``.

data/lib/scorched.rb

@@ -1,3 +1,5 @@
+ENV['RACK_ENV'] ||= 'development'
+
 # Gems
 require 'rack'
 require 'rack/accept'

data/lib/scorched/controller.rb

@@ -11,7 +11,8 @@ module Scorched
     config << {
       :strip_trailing_slash => :redirect, # :redirect => Strips and redirects URL ending in forward slash, :ignore => internally ignores trailing slash, false => does nothing.
       :static_dir => 'public', # The directory Scorched should serve static files from. Set to false if web server or anything else is serving static files.
-      :logger => Logger.new(STDOUT)
+      :logger => nil,
+      :show_exceptions => false
     }
     
     render_defaults << {
@@ -20,6 +21,13 @@ module Scorched
       :engine => :erb
     }
     
+    if ENV['RACK_ENV'] == 'development'
+      config[:logger] = Logger.new(STDOUT)
+      config[:show_exceptions] = true
+    else
+      config[:static_dir] = false
+    end
+    
     conditions << {
       charset: proc { |charsets|
         [*charsets].any? { |charset| request.env['rack-accept.request'].charset? charset }
@@ -53,10 +61,11 @@ module Scorched
       use Rack::Accept
       use Scorched::Static, this.config[:static_dir] if this.config[:static_dir]
       use Rack::Logger, this.config[:logger] if this.config[:logger]
+      use Rack::ShowExceptions if this.config[:show_exceptions]
     }
     
     class << self
-
+      
       def mappings
         @mappings ||= []
       end
@@ -381,12 +390,46 @@ module Scorched
     # Example: absolute('/style.css') #=> /myapp/style.css
     def absolute(path = nil)
       return path if path && URI.parse(path).scheme
-      if path
+      return_path = if path
         [request.script_name, path].join('/').gsub(%r{/+}, '/')
       else
         request.script_name
       end
+      return_path[0] == '/' ? return_path : return_path.insert(0, '/')
+    end
+    
+    if ENV['RACK_ENV'] == 'development' && 
+      after do
+        if response.empty?
+          response.body = <<-HTML
+            <!DOCTYPE html>
+            <html>
+            <head>
+              <style type="text/css">
+               @import url(http://fonts.googleapis.com/css?family=Titillium+Web|Open+Sans:300italic,400italic,700italic,400,700,300);
+                html, body { height: 100%; width: 100%; margin: 0; font-family: 'Open Sans', 'Lucida Sans', 'Arial'; }
+                body { color: #333; display: table; }
+                #container { display: table-cell; vertical-align: middle; text-align: center; }
+                #container > * { display: inline-block; text-align: center; vertical-align: middle; }
+                #logo {
+                  padding: 12px 24px 12px 120px; color: white; background: rgb(191, 64, 0);
+                  font-family: 'Titillium Web', 'Lucida Sans', 'Arial'; font-size: 36pt;  text-decoration: none;
+                }
+                h1 { margin-left: 18px; font-weight: 400; }
+              </style>
+            </head>
+            <body>
+              <div id="container">
+                <a id="logo" href="http://scorchedrb.com">Scorched</a>
+                <h1>404 Page Not Found</h1>
+              </div>
+            </body>
+            </html>
+          HTML
+        end
+      end
     end
+
     
   private
   
@@ -399,5 +442,11 @@ module Scorched
         end
       end
     end
+    
+    def log(type, message)
+      config[:logger].progname ||= 'Scorched'
+      type = Logger.const_get(type.to_s.upcase)
+      config[:logger].add(type, message)
+    end
   end
 end

data/lib/scorched/options.rb

@@ -7,7 +7,7 @@ module Scorched
       [:[]=, :clear, :delete, :delete_if, :merge!, :replace, :shift, :store].include? m
     }
     
-    alias_method :<<, :replace
+    alias_method :<<, :_merge!
     
     # sets parent Options object and returns self
     def parent!(parent)

data/lib/scorched/response.rb

@@ -17,7 +17,7 @@ module Scorched
     
     # Automatically wraps the assigned value in an array if it doesn't respond to ``each``.
     def body=(value)
-      super(value.respond_to?(:each) ? value : [value])
+      super(value.respond_to?(:each) ? value : [value].compact)
     end
     
     def finish(*args, &block)

data/lib/scorched/version.rb

@@ -1,3 +1,3 @@
 module Scorched
-  VERSION = '0.6'
+  VERSION = '0.7'
 end

data/scorched.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new 'scorched', Scorched::VERSION do |s|
   s.rdoc_options      = %w[--line-numbers --inline-source --title Scorched --encoding=UTF-8]
 
   s.add_dependency 'rack', '~> 1.4'
-  s.add_dependency 'rack-accept', '~> 0.4.5'
+  s.add_dependency 'rack-accept', '~> 0.4'
   s.add_dependency 'tilt', '~> 1.3'
   s.add_development_dependency 'rack-test', '~> 0.6'
   s.add_development_dependency 'rspec', '~> 2.9'

data/spec/controller_spec.rb

@@ -206,6 +206,14 @@ module Scorched
         rt.get('/dog').status.should == 404
         rt.get('/').status.should == 200
       end
+      
+      it "leaves body empty if nil is returned" do
+        app.get('/') { }
+        app.after do
+          response.body.should == []
+        end
+        rt.get('/')
+      end
     end
     
     describe "sub-controllers" do
@@ -459,8 +467,8 @@ module Scorched
     
     describe "configuration" do
       describe "strip_trailing_slash" do
-        it "is set to redirect by default" do
-          app.config[:strip_trailing_slash].should == :redirect
+        it "can be set to strip trailing slash and redirect" do
+          app.config[:strip_trailing_slash] = :redirect
           app.get('/test') { }
           response = rt.get('/test/')
           response.status.should == 307
@@ -486,8 +494,8 @@ module Scorched
       end
       
       describe "static_dir" do
-        it "is set to serve static files from 'public' directory by default" do
-          app.config[:static_dir].should == 'public'
+        it "can serve static file from the specific directory" do
+          app.config[:static_dir] = 'public'
           response = rt.get('/static.txt')
           response.status.should == 200
           response.body.should == 'My static file!'
@@ -500,218 +508,246 @@ module Scorched
         end
       end
       
-      describe "sessions" do
-        it "provides convenience method for accessing the Rack session" do
-          rack_session = nil
-          app.get('/') { rack_session = session }
-          rt.get('/')
-          rack_session.should be_nil
+      describe "show_exceptions" do
+        it "shows debug-friendly error page for unhandled exceptions" do
+          app.config[:show_exceptions] = true
+          app.get('/') { raise RuntimeError, "Kablamo!" }
+          response = rt.get('/')
+          response.status.should == 500
+          response.body.should include('Rack::ShowExceptions')
+        end
+        
+        it "can be disabled" do
+          app.config[:show_exceptions] = false
+          app.get('/') { raise RuntimeError, "Kablamo!" }
+          expect {
+            response = rt.get('/')
+          }.to raise_error(RuntimeError)
+        end
+      end
+    end
+    
+    describe "sessions" do
+      it "provides convenience method for accessing the Rack session" do
+        rack_session = nil
+        app.get('/') { rack_session = session }
+        rt.get('/')
+        rack_session.should be_nil
+        app.middleware << proc { use Rack::Session::Cookie, secret: 'test' }
+        rt.get('/')
+        rack_session.should be_a(Rack::Session::Abstract::SessionHash)
+      end
+      
+      describe "flash" do
+        before(:each) do
           app.middleware << proc { use Rack::Session::Cookie, secret: 'test' }
-          rt.get('/')
-          rack_session.should be_a(Rack::Session::Abstract::SessionHash)
         end
         
-        describe "flash" do
-          before(:each) do
-            app.middleware << proc { use Rack::Session::Cookie, secret: 'test' }
-          end
+        it "keeps session variables that live for one page load" do
+          app.get('/set') { flash[:cat] = 'meow' }
+          app.get('/get') { flash[:cat] }
           
-          it "keeps session variables that live for one page load" do
-            app.get('/set') { flash[:cat] = 'meow' }
-            app.get('/get') { flash[:cat] }
-            
-            rt.get('/set')
-            rt.get('/get').body.should == 'meow'
-            rt.get('/get').body.should == ''
-          end
-          
-          it "always reads from the original request flash" do
-            app.get('/') do
-              flash[:counter] = flash[:counter] ? flash[:counter] + 1 : 0
-              flash[:counter].to_s
-            end
-            
-            rt.get('/').body.should == ''
-            rt.get('/').body.should == '0'
-            rt.get('/').body.should == '1'
+          rt.get('/set')
+          rt.get('/get').body.should == 'meow'
+          rt.get('/get').body.should == ''
+        end
+        
+        it "always reads from the original request flash" do
+          app.get('/') do
+            flash[:counter] = flash[:counter] ? flash[:counter] + 1 : 0
+            flash[:counter].to_s
           end
           
-          it "can only remove flash variables if the flash object is accessed" do
-            app.get('/set') { flash[:cat] = 'meow' }
-            app.get('/get') { flash[:cat] }
-            app.get('/null') { }
-            
-            rt.get('/set')
-            rt.get('/null')
-            rt.get('/get').body.should == 'meow'
-            rt.get('/get').body.should == ''
-          end
+          rt.get('/').body.should == ''
+          rt.get('/').body.should == '0'
+          rt.get('/').body.should == '1'
+        end
+        
+        it "can only remove flash variables if the flash object is accessed" do
+          app.get('/set') { flash[:cat] = 'meow' }
+          app.get('/get') { flash[:cat] }
+          app.get('/null') { }
           
-          it "can keep multiple sets of flash session variables" do
-            app.get('/set_animal') { flash(:animals)[:cat] = 'meow' }
-            app.get('/get_animal') { flash(:animals)[:cat] }
-            app.get('/set_name') { flash(:names)[:jeff] = 'male' }
-            app.get('/get_name') { flash(:names)[:jeff] }
-            
-            rt.get('/set_animal')
-            rt.get('/set_name')
-            rt.get('/get_animal').body.should == 'meow'
-            rt.get('/get_name').body.should == 'male'
-            rt.get('/get_animal').body.should == ''
-            rt.get('/get_name').body.should == ''
-          end
+          rt.get('/set')
+          rt.get('/null')
+          rt.get('/get').body.should == 'meow'
+          rt.get('/get').body.should == ''
         end
-      end
-      
-      describe "cookie helper" do
-        it "sets, retrieves and deletes cookies" do
-          app.get('/') { cookie :test }
-          app.post('/') { cookie :test, 'hello' }
-          app.post('/goodbye') { cookie :test, {value: 'goodbye', expires: Time.now() + 999999 } }
-          app.delete('/') { cookie :test, nil }
-          app.delete('/alt') { cookie :test, {value: nil} }
+        
+        it "can keep multiple sets of flash session variables" do
+          app.get('/set_animal') { flash(:animals)[:cat] = 'meow' }
+          app.get('/get_animal') { flash(:animals)[:cat] }
+          app.get('/set_name') { flash(:names)[:jeff] = 'male' }
+          app.get('/get_name') { flash(:names)[:jeff] }
           
-          rt.get('/').body.should == ''
-          rt.post('/')
-          rt.get('/').body.should == 'hello'
-          rt.post('/goodbye')
-          rt.get('/').body.should == 'goodbye'
-          rt.delete('/')
-          rt.get('/').body.should == ''
-          rt.delete('/alt')
-          rt.get('/').body.should == ''
+          rt.get('/set_animal')
+          rt.get('/set_name')
+          rt.get('/get_animal').body.should == 'meow'
+          rt.get('/get_name').body.should == 'male'
+          rt.get('/get_animal').body.should == ''
+          rt.get('/get_name').body.should == ''
         end
       end
-      
-      describe "rendering" do
-        before(:each) do
-          app.render_defaults.each { |k,v| app.render_defaults[k] = nil }
-        end
+    end
+    
+    describe "cookie helper" do
+      it "sets, retrieves and deletes cookies" do
+        app.get('/') { cookie :test }
+        app.post('/') { cookie :test, 'hello' }
+        app.post('/goodbye') { cookie :test, {value: 'goodbye', expires: Time.now() + 999999 } }
+        app.delete('/') { cookie :test, nil }
+        app.delete('/alt') { cookie :test, {value: nil} }
+        
+        rt.get('/').body.should == ''
+        rt.post('/')
+        rt.get('/').body.should == 'hello'
+        rt.post('/goodbye')
+        rt.get('/').body.should == 'goodbye'
+        rt.delete('/')
+        rt.get('/').body.should == ''
+        rt.delete('/alt')
+        rt.get('/').body.should == ''
+      end
+    end
+    
+    describe "rendering" do
+      before(:each) do
+        app.render_defaults.each { |k,v| app.render_defaults[k] = nil }
+      end
 
-        it "can render a file, relative to the application root" do
-          app.get('/') do
-            render(:'views/main.erb').should == "3 for me"
-          end
-          rt.get('/')
+      it "can render a file, relative to the application root" do
+        app.get('/') do
+          render(:'views/main.erb').should == "3 for me"
         end
+        rt.get('/')
+      end
 
-        it "can render a string" do
-          app.get('/') do
-            render('<%= 1 + 1  %> for you', engine: :erb).should == "2 for you"
-          end
-          rt.get('/')
+      it "can render a string" do
+        app.get('/') do
+          render('<%= 1 + 1  %> for you', engine: :erb).should == "2 for you"
         end
+        rt.get('/')
+      end
 
-        it "takes an optional view directory, relative to the application root" do
-          app.get('/') do
-            render(:'main.erb', dir: 'views').should == "3 for me"
-          end
-          rt.get('/')
+      it "takes an optional view directory, relative to the application root" do
+        app.get('/') do
+          render(:'main.erb', dir: 'views').should == "3 for me"
         end
+        rt.get('/')
+      end
 
-        it "takes an optional block to be yielded by the view" do
-          app.get('/') do
-            render(:'views/layout.erb'){ "in the middle" }.should == "(in the middle)"
-          end
-          rt.get('/')
+      it "takes an optional block to be yielded by the view" do
+        app.get('/') do
+          render(:'views/layout.erb'){ "in the middle" }.should == "(in the middle)"
         end
+        rt.get('/')
+      end
 
-        it "renders the given layout" do
-          app.get('/') do
-            render(:'views/main.erb', layout: :'views/layout.erb').should == "(3 for me)"
-          end
-          rt.get('/')
+      it "renders the given layout" do
+        app.get('/') do
+          render(:'views/main.erb', layout: :'views/layout.erb').should == "(3 for me)"
         end
+        rt.get('/')
+      end
 
-        it "merges options with view config" do
-          app.get('/') do
-            render(:'main.erb').should == "3 for me"
-          end
-          app.get('/full_path') do
-            render(:'views/main.erb', {layout: :'views/layout.erb', dir: nil}).should == "(3 for me)"
-          end
-          app.render_defaults[:dir] = 'views'
-          rt.get('/')
-          rt.get('/full_path')
+      it "merges options with view config" do
+        app.get('/') do
+          render(:'main.erb').should == "3 for me"
+        end
+        app.get('/full_path') do
+          render(:'views/main.erb', {layout: :'views/layout.erb', dir: nil}).should == "(3 for me)"
         end
+        app.render_defaults[:dir] = 'views'
+        rt.get('/')
+        rt.get('/full_path')
+      end
 
-        it "derived template engine overrides specified engine" do
-          app.render_defaults[:dir] = 'views'
-          app.render_defaults[:engine] = :erb
-          app.get('/str') do
-            render(:'other.str').should == "hello hello"
-          end
-          app.get('/erb_file') do
-            render(:main).should == "3 for me"
-          end
-          app.get('/erb_string') do
-            render('<%= 1 + 1  %> for you').should == "2 for you"
-          end
-          rt.get('/str')
-          rt.get('/erb_file')
-          rt.get('/erb_string')
+      it "derived template engine overrides specified engine" do
+        app.render_defaults[:dir] = 'views'
+        app.render_defaults[:engine] = :erb
+        app.get('/str') do
+          render(:'other.str').should == "hello hello"
+        end
+        app.get('/erb_file') do
+          render(:main).should == "3 for me"
+        end
+        app.get('/erb_string') do
+          render('<%= 1 + 1  %> for you').should == "2 for you"
         end
+        rt.get('/str')
+        rt.get('/erb_file')
+        rt.get('/erb_string')
+      end
 
-        it "ignores default layout when called within a view" do
-          app.render_defaults << {:dir => 'views', :layout => :layout, :engine => :erb}
-          app.get('/') do
-            render :composer
-          end
-          rt.get('/').body.should == '({1 for none})'
+      it "ignores default layout when called within a view" do
+        app.render_defaults << {:dir => 'views', :layout => :layout, :engine => :erb}
+        app.get('/') do
+          render :composer
         end
+        rt.get('/').body.should == '({1 for none})'
+      end
+    end
+    
+    describe "url helpers" do
+      let(:my_app) do
+        Class.new(Scorched::Controller)
+      end
+      
+      let(:root_app) do
+        Class.new(Scorched::Controller)
       end
       
-      describe "url helpers" do
-        let(:myapp) do
-          Class.new(Scorched::Controller)
+      let(:app) do
+        this = self
+        builder = Rack::Builder.new
+        builder.map('/myapp') { run this.my_app }
+        builder.map('/') { run this.root_app }
+        builder.to_app
+      end
+      
+      describe "url" do
+        it "returns the fully qualified URL" do
+          my_app.get('/') { url }
+          rt.get('https://scorchedrb.com:73/myapp?something=true').body.should ==
+            'https://scorchedrb.com:73/myapp'
         end
         
-        let(:app) do
-          the_app = myapp
-          builder = Rack::Builder.new
-          builder.map('/myapp') { run the_app }
-          builder.to_app
+        it "can append an optional path" do
+          my_app.get('/') { url('hello') }
+          rt.get('https://scorchedrb.com:73/myapp?something=true').body.should ==
+            'https://scorchedrb.com:73/myapp/hello'
         end
         
-        describe "url" do
-          it "returns the fully qualified URL" do
-            myapp.get('/') { url }
-            rt.get('https://scorchedrb.com:73/myapp?something=true').body.should ==
-              'https://scorchedrb.com:73/myapp'
-          end
-          
-          it "can append an optional path" do
-            myapp.get('/') { url('hello') }
-            rt.get('https://scorchedrb.com:73/myapp?something=true').body.should ==
-              'https://scorchedrb.com:73/myapp/hello'
-          end
-          
-          it "returns the given URL if scheme detected" do
-            test_url = 'http://google.com/blah'
-            myapp.get('/') { url(test_url) }
-            rt.get('/myapp').body.should == test_url
-          end
+        it "returns the given URL if scheme detected" do
+          test_url = 'http://google.com/blah'
+          my_app.get('/') { url(test_url) }
+          rt.get('/myapp').body.should == test_url
+        end
+      end
+      
+      describe "absolute" do
+        it "returns an absolute URL path" do
+          my_app.get('/absolute') { absolute }
+          rt.get('http://scorchedrb.com/myapp/absolute?something=true').body.should == '/myapp'
         end
         
-        describe "absolute" do
-          it "returns an absolute URL path" do
-            myapp.get('/absolute') { absolute }
-            rt.get('http://scorchedrb.com/myapp/absolute?something=true').body.should == '/myapp'
-          end
-          
-          it "can append an optional path" do
-            myapp.get('/absolute') { absolute('hello') }
-            rt.get('http://scorchedrb.com/myapp/absolute?something=true').body.should == '/myapp/hello'
-          end
-          
-          it "returns the given URL if scheme detected" do
-            test_url = 'http://google.com/blah'
-            myapp.get('/') { absolute(test_url) }
-            rt.get('/myapp').body.should == test_url
-          end
+        it "returns a forward slash if script name is the root of the URL path" do
+          root_app.get('/') { absolute }
+          rt.get('http://scorchedrb.com').body.should == '/'
+        end
+        
+        it "can append an optional path" do
+          my_app.get('/absolute') { absolute('hello') }
+          rt.get('http://scorchedrb.com/myapp/absolute?something=true').body.should == '/myapp/hello'
+        end
+        
+        it "returns the given URL if scheme detected" do
+          test_url = 'http://google.com/blah'
+          my_app.get('/') { absolute(test_url) }
+          rt.get('/myapp').body.should == test_url
         end
       end
-      
     end
+
   end
 end

data/spec/helper.rb

@@ -1,7 +1,8 @@
+ENV['RACK_ENV'] = 'production'
+
 require 'rack/test'
 require_relative '../lib/scorched.rb'
 
-
 module Scorched
   class SimpleCounter
     def initialize(app)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scorched
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
 platform: ruby
 authors:
 - Tom Wardrop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -102,6 +102,8 @@ files:
 - docs/02_fundamentals/08_views.md
 - docs/02_fundamentals/09_sharing_request_state.md
 - docs/03_further_reading/be_creative.md
+- docs/03_further_reading/code_reloading.md
+- docs/03_further_reading/running_unit_tests.md
 - examples/file_upload.ru
 - examples/media_types.ru
 - lib/scorched.rb