title_estuary 1.1.1 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.2.0

data/lib/title_estuary.rb

@@ -4,8 +4,9 @@ module TitleEstuary
   # When TitleEstuary is included by a controller,
   # this hook prevents ActionPack from using
   # <tt>#page_title</tt> as an action and makes that
-  # method available to helpers and views; it also
-  # auto-includes TitleEstuary::InheritedResourcesSupport
+  # method available to helpers and views; you may
+  # also want to include
+  # TitleEstuary::InheritedResourcesSupport
   # and TitleEstuary::HighVoltageSupport
   # if applicable.
   #
@@ -15,15 +16,6 @@ module TitleEstuary
     base.send :include, TitleEstuary::InstanceMethods
     base.hide_action(:page_title) if base.respond_to?(:hide_action)
     base.helper_method(:page_title, :page_title=) if base.respond_to?(:helper_method)
-    if Object.const_defined?(:InheritedResources) &&
-         base <= ::InheritedResources::Base
-      base.send :include, TitleEstuary::InheritedResourcesSupport
-    end
-    if Object.const_defined?(:HighVoltage) && 
-         HighVoltage.const_defined?(:PagesController) && 
-         base <= ::HighVoltage::PagesController
-      base.send :include, TitleEstuary::HighVoltageSupport
-    end
   end
   
   module InstanceMethods

data/test/high_voltage_integration_test.rb

@@ -2,6 +2,7 @@ require File.dirname(__FILE__) + '/test_helper'
 
 class PagesController < HighVoltage::PagesController
   include TitleEstuary
+  include TitleEstuary::HighVoltageSupport
 end
 
 ActionController::Routing::Routes.draw do |map|
@@ -20,10 +21,6 @@ class HighVoltageIntegrationTest < ActionController::TestCase
         clear_translations!
       end
       
-      should 'have high-voltage support installed' do
-        assert ::PagesController < TitleEstuary::HighVoltageSupport
-      end
-      
       context 'on a GET to :show for a page with no i18n title set' do
         setup do
           get :show, :id => 'info'

data/test/inherited_resources_integration_test.rb

@@ -16,6 +16,7 @@ end
 class DeliciousThingsController < InheritedResources::Base
   self.resource_class = Pizza
   include TitleEstuary
+  include TitleEstuary::InheritedResourcesSupport
   def cheesey; index; end
   def add_topping; show; end
   def pizza_url(*args); delicious_thing_url(*args); end
@@ -38,10 +39,6 @@ class InheritedResourcesIntegrationTest < ActionController::TestCase
         clear_translations!
       end
       
-      should 'have inherited-resources support installed' do
-        assert DeliciousThingsController < TitleEstuary::InheritedResourcesSupport
-      end
-      
       context 'on a GET to :index' do
         setup do
           Pizza.stubs(:find).returns([])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: title_estuary
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors: 
 - James Rosen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-03 00:00:00 -04:00
+date: 2009-09-06 00:00:00 -04:00
 default_executable: 
 dependencies: []