ajax 0.1.7 → 1.0.1

data/Rakefile

@@ -48,10 +48,18 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('app/**/*.rb')
 end
 
-desc "Release a new patch version"
-task :release_new_version do
-  Rake::Task['version:bump:patch'].invoke
-  Rake::Task['github:release'].invoke
-  Rake::Task['git:release'].invoke
-  Rake::Task['gemcutter:release'].invoke
+namespace :release do
+
+  desc "Release a new patch version"
+  task :patch do
+    Rake::Task['version:bump:patch'].invoke
+    Rake::Task['release:current'].invoke
+  end
+
+  desc "Release the current version (e.g. after a version bump).  This rebuilds the gemspec, pushes the updated code, tags it and releases to RubyGems"
+  task :current do
+    Rake::Task['github:release'].invoke
+    Rake::Task['git:release'].invoke
+    Rake::Task['gemcutter:release'].invoke
+  end
 end

data/VERSION

@@ -1 +1 @@
-0.1.7
+1.0.1

data/lib/ajax/action_controller.rb

@@ -95,7 +95,7 @@ module Ajax
             url = Ajax.hashed_url_from_traditional(url)
           end
         end
-        Ajax.logger.info("[ajax] rewrote redirect from #{original_url} to #{url}")
+        Ajax.logger.info("[ajax] rewrote redirect from #{original_url} to #{url}") unless original_url == url
 
         # Don't store session[:redirected_to] if doing a special redirect otherwise
         # when the next request for root comes in it will think we really want
@@ -107,8 +107,17 @@ module Ajax
         else
           session[:redirected_to] = url
           if request.xhr?
-            render(:update) { |page| page.redirect_to(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}")
+            Ajax.set_header(response, :soft_redirect, redirect_path)
+            render :text => <<-END
+              <script type="text/javascript">
+                window.location.href = #{url.to_json};
+              </script>
+            END
           else
+            Ajax.logger.info("[ajax] not detecting we are xhr. Hard redirect!")
             redirect_to_full_url_without_ajax(url, status)
           end
         end

data/lib/ajax/helpers/request_helper.rb

@@ -85,16 +85,25 @@ module Ajax
       #
       # The string and regex paths are modified to match full URLs by prepending
       # them with the appropriate regular expression.
-      def exclude_paths(paths=nil)
+      def exclude_paths(paths=nil, expand = true)
         if !instance_variable_defined?(:@exclude_paths)
           @exclude_paths = []
         end
         (paths || []).each do |path|
-          @exclude_paths << /^(\w+\:\/\/[^\/]+\/?)?#{path.to_s}$/
+          if expand
+            @exclude_paths << /^(\w+\:\/\/[^\/]+\/?)?#{path.to_s}$/
+          else
+            @exclude_paths << path
+          end
         end
         @exclude_paths
       end
 
+      # Directly set regexes for one or more paths that can be accessed directly without the AJAX framework.
+      def exclude_regex(exclude_regex=nil)
+        exclude_paths(exclude_regex, false)
+      end
+
       # Return a boolean indicating whether or not to exclude a path from the
       # AJAX redirect.
       def exclude_path?(path)

data/lib/ajax/helpers/url_helper.rb

@@ -36,9 +36,18 @@ module Ajax
       protected
 
       def encode_and_parse_url(url)
-        URI.parse(URI.encode(url).gsub("%23", "#")) rescue URI.parse('/')
+        if already_encoded?(url)
+          res = URI.parse(url.gsub("%23", "#")) rescue URI.parse('/')
+        else
+          res = URI.parse(URI.encode(url).gsub("%23", "#")) rescue URI.parse('/')
+        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.rb

@@ -1,6 +1,8 @@
 require 'rack-ajax/decision_tree'
 require 'rack-ajax/parser'
 require 'json'
+require 'yaml'
+require 'yaml/encoding' unless RUBY_VERSION.to_f == 1.9
 
 module Rack
   class Ajax
@@ -34,6 +36,7 @@ module Rack
       @parser = Parser.new(env)
       rack_response = @parser.instance_eval(&@decision_tree)
 
+
       # Clear the value of session[:redirected_to]
       unless env['rack.session'].nil?
         env['rack.session']['redirected_to'] = env['rack.session'][:redirected_to] = nil
@@ -49,7 +52,7 @@ module Rack
       # The Ajax::Spec::Helpers module includes a helper
       # method to test the result of a rewrite.
       if ::Ajax.is_mocked?
-        rack_response.nil? ? Rack::Ajax::Parser.rack_response(env.to_yaml) : rack_response
+        rack_response.nil? ? Rack::Ajax::Parser.rack_response(env.to_yaml(:Encoding => :Utf8)) : rack_response
       elsif !rack_response.nil?
         rack_response
       else

data/lib/rack-ajax/decision_tree.rb

@@ -15,7 +15,6 @@ module Rack
       # completeness.
       def default_decision_tree
         @@default_decision_tree ||= Proc.new do
-          ::Ajax.logger.debug("[ajax] rack session #{@env['rack.session'].inspect}")
           ::Ajax.logger.debug("[ajax] Ajax-Info #{@env['Ajax-Info'].inspect}")
 
           if !::Ajax.exclude_path?(@env['PATH_INFO'] || @env['REQUEST_URI'])

data/public/javascripts/ajax.js

@@ -330,6 +330,7 @@ var Ajax = function(options) {
   self.addressChanged = function() {
     if (document.location.pathname != '/') { return false; }
     if (self.disable_next_address_intercept) {
+      console.log('skipping address intercept & resetting disable_next_address_intercept')
       self.disable_next_address_intercept = false;
       return false;
     }
@@ -341,18 +342,21 @@ var Ajax = function(options) {
     // Ensure that the URL ends with '#' if we are on root. This
     // will not trigger addressChanged().
     if (document.location.pathname == '/'
-      && document.location.href.indexOf('#') == -1) {
+        && document.location.href.indexOf('#') == -1) {
       document.location.href = document.location.href + '#';
     }
 
     // Clean up the URL before making the request.  If the URL changes
     // as a result of this, update it, which will trigger this
     // callback again.
-    var url = encodeURI($.address.value()).replace(/\/\//, '/');
+    console.log('cleaning up the url');
+    var url = ($.address.value()).replace(/\/\//, '/');
     if (url != $.address.value()) {
+      console.log('reloading because encoded uri ' + url + ' differs from current uri ' + $.address.value());
       $.address.value(url);
       return false;
     } else {
+      console.log('going ahead with load');
       self.loadPage({
         url: url
       });
@@ -380,21 +384,29 @@ var Ajax = function(options) {
       document.location.href = options.url;
       return true;
     }
+
+    if (options.url === undefined) {
+      console.log('[ajax] no url supplied ');
+      return false;
+    };
+
     self.loaded = false;
     self.showLoadingImage();
+    console.log('[ajax] loadPage ' + options.url);
 
     if (self.current_request !== undefined) {
-      try {
-        self.current_request.abort();
-        console.log('[ajax] aborting current request');
-      } catch(e) {
-        console.log('[ajax] abort failed!', e);
-      }
+      self.abortCurrentRequest();
     }
 
+    if ($.browser.msie) {
+      safe_url = encodeURI(options.url);
+    } else {
+      safe_url = options.url;
+    };
+
     self.current_request = jQuery.ajax({
       cache: false,
-      url: options.url,
+      url: safe_url,
       method: options.method || 'GET',
       beforeSend: self.setRequestHeaders,
       success: self.responseHandler,
@@ -413,6 +425,21 @@ var Ajax = function(options) {
     });
   };
 
+
+  /**
+   * abortCurrentRequest
+   *
+   * Abort the current ajax request
+   */
+  self.abortCurrentRequest = function() {
+    try {
+      console.log('[ajax] aborting current request for url ' + self.current_request.url);
+      self.current_request.abort();
+    } catch(e) {
+      console.log('[ajax] abort failed!', e);
+    };
+  };
+
   /**
    * setRequestHeaders
    *
@@ -447,16 +474,42 @@ var Ajax = function(options) {
    *
    */
   self.linkClicked = function(event) {
+    // The deep link must be a path.  A full URL shouldn't have
+    // made it through, but sometimes it can happen.  In this
+    // case, strip off the host and protocol.
+    if ($(this).attr('href') == '#') return false;
+    ajax_url = $(this).attr('data-deep-link');
+    if (ajax_url.match(/^https?:\/\//)) {
+      ajax_url = ajax_url.replace(/(https?:\/\/[^\/]*\/(.*))/, '$2');
+    }
     if (document.location.pathname != '/') {
-      var url = ('/#/' + $(this).attr('data-deep-link')).replace(/\/\//, '/');
+      var url = ('/#/' + ajax_url).replace(/\/\//, '/');
+      console.log('linkClicked 1: going to ' + url);
       document.location.href = url;
     } else {
       self.last_click_coords = { pageX: event.pageX, pageY: event.pageY };
-      $.address.value($(this).attr('data-deep-link'));
+      encoded_url = ajax.safeURL(ajax_url);
+      console.log('linkClicked 2: going to ' + ajax_url);
+      console.log('untouched url is ' + ajax_url + ', encoded is ' + encoded_url);
+      if ($.browser.msie) {
+        $.address.value(encoded_url);
+      }
+      else {
+        $.address.value(ajax_url);
+      }
     }
     return false;
   };
 
+  self.safeURL = function(url) {
+    if (decodeURI(url)==url) {
+      encoded_url = encodeURI(url);
+    } else {
+      encoded_url = url;
+    };
+    return encoded_url;
+  };
+
   /**
    * responseHandler
    *
@@ -466,17 +519,19 @@ var Ajax = function(options) {
    */
   self.responseHandler = function(responseText, textStatus, XMLHttpRequest) {
     var data = self.processResponseHeaders(XMLHttpRequest);
-    var container = data.container === undefined ? $(self.default_container) : $(data.container);
 
-    // Redirect?  Let the JS execute.  It will set the new window location.
-    if (responseText && responseText.match(/try\s{\swindow\.location\.href/)) {
-      jQuery.globalEval(responseText);
-      return true;
-    }
+    if (data.soft_redirect !== undefined) {
+      console.log('**** data.soft_redirect is ' + data.soft_redirect)
+      $.address.value(data.soft_redirect);
+      return false;
+    };
 
+    var container = data.container === undefined ? $(self.default_container) : $(data.container);
     /**
-     * Extract the body
-    */
+     * Full page response.  The best we can do is to extract the body
+     * and display that.  Additionally, if the container to update
+     * is present in the response, just use that.
+     */
     if (responseText.search(/<\s*body[^>]*>/) != -1) {
       var start = responseText.search(/<\s*body[^>]*>/);
       start += responseText.match(/<\s*body[^>]*>/)[0].length;
@@ -484,6 +539,11 @@ var Ajax = function(options) {
 
       console.log('Extracting body ['+start+'..'+end+'] chars');
       responseText = responseText.substr(start, end - start);
+
+      var body = $(responseText);
+      if (body.size() > 0 && body.find(container.selector).size() > 0) {
+        responseText = body.find(container.selector).html();
+      }
     }
 
     // Handle special header instructions
@@ -724,7 +784,7 @@ var Ajax = function(options) {
   };
 
   self.teaser = function(callback) {
-    return new String(callback).slice(0,50);
+    return new String(callback).slice(0,200).replace(/\n/g, ' ');
   };
 
   /**

metadata

@@ -3,10 +3,10 @@ name: ajax
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
+  - 1
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  version: 1.0.1
 platform: ruby
 authors: 
 - Karl Varga
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-28 00:00:00 -07:00
+date: 2010-07-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency