hierarchical_page_titles 0.1.0.pre → 0.1.0.pre.2

data/.gitignore

@@ -1,2 +1,3 @@
 .DS_Store
 *.tmproj
+*.gem

data/lib/hierarchical_page_titles/controller_helpers.rb

@@ -1,10 +1,12 @@
-require 'hierarchical_page_titles/shared_methods'
+require 'hierarchical_page_titles/shared_instance_methods'
 
 module HierarchicalPageTitles
   module ControllerHelpers
-    extend ActiveSupport::Concern
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
     
-    include SharedMethods
+    include SharedInstanceMethods
     
     module ClassMethods
       # Call this in the body of your controller with a string to add the string to
@@ -16,6 +18,7 @@ module HierarchicalPageTitles
         options = Hash === args.last ? args.last : {}
         before_filter(options) {|c| c.window_title(*args, &block) }
       end
+      alias :add_window_title :window_title
       
       # Call this in the body of your controller with a string to set the page title
       # globally for each action in your controller. Unlike window_title, this will not

data/lib/hierarchical_page_titles/{shared_methods.rb → shared_instance_methods.rb}

@@ -1,5 +1,5 @@
 module HierarchicalPageTitles
-  module SharedMethods
+  module SharedInstanceMethods
     # Call this in your view with a string to add the string to the array of window titles.
     # Call this in your layout to output the window title. You can specify a separator
     # that should be put between the titles by passing <tt>:separator => " - "</tt>.
@@ -8,7 +8,7 @@ module HierarchicalPageTitles
       titles = args.flatten
       @_window_titles ||= []
       if block_given?
-        @_window_titles << block.call
+        @_window_titles << instance_eval(&block)
       else
         @_window_titles += titles
       end
@@ -20,7 +20,7 @@ module HierarchicalPageTitles
     def page_title(*args, &block)
       options = args.extract_options!
       title = args.first
-      @_page_title = (block_given? ? block.call : title)
+      @_page_title = (block_given? ? instance_eval(&block) : title)
       @_page_title_set = true
     end
     

data/lib/hierarchical_page_titles/version.rb

@@ -1,3 +1,3 @@
 module HierarchicalPageTitles
-  VERSION = "0.1.0.pre"
+  VERSION = "0.1.0.pre.2"
 end

data/lib/hierarchical_page_titles/view_helpers.rb

@@ -1,8 +1,8 @@
-require 'hierarchical_page_titles/shared_methods'
+require 'hierarchical_page_titles/shared_instance_methods'
 
 module HierarchicalPageTitles
   module ViewHelpers
-    include SharedMethods
+    include SharedInstanceMethods
     
     # Call this in your view with a string to add the string to the array of window titles.
     # Call this in your layout to output the window title. You can specify a separator
@@ -12,8 +12,7 @@ module HierarchicalPageTitles
       if args.empty?
         options[:separator] ||= " - "
         @_window_titles ||= []
-        prefix = Array(options[:prefix]) || []
-        (prefix + @_window_titles).join(options[:separator])
+        @_window_titles.join(options[:separator])
       else
         super
       end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: hierarchical_page_titles
 version: !ruby/object:Gem::Version 
-  hash: 961915980
+  hash: -223651651
   prerelease: true
   segments: 
   - 0
   - 1
   - 0
   - pre
-  version: 0.1.0.pre
+  - 2
+  version: 0.1.0.pre.2
 platform: ruby
 authors: 
 - Elliot Winkler
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-08 00:00:00 -07:00
+date: 2010-12-13 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -40,7 +41,7 @@ files:
 - lib/hierarchical_page_titles.rb
 - lib/hierarchical_page_titles/controller_helpers.rb
 - lib/hierarchical_page_titles/railtie.rb
-- lib/hierarchical_page_titles/shared_methods.rb
+- lib/hierarchical_page_titles/shared_instance_methods.rb
 - lib/hierarchical_page_titles/version.rb
 - lib/hierarchical_page_titles/view_helpers.rb
 has_rdoc: true