happy 0.1.0.pre.3 → 0.1.0.pre.4

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' # TODO: , '~> 0.1.0'
+  gem.add_dependency 'happy-helpers', '~> 0.1.0.pre.5'
   gem.add_dependency 'allowance', '>= 0.1.1'
 
   gem.add_development_dependency 'rake'

data/lib/happy/context_ext/helpers.rb

@@ -7,6 +7,7 @@ module Happy
 
       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)

data/lib/happy/controller.rb

@@ -14,7 +14,7 @@ module Happy
       :render, :url_for,
       :to => :context
 
-    def initialize(env = nil, options = {}, &blk)
+    def initialize(env = {}, options = {}, &blk)
       @env = env
       @options = options
       instance_exec(&blk) if blk

data/lib/happy/controller_ext/actions.rb

@@ -10,16 +10,21 @@ module Happy
 
         # Mix in default options
         options = {
-          layout: context.layout
+          :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)
+        # Add status code from options
+        response.status = options.delete(:status) if options.has_key?(:status)
+
+        # Extract layout
+        layout = options.delete(:layout)
+
+        # Treat remaining options as headers
+        options.each { |k, v| header k, v }
 
         # Apply layout, if available
-        if options[:layout]
-          data = render(options[:layout]) { data }
+        if layout
+          data = render(layout) { data }
         end
 
         # Set response body and finish request
@@ -32,7 +37,7 @@ module Happy
       end
 
       def redirect!(to, status = 302)
-        header "Location", url_for(to)
+        header :location, url_for(to)
         response.status = status
         halt!
       end
@@ -42,7 +47,7 @@ module Happy
       end
 
       def content_type(type)
-        header 'Content-type', type
+        header :content_type, type
       end
 
       def max_age(t, options = {})
@@ -60,10 +65,11 @@ module Happy
       end
 
       def cache_control(s)
-        header 'Cache-control', s
+        header :cache_control, s
       end
 
       def header(name, value)
+        name = name.to_s.dasherize.humanize if name.is_a?(Symbol)
         response[name] = value
       end
 

data/lib/happy/controller_ext/routing.rb

@@ -2,8 +2,9 @@ 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>.+)')+'$')
+        # Since we want to be compatible with Ruby 1.8.7, we unfortunately can't use named captures like this:
+        # Regexp.compile('^'+path.gsub(/\)/, ')?').gsub(/\//, '\/').gsub(/\./, '\.').gsub(/:(\w+)/, '(?<\\1>.+)')+'$')
+        Regexp.compile('^'+path.gsub(/\)/, ')?').gsub(/\//, '\/').gsub(/\./, '\.').gsub(/:(\w+)/, '(.+)')+'$')
       end
 
       def path(*args, &blk)
@@ -11,18 +12,25 @@ module Happy
         args = [nil] if args.empty?
 
         args.each do |name|
+          # If a path name has been given, match it against the next request path part.
           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)
           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?))
 
           # 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] }
+              name.scan(/:(\w+)/).flatten.each do |var|
+                request.params[var] = path_match.captures.shift
+              end
               remaining_path.shift
             end
 
@@ -35,22 +43,22 @@ module Happy
       end
 
       def get(*args, &blk)
-        args.last.is_a?(Hash) ? args.last.merge(method: :get) : args.push(method: :get)
+        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)
+        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)
+        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)
+        args.last.is_a?(Hash) ? args.last.merge(:method => :delete) : args.push(:method => :delete)
         path(*args, &blk)
       end
     end

data/lib/happy/ext/resources.rb

@@ -91,8 +91,8 @@ module Happy
 
         def route
           @options = {
-            singular_name: options[:class].to_s.tableize.singularize,
-            plural_name:   options[:class].to_s.tableize.pluralize
+            :singular_name => options[:class].to_s.tableize.singularize,
+            :plural_name   => options[:class].to_s.tableize.pluralize
           }.merge(@options)
 
           path options[:plural_name] do

data/lib/happy/version.rb

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

data/spec/controller_ext/actions_spec.rb

@@ -0,0 +1,92 @@
+require 'spec_helper'
+
+module Happy
+  describe ControllerExtensions::Actions do
+    subject { Controller.new }
+
+    describe '#serve!' do
+      def app
+        build_controller do
+          path('simple') { serve! "Simple response" }
+          path('with_headers') { serve! "body { color: red }", :content_type => 'text/css' }
+          path('with_status')  { serve! "Not Allowed", :status => 401 }
+          path('with_layout')  { serve! "content", :layout => 'layout.erb' }
+        end
+      end
+
+      it "serves the provided string as the response body" do
+        response_for { get '/simple' }.body.should == 'Simple response'
+      end
+
+      it "responds with a status code of 200 by default" do
+        response_for { get '/simple' }.status.should == 200
+      end
+
+      it "sets the response status code to its :status option" do
+        response_for { get '/with_status' }.status.should == 401
+      end
+
+      it "uses the layout provided through the :layout option" do
+        instance = Controller.new
+        instance.send(:context).should_receive(:render).with('layout.erb')
+
+        catch(:done) { instance.serve! "content", :layout => 'layout.erb' }
+      end
+
+      it "sets extra options as response headers" do
+        response_for { get '/with_headers' }['Content-type'].should == 'text/css'
+      end
+
+      it "finishes the rendering by throwing :done" do
+        expect { subject.serve! "body" }.to throw_symbol :done
+      end
+    end
+
+    describe '#redirect!' do
+      it "triggers a redirection to the specified URL" do
+        def app
+          build_controller { redirect! 'http://www.test.com' }
+        end
+
+        get '/'
+        last_response.status.should == 302
+        last_response.headers['Location'].should == 'http://www.test.com'
+      end
+
+      it "sets the provided status code" do
+        def app
+          build_controller { redirect! 'http://www.test.com', 301 }
+        end
+
+        get '/'
+        last_response.status.should == 301
+      end
+    end
+
+    describe '#header' do
+      it "sets the specified header in the response" do
+        subject.send(:context).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.header :content_type, 'text/css'
+      end
+    end
+
+    describe '#content_type' do
+      it "sets the Content-type header" do
+        subject.should_receive(:header).with(:content_type, 'text/css')
+        subject.content_type 'text/css'
+      end
+    end
+
+    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.layout 'layout.erb'
+      end
+    end
+  end
+end

data/spec/controller_ext/routing_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+module Happy
+  describe ControllerExtensions::Routing do
+    describe '#path' do
+      subject do
+        Controller.build do
+          route do
+            path('foo') { serve! 'bar' }
+            path('one', 'two') { serve! 'onetwo' }
+            path('hello') do
+              path(:name) { serve! "Hello #{params['name']}" }
+              serve! "Please provide a name."
+            end
+            path('number-:num') { serve! "num = #{params['num']}" }
+            serve! "root"
+          end
+        end
+      end
+
+      it "routes requests to the specified path to its contained block" do
+        response_for { get '/' }.body.should == 'root'
+        response_for { get '/foo' }.body.should == 'bar'
+      end
+
+      it "routes independently from the request method" do
+        response_for { post '/foo' }.body.should == 'bar'
+      end
+
+      it "supports multiple path parameters" do
+        response_for { get '/one' }.body.should == 'onetwo'
+        response_for { get '/two' }.body.should == 'onetwo'
+      end
+
+      it "routes to the root code if no path matches" do
+        response_for { get '/' }.body.should == 'root'
+      end
+
+      it "executes the contained serve! call if no sub-paths match" do
+        response_for { get '/hello' }.body.should == 'Please provide a name.'
+      end
+
+      it "parses parameters when the provided path is a symbol" do
+        response_for { get '/hello/hendrik' }.body.should == 'Hello hendrik'
+      end
+
+      it "parses parameters within path names" do
+        response_for { get '/number-123' }.body.should == 'num = 123'
+      end
+    end
+
+    %w(get post put delete).each do |what|
+      describe "##{what}" do
+        subject { Controller.new }
+
+        it "merely invokes #path with the :method => :#{what} option" do
+          subject.should_receive(:path).with('path', :method => what.to_sym)
+          subject.send(what, 'path')
+        end
+      end
+    end
+  end
+end

