happy 0.1.0.pre.1 → 0.1.0.pre.2

data/.rspec

@@ -0,0 +1 @@
+--color

data/.yardopt

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

data/Rakefile

@@ -1,2 +1,7 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+
+# integrate rspec
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new('spec')
+task :default => :spec

data/happy.gemspec

@@ -19,4 +19,9 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'rack', '~> 1.4'
   gem.add_dependency 'happy-helpers' # TODO: , '~> 0.1.0'
   gem.add_dependency 'allowance', '>= 0.1.1'
+
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rspec', '~> 2.8'
+  gem.add_development_dependency 'rspec-html-matchers'
+  gem.add_development_dependency 'rack-test'
 end

data/lib/happy.rb

@@ -2,11 +2,12 @@ require 'active_support/all' # SMELL
 
 require 'happy/context'
 require 'happy/controller'
-require 'happy/static'
 
 module Happy
-  class HappyError < StandardError ; end
-  class NotFoundError < HappyError ; end
+  module Errors
+    class Base < StandardError ; end
+    class NotFound < Base ; end
+  end
 
   def self.env
     ActiveSupport::StringInquirer.new(ENV['RACK_ENV'] || 'development')

data/lib/happy/context.rb

@@ -1,9 +1,9 @@
 require 'happy/request'
-require 'happy/helpers'
+require 'happy/context_ext/helpers'
 
 module Happy
   class Context
-    include Helpers
+    include ContextExtensions::Helpers
 
     attr_reader   :request, :response, :remaining_path
     attr_accessor :layout, :controller

data/lib/happy/context_ext/helpers.rb

@@ -0,0 +1,39 @@
+require 'happy-helpers'
+
+module Happy
+  module ContextExtensions
+    module Helpers
+      include HappyHelpers::Helpers
+
+      def render(what, options = {}, &blk)
+        case what
+          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
+
+      def render_template(name, variables = {}, &blk)
+        HappyHelpers::Templates.render(name, self, variables, &blk)
+      end
+
+      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

data/lib/happy/controller.rb

@@ -1,12 +1,12 @@
-require 'happy/routing'
-require 'happy/actions'
-require 'happy/rackable'
+require 'happy/controller_ext/routing'
+require 'happy/controller_ext/actions'
+require 'happy/controller_ext/rackable'
 
 module Happy
   class Controller
-    include Routing
-    include Actions
-    include Rackable
+    include ControllerExtensions::Routing
+    include ControllerExtensions::Actions
+    include ControllerExtensions::Rackable
 
     attr_reader :options, :env
 

data/lib/happy/controller_ext/actions.rb

@@ -0,0 +1,80 @@
+module Happy
+  module ControllerExtensions
+    module Actions
+      def serve!(data, options = {})
+        # Don't serve if there are still bits of path remaining.
+        return unless remaining_path.empty?
+
+        # Don't serve is data is not a string.
+        return unless data.is_a?(String)
+
+        # Mix in default options
+        options = {
+          layout: context.layout
+        }.merge(options)
+
+        # Add optional headers et al
+        response.status = options[:status] if options.has_key?(:status)
+        response['Content-type'] = options[:content_type] if options.has_key?(:content_type)
+
+        # Apply layout, if available
+        if options[:layout]
+          data = render(options[:layout]) { data }
+        end
+
+        # Set response body and finish request
+        response.body = [data]
+        halt!
+      end
+
+      def halt!(message = :done)
+        throw message
+      end
+
+      def redirect!(to, status = 302)
+        header "Location", url_for(to)
+        response.status = status
+        halt!
+      end
+
+      def layout(name)
+        context.layout = name
+      end
+
+      def content_type(type)
+        header 'Content-type', type
+      end
+
+      def max_age(t, options = {})
+        options = {
+          :public => true,
+          :must_revalidate => true
+        }.merge(options)
+
+        s = []
+        s << 'public' if options[:public]
+        s << 'must-revalidate' if options[:must_revalidate]
+        s << "max-age=#{t.to_i}"
+
+        cache_control s.join(', ')
+      end
+
+      def cache_control(s)
+        header 'Cache-control', s
+      end
+
+      def header(name, value)
+        response[name] = value
+      end
+
+      def invoke(klass, options = {}, &blk)
+        klass.new(env, options, &blk).perform
+      end
+
+      def run(app)
+        context.response = app.call(request.env)
+        halt!
+      end
+    end
+  end
+end

data/lib/happy/controller_ext/rackable.rb

@@ -0,0 +1,26 @@
+module Happy
+  module ControllerExtensions
+    module Rackable
+      extend ActiveSupport::Concern
+
+      def call(env)
+        @env = env
+
+        catch :done do
+          serve! perform
+
+          # If we get here, #serve decided not to serve.
+          raise Errors::NotFound
+        end
+
+        response
+      end
+
+      module ClassMethods
+        def call(env)
+          new.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/happy/controller_ext/routing.rb

@@ -0,0 +1,58 @@
+module Happy
+  module ControllerExtensions
+    module Routing
+      def path_to_regexp(path)
+        path = ":#{path}" if path.is_a?(Symbol)
+        Regexp.compile('^'+path.gsub(/\)/, ')?').gsub(/\//, '\/').gsub(/\./, '\.').gsub(/:(\w+)/, '(?<\\1>.+)')+'$')
+      end
+
+      def path(*args, &blk)
+        options = (args.pop if args.last.is_a?(Hash)) || {}
+        args = [nil] if args.empty?
+
+        args.each do |name|
+          if name.present?
+            path_match = path_to_regexp(name).match(remaining_path.first)
+          end
+
+          method_matched = [nil, request.request_method.downcase.to_sym].include?(options[:method])
+          path_matched   = (path_match || (name.nil? && remaining_path.empty?))
+
+          # Only do something here if method and requested path both match
+          if path_matched && method_matched
+            # Transfer variables contained in path name to params hash
+            if path_match
+              path_match.names.each { |k| request.params[k] = path_match[k] }
+              remaining_path.shift
+            end
+
+            serve! instance_exec(&blk)
+
+            # If we get here, #serve decided not to serve.
+            raise Errors::NotFound
+          end
+        end
+      end
+
+      def get(*args, &blk)
+        args.last.is_a?(Hash) ? args.last.merge(method: :get) : args.push(method: :get)
+        path(*args, &blk)
+      end
+
+      def post(*args, &blk)
+        args.last.is_a?(Hash) ? args.last.merge(method: :post) : args.push(method: :post)
+        path(*args, &blk)
+      end
+
+      def put(*args, &blk)
+        args.last.is_a?(Hash) ? args.last.merge(method: :put) : args.push(method: :put)
+        path(*args, &blk)
+      end
+
+      def delete(*args, &blk)
+        args.last.is_a?(Hash) ? args.last.merge(method: :delete) : args.push(method: :delete)
+        path(*args, &blk)
+      end
+    end
+  end
+end

data/lib/happy/ext/permissions.rb

@@ -0,0 +1,38 @@
+require 'allowance'
+
+module Happy
+  module Extensions
+    module Permissions
+      module ContextExtensions
+        extend ActiveSupport::Concern
+
+        def permissions(&blk)
+          @permissions ||= Allowance.define
+        end
+
+        def can?(*args)
+          permissions.allowed?(*args)
+        end
+      end
+
+      module ControllerExtensions
+        extend ActiveSupport::Concern
+
+        included do
+          delegate :can?, :to => :context
+        end
+
+        module ClassMethods
+          attr_accessor :permissions_blk
+
+          def permissions(&blk)
+            self.permissions_blk = blk
+          end
+        end
+      end
+    end
+  end
+end
+
+Happy::Context.send(:include, Happy::Extensions::Permissions::ContextExtensions)
+Happy::Controller.send(:include, Happy::Extensions::Permissions::ControllerExtensions)

data/lib/happy/ext/resources.rb

@@ -0,0 +1,116 @@
+require 'happy/ext/permissions'
+
+module Happy
+  module Extensions
+    module Resources
+      module ControllerExtensions
+        def resource(klass, options = {}, &blk)
+          invoke ResourceMounter, options.merge(:class => klass), &blk
+        end
+      end
+
+      class ResourceMounter < Happy::Controller
+        def render_resource_template(name)
+          render "#{options[:plural_name]}/#{name}.html.haml"
+        end
+
+        def resource
+          options[:class]
+        end
+
+        def resource_with_permission_scope(*args)
+          context.permissions.scoped_model(*args, options[:class])
+        end
+
+        def require_permission!(*args)
+          raise "not allowed" unless can?(*args, options[:class])
+        end
+
+        def set_plural_variable(v)
+          context.instance_variable_set "@#{options[:plural_name]}", v
+        end
+
+        def plural_variable
+          context.instance_variable_get "@#{options[:plural_name]}"
+        end
+
+        def set_singular_variable(v)
+          context.instance_variable_set "@#{options[:singular_name]}", v
+        end
+
+        def singular_variable
+          context.instance_variable_get "@#{options[:singular_name]}"
+        end
+
+        def do_index
+          require_permission! :index
+          set_plural_variable resource_with_permission_scope(:index).all
+          render_resource_template 'index'
+        end
+
+        def do_show
+          require_permission! :show
+          set_singular_variable resource_with_permission_scope(:show).find(params['id'])
+          render_resource_template 'show'
+        end
+
+        def do_new
+          require_permission! :new
+          set_singular_variable resource_with_permission_scope(:new).new(params[options[:singular_name]], :as => options[:role])
+          render_resource_template 'new'
+        end
+
+        def do_create
+          require_permission! :create
+          set_singular_variable resource_with_permission_scope(:create).new(params[options[:singular_name]], :as => options[:role])
+
+          if singular_variable.save
+            redirect! singular_variable
+          else
+            render_resource_template 'new'
+          end
+        end
+
+        def do_edit
+          require_permission! :edit
+          set_singular_variable resource_with_permission_scope(:edit).find(params['id'])
+          render_resource_template 'edit'
+        end
+
+        def do_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]
+
+          if singular_variable.save
+            redirect! singular_variable
+          else
+            render_resource_template 'edit'
+          end
+        end
+
+        def route
+          @options = {
+            singular_name: options[:class].to_s.tableize.singularize,
+            plural_name:   options[:class].to_s.tableize.pluralize
+          }.merge(@options)
+
+          path options[:plural_name] do
+            get('new') { do_new }
+
+            path :id do
+              get         { do_show }
+              post        { do_update }
+              get('edit') { do_edit }
+            end
+
+            post { do_create }
+            get  { do_index }
+          end
+        end
+      end
+    end
+  end
+end
+
+Happy::Controller.send(:include, Happy::Extensions::Resources::ControllerExtensions)

data/lib/happy/ext/static.rb

@@ -0,0 +1,9 @@
+module Happy
+  module Extensions
+    class Static < Happy::Controller
+      def route
+        run Rack::File.new(options[:path])
+      end
+    end
+  end
+end

data/lib/happy/version.rb

@@ -1,3 +1,3 @@
 module Happy
-  VERSION = "0.1.0.pre.1"
+  VERSION = "0.1.0.pre.2"
 end

data/spec/controller_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+module Happy
+  describe Controller do
+    it "should have more specs"
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,9 @@
+SPEC_DIR = File.dirname(__FILE__)
+lib_path = File.expand_path("#{SPEC_DIR}/../lib")
+$LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
+
+require 'rubygems'
+require 'bundler/setup'
+require 'rack/test'
+
+require 'happy'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: happy
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.1
+  version: 0.1.0.pre.2
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70164769147200 !ruby/object:Gem::Requirement
+  requirement: &70265405180720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70164769147200
+  version_requirements: *70265405180720
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70164769146300 !ruby/object:Gem::Requirement
+  requirement: &70265405180020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70164769146300
+  version_requirements: *70265405180020
 - !ruby/object:Gem::Dependency
   name: happy-helpers
-  requirement: &70164769145860 !ruby/object:Gem::Requirement
+  requirement: &70265405178080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70164769145860
+  version_requirements: *70265405178080
 - !ruby/object:Gem::Dependency
   name: allowance
-  requirement: &70164769145220 !ruby/object:Gem::Requirement
+  requirement: &70265405175720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,51 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70164769145220
+  version_requirements: *70265405175720
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70265405174800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70265405174800
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70265405173920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  type: :development
+  prerelease: false
+  version_requirements: *70265405173920
+- !ruby/object:Gem::Dependency
+  name: rspec-html-matchers
+  requirement: &70265405172780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70265405172780
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &70265405170780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70265405170780
 description: A happy little toolkit for writing web applications.
 email:
 - hendrik@mans.de
@@ -63,23 +107,27 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
+- .yardopt
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - happy.gemspec
 - lib/happy.rb
-- lib/happy/actions.rb
 - lib/happy/context.rb
+- lib/happy/context_ext/helpers.rb
 - lib/happy/controller.rb
-- lib/happy/helpers.rb
-- lib/happy/permissions.rb
-- lib/happy/rackable.rb
+- lib/happy/controller_ext/actions.rb
+- lib/happy/controller_ext/rackable.rb
+- lib/happy/controller_ext/routing.rb
+- lib/happy/ext/permissions.rb
+- lib/happy/ext/resources.rb
+- lib/happy/ext/static.rb
 - lib/happy/request.rb
-- lib/happy/resources.rb
-- lib/happy/routing.rb
-- lib/happy/static.rb
 - lib/happy/version.rb
+- spec/controller_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/hmans/happy
 licenses: []
 post_install_message: 
@@ -104,5 +152,7 @@ rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A happy little toolkit for writing web applications.
-test_files: []
+test_files:
+- spec/controller_spec.rb
+- spec/spec_helper.rb
 has_rdoc: 

data/lib/happy/actions.rb

@@ -1,78 +0,0 @@
-module Happy
-  module Actions
-    def serve!(data, options = {})
-      # Don't serve if there are still bits of path remaining.
-      return unless remaining_path.empty?
-
-      # Don't serve is data is not a string.
-      return unless data.is_a?(String)
-
-      # Mix in default options
-      options = {
-        layout: context.layout
-      }.merge(options)
-
-      # Add optional headers et al
-      response.status = options[:status] if options.has_key?(:status)
-      response['Content-type'] = options[:content_type] if options.has_key?(:content_type)
-
-      # Apply layout, if available
-      if options[:layout]
-        data = render(options[:layout]) { data }
-      end
-
-      # Set response body and finish request
-      response.body = [data]
-      halt!
-    end
-
-    def halt!(message = :done)
-      throw message
-    end
-
-    def redirect!(to, status = 302)
-      header "Location", url_for(to)
-      response.status = status
-      halt!
-    end
-
-    def layout(name)
-      context.layout = name
-    end
-
-    def content_type(type)
-      header 'Content-type', type
-    end
-
-    def max_age(t, options = {})
-      options = {
-        :public => true,
-        :must_revalidate => true
-      }.merge(options)
-
-      s = []
-      s << 'public' if options[:public]
-      s << 'must-revalidate' if options[:must_revalidate]
-      s << "max-age=#{t.to_i}"
-
-      cache_control s.join(', ')
-    end
-
-    def cache_control(s)
-      header 'Cache-control', s
-    end
-
-    def header(name, value)
-      response[name] = value
-    end
-
-    def invoke(klass, options = {}, &blk)
-      klass.new(env, options, &blk).perform
-    end
-
-    def run(app)
-      context.response = app.call(request.env)
-      halt!
-    end
-  end
-end

data/lib/happy/helpers.rb

@@ -1,37 +0,0 @@
-require 'happy-helpers'
-
-module Happy
-  module Helpers
-    include HappyHelpers::Helpers
-
-    def render(what, options = {}, &blk)
-      case what
-        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
-
-    def render_template(name, variables = {}, &blk)
-      HappyHelpers::Templates.render(name, self, variables, &blk)
-    end
-
-    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

data/lib/happy/permissions.rb

@@ -1,34 +0,0 @@
-module Happy
-  module Permissions
-    module ContextExtensions
-      extend ActiveSupport::Concern
-
-      def permissions(&blk)
-        @permissions ||= Allowance.define
-      end
-
-      def can?(*args)
-        permissions.allowed?(*args)
-      end
-    end
-
-    module ControllerExtensions
-      extend ActiveSupport::Concern
-
-      included do
-        delegate :can?, :to => :context
-      end
-
-      module ClassMethods
-        attr_accessor :permissions_blk
-
-        def permissions(&blk)
-          self.permissions_blk = blk
-        end
-      end
-    end
-  end
-end
-
-Happy::Context.send(:include, Happy::Permissions::ContextExtensions)
-Happy::Controller.send(:include, Happy::Permissions::ControllerExtensions)

data/lib/happy/rackable.rb

@@ -1,24 +0,0 @@
-module Happy
-  module Rackable
-    extend ActiveSupport::Concern
-
-    def call(env)
-      @env = env
-
-      catch :done do
-        serve! perform
-
-        # If we get here, #serve decided not to serve.
-        raise NotFoundError
-      end
-
-      response
-    end
-
-    module ClassMethods
-      def call(env)
-        new.call(env)
-      end
-    end
-  end
-end

data/lib/happy/resources.rb

@@ -1,112 +0,0 @@
-module Happy
-  module Resources
-    module ControllerExtensions
-      def resource(klass, options = {}, &blk)
-        invoke Happy::Resources::ResourceMounter, options.merge(:class => klass), &blk
-      end
-    end
-
-    class ResourceMounter < Happy::Controller
-      def render_resource_template(name)
-        render "#{options[:plural_name]}/#{name}.html.haml"
-      end
-
-      def resource
-        options[:class]
-      end
-
-      def resource_with_permission_scope(*args)
-        context.permissions.scoped_model(*args, options[:class])
-      end
-
-      def require_permission!(*args)
-        raise "not allowed" unless can?(*args, options[:class])
-      end
-
-      def set_plural_variable(v)
-        context.instance_variable_set "@#{options[:plural_name]}", v
-      end
-
-      def plural_variable
-        context.instance_variable_get "@#{options[:plural_name]}"
-      end
-
-      def set_singular_variable(v)
-        context.instance_variable_set "@#{options[:singular_name]}", v
-      end
-
-      def singular_variable
-        context.instance_variable_get "@#{options[:singular_name]}"
-      end
-
-      def do_index
-        require_permission! :index
-        set_plural_variable resource_with_permission_scope(:index).all
-        render_resource_template 'index'
-      end
-
-      def do_show
-        require_permission! :show
-        set_singular_variable resource_with_permission_scope(:show).find(params['id'])
-        render_resource_template 'show'
-      end
-
-      def do_new
-        require_permission! :new
-        set_singular_variable resource_with_permission_scope(:new).new(params[options[:singular_name]], :as => options[:role])
-        render_resource_template 'new'
-      end
-
-      def do_create
-        require_permission! :create
-        set_singular_variable resource_with_permission_scope(:create).new(params[options[:singular_name]], :as => options[:role])
-
-        if singular_variable.save
-          redirect! singular_variable
-        else
-          render_resource_template 'new'
-        end
-      end
-
-      def do_edit
-        require_permission! :edit
-        set_singular_variable resource_with_permission_scope(:edit).find(params['id'])
-        render_resource_template 'edit'
-      end
-
-      def do_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]
-
-        if singular_variable.save
-          redirect! singular_variable
-        else
-          render_resource_template 'edit'
-        end
-      end
-
-      def route
-        @options = {
-          singular_name: options[:class].to_s.tableize.singularize,
-          plural_name:   options[:class].to_s.tableize.pluralize
-        }.merge(@options)
-
-        path options[:plural_name] do
-          get('new') { do_new }
-
-          path :id do
-            get         { do_show }
-            post        { do_update }
-            get('edit') { do_edit }
-          end
-
-          post { do_create }
-          get  { do_index }
-        end
-      end
-    end
-  end
-end
-
-Happy::Controller.send(:include, Happy::Resources::ControllerExtensions)

data/lib/happy/routing.rb

@@ -1,56 +0,0 @@
-module Happy
-  module Routing
-    def path_to_regexp(path)
-      path = ":#{path}" if path.is_a?(Symbol)
-      Regexp.compile('^'+path.gsub(/\)/, ')?').gsub(/\//, '\/').gsub(/\./, '\.').gsub(/:(\w+)/, '(?<\\1>.+)')+'$')
-    end
-
-    def path(*args, &blk)
-      options = (args.pop if args.last.is_a?(Hash)) || {}
-      args = [nil] if args.empty?
-
-      args.each do |name|
-        if name.present?
-          path_match = path_to_regexp(name).match(remaining_path.first)
-        end
-
-        method_matched = [nil, request.request_method.downcase.to_sym].include?(options[:method])
-        path_matched   = (path_match || (name.nil? && remaining_path.empty?))
-
-        # Only do something here if method and requested path both match
-        if path_matched && method_matched
-          # Transfer variables contained in path name to params hash
-          if path_match
-            path_match.names.each { |k| request.params[k] = path_match[k] }
-            remaining_path.shift
-          end
-
-          serve! instance_exec(&blk)
-
-          # If we get here, #serve decided not to serve.
-          raise NotFoundError
-        end
-      end
-    end
-
-    def get(*args, &blk)
-      args.last.is_a?(Hash) ? args.last.merge(method: :get) : args.push(method: :get)
-      path(*args, &blk)
-    end
-
-    def post(*args, &blk)
-      args.last.is_a?(Hash) ? args.last.merge(method: :post) : args.push(method: :post)
-      path(*args, &blk)
-    end
-
-    def put(*args, &blk)
-      args.last.is_a?(Hash) ? args.last.merge(method: :put) : args.push(method: :put)
-      path(*args, &blk)
-    end
-
-    def delete(*args, &blk)
-      args.last.is_a?(Hash) ? args.last.merge(method: :delete) : args.push(method: :delete)
-      path(*args, &blk)
-    end
-  end
-end

data/lib/happy/static.rb

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