happy 0.1.0.pre22 → 0.1.0.pre23

data/example/config.ru

@@ -17,7 +17,7 @@ class TestApp < Happy::Controller
   #
   # This method can be as simple or complex as you like. In this example
   # application, it wraps around a couple of annotated Happy examples.
-  # Usually, you'd use the #path? method to specify code to be executed if
+  # Usually, you'd use the #path method to specify code to be executed if
   # a certain path was requested; in this app, we're using a custom #example
   # 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.
@@ -38,8 +38,8 @@ class TestApp < Happy::Controller
     end
 
     example 'Path parameters' do
-      path? 'hello' do
-        path? :name do
+      on 'hello' do
+        on :name do
           "Hello, #{params['name']}!"
         end
       end
@@ -48,7 +48,7 @@ class TestApp < Happy::Controller
     end
 
     example 'Inline path parameters' do
-      path? 'hello-:name' do
+      on 'hello-:name' do
         "Hello, #{params['name']}!"
       end
 
@@ -59,7 +59,7 @@ class TestApp < Happy::Controller
       # set up permissions ;-)
       can.dance!
 
-      path? 'dance' do
+      on 'dance' do
         if can.dance?
           "You can dance."
         else
@@ -71,18 +71,18 @@ class TestApp < Happy::Controller
     end
 
     example 'Layouts' do
-      path? 'with-layout' do
+      on 'with-layout' do
         layout 'layout.erb'
 
-        path? 'changed-my-mind' do
+        on 'changed-my-mind' do
           layout false
           "This should render without a layout."
         end
 
-        "This should render with a layout."
+        "This should render with a layout. But #{link_to 'this', current_url('changed-my-mind')} shouldn't!"
       end
 
-      "This should render without a layout."
+      "This should render without a layout. But #{link_to 'this', current_url('with-layout')} should."
     end
 
     example 'Invoking other controllers' do
@@ -120,7 +120,7 @@ class TestApp < Happy::Controller
     examples[name] = path_name
 
     # Create a path containing the example's code block
-    path?(path_name, &blk)
+    on path_name, &blk
   end
 end
 

data/lib/happy/controller/routing.rb