data/spec/controller_spec.rb

@@ -2,6 +2,20 @@ require 'spec_helper'
 
 module Happy
   describe Controller do
+    subject do
+      Controller.build do
+        route do
+          serve! "it works"
+        end
+      end
+    end
+
+    it "is mountable as a Rack app" do
+      subject.should respond_to(:call)
+      get '/'
+      last_response.body.should == 'it works'
+    end
+
     describe ".build" do
       subject do
         Controller.build do
@@ -9,10 +23,6 @@ module Happy
         end
       end
 
-      def app
-        subject
-      end
-
       it "creates a new controller class" do
         subject.ancestors.should include(Controller)
       end
@@ -22,19 +32,5 @@ module Happy
         last_response.body.should == 'yay!'
       end
     end
-
-    it "is also a Rack app" do
-      def app
-        Controller.build do
-          route do
-            serve! "it works"
-          end
-        end
-      end
-
-      get '/'
-      last_response.body.should == 'it works'
-    end
-
   end
 end

data/spec/spec_helper.rb

@@ -8,6 +8,26 @@ require 'rack/test'
 
 require 'happy'
 
+module SpecHelpers
+  def app
+    subject
+  end
+
+  def response_for
+    yield if block_given?
+    last_response
+  end
+
+  def build_controller(&blk)
+    Happy::Controller.build do
+      route do
+        instance_exec(&blk)
+      end
+    end
+  end
+end
+
 RSpec.configure do |conf|
   conf.include Rack::Test::Methods
+  conf.include SpecHelpers
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: happy
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.3
+  version: 0.1.0.pre.4
   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: &70362048389880 !ruby/object:Gem::Requirement
+  requirement: &70114163872540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70362048389880
+  version_requirements: *70114163872540
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70362048389020 !ruby/object:Gem::Requirement
+  requirement: &70114163872020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +32,21 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70362048389020
+  version_requirements: *70114163872020
 - !ruby/object:Gem::Dependency
   name: happy-helpers
-  requirement: &70362048388280 !ruby/object:Gem::Requirement
+  requirement: &70114163868380 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0.pre.5
   type: :runtime
   prerelease: false
-  version_requirements: *70362048388280
+  version_requirements: *70114163868380
 - !ruby/object:Gem::Dependency
   name: allowance
-  requirement: &70362048386840 !ruby/object:Gem::Requirement
+  requirement: &70114163867700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70362048386840
+  version_requirements: *70114163867700
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70362048386200 !ruby/object:Gem::Requirement
+  requirement: &70114163867160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70362048386200
+  version_requirements: *70114163867160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70362048385440 !ruby/object:Gem::Requirement
+  requirement: &70114163866580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70362048385440
+  version_requirements: *70114163866580
 - !ruby/object:Gem::Dependency
   name: rspec-html-matchers
-  requirement: &70362048384620 !ruby/object:Gem::Requirement
+  requirement: &70114163866080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70362048384620
+  version_requirements: *70114163866080
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70362048384120 !ruby/object:Gem::Requirement
+  requirement: &70114163865340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70362048384120
+  version_requirements: *70114163865340
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70362048383520 !ruby/object:Gem::Requirement
+  requirement: &70114163864500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70362048383520
+  version_requirements: *70114163864500
 description: A happy little toolkit for writing web applications.
 email:
 - hendrik@mans.de
@@ -139,6 +139,8 @@ files:
 - lib/happy/ext/static.rb
 - lib/happy/request.rb
 - lib/happy/version.rb
+- spec/controller_ext/actions_spec.rb
+- spec/controller_ext/routing_spec.rb
 - spec/controller_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/hmans/happy
@@ -166,6 +168,8 @@ signing_key:
 specification_version: 3
 summary: A happy little toolkit for writing web applications.
 test_files:
+- spec/controller_ext/actions_spec.rb
+- spec/controller_ext/routing_spec.rb
 - spec/controller_spec.rb
 - spec/spec_helper.rb
 has_rdoc: