ajax 1.1.0 → 1.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ./
   specs:
-    ajax (1.1.0)
+    ajax (1.1.1)
       json
       rack
 

data/README.rdoc

@@ -10,6 +10,7 @@ As of May 2010 Ajax is being used live in production on kazaa.com[http://www.kaz
 
 == Changelog
 
+* v1.1.1: Backwards compatibility fix for Rails < 3
 * v1.1.0: Rails 3 supported!
 
 == Install

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/lib/ajax/action_controller.rb

@@ -5,7 +5,7 @@ module Ajax
         extend MirrorMethods
         include MirrorMethods
         after_filter :serialize_ajax_info
-        include InstanceMethods
+        include(Ajax.app.rails?(3) ? Rails3 : Rails2)
       end
     end
 
@@ -43,15 +43,11 @@ module Ajax
       end
     end
 
-    module InstanceMethods
-      protected
-
-      if Ajax.app.rails?(3)
-        # Rails 3 hook.  Rails < 3 is handled using redirect_to_full_url.  See
-        # those docs for info.
-        def redirect_to(url={}, status={})
-          super
-          self.location = nil if _ajax_redirect(url, status) # clear any location set by super
+    module Rails2
+      def self.included(klass)
+        klass.class_eval do
+          alias_method_chain :redirect_to_full_url, :ajax
+          alias_method_chain :render, :ajax
         end
       end
 
@@ -70,182 +66,197 @@ module Ajax
       # redirect.
       #
       # This method only applies to Rails < 3
-      def redirect_to_full_url(url, status)
-        super unless _ajax_redirect(url, status) # Only call super if we didn't handle it
+      def redirect_to_full_url_with_ajax(url, status)
+        if !_ajax_redirect(url, status)
+          redirect_to_full_url_without_ajax(url, status)
+        end
       end
 
-      # Perform special processing on the response if we need to.
-      # Return true if an Ajax "redirect" was performed, and false
-      # otherwise.
-      def _ajax_redirect(url, status)
-        return false unless Ajax.is_enabled?
-
-        special_redirect = false
-        original_url = url
+      #
+      # Intercept rendering to customize the headers and layout handling
+      #
+      def render_with_ajax(options = nil, extra_options = {}, &block)
+        return render_without_ajax(options, extra_options, &block) unless Ajax.is_enabled?
 
-        # If we have the full referrer in Ajax-Info, use that because it
-        # includes the fragment.
-        if url == request.headers["Referer"] && !request.headers['Ajax-Info'].blank?
-          url = request.headers['Ajax-Info']['referer']
-          Ajax.logger.debug("[ajax] using referer #{url} from Ajax-Info")
-        end
+        original_args = [options, extra_options]
+        if request.xhr?
 
-        if !Ajax.exclude_path?(url)
-          # Never redirect to the Ajax framework path, redirect to /
-          if url =~ %r[#{Ajax.framework_path}]
-            url = url.sub(%r[#{Ajax.framework_path}], '/')
-
-            # Special case:
-            #
-            # Changing protocol forces a redirect from root to root.
-            # The full request URL (including the hashed part) is
-            # in the browser.  So return JS to do the redirect and
-            # have it include the hashed part in the redirect URL.
-            if !request.xhr? && URI.parse(url).scheme != URI.parse(request.url).scheme
-              special_redirect = true
+          # Options processing taken from ActionController::Base#render
+          if options.nil?
+            options = { :template => default_template, :layout => true }
+          elsif options == :update
+            options = extra_options.merge({ :update => true })
+          elsif options.is_a?(String) || options.is_a?(Symbol)
+            case options.to_s.index('/')
+            when 0
+              extra_options[:file] = options
+            when nil
+              extra_options[:action] = options
+            else
+              extra_options[:template] = options
             end
+            options = extra_options
+          elsif !options.is_a?(Hash)
+            extra_options[:partial] = options
+            options = extra_options
           end
 
-          if !Ajax.is_hashed_url?(url) and !Ajax.is_robot?(request.user_agent)
-            url = Ajax.hashed_url_from_traditional(url)
-          end
-        end
-        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
-        # to display the home page.
-        if special_redirect
-          session[:redirected_to] = nil
-          Ajax.logger.info("[ajax] returning special redirect JS")
-          self.response_body = <<END
-<script type="text/javascript">
-  var url = #{url.to_json};
-  var hash = document.location.hash;
-
-  // Remove leading # from the fragment
-  if (hash.charAt(0) == '#') {
-    hash = hash.substr(1);
-  }
-
-  // Remove leading / from the fragment if the URL already ends in a /
-  // This prevents double-slashes.  Note we can't just replace all
-  // double-slashes because the protocol includes //.
-  if (url.charAt(url.length - 1) == '/' && hash.charAt(0) == '/') {
-    hash = hash.substr(1);
-  }
-
-  document.location.href = url + hash;
-</script>
-END
-        else
-          session[:redirected_to] = url
-          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}")
-            Ajax.set_header(response, :soft_redirect, redirect_path)
-            self.response_body = <<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!")
-            return false
-          end
+          default = pick_layout(options)
+          default = default.path_without_format_and_extension unless default.nil?
+          ajax_layout = _layout_for_ajax(default)
+          ajax_layout = ajax_layout.path_without_format_and_extension unless ajax_layout.nil?
+          options[:layout] = ajax_layout unless ajax_layout.nil?
+
+          # Send the current layout and controller in a custom response header
+          Ajax.set_header(response, :layout, ajax_layout)
+          Ajax.set_header(response, :controller, self.class.controller_name)
         end
-        true
+        render_without_ajax(options, extra_options, &block)
       end
 
-      # Convert the Ajax-Info hash to JSON before the request is sent.
-      # Invoked as an after filter.
-      def serialize_ajax_info
-        case response.headers['Ajax-Info']
-        when Hash
-          response.headers['Ajax-Info'] = response.headers['Ajax-Info'].to_json
+    end
+
+    module Rails3
+      # Rails 3 hook.  Rails < 3 is handled using redirect_to_full_url.  See
+      # those docs for info.
+      def redirect_to(url={}, status={})
+        if !_ajax_redirect(url, status)
+          super
         end
       end
 
       #
       # Intercept rendering to customize the headers and layout handling
       #
-      if !Ajax.app.rails?(3)
-        def render(options = nil, extra_options = {}, &block)
-          return super unless Ajax.is_enabled?
-
-          original_args = [options, extra_options]
-          if request.xhr?
-
-            # Options processing taken from ActionController::Base#render
-            if options.nil?
-              options = { :template => default_template, :layout => true }
-            elsif options == :update
-              options = extra_options.merge({ :update => true })
-            elsif options.is_a?(String) || options.is_a?(Symbol)
-              case options.to_s.index('/')
-              when 0
-                extra_options[:file] = options
-              when nil
-                extra_options[:action] = options
-              else
-                extra_options[:template] = options
-              end
-              options = extra_options
-            elsif !options.is_a?(Hash)
-              extra_options[:partial] = options
-              options = extra_options
-            end
+      def render_to_body(options = {})
+        return super if !request.xhr? || !Ajax.is_enabled?
+        _process_options(options)
+
+        if ajax_layout = _layout_for_ajax(options[:layout])
+          options[:layout] = ajax_layout.virtual_path
+        end
 
-            default = pick_layout(options)
-            default = default.path_without_format_and_extension unless default.nil?
-            ajax_layout = _layout_for_ajax(default)
-            ajax_layout = ajax_layout.path_without_format_and_extension unless ajax_layout.nil?
-            options[:layout] = ajax_layout unless ajax_layout.nil?
+        # Send the current layout and controller in a custom response header
+        Ajax.set_header(response, :layout, options[:layout])
+        Ajax.set_header(response, :controller, self.class.controller_name)
+
+        _render_template(options)
+      end
+    end
 
-            # Send the current layout and controller in a custom response header
-            Ajax.set_header(response, :layout, ajax_layout)
-            Ajax.set_header(response, :controller, self.class.controller_name)
+    protected
+
+    # Convert the Ajax-Info hash to JSON before the request is sent.
+    # Invoked as an after filter.
+    def serialize_ajax_info
+      case response.headers['Ajax-Info']
+      when Hash
+        response.headers['Ajax-Info'] = response.headers['Ajax-Info'].to_json
+      end
+    end
+
+    # Perform special processing on the response if we need to.
+    # Return true if an Ajax "redirect" was performed, and false
+    # otherwise.
+    def _ajax_redirect(url, status)
+      return false unless Ajax.is_enabled?
+      special_redirect = false
+      original_url = url
+
+      # If we have the full referrer in Ajax-Info, use that because it
+      # includes the fragment.
+      if url == request.headers["Referer"] && !request.headers['Ajax-Info'].blank?
+        url = request.headers['Ajax-Info']['referer']
+        Ajax.logger.debug("[ajax] using referer #{url} from Ajax-Info")
+      end
+
+      if !Ajax.exclude_path?(url)
+        # Never redirect to the Ajax framework path, redirect to /
+        if url =~ %r[#{Ajax.framework_path}]
+          url = url.sub(%r[#{Ajax.framework_path}], '/')
+
+          # Special case:
+          #
+          # Changing protocol forces a redirect from root to root.
+          # The full request URL (including the hashed part) is
+          # in the browser.  So return JS to do the redirect and
+          # have it include the hashed part in the redirect URL.
+          if !request.xhr? && URI.parse(url).scheme != URI.parse(request.url).scheme
+            special_redirect = true
           end
-          super(options, extra_options, &block)
         end
-      else
-        def render_to_body(options = {})
-          return super if !request.xhr? || !Ajax.is_enabled?
-          _process_options(options)
 
-          if ajax_layout = _layout_for_ajax(options[:layout])
-            options[:layout] = ajax_layout.virtual_path
-          end
+        if !Ajax.is_hashed_url?(url) and !Ajax.is_robot?(request.user_agent)
+          url = Ajax.hashed_url_from_traditional(url)
+        end
+      end
+      Ajax.logger.info("[ajax] rewrote redirect from #{original_url} to #{url}") unless original_url == url
 
-          # Send the current layout and controller in a custom response header
-          Ajax.set_header(response, :layout, options[:layout])
-          Ajax.set_header(response, :controller, self.class.controller_name)
+      # 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
+      # to display the home page.
+      if special_redirect
+        session[:redirected_to] = nil
+        Ajax.logger.info("[ajax] returning special redirect JS")
+        render :layout => false, :text => <<-END
+<script type="text/javascript">
+var url = #{url.to_json};
+var hash = document.location.hash;
 
-          _render_template(options)
+// Remove leading # from the fragment
+if (hash.charAt(0) == '#') {
+  hash = hash.substr(1);
+}
+
+// Remove leading / from the fragment if the URL already ends in a /
+// This prevents double-slashes.  Note we can't just replace all
+// double-slashes because the protocol includes //.
+if (url.charAt(url.length - 1) == '/' && hash.charAt(0) == '/') {
+  hash = hash.substr(1);
+}
+
+document.location.href = url + hash;
+</script>
+END
+      else
+        session[:redirected_to] = url
+        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}")
+          Ajax.set_header(response, :soft_redirect, redirect_path)
+          render :layout => false, :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!")
+          return false
         end
       end
+      true
+    end
 
-      # Return the layout to use for an AJAX request, or nil if the default should be used.
-      #
-      # If no ajax_layout is set, look for the default layout in <tt>layouts/ajax</tt>.
-      # If the layout cannot be found, use the default.
-      def _layout_for_ajax(default) #:nodoc:
-        ajax_layout = self.class.read_inheritable_attribute(:ajax_layout)
-        ajax_layout = if ajax_layout.nil? && default.nil?
-            nil
-          elsif ajax_layout.nil? && !default.nil? # look for one with the default name in layouts/ajax
-            "layouts/ajax/#{default.sub(/layouts(\/)?/, '')}"
-          elsif ajax_layout && !(ajax_layout =~ /^layouts\/ajax/) # look for it in layouts/ajax
-            "layouts/ajax/#{ajax_layout}"
-          else # look as is
-            ajax_layout
-          end
-        Ajax.app.rails?(3) ? find_template(ajax_layout) : find_layout(ajax_layout, 'html') if !ajax_layout.nil?
-      rescue ::ActionView::MissingTemplate
-        Ajax.logger.info("[ajax] no layout found in layouts/ajax.  Using #{default}.")
-        nil
-      end
+    # Return the layout to use for an AJAX request, or nil if the default should be used.
+    #
+    # If no ajax_layout is set, look for the default layout in <tt>layouts/ajax</tt>.
+    # If the layout cannot be found, use the default.
+    def _layout_for_ajax(default) #:nodoc:
+      ajax_layout = self.class.read_inheritable_attribute(:ajax_layout)
+      ajax_layout = if ajax_layout.nil? && default.nil?
+          nil
+        elsif ajax_layout.nil? && !default.nil? # look for one with the default name in layouts/ajax
+          "layouts/ajax/#{default.sub(/layouts(\/)?/, '')}"
+        elsif ajax_layout && !(ajax_layout =~ /^layouts\/ajax/) # look for it in layouts/ajax
+          "layouts/ajax/#{ajax_layout}"
+        else # look as is
+          ajax_layout
+        end
+      Ajax.app.rails?(3) ? find_template(ajax_layout) : find_layout(ajax_layout, 'html') if !ajax_layout.nil?
+    rescue ::ActionView::MissingTemplate
+      Ajax.logger.info("[ajax] no layout found in layouts/ajax.  Using #{default}.")
+      nil
     end
   end
 end

data/lib/ajax/action_view.rb

@@ -61,4 +61,4 @@ module Ajax
         link_to_without_ajax(*args, &block)
       end
   end
-end
+end

data/public/javascripts/ajax.js

@@ -448,7 +448,9 @@ var Ajax = function(options) {
    */
   self.abortCurrentRequest = function() {
     try {
-      console.log('[ajax] aborting current request for url ' + self.current_request.url);
+      if (self.current_request.url) {
+        console.log('[ajax] aborting current request for url ' + self.current_request.url);
+      }
       self.current_request.abort();
     } catch(e) {
       console.log('[ajax] abort failed!', e);

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ajax
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Karl Varga
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-26 00:00:00 -07:00
+date: 2011-04-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency