racket-mvc 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29d1cf6f2b573f99dc79d38f46c61bbc877b81c6
-  data.tar.gz: 114fceb1c2ff59e31a94b1300c1efbad34fc78cc
+  metadata.gz: 105b08877782c44a513558312f3e9b6af7daef75
+  data.tar.gz: 4ccd48feacc8788667f1ea5ab580a3cdb17cbdb0
 SHA512:
-  metadata.gz: fb0558de22c5ed965ea8955caa8aac5309cadaa4ed80f01d08cce38666575f3715bd3a84dd1d6e005d94aa191cc433cd5a123cf73169cfba005b9497094f7aff
-  data.tar.gz: b1b51dc4dcf51d057d472f1897b0e9cd92be66dad8abe06fe9eb7127bedc8e0122d3a58787acc2aee77027831abb0bbcab82bbff1bb85e64191675908062da0e
+  metadata.gz: 7275ee4175f164a783c9f827ddaee45f68b949ac4977c3637f6ff80e6f7662d03f0985926872d8fa68b68d4f1fa91a34c8aca3d2e3c8383cdbbdb9f3f4d45bac
+  data.tar.gz: 6795e2bfcca8c5671df6e65012fc60ec6ab374458d074c69f91451f9d5fde72de257530c9c32cf0e9336b16f18bc20417a2f6339edeefd09dbba91f62c5a3ab8

data/README.md

