happy 0.1.0.pre27 → 0.1.0.pre28

data/.yardopts

@@ -1 +1 @@
---no-private --protected --embed-mixins lib/**/*.rb - README.md TUTORIAL.md LICENSE
+--private --protected lib/**/*.rb - README.md TUTORIAL.md LICENSE

data/lib/happy/controller.rb

@@ -5,7 +5,6 @@ require 'happy/controller/routing'
 require 'happy/controller/actions'
 require 'happy/controller/rackable'
 require 'happy/controller/configurable'
-require 'happy/controller/cascadable'
 require 'happy/controller/permissions'
 
 module Happy
@@ -19,7 +18,6 @@ module Happy
     include Actions
     include Rackable
     include Configurable
-    include Cascadable
     include Permissions
     include Happy::Helpers
 
@@ -82,8 +80,45 @@ module Happy
       url_for(@root_url, extras)
     end
 
+    # Returns the application controller (ie, the root controller running this
+    # application.)
+    #
+    def app
+      @parent_controller ? @parent_controller.app : self
+    end
+
   private
 
+    # Adds helper methods to the base class for all controllers. Use this
+    # to define application-level helper methods that you want to have available
+    # in all views, even if they're begin rendered by a controller different from
+    # your application controller.
+    #
+    # Modules passed to this method will be included into the base controller class.
+    # Example:
+    #
+    #     helpers MyApp::Helpers
+    #
+    # Alternatively, you can specify a block that will be executed against the
+    # base controller class like this:
+    #
+    #     helpers do
+    #       def my_little_helper
+    #         "something useful"
+    #       end
+    #      end
+    #
+    def self.helpers(*args, &blk)
+      args.flatten.each do |arg|
+        case arg
+          when Module then Happy::Controller.send(:include, arg)
+          else raise "Invalid helper specified."
+        end
+      end
+
+      Happy::Controller.class_exec(&blk) if blk
+    end
+
     def current_url(*extras)
       url_for(processed_path, extras)
     end

data/lib/happy/version.rb

@@ -1,3 +1,3 @@
 module Happy
-  VERSION = "0.1.0.pre27"
+  VERSION = "0.1.0.pre28"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: happy
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre27
+  version: 0.1.0.pre28
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-17 00:00:00.000000000 Z
+date: 2012-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70179033071240 !ruby/object:Gem::Requirement
+  requirement: &70101332488280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70179033071240
+  version_requirements: *70101332488280
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70179033070740 !ruby/object:Gem::Requirement
+  requirement: &70101332487780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70179033070740
+  version_requirements: *70101332487780
 - !ruby/object:Gem::Dependency
   name: allowance
-  requirement: &70179033070280 !ruby/object:Gem::Requirement
+  requirement: &70101332487320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70179033070280
+  version_requirements: *70101332487320
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70179033069820 !ruby/object:Gem::Requirement
+  requirement: &70101332486860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70179033069820
+  version_requirements: *70101332486860
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70179033085800 !ruby/object:Gem::Requirement
+  requirement: &70101345428800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70179033085800
+  version_requirements: *70101345428800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70179033085260 !ruby/object:Gem::Requirement
+  requirement: &70101345428260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70179033085260
+  version_requirements: *70101345428260
 - !ruby/object:Gem::Dependency
   name: rspec-html-matchers
-  requirement: &70179033084840 !ruby/object:Gem::Requirement
+  requirement: &70101345427840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70179033084840
+  version_requirements: *70101345427840
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70179033084380 !ruby/object:Gem::Requirement
+  requirement: &70101345427380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70179033084380
+  version_requirements: *70101345427380
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70179033083960 !ruby/object:Gem::Requirement
+  requirement: &70101345426960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70179033083960
+  version_requirements: *70101345426960
 description: A happy little toolkit for writing web applications.
 email:
 - hendrik@mans.de
@@ -136,7 +136,6 @@ files:
 - lib/happy.rb
 - lib/happy/controller.rb
 - lib/happy/controller/actions.rb
-- lib/happy/controller/cascadable.rb
 - lib/happy/controller/configurable.rb
 - lib/happy/controller/permissions.rb
 - lib/happy/controller/rackable.rb
@@ -158,7 +157,6 @@ files:
 - lib/happy/response.rb
 - lib/happy/version.rb
 - spec/controller/actions_spec.rb
-- spec/controller/cascadable_spec.rb
 - spec/controller/configurable_spec.rb
 - spec/controller/routing_spec.rb
 - spec/controller_spec.rb
@@ -192,7 +190,6 @@ specification_version: 3
 summary: A happy little toolkit for writing web applications.
 test_files:
 - spec/controller/actions_spec.rb
-- spec/controller/cascadable_spec.rb
 - spec/controller/configurable_spec.rb
 - spec/controller/routing_spec.rb
 - spec/controller_spec.rb

data/lib/happy/controller/cascadable.rb

@@ -1,17 +0,0 @@
-module Happy
-  class Controller
-    module Cascadable
-      def method_missing(name, *args, &blk)
-        if @parent_controller && @parent_controller.respond_to?(name)
-          @parent_controller.send(name, *args, &blk)
-        else
-          super
-        end
-      end
-
-      def respond_to?(name)
-        super || @parent_controller.try(:respond_to?, name)
-      end
-    end
-  end
-end

data/spec/controller/cascadable_spec.rb

@@ -1,43 +0,0 @@
-require 'spec_helper'
-
-module Happy
-  describe Controller::Cascadable do
-
-    describe '#method_missing' do
-      it "passes on all method calls to a parent if there is one" do
-        class Inner < Controller
-          def route
-            on 'one' do
-              some_helper
-            end
-
-            on 'two' do
-              some_unknown_helper
-            end
-          end
-        end
-
-        class Middle < Controller
-          def route
-            run Inner
-          end
-        end
-
-        class Outer < Controller
-          def some_helper; 'some_information'; end
-          def route
-            run Middle
-          end
-        end
-
-        def app
-          Outer
-        end
-
-        response_for { get '/one' }.body.should == 'some_information'
-        response_for { get '/two' }.status.should == 500
-      end
-    end
-
-  end
-end