funky_tabs 0.1.1 → 0.1.2

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('funky_tabs', '0.1.1') do |p|
+Echoe.new('funky_tabs', '0.1.2') 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/app/controllers/funky_tabs/update_controller.rb

@@ -1,13 +1,6 @@
 class FunkyTabs::UpdateController < ApplicationController
   layout false
 
-  def funky_tab_action
-    tab,tab_action,tab_action_id = FunkyTabs.tab_and_tab_action_from_location_hash(params[:location_hash])
-    action_to_call = FunkyTabs.content_path_for_tab_and_tab_action(tab,tab_action,tab_action_id)
-    redirect_to action_to_call+"?funky_tabs=true&location_hash=#{params[:location_hash]}" and return unless action_to_call.include?("?")
-    redirect_to action_to_call+"&funky_tabs=true&location_hash=#{params[:location_hash]}" and return
-  end
-
   def missing_funky_tab
     render FunkyTabs.missing_tab_action_path,:layout=>false and return
   end

data/app/views/funky_tabs/update/_render_funky_tabs.html.erb

@@ -11,6 +11,8 @@
 </div>
 <div style="clear:both;"></div>
 <script type="text/javascript">
+<%= raw(@path_from_hash_arr) %>
+
 function selectFunkyTab(tab_index){
         jQuery('div#funky_tabs li.funky_tabs_list').removeClass('selected_tab');
         jQuery('ul.css-tabs li#funky_tabs_list-'+tab_index).addClass('selected_tab');
@@ -24,17 +26,35 @@ function selectFunkyTab(tab_index){
         <%= FunkyTabs.tab_select_callback.gsub(/:tab_number/,'tab_index') unless FunkyTabs.tab_select_callback.nil? %>
 }
 function funkyTabsAjaxCall(location_hash){
-        call_hash_change = false;
         jQuery('div#funky_tabs div.funky_tab').html("<%= raw(FunkyTabs.loading_html) %>");
+
+        if((typeof(location_hash)=="string") && (location_hash.indexOf("#") != -1)){
+                location_hash = location_hash.replace("#","");
+        }
+
+        var tab_action_id = "";
+        location_hash = ''+location_hash;
+
+        var hash_components = location_hash.split("-");
+        var hash_lookup = hash_components[0];
+        if(hash_components.length > 1){
+                hash_lookup = hash_lookup + "-" + hash_components[1];
+        }
+        if(hash_components.length > 2){
+                tab_action_id = hash_components[2];
+        }
+
+
         window.location.hash = location_hash;
-        jQuery("div#funky_tabs div.selected_tab_div").load("/funky_tabs/update/funky_tab_action?location_hash="+location_hash);
+
+        var path = path_from_hash_arr[hash_lookup];
+        if(tab_action_id != ""){
+                path = path.replace("?","?id="+tab_action_id+"&");
+        }
+        jQuery("div#funky_tabs div.selected_tab_div").load(path+'&location_hash='+location_hash);
 }
 function hashChangeEvent(){
-        if(call_hash_change){
-                funkyTabsAjaxCall(location.hash.replace("#",""));
-        } else {
-                call_hash_change = true;
-        }
+        funkyTabsAjaxCall(location.hash);
 }
 if(typeof(jQuery(window).hashchange) == "undefined"){
         // dont have special plugin, so use onhashchange event. NOTE: this will not work in ie 6 or 7
@@ -44,7 +64,6 @@ if(typeof(jQuery(window).hashchange) == "undefined"){
         jQuery(window).hashchange(hashChangeEvent);
 }
 var load_on_select = true;
-var call_hash_change = true;
 jQuery(function() {
         var initial_tab = <%= FunkyTabs.default_tab_index %>;
         if(window.location.hash != ""){

data/funky_tabs.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{funky_tabs}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   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-20}
+  s.date = %q{2011-05-21}
   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/helpers.rb

@@ -6,7 +6,7 @@ module FunkyTabs
     def self.included(base)
       base.class_eval do
         def render_funky_tabs
-          #@tab_data = FunkyTabs
+          @path_from_hash_arr = FunkyTabs.javascript_key_array
           return render_to_string :partial=>"funky_tabs/update/render_funky_tabs"
         end
 
@@ -14,18 +14,11 @@ module FunkyTabs
           return FunkyTabs.location_hash_for_tab_action(tab,tab_action,tab_action_id)
         end
 
-        def redirect_to_funky_tab(tab,tab_action=nil,tab_action_id=nil)
-          params[:location_hash] = FunkyTabs.location_hash_for_tab_action(tab,tab_action,tab_action_id)
-          action_to_call = FunkyTabs.content_path_for_tab_and_tab_action(tab,tab_action)
-          redirect_to action_to_call+"?funky_tabs=true&location_hash=#{params[:location_hash]}" and return unless action_to_call.include?("?")
-          redirect_to action_to_call+"&funky_tabs=true&location_hash=#{params[:location_hash]}" and return
-        end
-
         def js_to_funky_tab(tab,tab_action=nil,tab_action_id=nil)
           @location_hash_for_ajax = FunkyTabs.location_hash_for_tab_action(tab,tab_action,tab_action_id)
           return render_to_string :partial=>"funky_tabs/update/ajax.js"
         end
-        helper_method :render_funky_tabs, :redirect_to_funky_tab, :js_to_funky_tab
+        helper_method :render_funky_tabs, :js_to_funky_tab, :location_hash_for_funky_tab
       end
     end
   end

data/lib/funky_tabs/renderers.rb

@@ -10,7 +10,13 @@ module FunkyTabs
         super(*args, &block) and return if params[:funky_tabs].nil?
         @tab_index = FunkyTabs.tab_index_from_location_hash(params[:location_hash])
         super(*args, &block) and return if @tab_index.nil?
-        @location_hash = params[:location_hash]
+        logger.debug "full path is #{request.fullpath}"
+        if FunkyTabs.correct_path_for_location_hash?(request.fullpath,params[:location_hash])
+          @location_hash = params[:location_hash]
+        else
+          @location_hash = FunkyTabs.location_hash_for_content_path(request.fullpath)
+        end
+        super(*args, &block) and return if @location_hash.nil?
         @render_content = render_to_string(*args, &block)
         super(:template=>"funky_tabs/update/update_tab",:layout=>false)
       end

data/lib/funky_tabs.rb

@@ -20,7 +20,22 @@ module FunkyTabs
     @@tabs ||= []
   end
 
-  # make sure to include / at end of tab controller
+  mattr_accessor :location_hashes_for_content_paths
+  def self.location_hashes_for_content_paths
+    return @@location_hashes_for_content_paths unless @@location_hashes_for_content_paths.blank?
+
+    path_hash = {}
+    tabs.each do |tab|
+      tab.tab_actions.each do |tab_action|
+        location_hash = location_hash_for_tab_action(tab,tab_action)
+        path = content_path_for_tab_and_tab_action(tab,tab_action)
+        path_hash[path] = location_hash
+      end
+    end
+
+    @@location_hashes_for_content_paths = path_hash
+  end
+
   mattr_accessor :default_tab_index
   def self.default_tab_index
     @@default_tab_index ||= 0
@@ -88,8 +103,9 @@ module FunkyTabs
     return nil if tab_index.nil?
 
     tab_action_index = tabs[tab_index].find_tab_action(tab_action)
+    default_index = tabs[tab_index].find_tab_action(tabs[tab_index].default_tab_action)
 
-    return tab_index.to_s if tab_action_index.nil?
+    return tab_index.to_s if tab_action_index.nil? || tab_action_index == default_index
     return "#{tab_index}-#{tab_action_index}" if tab_action_id.nil?
     return "#{tab_index}-#{tab_action_index}-#{tab_action_id}"
   end
@@ -104,12 +120,16 @@ module FunkyTabs
   end
 
   def self.content_path_for_tab_and_tab_action(tab,tab_action=nil,tab_action_id=nil)
-    tab_index = find_tab(tab)
-    return missing_tab_action_path if tab_index.nil?
-    tab = tabs[tab_index]
-    tab_action_index = tab.find_tab_action(tab_action||tab.default_tab_action)
-    return missing_tab_action_path if tab_action_index.nil?
-    tab_action = tab.tab_actions[tab_action_index]
+    unless tab.is_a?(FunkyTabs::Tab)
+      tab_index = find_tab(tab)
+      return missing_tab_action_path if tab_index.nil?
+      tab = tabs[tab_index]
+    end
+    unless tab_action.is_a?(FunkyTabs::TabAction)
+      tab_action_index = tab.find_tab_action(tab_action||tab.default_tab_action)
+      return missing_tab_action_path if tab_action_index.nil?
+      tab_action = tab.tab_actions[tab_action_index]
+    end
     unless tab_action.content_path.blank?
       return tab_action.content_path if tab_action_id.nil?
       return tab_action.content_path+"&id=#{tab_action_id}" if tab_action.content_path.include?("?")
@@ -151,6 +171,32 @@ module FunkyTabs
     return indices.first
   end
 
+  def self.correct_path_for_location_hash?(path,location_hash)
+    return false if path.blank? || location_hash.blank?
+    path = path.split("?").first
+
+    tab,tab_action,tab_action_id = tab_and_tab_action_from_location_hash(location_hash)
+    return path == content_path_for_tab_and_tab_action(tab,tab_action)
+  end
+
+  def self.location_hash_for_content_path(path)
+    path = path.split("?").first
+    return location_hashes_for_content_paths[path] rescue nil
+  end
+
+  def self.javascript_key_array
+    js_array = "var path_from_hash_arr = {"
+    location_hashes_for_content_paths.each do |path,location_hash|
+      if path.include?("?")
+        path = path + "&funky_tabs=true"
+      else
+        path = path + "?funky_tabs=true"
+      end
+      js_array = js_array + "'#{location_hash}':'#{path}',"
+    end
+    js_array = js_array.chomp(",")+"};"
+  end
+
   # TODO: Figure out way to reset all mattr_accessors
   def self.reset
     tabs.clear

metadata

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