funky_tabs 0.1.5 → 0.1.6

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('funky_tabs', '0.1.5') do |p|
+Echoe.new('funky_tabs', '0.1.6') do |p|
   p.description    = "Create Ajaxified tabs with simple history through window location hashes for Rails."
   p.url            = "http://github.com/thomaspouncy/funky_tabs"
   p.author         = "Thomas Pouncy"

data/funky_tabs.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{funky_tabs}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Pouncy"]
-  s.date = %q{2011-05-25}
+  s.date = %q{2011-07-13}
   s.description = %q{Create Ajaxified tabs with simple history through window location hashes for Rails.}
   s.email = %q{thomas.pouncy@gmail.com}
   s.extra_rdoc_files = ["CHANGELOG", "README.rdoc", "lib/funky_tabs.rb", "lib/funky_tabs/helpers.rb", "lib/funky_tabs/rails.rb", "lib/funky_tabs/renderers.rb", "lib/funky_tabs/tab.rb", "lib/funky_tabs/tab_action.rb"]

data/lib/funky_tabs/renderers.rb

@@ -7,13 +7,13 @@ module FunkyTabs
 
     module InstanceMethods
       def render(*args, &block)
-        super(*args, &block) and return if params[:funky_tabs].nil?
+        return super(*args, &block) if params[:funky_tabs].nil?
         @location_hash = params[:location_hash]
-        super(*args, &block) and return if @location_hash.nil?
+        return super(*args, &block) if @location_hash.nil?
         @tab_index = FunkyTabs.tab_index_from_location_hash(@location_hash)
-        super(*args, &block) and return if @tab_index.nil?
+        return super(*args, &block) if @tab_index.nil?
         @render_content = render_to_string(*args, &block)
-        super(:template=>"funky_tabs/update/update_tab",:layout=>false)
+        return super(:template=>"funky_tabs/update/update_tab",:layout=>false)
       end
     end
   end

data/lib/funky_tabs/tab.rb

@@ -7,6 +7,7 @@ module FunkyTabs
     attr_accessor :title
     attr_accessor :default_tab_action
     attr_accessor :tab_actions
+    attr_accessor :controller_name
 
     #default values for attrs
     def title

data/lib/funky_tabs.rb

@@ -123,6 +123,17 @@ module FunkyTabs
     return location_hash_for_tab_action(tab,tab_action)
   end
 
+  def self.controller_for_tab(tab)
+    return default_tabs_controller if tab.nil?
+    unless tab.is_a?(FunkyTabs::Tab)
+      tab_index = find_tab(tab)
+      return default_tabs_controller if tab_index.nil?
+      tab = tabs[tab_index]
+    end
+    return tab.controller_name unless tab.controller_name.blank?
+    return default_tabs_controller
+  end
+
   def self.content_path_for_tab_and_tab_action(tab,tab_action=nil,tab_action_id=nil)
     unless tab.is_a?(FunkyTabs::Tab)
       tab_index = find_tab(tab)
@@ -140,9 +151,9 @@ module FunkyTabs
       return tab_action.content_path+"?id=#{tab_action_id}"
     end
     if tab_action.name.downcase == "index"
-      content_path = "/#{default_tabs_controller}/#{tab.name.gsub(/\s/,"_").downcase}_index"
+      content_path = "/#{controller_for_tab(tab)}/#{tab.name.gsub(/\s/,"_").downcase}_index"
     else
-      content_path = "/#{default_tabs_controller}/#{tab_action.name.gsub(/\s/,"_").downcase}_#{tab.name.gsub(/\s/,"_").downcase}"
+      content_path = "/#{controller_for_tab(tab)}/#{tab_action.name.gsub(/\s/,"_").downcase}_#{tab.name.gsub(/\s/,"_").downcase}"
     end
     return content_path if tab_action_id.nil?
     return "#{content_path}/#{tab_action_id}"

metadata

@@ -2,7 +2,7 @@
 name: funky_tabs
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Thomas Pouncy
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-25 00:00:00 -07:00
+date: 2011-07-13 00:00:00 -07:00
 default_executable: 
 dependencies: []