ajax 1.0.1 → 1.0.2

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/lib/ajax/action_controller.rb

@@ -91,7 +91,7 @@ module Ajax
             end
           end
 
-          if !Ajax.is_hashed_url?(url)
+          if !Ajax.is_hashed_url?(url) and !Ajax.is_robot?(request.user_agent)
             url = Ajax.hashed_url_from_traditional(url)
           end
         end
@@ -106,7 +106,7 @@ module Ajax
           render :partial => '/ajax/redirect_with_fragment', :locals => { :url => url }
         else
           session[:redirected_to] = url
-          if request.xhr?
+          if request.xhr? && Ajax.is_hashed_url?(url)
             Ajax.logger.info("[ajax] detecting we are xhr. soft redirect")
             redirect_path = URI.parse(url).select(:fragment).first
             Ajax.logger.info("[ajax] redirect path is #{redirect_path}")

data/lib/ajax/helpers/robot_helper.rb

@@ -14,6 +14,7 @@ module Ajax
         {:name => 'WordPress', :user_agent_regex => /\bWordPress\b/i, :sample_agent_string => 'WordPress'},
         {:name => 'ZIBB', :user_agent_regex => /\bZIBB\b/i, :sample_agent_string => 'ZIBB'},
         {:name => 'ZyBorg', :user_agent_regex => /\bZyBorg\b/i, :sample_agent_string => 'ZyBorg'},
+        {:name => 'Facebook', :user_agent_regex => /\bfacebookexternalhit\b/i, :sample_agent_string => 'facebookexternalhit'}
       ]
 
       def robot_for(user_agent)

data/lib/ajax/helpers/url_helper.rb

@@ -43,11 +43,11 @@ module Ajax
         end
         res
       end
-      
+
       def already_encoded?(url)
         URI.decode(url) != url rescue true
       end
-      
+
       def url_host(url)
         if url.match(/^(\w+\:\/\/[^\/]+)\/?/)
           $1

data/lib/rack-ajax/decision_tree.rb

@@ -56,4 +56,4 @@ module Rack
       end
     end
   end
-end
+end

data/public/javascripts/ajax.js

@@ -518,6 +518,13 @@ var Ajax = function(options) {
    *
    */
   self.responseHandler = function(responseText, textStatus, XMLHttpRequest) {
+    
+    self.last_request_object = XMLHttpRequest;
+    console.log("[AJAX] in response handler! status: " + self.last_request_object.status);
+    if(self.last_request_object.status == 0) {
+      console.log("[AJAX] aborting response handler! ");
+      return;
+    }
     var data = self.processResponseHeaders(XMLHttpRequest);
 
     if (data.soft_redirect !== undefined) {
@@ -553,6 +560,8 @@ var Ajax = function(options) {
     //  callback - execute a callback
     if (data.title !== undefined) {
       console.log('Using page title '+data.title);
+      // commenting this out until we fix ' char bug, removing % chars from page titles for now
+      // $.address.title(encodeURIComponent(data.title));
       $.address.title(data.title);
     }
 
@@ -653,6 +662,11 @@ var Ajax = function(options) {
    * Stop watching the mouse position.
    */
   self.hideLoadingImage = function() {
+    // check if a new request has already started
+    if (self.current_request.status == 0) {
+      console.log("[AJAX] aborting hideLoadingImage.. ")
+      return
+    }
     if (!self.show_loading_image) { return; }
     $(document).unbind('mousemove', self.updateImagePosition);
     $(self.loading_image).hide();

data/spec/ajax/helpers_spec.rb

@@ -77,15 +77,13 @@ context 'Ajax::UrlHelpers' do
     it "should return false for fragments that don't start with /" do
       Ajax.is_hashed_url?('/Beyonce#Akon').should be(false)
       Ajax.is_hashed_url?('/Beyonce?query#Akon/').should be(false)
-    end
-
-    it "should return false for no fragment" do
-      Ajax.is_hashed_url?('/Beyonce?query%23/').should be(false)
+      Ajax.is_hashed_url?('/Beyonce?query%23').should be(false)
     end
 
     it "should return true if the fragment starts with /" do
       Ajax.is_hashed_url?('/Beyonce#/Akon').should be(true)
       Ajax.is_hashed_url?('/#/Akon').should be(true)
+      Ajax.is_hashed_url?('/Beyonce?query%23/').should be(true) # KJV technically I don't think this behaviour is correct
     end
 
     DOMAINS.each do |domain|

data/spec/support/response_helpers.rb

@@ -0,0 +1,7 @@
+module ResponseHelpers
+  def should_redirect_to(location, code=302)
+    should_be_a_valid_response
+    response_code.should == code
+    response_headers['Location'].should == location
+  end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ajax
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Karl Varga
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-15 00:00:00 -07:00
+date: 2010-10-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -84,6 +87,8 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/file_macros.rb
+- spec/support/query_count.rb
+- spec/support/response_helpers.rb
 - tasks/ajax_tasks.rake
 has_rdoc: true
 homepage: http://github.com/kjvarga/ajax
@@ -95,23 +100,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A framework to augment a traditional Rails application with a completely AJAX frontend.