happy 0.1.0.pre25 → 0.1.0.pre27

data/.yardopts

@@ -0,0 +1 @@
+--no-private --protected --embed-mixins lib/**/*.rb - README.md TUTORIAL.md LICENSE

data/README.md

@@ -14,7 +14,7 @@ Happy is available as a RubyGem, so just install it through `gem install happy`
 
 ## Usage
 
-* The Happy Book of Happy (work in progress)
+* [The Happy Book of Happy](https://github.com/hmans/happy/blob/master/TUTORIAL.md)
 * [Reference Documentation](http://rdoc.info/github/hmans/happy/master/)
 
 ## Reporting Bugs & Contributing

data/TUTORIAL.md

@@ -0,0 +1,3 @@
+# The Happy Book of Happy
+
+Lorem to the ipsum.

data/example/config.ru

@@ -7,6 +7,8 @@ require 'happy'
 require 'happy/extras/action_controller'
 require 'happy/extras/resource_controller'
 
+require 'haml'
+
 # Controllers are the core building blocks of Happy applications.
 # They're also just Rack apps, so in any Happy app, you will
 # declare at least a "root" controller class and run that through Rack.
@@ -24,6 +26,8 @@ class TestApp < Happy::Controller
   # method, that does the same thing but also records the example in a hash
   # so we can generated a "table of contents" in index.erb.
 
+  set :views, File.expand_path("#{File.dirname(__FILE__)}/views")
+
   def route
     example 'Returning just a string' do
       "I'm just a string!"
@@ -120,9 +124,18 @@ class TestApp < Happy::Controller
       run ResourceTest
     end
 
+    example "Block Helpers" do
+      on('erb')  { render 'block_helpers.erb' }
+      on('haml') { render 'block_helpers.haml' }
+    end
+
     render 'index.erb'
   end
 
+  def blockquotify(&blk)
+    concat_output html_tag(:blockquote) { capture_template_block(&blk) }
+  end
+
   def examples; @examples ||= {}; end
 
   def example(name, path_name = nil, &blk)

data/example/views/block_helpers.erb

@@ -0,0 +1,3 @@
+<% blockquotify do %>
+  This should be inside a blockquote tag.
+<% end %>

data/example/views/block_helpers.haml

@@ -0,0 +1,2 @@
+= blockquotify do
+  This should be inside a blockquote tag.

data/happy.gemspec

@@ -17,8 +17,8 @@ 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.pre11'
   gem.add_dependency 'allowance', '>= 0.1.1'
+  gem.add_dependency 'tilt', '~> 1.3'
 
   # gem.add_dependency 'happy-cli', '>= 0.1.0.pre1'
 

data/lib/happy/controller/configurable.rb

@@ -3,21 +3,29 @@ module Happy
     module Configurable
       extend ActiveSupport::Concern
 
-      def options
-        @options ||= self.class.options.dup
+      # Return a hash containing this controller instance's settings.
+      #
+      def settings
+        @settings ||= self.class.settings.dup
       end
 
+      # Change a setting on this controller instance.
+      #
       def set(k, v)
-        options[k.to_sym] = v
+        settings[k.to_sym] = v
       end
 
       module ClassMethods
-        def options
-          @options ||= {}
+        # Return a hash containing this controller class' default settings.
+        #
+        def settings
+          @settings ||= {}
         end
 
+        # Change a default setting on this controller class.
+        #
         def set(k, v)
-          options[k.to_sym] = v
+          settings[k.to_sym] = v
         end
       end
     end

data/lib/happy/controller.rb

@@ -1,7 +1,6 @@
 require 'happy/request'
 require 'happy/response'
 
-require 'happy/controller/helpers'
 require 'happy/controller/routing'
 require 'happy/controller/actions'
 require 'happy/controller/rackable'
@@ -22,20 +21,20 @@ module Happy
     include Configurable
     include Cascadable
     include Permissions
-    include Helpers
+    include Happy::Helpers
 
     attr_reader :env
 
-    CASCADING_OPTIONS = [:views]
+    CASCADING_SETTINGS = [:views]
 
     # Creates a new instance of {Controller}. When a block is provided,
     # it is run against the new instance, allowing custom controller classes
     # to provide DSL-like configuration.
     #
-    # @param env [Hash]
-    #   Rack environment hash.
-    # @param options [Hash]
-    #   Controller options.
+    # @param env_or_parent [Hash,Controller]
+    #   Rack environment hash _or_ parent controller.
+    # @param opts [Hash]
+    #   Options to be merged with the controller's default (class-level) settings.
     #
     def initialize(env_or_parent = {}, opts = {}, &blk)
       if env_or_parent.is_a?(Happy::Controller)
@@ -49,13 +48,13 @@ module Happy
         @processed_path  = []
       end
 
-      # Augment this instance's options hash with the options given to this constructor
-      options.merge!(opts)
+      # Augment this instance's settings hash with the hash given to this constructor
+      settings.merge!(opts)
 
-      # Copy missing options from our parent
+      # Copy missing settings from our parent
       if @parent_controller
-        CASCADING_OPTIONS.each do |opt|
-          options[opt] ||= @parent_controller.options[opt]
+        CASCADING_SETTINGS.each do |name|
+          settings[name] ||= @parent_controller.settings[name]
         end
       end
 

data/lib/happy/errors.rb

@@ -5,10 +5,10 @@ module Happy
 
     # Render a HTML page for the given exception.
     #
-    # @param [Exception] exception
+    # @param exception [Exception]
     #   The exception to display.
-    # @param [Hash] env
-    #   The current Rack environment hash (used to display information on request parameters, session contents and such.)
+    # @param controller [Hash]
+    #   The Happy Controller that caught the exception.
     #
     # @option options [String] :title
     #   Title of error page

data/lib/happy/extras/active_model_resource_controller.rb

@@ -5,39 +5,39 @@ module Happy
 
     class ActiveModelResourceController < Happy::Extras::ResourceController
       def root_url
-        super(options[:plural_name])
+        super(settings[:plural_name])
       end
 
       def render_resource_template(name)
-        render "#{options[:plural_name]}/#{name}.html.haml"
+        render "#{settings[:plural_name]}/#{name}.html.haml"
       end
 
       def resource
-        options[:class]
+        settings[:class]
       end
 
       def resource_with_permission_scope(*args)
-        permissions.scoped_model(*args, options[:class])
+        permissions.scoped_model(*args, settings[:class])
       end
 
       def require_permission!(*args)
-        raise "not allowed" unless permissions.can?(*args, options[:class])
+        raise "not allowed" unless permissions.can?(*args, settings[:class])
       end
 
       def set_plural_variable(v)
-        instance_variable_set "@#{options[:plural_name]}", v
+        instance_variable_set "@#{settings[:plural_name]}", v
       end
 
       def plural_variable
-        instance_variable_get "@#{options[:plural_name]}"
+        instance_variable_get "@#{settings[:plural_name]}"
       end
 
       def set_singular_variable(v)
-        instance_variable_set "@#{options[:singular_name]}", v
+        instance_variable_set "@#{settings[:singular_name]}", v
       end
 
       def singular_variable
-        instance_variable_get "@#{options[:singular_name]}"
+        instance_variable_get "@#{settings[:singular_name]}"
       end
 
       def index
@@ -54,13 +54,13 @@ module Happy
 
       def new
         require_permission! :new
-        set_singular_variable resource_with_permission_scope(:new).new(params[options[:singular_name]], :as => options[:role])
+        set_singular_variable resource_with_permission_scope(:new).new(params[settings[:singular_name]], :as => settings[:role])
         render_resource_template 'new'
       end
 
       def create
         require_permission! :create
-        set_singular_variable resource_with_permission_scope(:create).new(params[options[:singular_name]], :as => options[:role])
+        set_singular_variable resource_with_permission_scope(:create).new(params[settings[:singular_name]], :as => settings[:role])
 
         if singular_variable.save
           redirect! singular_variable
@@ -78,7 +78,7 @@ module Happy
       def update
         require_permission! :update
         set_singular_variable resource_with_permission_scope(:update).find(params['id'])
-        singular_variable.assign_attributes params[options[:singular_name]], :as => options[:role]
+        singular_variable.assign_attributes params[settings[:singular_name]], :as => settings[:role]
 
         if singular_variable.save
           redirect! singular_variable
@@ -88,8 +88,8 @@ module Happy
       end
 
       def route
-        options[:singular_name] ||= options[:class].to_s.tableize.singularize
-        options[:plural_name]   ||= options[:class].to_s.tableize.pluralize
+        settings[:singular_name] ||= settings[:class].to_s.tableize.singularize
+        settings[:plural_name]   ||= settings[:class].to_s.tableize.pluralize
 
         super
       end

data/lib/happy/extras/scriptable.rb

@@ -22,7 +22,7 @@ module Happy
       end
 
       def load_script(name)
-        file_name = File.expand_path(File.join(options[:directory], name))
+        file_name = File.expand_path(File.join(settings[:directory], name))
         File.read(file_name)
       end
 

data/lib/happy/extras/static.rb

@@ -2,7 +2,7 @@ module Happy
   module Extras
     class Static < Happy::Controller
       def route
-        run Rack::File.new(options[:path])
+        run Rack::File.new(settings[:path])
       end
     end
   end

data/lib/happy/helpers/html.rb

@@ -0,0 +1,50 @@
+require 'active_support/core_ext'
+require 'cgi'
+
+module Happy
+  module Helpers
+    module Html
+      def html_tag(name, options = nil, escape = true, &block)
+        "<#{name} #{html_tag_attributes(options, escape) if options}#{block_given? ? ">#{yield if block_given?}</#{name}>" : " />"}"
+      end
+
+      def html_tag_attributes(options, escape = true)
+        options.map do |k,v|
+          if v
+            v == true ? "#{k}" : "#{k}=\"#{ escape_html(v) }\""
+          end
+        end.compact.join(" ")
+      end
+
+      def escape_html(t)
+        # Rack::Utils.escape_html(t.to_s)
+        CGI::escape_html(t.to_s)
+      end
+
+      def preserve(t)
+        t.chomp("\n").gsub(/\n/, '&#x000A;').gsub(/\r/, '')
+      end
+
+      def link_to(name, *target)
+        options = target.last.is_a?(Hash) ? target.pop : {}
+        html_tag(:a, options.merge(:href => url_for(*target))) { name }
+      end
+
+      def url_for(*what)
+        return what.first if what.size == 1 && what.first =~ %r{://}
+
+        result = what.flatten.inject('') do |url, item|
+          url << "/%s" % case item
+            when String, Symbol then item.to_s
+            when NilClass then "/"
+            else "%s/%s" % [item.class.to_s.tableize.pluralize, item.try(:to_param) || item.try(:to_id) || item.try(:id)]
+          end
+
+          url
+        end.gsub(/\/{2,}/, '/').chomp('/')
+
+        result == "" ? '/' : result
+      end
+    end
+  end
+end

data/lib/happy/helpers/i18n.rb

@@ -0,0 +1,13 @@
+module Happy
+  module Helpers
+    module I18n
+      def translate(*args)
+        ::I18n.translate(*args)
+      end
+
+      def localize(*args)
+        ::I18n.localize(*args)
+      end
+    end
+  end
+end

data/lib/happy/helpers/rendering.rb

@@ -0,0 +1,89 @@
+require 'tilt'
+
+module Happy
+  module Helpers
+    module Rendering
+      attr_accessor :output_buffer
+
+      # Renders "something". This method takes a closer look at what this
+      # "something" is and then dispatches to a more specific method.
+      #
+      def render(what, options = {}, &blk)
+        case what
+          when NilClass   then ''
+          when String     then render_template(what, options, &blk)
+          when Enumerable then what.map { |i| render(i, options, &blk) }.join
+          else render_resource(what, options)
+        end
+      end
+
+      # Render a template from the controller's view folder.
+      #
+      def render_template(name, variables = {}, &blk)
+        path = settings[:views] || './views'
+        full_name = File.expand_path(File.join(path, name))
+
+        # load and cache template
+        @@cached_templates ||= {}
+        t = @@cached_templates[full_name] =
+          (Happy.env.production? && @@cached_templates[full_name]) ||
+          Tilt.new(full_name, :default_encoding => 'utf-8', :outvar => "@output_buffer")
+
+        # render template
+        t.render(self, variables, &blk)
+      end
+
+      # Render a resource.
+      #
+      def render_resource(resource, options = {})
+        # build name strings
+        singular_name = resource.class.to_s.tableize.singularize
+        plural_name   = singular_name.pluralize
+
+        # set options
+        options = {
+          singular_name => resource
+        }.merge(options)
+
+        # render
+        render_template("#{plural_name}/_#{singular_name}.html.haml", options)
+      end
+
+
+      # Capture a block from a template. Use this inside view helpers that
+      # take blocks.
+      #
+      def capture_template_block(*args, &blk)
+        if respond_to?(:is_haml?) && is_haml?
+          capture_haml(*args, &blk)
+        else
+          with_output_buffer(&blk)
+        end
+      end
+
+      # Add something to the output being rendered by the current template.
+      # Use this inside view helpers that take blocks.
+      #
+      def concat_output(v)
+        if respond_to?(:is_haml?) && is_haml?
+          v
+        else
+          self.output_buffer << v
+        end
+      end
+
+      # Execute the given block, adding its generated output to a new view
+      # buffer, and finally returning that buffer. Use this inside view helpers
+      # that take blocks.
+      #
+      def with_output_buffer
+        self.output_buffer, old_buffer = "", self.output_buffer
+        yield if block_given?
+        output_buffer
+      ensure
+        self.output_buffer = old_buffer
+      end
+
+    end
+  end
+end

data/lib/happy/helpers.rb

@@ -0,0 +1,19 @@
+require 'happy/helpers/html'
+require 'happy/helpers/i18n'
+require 'happy/helpers/rendering'
+
+module Happy
+  # A collection of useful helper methods.
+  #
+  module Helpers
+    include Html
+    include Rendering
+    include I18n
+
+    # Some useful shortcuts.
+    #
+    alias_method :h, :escape_html
+    alias_method :l, :localize
+    alias_method :t, :translate
+  end
+end

data/lib/happy/request/date_parameter_converter.rb

@@ -0,0 +1,25 @@
+module Happy
+  class Request < Rack::Request
+    module DateParameterConverter
+      class << self
+        def convert!(params)
+          params.each do |k, v|
+            if looks_like_a_date?(v)
+              params[k] = convert_to_date(v)
+            elsif v.is_a? Hash
+              convert!(v)
+            end
+          end
+        end
+
+        def looks_like_a_date?(v)
+          v.is_a?(Hash) && v.has_key?('year') && v.has_key?('month') && v.has_key?('day')
+        end
+
+        def convert_to_date(v)
+          DateTime.new(v['year'].to_i, v['month'].to_i, v['day'].to_i, v['hour'].to_i, v['minute'].to_i, v['second'].to_i)
+        end
+      end
+    end
+  end
+end

data/lib/happy/request.rb

@@ -1,17 +1,25 @@
-# SMELL: really?
-require 'happy-helpers/utils/date_parameter_converter'
+require 'happy/request/date_parameter_converter'
 
 module Happy
   # Happy's own little request class. It extends {Rack::Request} with
   # a bit of convenience functionality.
   #
   class Request < Rack::Request
+    # Override the default #params method so it returns a Hash with indifferent
+    # access if ActiveSupport is available.
+    def params
+      @env['happy.params'] ||= if defined?(HashWithIndifferentAccess)
+        super.with_indifferent_access
+      else
+        super
+      end
+    end
 
   protected
 
     def parse_query(qs)
       super(qs).tap do |p|
-        HappyHelpers::Utils::DateParameterConverter.convert!(p)
+        DateParameterConverter.convert!(p)
       end
     end
   end

data/lib/happy/version.rb

@@ -1,3 +1,3 @@
 module Happy
-  VERSION = "0.1.0.pre25"
+  VERSION = "0.1.0.pre27"
 end

data/lib/happy.rb

@@ -1,6 +1,14 @@
 require 'rack'
+
+# Happy is currently making use of ActiveSupport. I'm not 100% happy
+# about this dependency and will eventually try to remove it.
+# The following line should at least make sure that the individual
+# components are autoloaded as needed.
+require 'active_support'
+
 require 'happy/version'
 require 'happy/errors'
+require 'happy/helpers'
 require 'happy/controller'
 
 module Happy

data/spec/controller/configurable_spec.rb

@@ -8,7 +8,7 @@ module Happy
 
     describe '.set' do
       it 'sets a class-level option' do
-        TestController.options[:foo].should == 'bar'
+        TestController.settings[:foo].should == 'bar'
       end
     end
 
@@ -19,21 +19,21 @@ module Happy
       end
 
       it 'sets an instance-level option, overriding the class default' do
-        @instance.options[:foo].should == 'baz'
+        @instance.settings[:foo].should == 'baz'
       end
 
       it "doesn't modify the class-level default option" do
-        TestController.options[:foo].should == 'bar'
+        TestController.settings[:foo].should == 'bar'
       end
     end
 
-    describe 'class-level options' do
-      it 'are the defaults for instance-level options' do
-        TestController.new.options[:foo].should == 'bar'
+    describe 'class-level settings' do
+      it 'are the defaults for instance-level settings' do
+        TestController.new.settings[:foo].should == 'bar'
       end
     end
 
-    describe 'cascading options' do
+    describe 'cascading settings' do
       class OuterController < Controller
         set :views, './foo/'
         set :foo, 'bar'
@@ -44,15 +44,15 @@ module Happy
 
       it "are copied from the parent controller if necessary" do
         @instance = InnerController.new(OuterController.new)
-        @instance.options[:views].should == './foo/'
-        @instance.options[:foo].should be_nil
+        @instance.settings[:views].should == './foo/'
+        @instance.settings[:foo].should be_nil
       end
     end
 
-    describe 'options passed to the initializer' do
-      it "override default options" do
+    describe 'settings passed to the initializer' do
+      it "override default settings" do
         @instance = TestController.new({}, :foo => 'baz')
-        @instance.options[:foo].should == 'baz'
+        @instance.settings[:foo].should == 'baz'
       end
     end
   end

data/spec/helpers/html_spec.rb

@@ -0,0 +1,48 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+module Happy
+  module Helpers
+    describe Html do
+      include Html
+
+      describe "#url_for" do
+        it "generates a url from an array of strings" do
+          url_for('foo', 'bar', '123').should == '/foo/bar/123'
+        end
+
+        it "removes duplicate dashes" do
+          url_for('/foo/', 'bar').should == '/foo/bar'
+        end
+
+        it "removes leading dashes" do
+          url_for('foo/').should == '/foo'
+        end
+
+        it "returns just a slash if no parameters are given" do
+          url_for().should == '/'
+        end
+
+        it "doesn't take nil into account" do
+          url_for('foo', nil, 'bar').should == '/foo/bar'
+        end
+
+        it "also accepts symbols" do
+          url_for(:foo, 'bar').should == '/foo/bar'
+        end
+
+        it "generates RESTful URLs from objects" do
+          url_for(mock(:class => 'thingy', :to_param => '1')).should == '/thingies/1'
+        end
+
+        it "is can be cascaded" do
+          url_for(url_for(:foo, :bar), '123', url_for('woop')).should == '/foo/bar/123/woop'
+        end
+
+        it "doesn't modify strings containing complete URLs" do
+          url_for('http://www.test.com').should == 'http://www.test.com'
+        end
+      end
+    end
+  end
+end

data/spec/request_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+module Happy
+  describe Request do
+    describe '#params' do
+      subject do
+        Happy.route do
+          on('symbol') { "Your name is #{params[:name]}!" }
+          on('string') { "Your name is #{params['name']}!" }
+        end
+      end
+
+      it "is accessible through strings" do
+        response_for { get '/string', 'name' => 'Hendrik' }.body.should == 'Your name is Hendrik!'
+      end
+
+      it "is accessible through symbols" do
+        response_for { get '/symbol', 'name' => 'Hendrik' }.body.should == 'Your name is Hendrik!'
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: happy
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre25
+  version: 0.1.0.pre27
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-15 00:00:00.000000000 Z
+date: 2012-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70205965488560 !ruby/object:Gem::Requirement
+  requirement: &70179033071240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70205965488560
+  version_requirements: *70179033071240
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70205965488060 !ruby/object:Gem::Requirement
+  requirement: &70179033070740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,32 +32,32 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70205965488060
+  version_requirements: *70179033070740
 - !ruby/object:Gem::Dependency
-  name: happy-helpers
-  requirement: &70205965487600 !ruby/object:Gem::Requirement
+  name: allowance
+  requirement: &70179033070280 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre11
+        version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70205965487600
+  version_requirements: *70179033070280
 - !ruby/object:Gem::Dependency
-  name: allowance
-  requirement: &70205965487140 !ruby/object:Gem::Requirement
+  name: tilt
+  requirement: &70179033069820 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70205965487140
+  version_requirements: *70179033069820
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70205965486760 !ruby/object:Gem::Requirement
+  requirement: &70179033085800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70205965486760
+  version_requirements: *70179033085800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70205965502600 !ruby/object:Gem::Requirement
+  requirement: &70179033085260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70205965502600
+  version_requirements: *70179033085260
 - !ruby/object:Gem::Dependency
   name: rspec-html-matchers
-  requirement: &70205965502180 !ruby/object:Gem::Requirement
+  requirement: &70179033084840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70205965502180
+  version_requirements: *70179033084840
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70205965501720 !ruby/object:Gem::Requirement
+  requirement: &70179033084380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70205965501720
+  version_requirements: *70179033084380
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70205965501300 !ruby/object:Gem::Requirement
+  requirement: &70179033083960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70205965501300
+  version_requirements: *70179033083960
 description: A happy little toolkit for writing web applications.
 email:
 - hendrik@mans.de
@@ -121,12 +121,15 @@ files:
 - .rspec
 - .travis.yml
 - .watchr
-- .yardopt
+- .yardopts
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- TUTORIAL.md
 - example/config.ru
+- example/views/block_helpers.erb
+- example/views/block_helpers.haml
 - example/views/index.erb
 - example/views/layout.erb
 - happy.gemspec
@@ -135,7 +138,6 @@ files:
 - 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
@@ -147,7 +149,12 @@ files:
 - lib/happy/extras/scriptable.rb
 - lib/happy/extras/static.rb
 - lib/happy/files/error.erb
+- lib/happy/helpers.rb
+- lib/happy/helpers/html.rb
+- lib/happy/helpers/i18n.rb
+- lib/happy/helpers/rendering.rb
 - lib/happy/request.rb
+- lib/happy/request/date_parameter_converter.rb
 - lib/happy/response.rb
 - lib/happy/version.rb
 - spec/controller/actions_spec.rb
@@ -156,6 +163,8 @@ files:
 - spec/controller/routing_spec.rb
 - spec/controller_spec.rb
 - spec/happy_spec.rb
+- spec/helpers/html_spec.rb
+- spec/request_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/hmans/happy
 licenses: []
@@ -188,5 +197,7 @@ test_files:
 - spec/controller/routing_spec.rb
 - spec/controller_spec.rb
 - spec/happy_spec.rb
+- spec/helpers/html_spec.rb
+- spec/request_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

data/.yardopt

@@ -1 +0,0 @@
---no-private --protected --embed-mixins lib/**/*.rb - README LEGAL

data/lib/happy/controller/helpers.rb

@@ -1,52 +0,0 @@
-require 'happy-helpers'
-
-module Happy
-  class Controller
-    # A collection of useful helper methods.
-    #
-    module Helpers
-      # Load a whole bunch of helpers fromi HappyHelpers. This includes stuff
-      # like url_for, link_to and more.
-      include HappyHelpers::Helpers
-
-      # Renders "something". This method takes a closer look at what this
-      # "something" is and then dispatches to a more specific method.
-      #
-      def render(what, options = {}, &blk)
-        case what
-          when NilClass   then ''
-          when String     then render_template(what, options, &blk)
-          when Enumerable then what.map { |i| render(i, options, &blk) }.join
-          else render_resource(what, options)
-        end
-      end
-
-      # Render a template from the controller's view folder.
-      #
-      def render_template(name, variables = {}, &blk)
-        path = options[:views] || './views'
-        HappyHelpers::Templates.render(File.join(path, name), self, variables, &blk)
-      end
-
-      # Render a resource.
-      #
-      def render_resource(resource, options = {})
-        # build name strings
-        singular_name = resource.class.to_s.tableize.singularize
-        plural_name   = singular_name.pluralize
-
-        # set options
-        options = {
-          singular_name => resource
-        }.merge(options)
-
-        # render
-        render_template("#{plural_name}/_#{singular_name}.html.haml", options)
-      end
-
-      alias_method :h, :escape_html
-      alias_method :l, :localize
-      alias_method :t, :translate
-    end
-  end
-end