@@ -1,49 +1,49 @@
-# Racket - The noisy Rack MVC framework
-
-[![Build Status](https://travis-ci.org/lasso/racket.svg?branch=master)](https://travis-ci.org/lasso/racket)    [![codecov.io](https://codecov.io/github/lasso/racket/coverage.svg?branch=master)](https://codecov.io/github/lasso/racket?branch=master)    [![Gem Version](https://badge.fury.io/rb/racket-mvc.svg)](http://badge.fury.io/rb/racket-mvc)
-
-## Say what?
-Yes. It is yet another framework built on rack. Using MVC. Doing silly stuff while you look the other way.
-
-## Why? I though there were a gazillion frameworks that did the same thing already...
-You are correct. There are _lots_ of Rack frameworks out there. This one does not pretend to do anything special
-that you could not get from any of them.
-
-## So, I have to ask again. Why did you create this monstrosity?
-Well, when my web host suddenly started insisting on using Phusion Passenger on all of their servers
-I needed to replace my old [Ramaze](http://ramaze.net/) setup without to much hassle. I tried several
-other Rack framework, but none of them seemed capable of replacing my apps without some major rewrites.
-
-## So you just though writing a whole new framework would be easier than using Rails?
-Yes. Writing Rack frameworks is easy! And since I am able to decide exactly what features I want I don't
-need to adopt to a large ecosystem of concepts I do not like.
-
-## So, is it any good?
-Let us just say it is good _enough_ for my needs at the moment. I plan to add more features/make stuff faster
-whenever I am finished porting most of my old apps from Ramaze.
-
-## Where are the tests?
-Have a look in the `spec` directory. The code base have tests covering 100 per cent of the code and I am planning on keeping it that way. At the moment the code is tested on the following platforms (using [Travis CI](https://travis-ci.org/)):
-
-- ruby 1.9.3
-- ruby 2.0.0
-- ruby 2.1.7
-- ruby 2.2.3
-- jruby 1.7 (1.9 mode only)
-- jruby 9.0.0.0
-- rbx-2 (latest version)
-
-I am using [bacon](https://github.com/chneukirchen/bacon) and [rack-test](https://github.com/brynary/rack-test) for testing. Run the tests by typing `rake test`in the root directory. Code coverage reports are provided by [simplecov](https://rubygems.org/gems/simplecov). After the tests have run the an HTML report can be found in the `coverage` directory.
-
-If you are not interested in running the tests yourself you could have a look at the test status at [Travis CI](https://travis-ci.org/lasso/racket) and the code coverage at [Codecov](https://codecov.io/github/lasso/racket). Their stats get updated on every commit.
-
-## Alright, I want to try using this stuff. Where are the docs?
-At the moment there is not much documentation available, but I have started working on the [wiki](https://github.com/lasso/racket/wiki).
-
-The code itself is documented using [Yard](http://yardoc.org/). The docs are not generated automatically, you need to run `rake doc` in the root directory to generate them. After running the rake task the documentation will be available in the `doc` directory.
-
-## Why is the code licenced under the GNU Affero General Public License? I want a more liberal licence!
-Because I think it is a Good Thing™ to share code. The
-[GNU Affero General Public License licence](https://www.gnu.org/licenses/agpl.html) is very liberal unless you plan
-on beeing egotistical. I you feel you cannot work with that, please choose
-[something else](https://en.wikipedia.org/wiki/Comparison_of_web_application_frameworks#Ruby).
+# Racket - The noisy Rack MVC framework
+
+[![Build Status](https://travis-ci.org/lasso/racket.svg?branch=master)](https://travis-ci.org/lasso/racket)    [![Code Climate](https://codeclimate.com/github/lasso/racket/badges/gpa.svg)](https://codeclimate.com/github/lasso/racket)    [![codecov.io](https://codecov.io/github/lasso/racket/coverage.svg?branch=master)](https://codecov.io/github/lasso/racket?branch=master)    [![Gem Version](https://badge.fury.io/rb/racket-mvc.svg)](http://badge.fury.io/rb/racket-mvc)
+
+## Say what?
+Yes. It is yet another framework built on rack. Using MVC. Doing silly stuff while you look the other way.
+
+## Why? I though there were a gazillion frameworks that did the same thing already...
+You are correct. There are _lots_ of Rack frameworks out there. This one does not pretend to do anything special
+that you could not get from any of them.
+
+## So, I have to ask again. Why did you create this monstrosity?
+Well, when my web host suddenly started insisting on using Phusion Passenger on all of their servers
+I needed to replace my old [Ramaze](http://ramaze.net/) setup without to much hassle. I tried several
+other Rack framework, but none of them seemed capable of replacing my apps without some major rewrites.
+
+## So you just though writing a whole new framework would be easier than using Rails?
+Yes. Writing Rack frameworks is easy! And since I am able to decide exactly what features I want I don't
+need to adopt to a large ecosystem of concepts I do not like.
+
+## So, is it any good?
+Let us just say it is good _enough_ for my needs at the moment. I plan to add more features/make stuff faster
+whenever I am finished porting most of my old apps from Ramaze.
+
+## Where are the tests?
+Have a look in the `spec` directory. The code base have tests covering 100 per cent of the code and I am planning on keeping it that way. At the moment the code is tested on the following platforms (using [Travis CI](https://travis-ci.org/)):
+
+- 1.9.3
+- 2.0.0
+- 2.1.7
+- 2.2.3
+- jruby-19mode
+- jruby-head
+- rbx-2
+
+I am using [bacon](https://github.com/chneukirchen/bacon) and [rack-test](https://github.com/brynary/rack-test) for testing. Run the tests by typing `rake test`in the root directory. Code coverage reports are provided by [simplecov](https://rubygems.org/gems/simplecov). After the tests have run the an HTML report can be found in the `coverage` directory.
+
+If you are not interested in running the tests yourself you could have a look at the test status at [Travis CI](https://travis-ci.org/lasso/racket) and the code coverage at [Codecov](https://codecov.io/github/lasso/racket). Their stats get updated on every commit.
+
+## Alright, I want to try using this stuff. Where are the docs?
+At the moment there is not much documentation available, but I have started working on the [wiki](https://github.com/lasso/racket/wiki).
+
+The code itself is documented using [Yard](http://yardoc.org/). The docs are not generated automatically, you need to run `rake doc` in the root directory to generate them. After running the rake task the documentation will be available in the `doc` directory.
+
+## Why is the code licenced under the GNU Affero General Public License? I want a more liberal licence!
+Because I think it is a Good Thing™ to share code. The
+[GNU Affero General Public License licence](https://www.gnu.org/licenses/agpl.html) is very liberal unless you plan
+on beeing egotistical. I you feel you cannot work with that, please choose
+[something else](https://en.wikipedia.org/wiki/Comparison_of_web_application_frameworks#Ruby).

data/Rakefile

@@ -1,30 +1,31 @@
 require 'rubygems'
 require 'bundler/setup'
+require './rake/utils.rb'
 
-desc "Run bacon tests"
+desc 'Run bacon tests'
 task default: [:test]
 
-desc "Build racket-mvc gem"
+desc 'Build racket-mvc gem'
 task :build_gem do
   exec 'gem build racket.gemspec'
 end
 
-desc "Build yard docs"
+desc 'Build yard docs'
 task :doc do
   exec 'yard'
 end
 
-desc "Show list of undocumented modules/classes/methods"
+desc 'Show list of undocumented modules/classes/methods'
 task :nodoc do
   exec 'yard stats --list-undoc'
 end
 
-desc "Publish racket-mvc gem"
+desc 'Publish racket-mvc gem'
 task publish_gem: [:build_gem] do
-  exec 'gem push racket-mvc.gem'
+  exec "gem push racket-mvc#{racket_version}.gem"
 end
 
-desc "Run bacon tests"
+desc 'Run bacon tests'
 task :test do
   exec 'bacon spec/racket.rb'
 end

data/lib/racket/controller.rb

@@ -24,24 +24,17 @@ module Racket
       helper_modules = {}
       helpers.each do |helper|
         helper_module = helper.to_s.split('_').collect(&:capitalize).join.to_sym
-        begin
-          begin
-            require "racket/helpers/#{helper}"
-          rescue LoadError
-            if helper_dir
-              begin
-                require Utils.build_path(helper_dir, helper)
-              rescue LoadError
-              end
-            end
-          end
+        Utils.run_block(NameError) do
+          Utils.run_block(LoadError) { require "racket/helpers/#{helper}" } ||
+            (helper_dir &&
+              Utils.run_block(LoadError) { require Utils.build_path(helper_dir, helper) }
+            )
           helper_modules[helper] = Racket::Helpers.const_get(helper_module)
           Application.inform_dev("Added helper module #{helper.inspect} to class #{self}.")
-        rescue NameError
+        end ||
           Application.inform_dev(
             "Failed to add helper module #{helper.inspect} to class #{self}.", :warn
           )
-        end
       end
       helper_modules
     end
@@ -102,7 +95,7 @@ module Racket
         helper_modules.merge!(__load_helpers(existing_helpers))
       end
       # Load new helpers
-      helpers.map! { |helper| helper.to_sym }
+      helpers.map!(&:to_sym)
       helpers.reject! { |helper| helper_modules.key?(helper) }
       helper_modules.merge!(__load_helpers(helpers))
       set_option(:helpers, helper_modules)

data/lib/racket/current.rb

@@ -35,17 +35,25 @@ module Racket
     # @return [Module] A module encapsulating all state relating to the current request
     def self.init(env, klass, action, params)
       klass.helper if klass.get_option(:helpers).nil? # Makes sure default helpers are loaded.
-      racket = State.new(action, nil, params)
-      request = Request.new(env)
-      response = Response.new
-      session = Session.new(env['rack.session']) if env.key?('rack.session')
+      properties = init_properties(action, params, env)
       Module.new do
         klass.get_option(:helpers).each_value { |helper| include helper }
-        define_method(:racket) { racket }
-        define_method(:request) { request }
-        define_method(:response) { response }
-        define_method(:session) { session } if env.key?('rack.session')
+        properties.each_pair { |key, value| define_method(key) { value } }
       end
     end
+
+    def self.init_properties(action, params, env)
+      properties =
+        {
+          racket: State.new(action, nil, params),
+          request: Request.new(env),
+          response: Response.new
+        }
+      session = env.fetch('rack.session', nil)
+      properties[:session] = Session.new(session) if session
+      properties
+    end
+
+    private_class_method :init_properties
   end
 end

data/lib/racket/helpers/file.rb

@@ -28,12 +28,7 @@ module Racket
       # @return [Array]
       def send_file(file, options = {})
         file = Utils.build_path(file)
-        # Respond with a 404 Not Found if the file cannot be read.
-        respond!(
-          404,
-          { 'Content-Type' => 'text/plain' },
-          Rack::Utils::HTTP_STATUS_CODES[404]
-        ) unless Utils.file_readable? (file)
+        _send_file_check_file_readable(file)
         headers = {}
         mime_type = options.fetch(:mime_type, nil)
         # Calculate MIME type if it was not already specified.
@@ -41,15 +36,28 @@ module Racket
         headers['Content-Type'] = mime_type
         # Set Content-Disposition (and a file name) if the file should be downloaded
         # instead of displayed inline.
-        if options.fetch(:download, false)
-          filename = options.fetch(:filename, nil).to_s
-          headers['Content-Disposition'] = 'attachment'
-          headers['Content-Disposition'] << sprintf('; filename="%s"', filename) unless
-            filename.empty?
-        end
+        _send_file_set_content_disposition(options, headers)
         # Send response
         respond!(200, headers, ::File.read(file))
       end
+
+      private
+
+      def _send_file_check_file_readable(file)
+        # Respond with a 404 Not Found if the file cannot be read.
+        respond!(
+          404,
+          { 'Content-Type' => 'text/plain' },
+          Rack::Utils::HTTP_STATUS_CODES[404]
+        ) unless Utils.file_readable?(file)
+      end
+
+      def _send_file_set_content_disposition(options, headers)
+        return unless options.fetch(:download, false)
+        filename = options.fetch(:filename, nil).to_s
+        headers['Content-Disposition'] = 'attachment'
+        headers['Content-Disposition'] << format('; filename="%s"', filename) unless filename.empty?
+      end
     end
   end
 end

data/lib/racket/router.rb

@@ -23,38 +23,41 @@ require 'http_router'
 module Racket
   # Handles routing in Racket applications.
   class Router
+    attr_reader :action_cache
+    attr_reader :routes
+
     def initialize
       @router = HttpRouter.new
-      @routes_by_controller = {}
-      @actions_by_controller = {}
+      @routes = {}
+      @action_cache = {}
     end
 
     # Caches available actions for each controller class. This also works for controller classes
     # that inherit from other controller classes.
     #
-    # @param [Class] controller
+    # @param [Class] controller_class
     # @return [nil]
-    def cache_actions(controller)
+    def cache_actions(controller_class)
       actions = SortedSet.new
-      current = controller
-      while current < Controller
-        actions.merge(current.instance_methods(false))
-        current = current.superclass
+      current_class = controller_class
+      while current_class < Controller
+        actions.merge(current_class.public_instance_methods(false))
+        current_class = current_class.superclass
       end
-      (@actions_by_controller[controller] = actions.to_a) && nil
+      (@action_cache[controller_class] = actions.to_a) && nil
     end
 
     # Returns a route to the specified controller/action/parameter combination.
     #
-    # @param [Class] controller
+    # @param [Class] controller_class
     # @param [Symbol] action
     # @param [Array] params
     # @return [String]
-    def get_route(controller, action, params)
-      fail "Cannot find controller #{controller}" unless @routes_by_controller.key?(controller)
+    def get_route(controller_class, action, params)
+      fail "Cannot find controller #{controller_class}" unless @routes.key?(controller_class)
       params.flatten!
       route = ''
-      route << @routes_by_controller[controller]
+      route << @routes[controller_class]
       route << "/#{action}" unless action.nil?
       route << "/#{params.join('/')}" unless params.empty?
       route = route[1..-1] if route.start_with?('//') # Special case for root path
@@ -64,14 +67,14 @@ module Racket
     # Maps a controller to the specified path.
     #
     # @param [String] path
-    # @param [Class] controller
+    # @param [Class] controller_class
     # @return [nil]
-    def map(path, controller)
-      controller_base_path = path.empty? ? '/' : path
-      Application.inform_dev("Mapping #{controller} to #{controller_base_path}.")
-      @router.add("#{path}(/*params)").to(controller)
-      @routes_by_controller[controller] = controller_base_path
-      cache_actions(controller) && nil
+    def map(path, controller_class)
+      controller_class_base_path = path.empty? ? '/' : path
+      Application.inform_dev("Mapping #{controller_class} to #{controller_class_base_path}.")
+      @router.add("#{path}(/*params)").to(controller_class)
+      @routes[controller_class] = controller_class_base_path
+      cache_actions(controller_class) && nil
     end
 
     # @todo: Allow the user to set custom handlers for different errors
@@ -105,7 +108,7 @@ module Racket
         action = params.empty? ? target_klass.get_option(:default_action) : params.shift.to_sym
 
         # Check if action is available on target
-        return render_error(404) unless @actions_by_controller[target_klass].include?(action)
+        return render_error(404) unless @action_cache[target_klass].include?(action)
 
         # Rewrite PATH_INFO to reflect that we split out the parameters
         env['PATH_INFO'] = env['PATH_INFO']

data/lib/racket/utils.rb

@@ -19,6 +19,38 @@
 module Racket
   # Collects utilities needed by different objects in Racket.
   class Utils
+    # Handles exceptions dynamically
+    class ExceptionHandler
+      # Runs a block.
+      # If no exceptions are raised, this method returns true.
+      # If any of the provided error types are raised, this method returns false.
+      # If any other exception is raised, this method will just forward the exception.
+      #
+      # @param [Array] errors
+      # @return [true|flase]
+      def self.run_block(errors)
+        fail 'Need a block' unless block_given?
+        begin
+          true.tap { yield }
+        rescue boolean_module(errors)
+          false
+        end
+      end
+
+      # Returns an anonymous module that can be used to rescue exceptions dynamically.
+      def self.boolean_module(errors)
+        Module.new do
+          (class << self; self; end).instance_eval do
+            define_method(:===) do |error|
+              errors.any? { |e| error.class <= e }
+            end
+          end
+        end
+      end
+
+      private_class_method :boolean_module
+    end
+
     # Builds and returns a path in the file system from the provided arguments. The first element
     # in the argument list can be either absolute or relative, all other arguments must be relative,
     # otherwise they will be removed from the final path.
@@ -29,7 +61,7 @@ module Racket
       if args.empty?
         path = Pathname.pwd
       else
-        args.map! { |arg| arg.to_s }
+        args.map!(&:to_s)
         path = Pathname.new(args.shift)
         path = Pathname.new(Application.options[:root_dir]).join(path) if path.relative?
         args.each do |arg|
@@ -50,5 +82,16 @@ module Racket
       pathname = Pathname.new(path)
       pathname.exist? && pathname.file? && pathname.readable?
     end
+
+    # Runs a block.
+    # If no exceptions are raised, this method returns true.
+    # If any of the provided error types are raised, this method returns false.
+    # If any other exception is raised, this method will just forward the exception.
+    #
+    # @param [Array] errors
+    # @return [true|flase]
+    def self.run_block(*errors, &block)
+      ExceptionHandler.run_block(errors, &block)
+    end
   end
 end

data/lib/racket/version.rb

@@ -25,7 +25,7 @@ module Racket
     # Minor version
     MINOR = 2
     # Teeny version
-    TEENY = 1
+    TEENY = 2
     # Is it a prerelease?
     PRERELEASE = false
 

data/lib/racket/view_manager.rb

@@ -21,7 +21,6 @@ require 'tilt'
 module Racket
   # Handles rendering in Racket applications.
   class ViewManager
-
     attr_reader :layout_cache
     attr_reader :view_cache
 
@@ -77,6 +76,26 @@ module Racket
       proc.call(*proc_args).to_s
     end
 
+    # Returns a cached template. If the template has not been cached yet, this method will run a
+    # lookup against the provided parameters.
+    #
+    # @param [String] path
+    # @param [Racket::Controller] controller
+    # @param [Symbol] type
+    def ensure_in_cache(path, controller, type)
+      store = instance_variable_get("@#{type}_cache".to_sym)
+      return store[path] if store.key?(path)
+      base_dir = instance_variable_get("@#{type}_base_dir".to_sym)
+      default_template = controller.controller_option("default_#{type}".to_sym)
+      template = lookup_template(base_dir, path)
+      template =
+        lookup_default_template(base_dir, File.dirname(path), default_template) unless template
+      Application.inform_dev(
+        "Using #{type} #{template.inspect} for #{controller.class}.#{controller.racket.action}."
+      )
+      store[path] = template
+    end
+
     # Tries to locate a layout matching +path+ in the file system and returns the path if a
     # matching file is found. If no matching file is found, +nil+ is returned. The result is cached,
     # meaning that the filesystem lookup for a specific path will only happen once.
@@ -85,18 +104,7 @@ module Racket
     # @param [Racket::Controller] controller
     # @return [String|nil]
     def get_layout(path, controller)
-      unless @layout_cache.key?(path)
-        layout = lookup_template(@layout_base_dir, path)
-        layout =
-          lookup_default_template(
-            @layout_base_dir, File.dirname(path), controller.controller_option(:default_layout)
-          ) unless layout
-        Application.inform_dev(
-          "Using layout #{layout.inspect} for #{controller.class}.#{controller.racket.action}."
-        )
-        @layout_cache[path] = layout
-      end
-      layout = @layout_cache[path]
+      layout = ensure_in_cache(path, controller, :layout)
       if layout.is_a?(Proc)
         layout =
           lookup_template(
@@ -115,18 +123,7 @@ module Racket
     # @param [Racket::Controller] controller
     # @return [String|nil]
     def get_view(path, controller)
-      unless @view_cache.key?(path)
-        view = lookup_template(@view_base_dir, path)
-        view =
-          lookup_default_template(
-            @view_base_dir, File.dirname(path), controller.controller_option(:default_view)
-          ) unless view
-        Application.inform_dev(
-          "Using view #{view.inspect} for #{controller.class}.#{controller.racket.action}."
-        )
-        @view_cache[path] = view
-      end
-      view = @view_cache[path]
+      view = ensure_in_cache(path, controller, :view)
       if view.is_a?(Proc)
         view =
           lookup_template(

data/rake/utils.rb

@@ -0,0 +1,36 @@
+# Racket - The noisy Rack MVC framework
+# Copyright (C) 2015  Lars Olsson <lasso@lassoweb.se>
+#
+# This file is part of Racket.
+#
+# Racket is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Racket is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with Racket.  If not, see <http://www.gnu.org/licenses/>.
+
+def racket_version
+  mod = Module.new
+  mod.module_eval(
+    File.read(
+      File.join(File.dirname(File.dirname(__FILE__)), 'lib', 'racket', 'version.rb')
+    )
+  )
+  mod::Racket::Version.current
+end
+
+def racket_files
+  Dir.chdir(File.dirname(File.dirname(__FILE__))) do
+    files = FileList['lib/**/*.rb'].to_a
+    files.concat(FileList['rake/**/*'].to_a)
+    files.concat(FileList['spec/**/*'].to_a)
+    files.concat(FileList['COPYING.AGPL', 'Rakefile', 'README.md'].to_a)
+  end
+end

data/spec/_custom.rb

@@ -50,14 +50,14 @@ describe 'A custom Racket test Application' do
     last_response.headers.key?('X-Hook-Action').should.equal(true)
     last_response.headers['X-Hook-Action'].should.equal('run')
     response = JSON.parse(last_response.body)
-    response.should.equal(["Data added in before block", "Data added in action"])
+    response.should.equal(['Data added in before block', 'Data added in action'])
   end
 
   it 'should let Rack::ShowExceptions handle the error' do
     get '/sub1/epic_fail'
     last_response.status.should.equal(500)
     last_response.headers['Content-Type'].should.equal('text/plain')
-    last_response.body.should.match(%r(^RuntimeError: Epic fail!))
+    last_response.body.should.match(/^RuntimeError: Epic fail!/)
   end
 
   it 'should be able to render custom files' do
@@ -104,7 +104,7 @@ describe 'A custom Racket test Application' do
     last_response.status.should.equal(404)
     last_response.headers['Content-Type'].should.equal('text/plain')
     last_response.headers.key?('Content-Disposition').should.equal(false)
-    last_response.body.should.equal("Not Found")
+    last_response.body.should.equal('Not Found')
   end
 
   it 'should be able to handle dynamic layouts and views' do

data/spec/_default.rb

@@ -10,33 +10,27 @@ describe 'A default Racket test Application' do
   end
 
   it 'has mapped controllers correctly' do
-    routes_by_controller = actions_by_controller = nil
-    app.instance_eval do
-      router.instance_eval do
-        routes_by_controller = @routes_by_controller
-        actions_by_controller = @actions_by_controller
-      end
-    end
-
-    routes_by_controller[DefaultRootController].should.equal('/')
-    routes_by_controller[DefaultSubController1].should.equal('/sub1')
-    routes_by_controller[DefaultSubController2].should.equal('/sub2')
-    routes_by_controller[DefaultSubController3].should.equal('/sub3')
-    routes_by_controller[DefaultInheritedController].should.equal('/sub3/inherited')
-
-    actions_by_controller[DefaultRootController].length.should.equal(5)
-    actions_by_controller[DefaultRootController].include?(:index).should.equal(true)
-    actions_by_controller[DefaultRootController].include?(:my_first_route).should.equal(true)
-    actions_by_controller[DefaultRootController].include?(:my_second_route).should.equal(true)
-    actions_by_controller[DefaultSubController1].length.should.equal(4)
-    actions_by_controller[DefaultSubController1].include?(:route_to_root).should.equal(true)
-    actions_by_controller[DefaultSubController1].include?(:route_to_nonexisting).should.equal(true)
-    actions_by_controller[DefaultSubController2].length.should.equal(5)
-    actions_by_controller[DefaultSubController2].include?(:index).should.equal(true)
-    actions_by_controller[DefaultSubController2].include?(:current_action).should.equal(true)
-    actions_by_controller[DefaultSubController2].include?(:current_params).should.equal(true)
-    actions_by_controller[DefaultSubController3].should.equal([:index])
-    actions_by_controller[DefaultInheritedController].should.equal([:index])
+    app.router.routes.length.should.equal(5)
+    app.router.routes[DefaultRootController].should.equal('/')
+    app.router.routes[DefaultSubController1].should.equal('/sub1')
+    app.router.routes[DefaultSubController2].should.equal('/sub2')
+    app.router.routes[DefaultSubController3].should.equal('/sub3')
+    app.router.routes[DefaultInheritedController].should.equal('/sub3/inherited')
+
+    app.router.action_cache[DefaultRootController].length.should.equal(5)
+    app.router.action_cache[DefaultRootController].include?(:index).should.equal(true)
+    app.router.action_cache[DefaultRootController].include?(:my_first_route).should.equal(true)
+    app.router.action_cache[DefaultRootController].include?(:my_second_route).should.equal(true)
+    app.router.action_cache[DefaultSubController1].length.should.equal(4)
+    app.router.action_cache[DefaultSubController1].include?(:route_to_root).should.equal(true)
+    app.router.action_cache[DefaultSubController1].include?(:route_to_nonexisting)
+      .should.equal(true)
+    app.router.action_cache[DefaultSubController2].length.should.equal(5)
+    app.router.action_cache[DefaultSubController2].include?(:index).should.equal(true)
+    app.router.action_cache[DefaultSubController2].include?(:current_action).should.equal(true)
+    app.router.action_cache[DefaultSubController2].include?(:current_params).should.equal(true)
+    app.router.action_cache[DefaultSubController3].should.equal([:index])
+    app.router.action_cache[DefaultInheritedController].should.equal([:index])
   end
 
   it 'should set rack variables correctly' do
@@ -46,7 +40,7 @@ describe 'A default Racket test Application' do
 
     get '/sub2/current_params/foo/bar/baz'
     last_response.status.should.equal(200)
-    JSON.parse(last_response.body).should.equal(['foo', 'bar', 'baz'])
+    JSON.parse(last_response.body).should.equal(%w(foo bar baz))
   end
 
   it 'returns the correct respnse when calling index action' do
@@ -107,27 +101,27 @@ describe 'A default Racket test Application' do
   end
 
   it 'should be able to log messages to everybody' do
-    _logger = app.options[:logger]
+    original_logger = app.options[:logger]
     sio = StringIO.new
     app.options[:logger] = Logger.new(sio)
-    app.inform_all('Informational message');
+    app.inform_all('Informational message')
     sio.string.should.match(/Informational message/)
-    app.options[:logger] = _logger
+    app.options[:logger] = original_logger
   end
 
   it 'should be able to log messages to developer' do
-    _logger = app.options[:logger]
-    _mode = app.options[:mode]
+    original_logger = app.options[:logger]
+    original_mode = app.options[:mode]
     sio = StringIO.new
     app.options[:logger] = Logger.new(sio)
     app.options[:mode] = :live
-    app.inform_dev('Development message');
+    app.inform_dev('Development message')
     sio.string.should.be.empty
     app.options[:mode] = :dev
-    app.inform_dev('Hey, listen up!');
-    sio.string.should.match(%r(Hey, listen up!))
-    app.options[:mode] = _mode
-    app.options[:logger] = _logger
+    app.inform_dev('Hey, listen up!')
+    sio.string.should.match(/Hey, listen up!/)
+    app.options[:mode] = original_mode
+    app.options[:logger] = original_logger
   end
 
   it 'should be able to set and clear session variables' do
@@ -138,7 +132,7 @@ describe 'A default Racket test Application' do
     response.keys.should.be.empty
     get '/session_as_json?foo=bar'
     last_response.headers.keys.should.include('Set-Cookie')
-    last_response.headers['Set-Cookie'].should.match(%r(racket.session=))
+    last_response.headers['Set-Cookie'].should.match(/racket.session=/)
     response = JSON.parse(last_response.body)
     response.class.should.equal(Hash)
     response.keys.length.should.equal(2)
@@ -146,7 +140,7 @@ describe 'A default Racket test Application' do
     response.keys.should.include('session_id')
     get '/session_as_json?baz=quux'
     last_response.headers.keys.should.include('Set-Cookie')
-    last_response.headers['Set-Cookie'].should.match(%r(racket.session=))
+    last_response.headers['Set-Cookie'].should.match(/racket.session=/)
     response = JSON.parse(last_response.body)
     response.class.should.equal(Hash)
     response.keys.length.should.equal(3)
@@ -155,14 +149,14 @@ describe 'A default Racket test Application' do
     response.keys.should.include('session_id')
     get '/session_as_json?drop_session'
     last_response.headers.keys.should.include('Set-Cookie')
-    last_response.headers['Set-Cookie'].should.match(%r(racket.session=))
+    last_response.headers['Set-Cookie'].should.match(/racket.session=/)
     response = JSON.parse(last_response.body)
     response.class.should.equal(Hash)
     response.keys.should.be.empty
     get '/session_strings'
     response = JSON.parse(last_response.body)
     response.length.should.equal(3)
-    response.each { |elem| elem.should.match(%r(Racket::Session)) }
+    response.each { |elem| elem.should.match(/Racket::Session/) }
   end
 
   it 'should be able to build paths correctly' do
@@ -173,7 +167,7 @@ describe 'A default Racket test Application' do
   end
 
   it 'should handle GET parameters correctly' do
-    get '/sub2/get_some_data/?data1=foo&data3=bar'
+    get '/sub2/some_get_data/?data1=foo&data3=bar'
     last_response.status.should.equal(200)
     response = JSON.parse(last_response.body, symbolize_names: true)
     response.class.should.equal(Hash)
@@ -184,7 +178,7 @@ describe 'A default Racket test Application' do
   end
 
   it 'should handle POST parameters correctly' do
-    post '/sub2/post_some_data', { data1: 'foo', data3: 'bar' }
+    post '/sub2/some_post_data', data1: 'foo', data3: 'bar'
     last_response.status.should.equal(200)
     response = JSON.parse(last_response.body, symbolize_names: true)
     response.class.should.equal(Hash)
@@ -207,5 +201,4 @@ describe 'A default Racket test Application' do
     last_response.headers['Content-Type'].should.equal('text/plain')
     last_response.body.should.equal('500 Internal Server Error')
   end
-
 end

data/spec/_invalid.rb

@@ -6,9 +6,8 @@ describe 'An invalid Racket test Application' do
   end
 
   it 'should never initialize' do
-    lambda { get '/' }
+    -> { get '/' }
       .should.raise(RuntimeError)
       .message.should.equal('Application has already been initialized!')
   end
-
 end

data/spec/_request.rb

@@ -1,5 +1,4 @@
 describe 'Racket::Request should override Rack::Request correctly' do
-
   r = Racket::Request.new({}).freeze
 
   describe 'Racket::Request should inherit some methods from Rack::Request' do
@@ -45,5 +44,4 @@ describe 'Racket::Request should override Rack::Request correctly' do
       end
     end
   end
-
 end

data/spec/racket.rb

@@ -11,8 +11,9 @@ if ENV['CI'] == 'true'
   SimpleCov.formatter = SimpleCov::Formatter::Codecov
 end
 
-TEST_DEFAULT_APP_DIR = File.absolute_path(File.join(File.dirname(__FILE__), 'test_default_app'))
-TEST_CUSTOM_APP_DIR = File.absolute_path(File.join(File.dirname(__FILE__), 'test_custom_app'))
+TEST_DIR = File.absolute_path(File.dirname(__FILE__))
+TEST_DEFAULT_APP_DIR = File.join(TEST_DIR, 'test_default_app')
+TEST_CUSTOM_APP_DIR = File.join(TEST_DIR, 'test_custom_app')
 
 require 'racket'
 
@@ -22,9 +23,9 @@ require 'racket/helpers/file.rb'
 require 'rack/test'
 require 'bacon'
 
-require_relative '_request.rb'
+require File.join(TEST_DIR, '_request.rb')
 
-Dir.chdir(TEST_DEFAULT_APP_DIR) { require_relative '_default.rb' }
-Dir.chdir(TEST_CUSTOM_APP_DIR) { require_relative '_custom.rb' }
+Dir.chdir(TEST_DEFAULT_APP_DIR) { require File.join(TEST_DIR, '_default.rb') }
+Dir.chdir(TEST_CUSTOM_APP_DIR) { require File.join(TEST_DIR, '_custom.rb') }
 
-require_relative '_invalid.rb'
+require File.join(TEST_DIR, '_invalid.rb')

data/spec/test_custom_app/controllers/sub1/custom_sub_controller_1.rb

@@ -1,5 +1,5 @@
+# Custom sub controller 1
 class CustomSubController1 < Racket::Controller
-
   helper :file
 
   def index
@@ -37,5 +37,4 @@ class CustomSubController1 < Racket::Controller
   def send_nonexisting_file
     send_file('files/no_such_thing.jpg')
   end
-
 end

data/spec/test_custom_app/controllers/sub2/custom_sub_controller_2.rb

@@ -1,5 +1,5 @@
+# Custom sub controller 2
 class CustomSubController2 < Racket::Controller
-
   def index
     "#{self.class}::#{__method__}"
   end
@@ -30,5 +30,4 @@ class CustomSubController2 < Racket::Controller
   end
 
   helper :nonexisting
-
 end

data/spec/test_custom_app/controllers/sub3/custom_sub_controller_3.rb

@@ -1,5 +1,5 @@
+# Custom sub controller 3
 class CustomSubController3 < Racket::Controller
-
   set_option(:top_secret, 42)
 
   def index
@@ -23,5 +23,4 @@ class CustomSubController3 < Racket::Controller
     obj.instance_eval { @secret = 42 }
     render_template('files/secret.erb', obj)
   end
-
 end

data/spec/test_custom_app/controllers/sub3/inherited/custom_inherited_controller.rb

@@ -1,9 +1,8 @@
 require_relative '../custom_sub_controller_3.rb'
 
+# Custom inherited controller
 class CustomInheritedController < CustomSubController3
-
   def index
     "#{self.class}::#{__method__}"
   end
-
 end

data/spec/test_custom_app/controllers/sub4/custom_sub_controller_4.rb

@@ -0,0 +1,25 @@
+# Custom sub controller 4
+class CustomSubController4 < Racket::Controller
+  set_option :default_layout, -> { 'layout.erb' }
+
+  set_option :default_view,
+             lambda { |action|
+               case action
+               when :foo then 'myfoo.erb'
+               when :bar then 'mybar.erb'
+               else 'default.erb'
+               end
+             }
+
+  def foo
+    @data = 'FOO'
+  end
+
+  def bar
+    @data = 'BAR'
+  end
+
+  def baz
+    @data = 'BAZ'
+  end
+end

data/spec/test_default_app/controllers/default_root_controller.rb

@@ -1,7 +1,7 @@
 require 'json'
 
+# Default root controller
 class DefaultRootController < Racket::Controller
-
   def index
     "#{self.class}::#{__method__}"
   end
@@ -28,5 +28,4 @@ class DefaultRootController < Racket::Controller
   def session_strings
     [session.inspect, session.to_s, session.to_str].to_json
   end
-
 end

data/spec/test_default_app/controllers/sub1/default_sub_controller_1.rb

@@ -1,5 +1,5 @@
+# Default sub controller 1
 class DefaultSubController1 < Racket::Controller
-
   def index
     "#{self.class}::#{__method__}"
   end
@@ -15,5 +15,4 @@ class DefaultSubController1 < Racket::Controller
   def epic_fail
     fail 'Epic fail!'
   end
-
 end

data/spec/test_default_app/controllers/sub2/default_sub_controller_2.rb

@@ -1,5 +1,5 @@
+# Default sub controller 2
 class DefaultSubController2 < Racket::Controller
-
   def index
     "#{self.class}::#{__method__}"
   end
@@ -12,7 +12,7 @@ class DefaultSubController2 < Racket::Controller
     racket.params.to_json
   end
 
-  def get_some_data
+  def some_get_data
     data = {}
     [:data1, :data2, :data3].each do |d|
       data[d] = request.get(d)
@@ -20,12 +20,11 @@ class DefaultSubController2 < Racket::Controller
     data.to_json
   end
 
-  def post_some_data
+  def some_post_data
     data = {}
     [:data1, :data2, :data3].each do |d|
       data[d] = request.post(d)
     end
     data.to_json
   end
-
 end

data/spec/test_default_app/controllers/sub3/default_sub_controller_3.rb

@@ -1,7 +1,18 @@
+# Default sub controller 3
 class DefaultSubController3 < Racket::Controller
-
   def index
     "#{self.class}::#{__method__}"
   end
 
+  protected
+
+  def protected_method
+    "I'm protected"
+  end
+
+  private
+
+  def private_method
+    "I'm private"
+  end
 end

data/spec/test_default_app/controllers/sub3/inherited/default_inherited_controller.rb

@@ -1,9 +1,8 @@
 require_relative '../default_sub_controller_3.rb'
 
+# Default inherited controller
 class DefaultInheritedController < DefaultSubController3
-
   def index
     "#{self.class}::#{__method__}"
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: racket-mvc
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Lars Olsson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_router
@@ -159,6 +159,7 @@ files:
 - lib/racket/utils.rb
 - lib/racket/version.rb
 - lib/racket/view_manager.rb
+- rake/utils.rb
 - spec/_custom.rb
 - spec/_default.rb
 - spec/_invalid.rb
@@ -168,7 +169,7 @@ files:
 - spec/test_custom_app/controllers/sub2/custom_sub_controller_2.rb
 - spec/test_custom_app/controllers/sub3/custom_sub_controller_3.rb
 - spec/test_custom_app/controllers/sub3/inherited/custom_inherited_controller.rb
-- spec/test_custom_app/controllers/sub4/default_sub_controller_4.rb
+- spec/test_custom_app/controllers/sub4/custom_sub_controller_4.rb
 - spec/test_custom_app/extra/blob.rb
 - spec/test_custom_app/extra/blob/inner_blob.rb
 - spec/test_custom_app/files/plain_text.txt

data/spec/test_custom_app/controllers/sub4/default_sub_controller_4.rb

@@ -1,26 +0,0 @@
-class CustomSubController4 < Racket::Controller
-
-  set_option  :default_layout, lambda { 'layout.erb' }
-
-  set_option  :default_view,
-              lambda { |action|
-                case action
-                when :foo then 'myfoo.erb'
-                when :bar then 'mybar.erb'
-                else 'default.erb'
-                end
-              }
-
-  def foo
-    @data = 'FOO'
-  end
-
-  def bar
-    @data = 'BAR'
-  end
-
-  def baz
-    @data = 'BAZ'
-  end
-
-end