@@ -7,7 +7,7 @@ module Happy
         Regexp.compile('^'+path.gsub(/\)/, ')?').gsub(/\//, '\/').gsub(/\./, '\.').gsub(/:(\w+)/, '(.+)')+'$')
       end
 
-      def path?(*args, &blk)
+      def on(*args, &blk)
         options = (args.pop if args.last.is_a?(Hash)) || {}
         args = [nil] if args.empty?
 
@@ -40,9 +40,9 @@ module Happy
       end
 
       [:get, :post, :put, :delete].each do |method|
-        define_method("#{method}?") do |*args, &blk|
+        define_method("on_%s" % method) do |*args, &blk|
           args.last.is_a?(Hash) ? args.last.merge(:method => method) : args.push(:method => method)
-          path?(*args, &blk)
+          on(*args, &blk)
         end
       end
     end

data/lib/happy/extras/resources.rb

@@ -95,17 +95,17 @@ module Happy
           options[:singular_name] ||= options[:class].to_s.tableize.singularize
           options[:plural_name]   ||= options[:class].to_s.tableize.pluralize
 
-          path? options[:plural_name] do
-            get?('new') { do_new }
+          path options[:plural_name] do
+            get('new') { do_new }
 
-            path? :id do
-              get?         { do_show }
-              post?        { do_update }
-              get?('edit') { do_edit }
+            path :id do
+              get         { do_show }
+              post        { do_update }
+              get('edit') { do_edit }
             end
 
-            post? { do_create }
-            get?  { do_index }
+            post { do_create }
+            get  { do_index }
           end
         end
       end

data/lib/happy/version.rb

@@ -1,3 +1,3 @@
 module Happy
-  VERSION = "0.1.0.pre22"
+  VERSION = "0.1.0.pre23"
 end

data/spec/controller/actions_spec.rb

@@ -6,11 +6,11 @@ module Happy
 
     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' }
+        Happy.route do
+          on('simple') { serve! "Simple response" }
+          on('with_headers') { serve! "body { color: red }", :content_type => 'text/css' }
+          on('with_status')  { serve! "Not Allowed", :status => 401 }
+          on('with_layout')  { serve! "content", :layout => 'layout.erb' }
         end
       end
 
@@ -45,7 +45,7 @@ module Happy
         def app
           Happy.route do
             serve! "This should not render"
-            path? 'test' do
+            on 'test' do
               serve! "But this should render"
             end
           end
@@ -58,7 +58,7 @@ module Happy
     describe '#redirect!' do
       it "triggers a redirection to the specified URL" do
         def app
-          build_controller { redirect! 'http://www.test.com' }
+          Happy.route { redirect! 'http://www.test.com' }
         end
 
         get '/'
@@ -68,7 +68,7 @@ module Happy
 
       it "sets the provided status code" do
         def app
-          build_controller { redirect! 'http://www.test.com', 301 }
+          Happy.route { redirect! 'http://www.test.com', 301 }
         end
 
         get '/'
@@ -80,7 +80,7 @@ module Happy
           Happy.route do
             redirect! "http://mans.de"
 
-            path? 'test' do
+            on 'test' do
               redirect! "http://schnitzelpress.org"
             end
           end
@@ -101,7 +101,7 @@ module Happy
         end
 
         def app
-          build_controller { run InnerController }
+          Happy.route { run InnerController }
         end
 
         response_for { get '/' }.body.should == 'awesome!'
@@ -115,7 +115,7 @@ module Happy
         end
 
         def app
-          build_controller { run SomeRackApp }
+          Happy.route { run SomeRackApp }
         end
 
         response_for { get '/' }.body.should == 'racksome!'
@@ -129,7 +129,7 @@ module Happy
         end
 
         def app
-          build_controller { run SomeClass }
+          Happy.route { run SomeClass }
         end
 
         response_for { get '/' }.body.should == 'stringsome!'

data/spec/controller/cascadable_spec.rb

@@ -7,11 +7,11 @@ module Happy
       it "passes on all method calls to a parent if there is one" do
         class Inner < Controller
           def route
-            path? 'one' do
+            on 'one' do
               some_helper
             end
 
-            path? 'two' do
+            on 'two' do
               some_unknown_helper
             end
           end

data/spec/controller/routing_spec.rb

@@ -5,17 +5,17 @@ module Happy
     describe '#path' do
       subject do
         Happy.route do
-          path?('foo') { serve! 'bar' }
-          path?('one', 'two') { serve! 'onetwo' }
-          path?('hello') do
-            path?(:name) { serve! "Hello #{params['name']}" }
+          on('foo') { serve! 'bar' }
+          on('one', 'two') { serve! 'onetwo' }
+          on('hello') do
+            on(: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' }
+          on('number-:num') { serve! "num = #{params['num']}" }
+          on('return-value') { 'moo?' }
+          on('resource') do
+            on_get { 'GET resource' }
+            on_post { 'POST resource' }
           end
           serve! "root"
         end
@@ -62,12 +62,14 @@ module Happy
     end
 
     %w(get post put delete).each do |what|
-      describe "##{what}?" do
+      method_name = "on_%s" % what
+
+      describe "#%s" % method_name 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')
+        it "merely invokes #path with the :method => :#{what} option" do
+          subject.should_receive(:on).with('path', :method => what.to_sym)
+          subject.send(method_name, 'path')
         end
       end
     end

data/spec/controller_spec.rb

@@ -21,9 +21,9 @@ module Happy
     describe '#current_url' do
       it "returns the current URL" do
         def app
-          build_controller do
-            path? 'foo' do
-              path? 'bar' do
+          Happy.route do
+            on 'foo' do
+              on 'bar' do
                 "My URL is #{current_url}"
               end
 
@@ -41,8 +41,8 @@ module Happy
 
       it "appends extra paths to the URL if provided" do
         def app
-          build_controller do
-            path? 'foo' do
+          Happy.route do
+            on 'foo' do
               current_url('bar', 'moo')
             end
           end
@@ -55,16 +55,16 @@ module Happy
     describe '#root_url' do
       it "returns the controller's root URL" do
         def app
-          root_url_printer = build_controller do
-            path? 'bar' do
+          root_url_printer = Happy.route do
+            on 'bar' do
               "My root URL is still #{root_url}"
             end
 
             "My root URL is #{root_url}"
           end
 
-          build_controller do
-            path? 'foo' do
+          Happy.route do
+            on 'foo' do
               run root_url_printer
             end
 
@@ -79,12 +79,12 @@ module Happy
 
       it "appends extra paths to the root URL if provided" do
         def app
-          some_controller = build_controller do
+          some_controller = Happy.route do
             root_url('bar')
           end
 
-          build_controller do
-            path? 'foo' do
+          Happy.route do
+            on 'foo' do
               run some_controller
             end
           end

data/spec/spec_helper.rb

@@ -16,10 +16,6 @@ module SpecHelpers
     yield if block_given?
     last_response
   end
-
-  def build_controller(&blk)
-    Happy.route(&blk)
-  end
 end
 
 RSpec.configure do |conf|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: happy
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre22
+  version: 0.1.0.pre23
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-13 00:00:00.000000000 Z
+date: 2012-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70226632793780 !ruby/object:Gem::Requirement
+  requirement: &70202609576440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70226632793780
+  version_requirements: *70202609576440
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70226632793280 !ruby/object:Gem::Requirement
+  requirement: &70202609575940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70226632793280
+  version_requirements: *70202609575940
 - !ruby/object:Gem::Dependency
   name: happy-helpers
-  requirement: &70226632792820 !ruby/object:Gem::Requirement
+  requirement: &70202609575480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.0.pre11
   type: :runtime
   prerelease: false
-  version_requirements: *70226632792820
+  version_requirements: *70202609575480
 - !ruby/object:Gem::Dependency
   name: allowance
-  requirement: &70226632792360 !ruby/object:Gem::Requirement
+  requirement: &70202609575020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70226632792360
+  version_requirements: *70202609575020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70226632791980 !ruby/object:Gem::Requirement
+  requirement: &70202609574640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70226632791980
+  version_requirements: *70202609574640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70226632791440 !ruby/object:Gem::Requirement
+  requirement: &70202475775160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70226632791440
+  version_requirements: *70202475775160
 - !ruby/object:Gem::Dependency
   name: rspec-html-matchers
-  requirement: &70226632791020 !ruby/object:Gem::Requirement
+  requirement: &70202475774740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70226632791020
+  version_requirements: *70202475774740
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70226632790560 !ruby/object:Gem::Requirement
+  requirement: &70202475774280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70226632790560
+  version_requirements: *70202475774280
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70226632790140 !ruby/object:Gem::Requirement
+  requirement: &70202475773860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70226632790140
+  version_requirements: *70202475773860
 description: A happy little toolkit for writing web applications.
 email:
 - hendrik@mans.de