racket-mvc 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 297c59402186821841ac8b3d9ec1585ebd19a9d4
-  data.tar.gz: acd9b707fa7aa9d7e249e818454fb2045367b5ef
+  metadata.gz: aa507274155a8638944da1b19957b0423499a3aa
+  data.tar.gz: 54631b41e9a2ec392b7bb41fd23a87c93ea1df02
 SHA512:
-  metadata.gz: a0a346641c4c8f09872051634660c1270edaa0c6ca34ee4f9fd13e69736d24c58bb976b45df94cbc4208443204ad0198ab0ef7d1cfbb57b47d9c27995ac81a01
-  data.tar.gz: 0cfa26fb63e2750dd4b3ab3bb1472fefbbc589f24d29fcacfbeb13ea55b787cd46f0b249b57b5f0fa5706786dc6b72cfd67da64e2feff86a40eb11ba18e1728c
+  metadata.gz: e1e402abcbadc38764b851c7b014e39493692b71247f0db412d75d063b5c844c9048c2faa2dc695f37cb53ee9809d8386a2cae994d0b76afa10952f0889af03e
+  data.tar.gz: 65c154fb5ecdb60e364500614f7f7eb1346d3054a1923ec092a0cf52c874a16b150cd383d2aca07cd0ad9dd8455a4500bdde53a24e26b87601f80f946d8bfe29

data/README.md

@@ -1,7 +1,6 @@
 # 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)
-
+[![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.

data/Rakefile

@@ -1,5 +1,12 @@
+require 'rubygems'
+require 'bundler/setup'
+
 task default: %w[test]
 
+task :build_gem do
+  exec 'gem build racket.gemspec'
+end
+
 task :doc do
   exec 'yard'
 end

data/lib/racket.rb

@@ -1,22 +1,20 @@
-=begin
-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/>.
-=end
+# 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/>.
 
 require 'pathname'
 require 'rack'
@@ -31,6 +29,7 @@ require_relative 'racket/session.rb'
 require_relative 'racket/view_cache.rb'
 require_relative 'racket/utils.rb'
 
+# Racket main namespace
 module Racket
   # Requires a file using the current application directory as a base path.
   #

data/lib/racket/application.rb

@@ -1,29 +1,26 @@
-=begin
-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/>.
-=end
+# 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/>.
 
 require 'logger'
 
 module Racket
   # Racket main application class.
   class Application
-
     @options = nil
 
     # Returns the internal application object. When called for the first time this method will use
@@ -32,13 +29,16 @@ module Racket
     # @return [Rack::Builder]
     def self.application
       return @application if @application
+      @options[:middleware].unshift(@options[:session_handler]) if @options[:session_handler]
+      @options[:middleware].unshift([Rack::ContentType, @options[:default_content_type]]) if
+        @options[:default_content_type]
       @options[:middleware].unshift([Rack::ShowExceptions]) if dev_mode?
       instance = self
       @application = Rack::Builder.new do
         instance.options[:middleware].each do |middleware|
           klass, opts = middleware
-          instance.inform_dev("Loading middleware #{klass} with options #{opts}.")
-          use *middleware
+          instance.inform_dev("Loading middleware #{klass} with options #{opts.inspect}.")
+          use(*middleware)
         end
         run lambda { |env|
           static_result = instance.serve_static_file(env)
@@ -64,23 +64,25 @@ module Racket
       {
         controller_dir: Utils.build_path(root_dir, 'controllers'),
         default_action: :index,
+        default_content_type: 'text/html',
+        default_controller_helpers: [:routing, :view],
         default_layout: '_default.*',
         default_view: nil,
+        helper_dir: Utils.build_path(root_dir, 'helpers'),
         layout_dir: Utils.build_path(root_dir, 'layouts'),
         logger: Logger.new($stdout),
-        middleware: [
-          [
-            Rack::Session::Cookie,
-            {
-              key: 'racket.session',
-              old_secret: SecureRandom.hex(16),
-              secret: SecureRandom.hex(16)
-            }
-          ]
-        ],
+        middleware: [],
         mode: :live,
         public_dir: Utils.build_path(root_dir, 'public'),
         root_dir: root_dir,
+        session_handler: [
+          Rack::Session::Cookie,
+          {
+            key: 'racket.session',
+            old_secret: SecureRandom.hex(16),
+            secret: SecureRandom.hex(16)
+          }
+        ],
         view_dir: Utils.build_path(root_dir, 'views')
       }
     end
@@ -110,6 +112,15 @@ module Racket
       init({}, reboot)
     end
 
+    # Expands all paths defined in the application, but only if it is set to something usable.
+    #
+    # @return [nil]
+    def self.expand_paths
+      [:controller_dir, :helper_dir, :layout_dir, :public_dir, :view_dir].each do |dir|
+        @options[dir] = Utils.build_path(@options[dir]) if @options[dir]
+      end && nil
+    end
+
     # Writes a message to the logger if there is one present.
     #
     # @param [String] message
@@ -146,6 +157,7 @@ module Racket
       instance_variables.each { |ivar| instance_variable_set(ivar, nil) } if reboot
       fail 'Application has already been initialized!' if @options
       @options = default_options.merge(options)
+      expand_paths
       setup_static_server
       reload
       self
@@ -159,8 +171,7 @@ module Racket
       @options[:last_added_controller] = []
       @controller = nil
       Dir.chdir(@options[:controller_dir]) do
-        files = Pathname.glob(File.join('**', '*.rb'))
-        files.map! { |file| file.to_s }
+        files = Pathname.glob(File.join('**', '*.rb')).map!(&:to_s)
         # Sort by longest path so that the longer paths gets matched first
         # HttpRouter claims to be doing this already, but this "hack" is needed in order
         # for the router to work.
@@ -252,7 +263,7 @@ module Racket
       @view_cache ||= ViewCache.new(@options[:layout_dir], @options[:view_dir])
     end
 
-    private_class_method  :application, :default_options, :inform, :init, :load_controllers,
-                          :setup_routes, :setup_static_server
+    private_class_method :application, :default_options, :expand_paths, :inform, :init,
+                         :load_controllers, :setup_routes, :setup_static_server
   end
 end

data/lib/racket/controller.rb

@@ -1,27 +1,52 @@
-=begin
-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/>.
-=end
+# 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/>.
 
 module Racket
-
   # Base controller class. Your controllers should inherit this class.
   class Controller
+    def self.__load_helpers(helpers)
+      helper_dir = Application.options.fetch(:helper_dir, nil)
+      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
+          helper_modules[helper] = Racket::Helpers.const_get(helper_module)
+          Application.inform_dev("Added helper module #{helper.inspect} to class #{self}.")
+        rescue NameError
+          Application.inform_dev(
+            "Failed to add helper module #{helper.inspect} to class #{self}.", :warn
+          )
+        end
+      end
+      helper_modules
+    end
+
+    private_class_method :__load_helpers
 
     # Adds a hook to one or more actions.
     #
@@ -32,7 +57,7 @@ module Racket
     def self.__register_hook(type, methods, blk)
       key = "#{type}_hooks".to_sym
       meths = public_instance_methods(false)
-      meths = meths & methods.map { |method| method.to_sym} unless methods.empty?
+      meths &= methods.map(&:to_sym) unless methods.empty?
       hooks = get_option(key) || {}
       meths.each { |meth| hooks[meth] = blk }
       set_option(key, hooks)
@@ -59,6 +84,30 @@ module Racket
       __register_hook(:before, methods, blk) if block_given?
     end
 
+    # Adds one or more helpers to the controller. All controllers get some default helpers
+    # (see Application.default_options), but if you have your own helpers you want to load this
+    # is the preferred method.
+    #
+    # By default Racket will look for your helpers in the helpers directory, but you can specify
+    # another location by setting the helper_dir option.
+    #
+    # @param [Array] helpers An array of symbols representing classes living in the Racket::Helpers
+    #  namespace.
+    def self.helper(*helpers)
+      helper_modules = {}
+      existing_helpers = get_option(:helpers)
+      if existing_helpers.nil?
+        # No helpers has been loaded yet. Load the default helpers.
+        existing_helpers = Application.options.fetch(:default_controller_helpers, [])
+        helper_modules.merge!(__load_helpers(existing_helpers))
+      end
+      # Load new helpers
+      helpers.map! { |helper| helper.to_sym }
+      helpers.reject! { |helper| helper_modules.key?(helper) }
+      helper_modules.merge!(__load_helpers(helpers))
+      set_option(:helpers, helper_modules)
+    end
+
     # :nodoc:
     def self.inherited(klass)
       Application.options[:last_added_controller].push(klass)
@@ -83,7 +132,7 @@ module Racket
     # @param [Object] value
     def self.set_option(key, value)
       @options ||= {}
-      @options[key] = value
+      (@options[key] = value) && nil
     end
 
     # Returns an option from the current controller class.
@@ -94,72 +143,69 @@ module Racket
       self.class.get_option(key)
     end
 
-    # Returns a route to an action within the current controller.
+    # Redirects the client. After hooks are run.
     #
-    # @param [Symbol] action
-    # @param [Array] params
-    # @return [String]
-    def rs(action, *params)
-      Application.get_route(self.class, action, params)
-    end
-
-    # Returns a route to an action within another controller.
-    #
-    # @param [Class] controller
-    # @param [Symbol] action
-    # @param [Array] params
-    # @return [String]
-    def r(controller, action, *params)
-      Application.get_route(controller, action, params)
+    # @param [String] target URL to redirect to
+    # @param [Fixnum] status HTTP status to send
+    # @return [Object]
+    def redirect(target, status = 302)
+      response.redirect(target, status)
+      respond(response.status, response.headers, '')
     end
 
-    # Redirects the client. After hooks are
+    # Redirects the client. After hooks are *NOT* run.
     #
     # @param [String] target URL to redirect to
     # @param [Fixnum] status HTTP status to send
-    # @param [true|false] run_after_hook Whether after hook should be run before redirecting
     # @return [Object]
-    def redirect(target, status = 302, run_after_hook = true)
+    def redirect!(target, status = 302)
       response.redirect(target, status)
-      respond(response.status, response.headers, '', run_after_hook);
+      respond!(response.status, response.headers, '')
+    end
+
+    # Stop processing request and send a custom response. After calling this method, after hooks
+    # (but no rendering) will be run.
+    #
+    # @param [Fixnum] status
+    # @param [Hash] headers
+    # @param [String] body
+    def respond(status = 200, headers = {}, body = '')
+      __run_hook(:after)
+      respond!(status, headers, body)
     end
 
     # Stop processing request and send a custom response. After calling this method, no further
-    # processing of the request is done unless +run_after_hook+ is set to true. If +run_after_hook+
-    # is set to true, any after hook associated with the action (but no other code) will be run.
+    # processing of the request is done.
     #
     # @param [Fixnum] status
     # @param [Hash] headers
     # @param [String] body
-    # @param [true|false] run_after_hook Whether after hook should be run
-    def respond(status = 200, headers = {}, body = '', run_after_hook = false)
-      __run_hook(:after, racket.action) if run_after_hook
+    def respond!(status = 200, headers = {}, body = '')
       throw :response, [status, headers, body]
     end
 
-    # Renders an action.
+    # Calls hooks, action and renderer.
     #
-    # @param [Symbol] action
     # @return [String]
-    def render(action)
-      __execute(action)
+    def __run
+      __run_hook(:before)
+      __run_action
+      __run_hook(:after)
       Application.view_cache.render(self)
     end
 
     private
 
-    def __execute(action)
-      __run_hook(:before, action)
-      meth = method(action)
+    def __run_action
+      meth = method(racket.action)
       params = racket.params[0...meth.parameters.length]
-      racket.action_result = meth.call(*params)
-      __run_hook(:after, action)
+      (racket.action_result = meth.call(*params)) && nil
     end
 
-    def __run_hook(type, action)
+    def __run_hook(type)
       hooks = controller_option("#{type}_hooks".to_sym) || {}
-      self.instance_eval &hooks[action] if hooks.key?(action)
+      blk = hooks.fetch(racket.action, nil)
+      (instance_eval(&blk) if blk) && nil
     end
-
   end
 end

data/lib/racket/current.rb

@@ -1,22 +1,20 @@
-=begin
-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/>.
-=end
+# 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/>.
 
 module Racket
   # Represents the current state of Racket while processing a request. The state gets mixed into
@@ -30,15 +28,19 @@ module Racket
     # Called whenever a new request needs to be processed.
     #
     # @param [Hash] env Rack environment
+    # @param [Class] klass Target klass, needed because we are copying stuff from the class to the
+    #   instance.
     # @param [Symbol] action Keeps track of which action was called on the controller
     # @param [Array] params Parameters sent to the action
     # @return [Module] A module encapsulating all state relating to the current request
-    def self.init(env, action, params)
+    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')
       Module.new do
+        klass.get_option(:helpers).each_value { |helper| include helper }
         define_method(:racket) { racket }
         define_method(:request) { request }
         define_method(:response) { response }

data/lib/racket/helpers/routing.rb

@@ -0,0 +1,48 @@
+# 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/>.
+
+module Racket
+  # Helpers module
+  module Helpers
+    # Helper module that handles routing
+    module Routing
+      # Returns a route to an action within another controller.
+      #
+      # @param [Class] controller
+      # @param [Symbol] action
+      # @param [Array] params
+      # @return [String]
+      def route(controller, action, *params)
+        Application.get_route(controller, action, params)
+      end
+
+      alias_method(:r, :route)
+
+      # Returns a route to an action within the current controller.
+      #
+      # @param [Symbol] action
+      # @param [Array] params
+      # @return [String]
+      def route_self(action, *params)
+        Application.get_route(self.class, action, params)
+      end
+
+      alias_method(:rs, :route_self)
+    end
+  end
+end

data/lib/racket/helpers/view.rb

@@ -0,0 +1,35 @@
+# 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/>.
+
+module Racket
+  # Helpers module
+  module Helpers
+    # Helper module that handles views
+    module View
+      # Renders a template file using the specified context.
+      #
+      # @param [String] template
+      # @param [Object] context
+      # @return [String|nil]
+      def render_template(template, context = self)
+        return nil unless Utils.file_readable?(template)
+        Tilt.new(template).render(context)
+      end
+    end
+  end
+end

data/lib/racket/request.rb

@@ -1,22 +1,20 @@
-=begin
-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/>.
-=end
+# 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/>.
 
 module Racket
   # Represents an incoming request. Mostly matches Rack::Request but removes some methods that

data/lib/racket/response.rb

@@ -1,22 +1,20 @@
-=begin
-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/>.
-=end
+# 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/>.
 
 module Racket
   # Represents a response from the application

data/lib/racket/router.rb

@@ -1,22 +1,22 @@
-=begin
-Racket - The noisy Rack MVC framework
-Copyright (C) 2015  Lars Olsson <lasso@lassoweb.se>
+# 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/>.
 
-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/>.
-=end
+require 'set'
 
 require 'http_router'
 
@@ -35,7 +35,7 @@ module Racket
     # @param [Class] controller
     # @return [nil]
     def cache_actions(controller)
-      actions = Set.new
+      actions = SortedSet.new
       current = controller
       while current < Controller
         actions.merge(current.instance_methods(false))
@@ -76,10 +76,10 @@ module Racket
     # @todo: Allow the user to set custom handlers for different errors
     def render_error(status, error = nil)
       # If running in dev mode, let Rack::ShowExceptions handle the error.
-      raise error if error && Application.dev_mode?
+      fail(error) if error && Application.dev_mode?
 
       # Not running in dev mode, let us handle the error ourselves.
-      response = Response.new([], status, { 'Content-Type' => 'text/plain' })
+      response = Response.new([], status, 'Content-Type' => 'text/plain')
       response.write("#{status} #{Rack::Utils::HTTP_STATUS_CODES[status]}")
       response.finish
     end
@@ -89,36 +89,35 @@ module Racket
     # @param [Hash] env Rack environment
     # @return [Array] A Rack response triplet
     def route(env)
-      begin
-        catch :response do # Catches early exits from Controller.respond.
-          # Find controller in map
-          # If controller exists, call it
-          # Otherwise, send a 404
-          matching_routes = @router.recognize(env)
-          unless matching_routes.first.nil?
-            target_klass = matching_routes.first.first.route.dest
-            params = matching_routes.first.first.param_values.first.reject { |e| e.empty? }
-            action = params.empty? ? target_klass.get_option(:default_action) : params.shift.to_sym
+      catch :response do # Catches early exits from Controller.respond.
+        # Find controller in map
+        # If controller exists, call it
+        # Otherwise, send a 404
+        matching_routes = @router.recognize(env)
+
+        # Exit early if no controller is responsible for the route
+        return render_error(404) if matching_routes.first.nil?
 
-            # Check if action is available on target
-            return render_error(404) unless @actions_by_controller[target_klass].include?(action)
+        # Some controller is claiming to be responsible for the route
+        target_klass = matching_routes.first.first.route.dest
+        params = matching_routes.first.first.param_values.first.reject(&:empty?)
+        action = params.empty? ? target_klass.get_option(:default_action) : params.shift.to_sym
 
-            # Rewrite PATH_INFO to reflect that we split out the parameters
-            env['PATH_INFO'] = env['PATH_INFO']
-                                 .split('/')[0...-params.count]
-                                 .join('/') unless params.empty?
+        # Check if action is available on target
+        return render_error(404) unless @actions_by_controller[target_klass].include?(action)
 
-            # Initialize and render target
-            target = target_klass.new
-            target.extend(Current.init(env, action, params))
-            target.render(action)
-          else
-            render_error(404)
-          end
-        end
+        # Rewrite PATH_INFO to reflect that we split out the parameters
+        env['PATH_INFO'] = env['PATH_INFO']
+                           .split('/')[0...-params.count]
+                           .join('/') unless params.empty?
+
+        # Initialize and render target
+        target = target_klass.new
+        target.extend(Current.init(env, target_klass, action, params))
+        target.__run
+      end
       rescue => err
         render_error(500, err)
-      end
     end
   end
 end

data/lib/racket/session.rb

@@ -1,22 +1,20 @@
-=begin
-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/>.
-=end
+# 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/>.
 
 module Racket
   # Racket::Session is just a thin wrapper around whetever object that is implementing the session
@@ -31,7 +29,7 @@ module Racket
     def inspect
       "#<#{self.class}:#{object_id}>"
     end
-    alias :to_s inspect
-    alias :to_str inspect
+    alias_method(:to_s, :inspect)
+    alias_method(:to_str, :inspect)
   end
 end

data/lib/racket/utils.rb

@@ -1,22 +1,20 @@
-=begin
-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/>.
-=end
+# 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/>.
 
 module Racket
   # Collects utilities needed by different objects in Racket.
@@ -28,9 +26,10 @@ module Racket
     # @param [Array] args
     # @return [String]
     def self.build_path(*args)
-      if (args.empty?)
+      if args.empty?
         path = Pathname.pwd
       else
+        args.map! { |arg| arg.to_s }
         path = Pathname.new(args.shift)
         path = Pathname.new(Application.options[:root_dir]).join(path) if path.relative?
         args.each do |arg|
@@ -46,5 +45,10 @@ module Racket
       pathname = Pathname.new(path)
       pathname.exist? && pathname.directory? && pathname.readable?
     end
+
+    def self.file_readable?(path)
+      pathname = Pathname.new(path)
+      pathname.exist? && pathname.file? && pathname.readable?
+    end
   end
 end

data/lib/racket/version.rb

@@ -1,22 +1,20 @@
-=begin
-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/>.
-=end
+# 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/>.
 
 module Racket
   # The only purpose of this module is to keep track of the current Racket version. It is *not*
@@ -27,7 +25,7 @@ module Racket
     # Minor version
     MINOR = 1
     # Teeny version
-    TEENY = 0
+    TEENY = 1
     # Prerelease ?
     PRERELEASE = false
 

data/lib/racket/view_cache.rb

@@ -1,29 +1,26 @@
-=begin
-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/>.
-=end
+# 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/>.
 
 require 'tilt'
 
 module Racket
   # Handles rendering in Racket applications.
   class ViewCache
-
     def initialize(layout_base_dir, template_base_dir)
       @layout_base_dir = layout_base_dir
       @template_base_dir = template_base_dir
@@ -95,14 +92,14 @@ module Racket
           if default_file
             files = Pathname.glob(default_file)
             return nil if files.empty? # No default file found
-            return File.join(file_path, files.first.to_s)
+            final_path = File.join(file_path, files.first.to_s)
+            return Utils.file_readable?(final_path) ? final_path : nil
           end
           return nil # Neither default file or specified file found
         end
-        File.join(file_path, files.first.to_s)
+        final_path = File.join(file_path, files.first.to_s)
+        return Utils.file_readable?(final_path) ? final_path : nil
       end
     end
-
   end
-
 end

data/spec/_custom.rb

@@ -9,7 +9,7 @@ describe 'A custom Racket test Application' do
 
   it 'should set requested options' do
     app.options[:default_layout].should.equal('zebra.*')
-    app.options[:view_dir].should.equal('templates')
+    app.options[:view_dir].should.equal(Racket::Utils.build_path('templates'))
   end
 
   it 'should be able to get/set options on controller' do
@@ -17,6 +17,10 @@ describe 'A custom Racket test Application' do
     last_response.status.should.equal(302)
     last_response.headers['Location'].should.equal('/sub3/a_secret_place/42')
     last_response.body.length.should.equal(0)
+    get '/sub3/not_so_secret'
+    last_response.status.should.equal(302)
+    last_response.headers['Location'].should.equal('/sub3/not_so_secret/21')
+    last_response.body.length.should.equal(0)
   end
 
   it 'should return a 404 on a nonexisting url' do
@@ -55,4 +59,11 @@ describe 'A custom Racket test Application' do
     last_response.headers['Content-Type'].should.equal('text/plain')
     last_response.body.should.match(%r(^RuntimeError: Epic fail!))
   end
+
+  it 'should be able to render custom files' do
+    get '/sub3/render_a_file'
+    last_response.status.should.equal(200)
+    last_response.headers['Content-Type'].should.equal('text/html')
+    last_response.body.should.equal("The secret is 42!\n")
+  end
 end

data/spec/_default.rb

@@ -11,7 +11,7 @@ describe 'A default Racket test Application' do
 
   it 'has mapped controllers correctly' do
     routes_by_controller = actions_by_controller = nil
-    routes = app.instance_eval do
+    app.instance_eval do
       router.instance_eval do
         routes_by_controller = @routes_by_controller
         actions_by_controller = @actions_by_controller

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

@@ -29,4 +29,6 @@ class CustomSubController2 < Racket::Controller
     response.headers['X-Hook-Action'] = 'run'
   end
 
+  helper :nonexisting
+
 end

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

@@ -10,4 +10,18 @@ class CustomSubController3 < Racket::Controller
     redirect(rs(__method__, controller_option(:top_secret)))
   end
 
+  def not_so_secret
+    redirect!(rs(__method__, 21))
+  end
+
+  after :not_so_secret do
+    fail 'Should not happen!'
+  end
+
+  def render_a_file
+    obj = Object.new
+    obj.instance_eval { @secret = 42 }
+    render_template('files/secret.erb', obj)
+  end
+
 end

data/spec/test_custom_app/files/secret.erb

@@ -0,0 +1 @@
+The secret is <%=@secret%>!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: racket-mvc
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Lars Olsson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2015-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_router
@@ -149,6 +149,8 @@ files:
 - lib/racket/application.rb
 - lib/racket/controller.rb
 - lib/racket/current.rb
+- lib/racket/helpers/routing.rb
+- lib/racket/helpers/view.rb
 - lib/racket/request.rb
 - lib/racket/response.rb
 - lib/racket/router.rb
@@ -166,6 +168,7 @@ files:
 - spec/test_custom_app/controllers/sub3/inherited/custom_inherited_controller.rb
 - spec/test_custom_app/extra/blob.rb
 - spec/test_custom_app/extra/blob/inner_blob.rb
+- spec/test_custom_app/files/secret.erb
 - spec/test_custom_app/layouts/sub2/zebra.erb
 - spec/test_custom_app/templates/sub2/template.erb
 - spec/test_default_app/controllers/default_root_controller.rb