happy 0.1.0.pre13 → 0.1.0.pre14

data/README.md

@@ -16,13 +16,11 @@ Furthermore, the way Happy handles incoming requests is vastly different from ho
 # config.ru
 require 'happy'
 
-class MyApp < Happy::Controller
-  route do
-    'Hello world'
-  end
+Happy.route do
+  'Hello world'
 end
 
-run MyApp
+run Happy
 ```
 
 How about something a little bit closer to reality?
@@ -31,62 +29,59 @@ How about something a little bit closer to reality?
 # config.ru
 require 'happy'
 
-class MyApp < Happy::Controller
-  route do
-    # Set a default layout for all responses!
-    layout 'application.erb'
-
-    # Happily deal with sub-paths!
-    path 'hello' do
-      # Let's use a different layout here.
-      layout 'hello_layout.erb'
+Happy.route do
+  # Set a default layout for all responses!
+  layout 'application.erb'
 
-      # Happily deal with parameters contained in paths!
-      path :name do
-        # Just return a string to happily render it!
-        "Hello, #{params['name']}"!
-      end
+  # Happily deal with sub-paths!
+  path 'hello' do
+    # Let's use a different layout here.
+    layout 'hello_layout.erb'
 
-      "Silly user, didn't provide a name!"
+    # Happily deal with parameters contained in paths!
+    path :name do
+      # Just return a string to happily render it!
+      "Hello, #{params['name']}"!
     end
 
-    # Now let's do something a little bit more exciting!
-    #
-    # How about passing control to another controller? In this instance,
-    # we're invoking an instance of ResourceMounter, a controller class
-    # that serves a model resource RESTful-Rails-style. We'll save a 
-    # reference to the controller for later.
-
-    articles = ResourceMounter.new(:class => Article)
-    articles.perform
-
-    # Or use the shortcut: invoke :resource_mounter, :class => Article
-
-    # This block of code is executed for every request, so you can do
-    # some crazy stuff here, including only defining specific paths
-    # when certain conditions are given. Just write Ruby! :)
-    
-    if context.user_is_admin?
-      path 'delete_everything' do
-        Article.delete_all
-
-        # How about rendering a view template and passing
-        # variables to it?
-        render 'admin_message.erb',
-          :message => 'You just deleted everything. Grats!'
-      end
-    end
+    "Silly user, didn't provide a name!"
+  end
 
-    # If we reach this point, the request still hasn't been handled, so
-    # the user must by trying to access the root URL. How about a redirect
-    # to the URL of the previously invoked controller?
-    
-    redirect! articles.root_url
+  # Now let's do something a little bit more exciting!
+  #
+  # How about passing control to another controller? In this instance,
+  # we're invoking an instance of ResourceMounter, a controller class
+  # that serves a model resource RESTful-Rails-style. We'll save a 
+  # reference to the controller for later.
+
+  articles = ResourceMounter.new(:class => Article)
+  articles.perform
+
+  # Or use the shortcut: invoke :resource_mounter, :class => Article
+
+  # This block of code is executed for every request, so you can do
+  # some crazy stuff here, including only defining specific paths
+  # when certain conditions are given. Just write Ruby! :)
+  
+  if context.user_is_admin?
+    path 'delete_everything' do
+      Article.delete_all
+
+      # How about rendering a view template and passing
+      # variables to it?
+      render 'admin_message.erb',
+        :message => 'You just deleted everything. Grats!'
+    end
   end
+
+  # If we reach this point, the request still hasn't been handled, so
+  # the user must by trying to access the root URL. How about a redirect
+  # to the URL of the previously invoked controller?
+  
+  redirect! articles.root_url
 end
 
-# It's just a Rack app, so let's run it.
-run MyApp
+run Happy
 ```
 
 

data/lib/happy/context.rb

@@ -5,8 +5,8 @@ module Happy
   class Context
     include Helpers
 
-    attr_reader   :request, :response, :previous_path, :remaining_path
-    attr_accessor :layout, :controller
+    attr_reader   :request, :previous_path, :remaining_path
+    attr_accessor :layout, :controller, :response
     delegate      :params, :session, :to => :request
 
     def initialize(request, response)
@@ -30,10 +30,6 @@ module Happy
       self.controller = old_controller
     end
 
-    def response=(r)
-      @response = r
-    end
-
   private
 
     class << self

data/lib/happy/controller.rb

@@ -46,31 +46,20 @@ module Happy
     end
 
     def context
-      @env['happy.context'] ||= self.class.context_class.from_env(@env)
+      @env['happy.context'] ||= Happy::Context.from_env(@env)
     end
 
     def route
-      instance_exec(&self.class.route_blk) if self.class.route_blk
+      # override this in subclasses
     end
 
     class << self
-      attr_reader :route_blk
-
-      def route(&blk)
-        @route_blk = blk
-      end
-
-      def context(&blk)
-        context_class.class_exec(&blk)
-      end
-
-      def context_class
-        Happy::Context
-      end
-
+      # Create a new subclass of Happy::Controller, using the provided
+      # block for defining class methods et al.
+      #
       def build(&blk)
         Class.new(self).tap do |klass|
-          klass.instance_eval(&blk) if blk
+          klass.class_eval(&blk) if blk
         end
       end
     end

data/lib/happy/version.rb

@@ -1,3 +1,3 @@
 module Happy
-  VERSION = "0.1.0.pre13"
+  VERSION = "0.1.0.pre14"
 end

data/lib/happy.rb

@@ -11,4 +11,24 @@ module Happy
   def self.env
     ActiveSupport::StringInquirer.new(ENV['RACK_ENV'] || 'development')
   end
+
+  # Creates a new Happy::Controller class, using the provided block as
+  # its routing block.
+  #
+  def self.route(&blk)
+    @last_controller_class_created = 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

data/spec/controller/actions_spec.rb

@@ -66,7 +66,9 @@ module Happy
     describe '#run' do
       it "passes control to another controller" do
         class InnerController < Controller
-          route { 'awesome!' }
+          def route
+            'awesome!'
+          end
         end
 
         def app

data/spec/controller/routing_spec.rb

@@ -4,22 +4,20 @@ module Happy
   describe Controller::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']}" }
-            path('return-value') { 'moo?' }
-            path('resource') do
-              get { 'GET resource' }
-              post { 'POST resource' }
-            end
-            serve! "root"
+        Happy.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']}" }
+          path('return-value') { 'moo?' }
+          path('resource') do
+            get { 'GET resource' }
+            post { 'POST resource' }
+          end
+          serve! "root"
         end
       end
 

data/spec/controller_spec.rb

@@ -3,11 +3,13 @@ require 'spec_helper'
 module Happy
   describe Controller do
     subject do
-      Controller.build do
-        route do
+      class MyController < Happy::Controller
+        def route
           serve! "it works"
         end
       end
+
+      MyController
     end
 
     it "is mountable as a Rack app" do
@@ -19,7 +21,9 @@ module Happy
     describe ".build" do
       subject do
         Controller.build do
-          route { serve! "yay!" }
+          def route
+            serve! "yay!"
+          end
         end
       end
 

data/spec/happy_spec.rb

@@ -7,11 +7,11 @@ describe Happy do
     end
 
     it "provides #development?, #production? etc." do
-      ENV.should_receive(:[]).twice.with('RACK_ENV').and_return('development')
+      ENV['RACK_ENV'] = 'development'
       Happy.env.should be_development
       Happy.env.should_not be_production
 
-      ENV.should_receive(:[]).twice.with('RACK_ENV').and_return('production')
+      ENV['RACK_ENV'] = 'production'
       Happy.env.should be_production
       Happy.env.should_not be_development
     end

data/spec/spec_helper.rb

@@ -18,11 +18,7 @@ module SpecHelpers
   end
 
   def build_controller(&blk)
-    Happy::Controller.build do
-      route do
-        instance_exec(&blk)
-      end
-    end
+    Happy.route(&blk)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: happy
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre13
+  version: 0.1.0.pre14
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-06 00:00:00.000000000 Z
+date: 2012-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70218841196860 !ruby/object:Gem::Requirement
+  requirement: &70317632674040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70218841196860
+  version_requirements: *70317632674040
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70218841195560 !ruby/object:Gem::Requirement
+  requirement: &70317632672560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70218841195560
+  version_requirements: *70317632672560
 - !ruby/object:Gem::Dependency
   name: happy-helpers
-  requirement: &70218841194520 !ruby/object:Gem::Requirement
+  requirement: &70317632671280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.0.pre9
   type: :runtime
   prerelease: false
-  version_requirements: *70218841194520
+  version_requirements: *70317632671280
 - !ruby/object:Gem::Dependency
   name: allowance
-  requirement: &70218841193840 !ruby/object:Gem::Requirement
+  requirement: &70317632685880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70218841193840
+  version_requirements: *70317632685880
 - !ruby/object:Gem::Dependency
   name: happy-cli
-  requirement: &70218841193140 !ruby/object:Gem::Requirement
+  requirement: &70317632681080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.1.0.pre1
   type: :runtime
   prerelease: false
-  version_requirements: *70218841193140
+  version_requirements: *70317632681080
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70218841192140 !ruby/object:Gem::Requirement
+  requirement: &70317632678780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70218841192140
+  version_requirements: *70317632678780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70218841189600 !ruby/object:Gem::Requirement
+  requirement: &70317632703660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70218841189600
+  version_requirements: *70317632703660
 - !ruby/object:Gem::Dependency
   name: rspec-html-matchers
-  requirement: &70218841188740 !ruby/object:Gem::Requirement
+  requirement: &70317632702220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70218841188740
+  version_requirements: *70317632702220
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70218841187540 !ruby/object:Gem::Requirement
+  requirement: &70317632701180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70218841187540
+  version_requirements: *70317632701180
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70218841186200 !ruby/object:Gem::Requirement
+  requirement: &70317632700160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70218841186200
+  version_requirements: *70317632700160
 description: A happy little toolkit for writing web applications.
 email:
 - hendrik@mans.de