happy 0.1.0.pre.4 → 0.1.0.pre.5

data/lib/happy/controller.rb

@@ -53,7 +53,7 @@ module Happy
 
       def build(&blk)
         Class.new(self).tap do |klass|
-          klass.instance_eval &blk
+          klass.instance_eval(&blk) if blk
         end
       end
     end

data/lib/happy/controller_ext/actions.rb

@@ -73,13 +73,19 @@ module Happy
         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!
+      def run(thing, options = {}, &blk)
+        if thing.is_a?(Class) && thing.ancestors.include?(Happy::Controller)
+          # Happy controllers!
+          thing.new(env, options, &blk).perform
+        elsif thing.respond_to?(:call)
+          # Rack apps!
+          context.response = thing.call(request.env)
+          halt!
+        elsif thing.respond_to?(:to_s)
+          thing.to_s
+        else
+          raise "Don't know how to run #{thing.inspect} :("
+        end
       end
     end
   end

data/lib/happy/version.rb

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

data/lib/happy.rb

@@ -1,5 +1,6 @@
 require 'active_support/all' # SMELL
 
+require 'rack'
 require 'happy/context'
 require 'happy/controller'
 

data/spec/controller_ext/actions_spec.rb

@@ -63,6 +63,48 @@ module Happy
       end
     end
 
+    describe '#run' do
+      it "passes control to another controller" do
+        class InnerController < Controller
+          route { 'awesome!' }
+        end
+
+        def app
+          build_controller { run InnerController }
+        end
+
+        response_for { get '/' }.body.should == 'awesome!'
+      end
+
+      it "passes control to a Rack app" do
+        class SomeRackApp
+          def self.call(env)
+            Rack::Response.new('racksome!')
+          end
+        end
+
+        def app
+          build_controller { run SomeRackApp }
+        end
+
+        response_for { get '/' }.body.should == 'racksome!'
+      end
+
+      it "falls back to .to_s" do
+        class SomeClass
+          def self.to_s
+            "stringsome!"
+          end
+        end
+
+        def app
+          build_controller { run SomeClass }
+        end
+
+        response_for { get '/' }.body.should == 'stringsome!'
+      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')

data/spec/controller_ext/routing_spec.rb

@@ -13,6 +13,11 @@ module Happy
               serve! "Please provide a name."
             end
             path('number-:num') { serve! "num = #{params['num']}" }
+            path('return-value') { 'moo?' }
+            path('resource') do
+              get { 'GET resource' }
+              post { 'POST resource' }
+            end
             serve! "root"
           end
         end
@@ -23,6 +28,10 @@ module Happy
         response_for { get '/foo' }.body.should == 'bar'
       end
 
+      it "renders its block's results if no other #serve! call is made" do
+        response_for { get '/return-value' }.body.should == 'moo?'
+      end
+
       it "routes independently from the request method" do
         response_for { post '/foo' }.body.should == 'bar'
       end
@@ -40,6 +49,11 @@ module Happy
         response_for { get '/hello' }.body.should == 'Please provide a name.'
       end
 
+      it "just matches the method if no path name is given" do
+        response_for { get '/resource' }.body.should == 'GET resource'
+        response_for { post '/resource' }.body.should == 'POST resource'
+      end
+
       it "parses parameters when the provided path is a symbol" do
         response_for { get '/hello/hendrik' }.body.should == 'Hello hendrik'
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: happy
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.4
+  version: 0.1.0.pre.5
   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: &70114163872540 !ruby/object:Gem::Requirement
+  requirement: &70252206125620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70114163872540
+  version_requirements: *70252206125620
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70114163872020 !ruby/object:Gem::Requirement
+  requirement: &70252206112780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70114163872020
+  version_requirements: *70252206112780
 - !ruby/object:Gem::Dependency
   name: happy-helpers
-  requirement: &70114163868380 !ruby/object:Gem::Requirement
+  requirement: &70252206112060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.0.pre.5
   type: :runtime
   prerelease: false
-  version_requirements: *70114163868380
+  version_requirements: *70252206112060
 - !ruby/object:Gem::Dependency
   name: allowance
-  requirement: &70114163867700 !ruby/object:Gem::Requirement
+  requirement: &70252206111260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70114163867700
+  version_requirements: *70252206111260
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70114163867160 !ruby/object:Gem::Requirement
+  requirement: &70252206110820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70114163867160
+  version_requirements: *70252206110820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70114163866580 !ruby/object:Gem::Requirement
+  requirement: &70252206109960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70114163866580
+  version_requirements: *70252206109960
 - !ruby/object:Gem::Dependency
   name: rspec-html-matchers
-  requirement: &70114163866080 !ruby/object:Gem::Requirement
+  requirement: &70252206109140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70114163866080
+  version_requirements: *70252206109140
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70114163865340 !ruby/object:Gem::Requirement
+  requirement: &70252206108080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70114163865340
+  version_requirements: *70252206108080
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70114163864500 !ruby/object:Gem::Requirement
+  requirement: &70252206107080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70114163864500
+  version_requirements: *70252206107080
 description: A happy little toolkit for writing web applications.
 email:
 - hendrik@mans.de