ajaxify_rails 0.7.1 → 0.7.5

data/README.md

@@ -1,4 +1,4 @@
-# Ajaxify Rails  [![Build Status](https://travis-ci.org/ncri/ajaxify_rails.png)](https://travis-ci.org/ncri/ajaxify_rails)
+# Ajaxify Rails
 
 No more full page reloads for your Rails app! Yay! 
 

data/lib/ajaxify_rails/action_caching_patch.rb

@@ -1,20 +1,25 @@
+require 'active_support/core_ext/module/qualified_const'
+
 # Makes Ajaxify work properly with action cached actions.
-module ActionController
-  module Caching
-    module Actions
+if ActionController.qualified_const_defined?("Caching::Actions::ActionCacheFilter")
+	module ActionController
+	  module Caching
+	    module Actions
 
-      protected
+	      protected
 
-        class ActionCacheFilter #:nodoc:
+	        class ActionCacheFilter #:nodoc:
 
-        	alias_method :original_filter, :filter
+	        	alias_method :original_filter, :filter
 
-          def filter(controller)
-						original_filter controller
-            controller.ajaxify_add_meta_tags
-          end
-        end
+	          def filter(controller)
+							original_filter controller
+	            controller.ajaxify_add_meta_tags unless controller.request.xhr?
+	            controller.ajaxify_set_asset_digest_header if controller.ajaxified?
+	          end
+	        end
 
-    end
-  end
+	    end
+	  end
+	end
 end

data/lib/ajaxify_rails/action_controller_additions.rb

@@ -3,6 +3,8 @@ module ActionControllerAdditions
   def self.included(controller)
     controller.class_eval do
 
+      hide_action :page_title, :ajaxify_extra_content, :ajaxify_add_meta_tags, :ajaxify_set_asset_digest_header, :ajaxified?
+
       # override in your controller
       def page_title
         nil
@@ -15,21 +17,26 @@ module ActionControllerAdditions
 
 
       def ajaxify_add_meta_tags
-        ajaxify_add_meta_tag( ajaxify_assets_digest_meta_tag ) if !request.xhr?
+        ajaxify_add_meta_tag( ajaxify_assets_digest_meta_tag )
 
         # Correcting urls for non history api browsers wont work for post requests so add a meta tag to the response body to communicate this to
         # the ajaxify javascript
-        ajaxify_add_meta_tag( view_context.tag(:meta, name: 'ajaxify:dont_correct_url', content: 'true') ) if request.post? and not request.xhr?
+        ajaxify_add_meta_tag( view_context.tag(:meta, name: 'ajaxify:dont_correct_url', content: 'true') ) if request.post?
       end
 
 
-      private
+      def ajaxify_set_asset_digest_header
+        response.headers['Ajaxify-Assets-Digest'] = ajaxify_assets_digest
+      end
+
 
       def ajaxified?
         request.xhr? and params[:ajaxified]
       end
 
 
+      private
+
       def render *args, &block
         if ajaxified?
           args = _normalize_args(*args, &block)
@@ -58,14 +65,14 @@ module ActionControllerAdditions
                                                        data: { page_title: page_title,
                                                                flashes: flashes.to_json } )
           response.body = response_body[0]
-          response.headers['Ajaxify-Assets-Digest'] = ajaxify_assets_digest
+          ajaxify_set_asset_digest_header
 
           return
         end
 
         super
 
-        ajaxify_add_meta_tags  # doesn't work for action cached pages right now
+        ajaxify_add_meta_tags unless request.xhr?
 
         return
       end

data/lib/ajaxify_rails/version.rb

@@ -1,3 +1,3 @@
 module AjaxifyRails
-  VERSION = "0.7.1"
+  VERSION = "0.7.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ajaxify_rails
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-13 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails