happy 0.1.0.pre19 → 0.1.0.pre20

data/example/config.ru

@@ -0,0 +1,105 @@
+lib_path = File.expand_path("#{File.dirname(__FILE__)}/../lib")
+$LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
+
+require 'happy'
+require 'cgi'
+
+class TestApp < Happy::Controller
+  def examples; @examples ||= {}; end
+
+  def example(name, path_name = nil, &blk)
+    path_name ||= name.parameterize
+    examples[name] = path_name
+
+    # Create a path containing the example's code block
+    path(path_name, &blk)
+  end
+
+  def route
+    example 'Returning just a string' do
+      "I'm just a string!"
+    end
+
+    example 'Explicit responses' do
+      serve! "I was served through #serve!"
+      serve! "I'm not being served, since the above call to #serve! halted processing."
+    end
+
+    example 'Path parameters' do
+      path 'hello' do
+        path :name do
+          "Hello, #{params['name']}!"
+        end
+      end
+
+      "Try #{link_to 'this', current_url('hello', 'hendrik')}!"
+    end
+
+    example 'Inline path parameters' do
+      path 'hello-:name' do
+        "Hello, #{params['name']}!"
+      end
+
+      "Try #{link_to 'this', current_url('hello-hendrik')}!"
+    end
+
+    example 'Permissions' do
+      # set up permissions ;-)
+      can.dance!
+
+      path 'dance' do
+        if can.dance?
+          "You can dance."
+        else
+          "You can not dance."
+        end
+      end
+
+      "Can you #{link_to 'dance', current_url('dance')}?"
+    end
+
+    example 'Layouts' do
+      path 'with-layout' do
+        layout 'layout.erb'
+
+        path 'changed-my-mind' do
+          layout false
+          "This should render without a layout."
+        end
+
+        "This should render with a layout."
+      end
+
+      "This should render without a layout."
+    end
+
+    example 'Invoking other controllers' do
+      # creata new controller on the fly
+      c = Happy.route do
+        "Controller wrapping works, yay!"
+      end
+
+      # pass control over the request to that controller
+      run c
+    end
+
+    example 'Invoking Rack apps' do
+      # define a Rack app
+      rackapp = lambda { |env| [200, {'Content-type' => 'text/html'}, ["It works!"]] }
+
+      # pass control over the request to the Rack application
+      run rackapp
+    end
+
+    example 'Errors' do
+      null = Happy::Controller.new
+
+      # Trigger an error. This should display a nice error page.
+      null.foobar
+    end
+
+    render 'index.erb'
+  end
+end
+
+run TestApp

data/example/views/index.erb

@@ -0,0 +1,7 @@
+<h3>Happy Tests</h3>
+
+<ul>
+  <% examples.each do |name, args| %>
+    <li><%= link_to name, args %></li>
+  <% end %>
+</ul>

data/example/views/layout.erb

@@ -0,0 +1,3 @@
+<h1>With Layout!</h1>
+
+<%= yield %>

data/happy.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'activesupport', '~> 3.1'
   gem.add_dependency 'rack', '~> 1.4'
-  gem.add_dependency 'happy-helpers', '~> 0.1.0.pre10'
+  gem.add_dependency 'happy-helpers', '~> 0.1.0.pre11'
   gem.add_dependency 'allowance', '>= 0.1.1'
 
   gem.add_dependency 'happy-cli', '>= 0.1.0.pre1'

data/lib/happy.rb

@@ -1,7 +1,6 @@
 require 'rack'
 require 'happy/version'
 require 'happy/errors'
-require 'happy/context'
 require 'happy/controller'
 
 module Happy
@@ -13,22 +12,8 @@ module Happy
   # its routing block.
   #
   def self.route(&blk)
-    @last_controller_class_created = Class.new(Happy::Controller).tap do |klass|
+    Class.new(Happy::Controller).tap do |klass|
       klass.send(:define_method, :route, &blk)
     end
   end
-
-  # Run the provided block against Happy::Context. Use this to add new
-  # methods to the request context class.
-  #
-  def self.context(&blk)
-    Context.class_exec(&blk)
-  end
-
-  def self.call(env)
-    @last_controller_class_created.try(:call, env) or raise "Please use Happy.route to define some routes."
-  end
 end
-
-__END__
-yooooooo!

data/lib/happy/controller.rb

@@ -1,7 +1,13 @@
+require 'happy/request'
+require 'happy/response'
+
+require 'happy/controller/helpers'
 require 'happy/controller/routing'
 require 'happy/controller/actions'
 require 'happy/controller/rackable'
 require 'happy/controller/configurable'
+require 'happy/controller/cascadable'
+require 'happy/controller/permissions'
 
 module Happy
   # Base class for Happy controllers. A controller's primary job is to act
@@ -14,13 +20,11 @@ module Happy
     include Actions
     include Rackable
     include Configurable
+    include Cascadable
+    include Permissions
+    include Helpers
 
-    attr_reader :options, :env, :root_path
-
-    delegate :request, :response, :params, :session,
-      :previous_path, :remaining_path,
-      :render, :url_for,
-      :to => :context
+    attr_reader :options, :env, :unprocessed_path, :processed_path
 
     # Creates a new instance of {Controller}. When a block is provided,
     # it is run against the new instance, allowing custom controller classes
@@ -31,45 +35,54 @@ module Happy
     # @param options [Hash]
     #   Controller options.
     #
-    def initialize(env = {}, options = {}, &blk)
-      @env = env
+    def initialize(env_or_parent = {}, options = {}, &blk)
+      if env_or_parent.is_a?(Happy::Controller)
+        @parent_controller = env_or_parent
+        @env = @parent_controller.env
+        @unprocessed_path = env_or_parent.unprocessed_path
+        @processed_path = env_or_parent.processed_path
+      else
+        @env = env_or_parent
+        @unprocessed_path = request.path.split('/').reject {|s| s.blank? }
+        @processed_path  = []
+      end
+
       @options = options
 
       # Save a copy of the current path as this controller's root path.
-      @root_path = context.previous_path.dup
+      @root_url = processed_path.join('/')
 
       # Execute block against this instance, allowing the controller to
       # provide a DSL for configuration.
       instance_exec(&blk) if blk
     end
 
-  protected
-
-    # Run this controller, performing its routing logic.
-    #
-    def perform
-      context.with_controller(self) do
-        route
-      end
+    def request
+      @env['happy.request'] ||= Happy::Request.new(@env)
     end
 
-    def root_url(extras = nil)
-      url_for(root_path, extras)
+    def response
+      @env['happy.response'] ||= Happy::Response.new
     end
 
-  private
+  protected
 
-    def url(extras = nil)
-      url_for(previous_path, extras)
+    def root_url(*extras)
+      url_for(@root_url, extras)
     end
 
-    def context
-      @env['happy.context'] ||= Happy::Context.new(@env)
+  private
+
+    def current_url(*extras)
+      url_for(processed_path, extras)
     end
 
     def route
       # override this in subclasses
     end
 
+    def params; request.params; end
+    def session; request.session; end
+
   end
 end

data/lib/happy/controller/actions.rb

@@ -8,7 +8,7 @@ module Happy
 
           # Mix in default options
           options = {
-            :layout => context.layout
+            :layout => response.layout
           }.merge(options)
 
           # Add status code from options
@@ -31,9 +31,9 @@ module Happy
         end
       end
 
-      def halt!(message = :done)
+      def halt!(message = :done, what = nil)
         only_if_path_matches do
-          throw message
+          throw message, what || response
         end
       end
 
@@ -46,7 +46,7 @@ module Happy
       end
 
       def layout(name)
-        context.layout = name
+        response.layout = name
       end
 
       def content_type(type)
@@ -79,11 +79,10 @@ module Happy
       def run(thing, options = {}, &blk)
         if thing.is_a?(Class) && thing.ancestors.include?(Happy::Controller)
           # Happy controllers!
-          thing.new(env, options, &blk).perform
+          thing.new(self, options, &blk).route
         elsif thing.respond_to?(:call)
           # Rack apps!
-          context.response = thing.call(request.env)
-          throw :done
+          throw :done, thing.call(request.env)
         elsif thing.respond_to?(:to_s)
           thing.to_s
         else
@@ -99,7 +98,7 @@ module Happy
       # is not the path the user requested.)
       #
       def only_if_path_matches
-        yield if remaining_path.empty?
+        yield if unprocessed_path.empty?
       end
     end
   end

data/lib/happy/controller/cascadable.rb

@@ -0,0 +1,17 @@
+module Happy
+  class Controller
+    module Cascadable
+      def method_missing(name, *args, &blk)
+        if @parent_controller && @parent_controller.respond_to?(name)
+          @parent_controller.send(name, *args, &blk)
+        else
+          super
+        end
+      end
+
+      def respond_to?(name)
+        super || @parent_controller.try(:respond_to?, name)
+      end
+    end
+  end
+end

data/lib/happy/{context → controller}/helpers.rb

@@ -1,7 +1,7 @@
 require 'happy-helpers'
 
 module Happy
-  class Context
+  class Controller
     module Helpers
       include HappyHelpers::Helpers
 

data/lib/happy/controller/permissions.rb

@@ -0,0 +1,17 @@
+require 'allowance'
+
+module Happy
+  class Controller
+    module Permissions
+      def permissions(&blk)
+        (@env['happy.permissions'] ||= Allowance::Permissions.new).tap do |p|
+          if blk
+            blk.arity == 0 ? p.instance_exec(&blk) : blk.call(p)
+          end
+        end
+      end
+
+      alias_method :can, :permissions
+    end
+  end
+end

data/lib/happy/controller/rackable.rb

@@ -4,19 +4,21 @@ module Happy
       extend ActiveSupport::Concern
 
       def handle_request
-        catch :done do
-          serve!(perform) or raise Errors::NotFound
+        r = catch :done do
+          serve!(route) or raise Errors::NotFound
         end
 
-        response
+        r ||response
+
       rescue Errors::NotFound => e
-        html = Errors.html e, env,
+        html = Errors.html e, self,
           :title => "Path not found",
           :message => '',
-          :friendly_message => "You performed a <strong>#{context.request.request_method}</strong> request on <strong>#{context.request.path}</strong>, but your application did not know how to handle this request."
+          :friendly_message => "You performed a <strong>#{request.request_method}</strong> request on <strong>#{request.path}</strong>, but your application did not know how to handle this request."
         [404, {'Content-type' => 'text/html'}, [html]]
+
       rescue ::Exception => e
-        html = Errors.html e, env
+        html = Errors.html e, self
         [500, {'Content-type' => 'text/html'}, [html]]
       end
 

data/lib/happy/controller/routing.rb

@@ -16,13 +16,13 @@ module Happy
           if name.present?
             # convert symbols to ":foo" type string
             name = ":#{name}" if name.is_a?(Symbol)
-            path_match = path_to_regexp(name).match(remaining_path.first)
+            path_match = path_to_regexp(name).match(unprocessed_path.first)
           end
 
           # Match the request method, if specified
           method_matched = [nil, request.request_method.downcase.to_sym].include?(options[:method])
 
-          path_matched   = (path_match || (name.nil? && remaining_path.empty?))
+          path_matched   = (path_match || (name.nil? && unprocessed_path.empty?))
 
           # Only do something here if method and requested path both match
           if path_matched && method_matched
@@ -31,7 +31,7 @@ module Happy
               name.scan(/:(\w+)/).flatten.each do |var|
                 request.params[var] = path_match.captures.shift
               end
-              previous_path << remaining_path.shift
+              processed_path << unprocessed_path.shift
             end
 
             serve!(instance_exec(&blk)) or raise Errors::NotFound

data/lib/happy/errors.rb

@@ -18,15 +18,13 @@ module Happy
     #   Friendly error message to be displayed below title and message.
     #   If left blank, will be generated from the exception message.
     #
-    def self.html(exception, env, options = {})
+    def self.html(exception, controller, options = {})
       options = {
         :title => exception.class.to_s,
         :message => exception.message,
         :friendly_message => nil
       }.merge(options)
 
-      context = env['happy.context']
-
       # Load and cache error template.
       @html = begin
         File.read(File.expand_path(File.join(__FILE__, '../files/error.erb')))

data/lib/happy/extras/resources.rb

@@ -1,5 +1,3 @@
-require 'happy/extras/permissions'
-
 module Happy
   module Extras
     module Resources
@@ -31,19 +29,19 @@ module Happy
         end
 
         def set_plural_variable(v)
-          context.instance_variable_set "@#{options[:plural_name]}", v
+          instance_variable_set "@#{options[:plural_name]}", v
         end
 
         def plural_variable
-          context.instance_variable_get "@#{options[:plural_name]}"
+          instance_variable_get "@#{options[:plural_name]}"
         end
 
         def set_singular_variable(v)
-          context.instance_variable_set "@#{options[:singular_name]}", v
+          instance_variable_set "@#{options[:singular_name]}", v
         end
 
         def singular_variable
-          context.instance_variable_get "@#{options[:singular_name]}"
+          instance_variable_get "@#{options[:singular_name]}"
         end
 
         def do_index

data/lib/happy/extras/scriptable.rb

@@ -4,7 +4,6 @@ module Happy
   module Extras
     class Scriptable < Happy::Controller
       def route
-        Happy::Context.class_eval(load_script 'context.rb')
         run_script 'permissions.rb'
         run_script 'route.rb'
       end

data/lib/happy/files/error.erb

@@ -110,17 +110,17 @@
 
     <h2>Request Parameters:</h2>
     <div class="output params">
-      <%= h context.request.params.inspect %>
+      <%= h controller.request.params.inspect %>
     </div>
 
     <h2>Session:</h2>
     <div class="output session">
-      <%= h context.request.session.inspect %>
+      <%= h controller.request.session.inspect %>
     </div>
 
     <h2>Environment:</h2>
     <div class="output env">
-      <%= h env %>
+      <%= h controller.env %>
     </div>
 
     <p>

data/lib/happy/response.rb

@@ -0,0 +1,10 @@
+module Happy
+  class Response < Rack::Response
+    attr_accessor :layout
+
+    def initialize(*args)
+      super
+      @layout = nil
+    end
+  end
+end

data/lib/happy/version.rb

@@ -1,3 +1,3 @@
 module Happy
-  VERSION = "0.1.0.pre19"
+  VERSION = "0.1.0.pre20"
 end

data/spec/controller/actions_spec.rb

@@ -28,7 +28,7 @@ module Happy
 
       it "uses the layout provided through the :layout option" do
         instance = Controller.new
-        instance.send(:context).should_receive(:render).with('layout.erb')
+        instance.should_receive(:render).with('layout.erb')
 
         catch(:done) { instance.serve! "content", :layout => 'layout.erb' }
       end
@@ -138,12 +138,12 @@ module Happy
 
     describe '#header' do
       it "sets the specified header in the response" do
-        subject.send(:context).response.should_receive(:[]=).with('Content-type', 'text/css')
+        subject.send(:response).should_receive(:[]=).with('Content-type', 'text/css')
         subject.header 'Content-type', 'text/css'
       end
 
       it "also accepts the header name as a symbol" do
-        subject.send(:context).response.should_receive(:[]=).with('Content-type', 'text/css')
+        subject.send(:response).should_receive(:[]=).with('Content-type', 'text/css')
         subject.header :content_type, 'text/css'
       end
     end
@@ -157,7 +157,7 @@ module Happy
 
     describe '#layout' do
       it "sets the layout to be used by the current context" do
-        subject.send(:context).should_receive(:layout=).with('layout.erb')
+        subject.send(:response).should_receive(:layout=).with('layout.erb')
         subject.layout 'layout.erb'
       end
     end

data/spec/controller/cascadable_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+module Happy
+  describe Controller::Cascadable do
+
+    describe '#method_missing' do
+      it "passes on all method calls to a parent if there is one" do
+        class Inner < Controller
+          def route
+            path 'one' do
+              some_helper
+            end
+
+            path 'two' do
+              some_unknown_helper
+            end
+          end
+        end
+
+        class Middle < Controller
+          def route
+            run Inner
+          end
+        end
+
+        class Outer < Controller
+          def some_helper; 'some_information'; end
+          def route
+            run Middle
+          end
+        end
+
+        def app
+          Outer
+        end
+
+        response_for { get '/one' }.body.should == 'some_information'
+        response_for { get '/two' }.status.should == 500
+      end
+    end
+
+  end
+end

data/spec/controller_spec.rb

@@ -18,19 +18,19 @@ module Happy
       last_response.body.should == 'it works'
     end
 
-    describe '#url' do
+    describe '#current_url' do
       it "returns the current URL" do
         def app
           build_controller do
             path 'foo' do
               path 'bar' do
-                "My URL is #{url}"
+                "My URL is #{current_url}"
               end
 
-              "My URL is #{url}"
+              "My URL is #{current_url}"
             end
 
-            "My URL is #{url}"
+            "My URL is #{current_url}"
           end
         end
 
@@ -43,12 +43,12 @@ module Happy
         def app
           build_controller do
             path 'foo' do
-              url('bar')
+              current_url('bar', 'moo')
             end
           end
         end
 
-        response_for { get '/foo' }.body.should == "/foo/bar"
+        response_for { get '/foo' }.body.should == "/foo/bar/moo"
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: happy
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre19
+  version: 0.1.0.pre20
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-10 00:00:00.000000000 Z
+date: 2012-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70302468087940 !ruby/object:Gem::Requirement
+  requirement: &70246363046260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70302468087940
+  version_requirements: *70246363046260
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70302468086760 !ruby/object:Gem::Requirement
+  requirement: &70246363043080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +32,21 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70302468086760
+  version_requirements: *70246363043080
 - !ruby/object:Gem::Dependency
   name: happy-helpers
-  requirement: &70302468085720 !ruby/object:Gem::Requirement
+  requirement: &70246363042320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre10
+        version: 0.1.0.pre11
   type: :runtime
   prerelease: false
-  version_requirements: *70302468085720
+  version_requirements: *70246363042320
 - !ruby/object:Gem::Dependency
   name: allowance
-  requirement: &70302468084660 !ruby/object:Gem::Requirement
+  requirement: &70246363058000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70302468084660
+  version_requirements: *70246363058000
 - !ruby/object:Gem::Dependency
   name: happy-cli
-  requirement: &70302468122420 !ruby/object:Gem::Requirement
+  requirement: &70246363056880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.1.0.pre1
   type: :runtime
   prerelease: false
-  version_requirements: *70302468122420
+  version_requirements: *70246363056880
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70302468120940 !ruby/object:Gem::Requirement
+  requirement: &70246363056380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70302468120940
+  version_requirements: *70246363056380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70302468119720 !ruby/object:Gem::Requirement
+  requirement: &70246363055680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70302468119720
+  version_requirements: *70246363055680
 - !ruby/object:Gem::Dependency
   name: rspec-html-matchers
-  requirement: &70302468119000 !ruby/object:Gem::Requirement
+  requirement: &70246363054880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70302468119000
+  version_requirements: *70246363054880
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70302468118500 !ruby/object:Gem::Requirement
+  requirement: &70246363054000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70302468118500
+  version_requirements: *70246363054000
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70302468118060 !ruby/object:Gem::Requirement
+  requirement: &70246363053540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70302468118060
+  version_requirements: *70246363053540
 description: A happy little toolkit for writing web applications.
 email:
 - hendrik@mans.de
@@ -137,25 +137,30 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- example/config.ru
+- example/views/index.erb
+- example/views/layout.erb
 - happy.gemspec
 - lib/happy.rb
-- lib/happy/context.rb
-- lib/happy/context/helpers.rb
 - lib/happy/controller.rb
 - lib/happy/controller/actions.rb
+- lib/happy/controller/cascadable.rb
 - lib/happy/controller/configurable.rb
+- lib/happy/controller/helpers.rb
+- lib/happy/controller/permissions.rb
 - lib/happy/controller/rackable.rb
 - lib/happy/controller/routing.rb
 - lib/happy/errors.rb
 - lib/happy/extras/code_reloader.rb
-- lib/happy/extras/permissions.rb
 - lib/happy/extras/resources.rb
 - lib/happy/extras/scriptable.rb
 - lib/happy/extras/static.rb
 - lib/happy/files/error.erb
 - lib/happy/request.rb
+- lib/happy/response.rb
 - lib/happy/version.rb
 - spec/controller/actions_spec.rb
+- spec/controller/cascadable_spec.rb
 - spec/controller/routing_spec.rb
 - spec/controller_spec.rb
 - spec/happy_spec.rb
@@ -186,6 +191,7 @@ specification_version: 3
 summary: A happy little toolkit for writing web applications.
 test_files:
 - spec/controller/actions_spec.rb
+- spec/controller/cascadable_spec.rb
 - spec/controller/routing_spec.rb
 - spec/controller_spec.rb
 - spec/happy_spec.rb

data/lib/happy/context.rb

@@ -1,88 +0,0 @@
-require 'happy/request'
-require 'happy/context/helpers'
-
-module Happy
-  # Represents the current request and its respective application state.
-  # Not only does this class wrap around both the incoming {#request} and the
-  # generated {#response}, but it is also used as the scope for all templates
-  # rendered through {#render_template}.
-  #
-  # (In case you're wondering, a particular request's instance of #{Context} is
-  # created from the Rack environment by #{Controller#context} when first accessed.)
-  #
-  # == View Helpers
-  #
-  # If you're coming from other web frameworks and looking for the right place
-  # to add "view helpers", this is it, since all templates being rendered use
-  # the request's instance of {Context} as their scope.
-  #
-  # The most convenient way of extending this class is through #{Happy.context}.
-  #
-  #     Happy.context do
-  #       def some_helper
-  #         "I'm a view helper!"
-  #       end
-  #     end
-  #
-  # In addition to view helpers, the context is the place to add methods
-  # dealing with the current request scope, eg. methods like 'current_user'.
-  #
-  class Context
-    include Helpers
-
-    # Instance of {Happy::Request} representing the current HTTP request.
-    attr_reader :request
-
-    # The Rack::Response instance being used to compose the response.
-    attr_accessor :response
-
-    # The current layout template to be used when rendering the response.
-    attr_accessor :layout
-
-    # Array containing path parts that are yet to be handled.
-    attr_reader :remaining_path
-
-    # Array of path parts that have been handled so far.
-    attr_reader :previous_path
-
-    delegate :params, :session, :to => :request
-
-    # Initializes a new {Context} instance from a Rack environment hash.
-    #
-    # @param [Hash] env Rack environment hash
-    #
-    def initialize(env)
-      @request        = Happy::Request.new(env)
-      @response       = Rack::Response.new
-
-      @remaining_path = @request.path.split('/').reject {|s| s.blank? }
-      @previous_path  = []
-      @layout         = nil
-      @controller     = nil
-    end
-
-    # @note
-    #   This method is mostly used internally by Happy. You will not need
-    #   to call it from your own controllers or applications.
-    #
-    # Execute the provided block, but register the provided {Controller}
-    # instance as the controller currently handling the request. Call this
-    # whenever you're passing control from one controller to another.
-    #
-    # @param [Controller] new_controller The {Controller} instance to set as the current controller
-    # @return Results of provided block.
-    #
-    def with_controller(new_controller)
-      # remember previous controller
-      old_controller = @controller
-      @controller = new_controller
-
-      # execute block
-      yield if block_given?
-    ensure
-      # switch back to previous controller
-      @controller = old_controller
-    end
-
-  end
-end

data/lib/happy/extras/permissions.rb

@@ -1,32 +0,0 @@
-require 'allowance'
-
-module Happy
-  module Extras
-    module Permissions
-      module ContextExtensions
-        extend ActiveSupport::Concern
-
-        def permissions(&blk)
-          (@permissions ||= Allowance::Permissions.new).tap do |p|
-            if blk
-              blk.arity == 0 ? p.instance_exec(&blk) : blk.call(p)
-            end
-          end
-        end
-
-        alias_method :can, :permissions
-      end
-
-      module ControllerExtensions
-        extend ActiveSupport::Concern
-
-        included do
-          delegate :permissions, :can, :to => :context
-        end
-      end
-    end
-  end
-end
-
-Happy::Context.send(:include, Happy::Extras::Permissions::ContextExtensions)
-Happy::Controller.send(:include, Happy::Extras::Permissions::ControllerExtensions)