pagelime-rack 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31190639b8f777f1cb45f8686a62fcba12cf3471
-  data.tar.gz: 2bedf88cb41d6e5e84433a3e5558189674e53803
+  metadata.gz: e6f9dea9eac27aa1acd84261c8e8bfcef985bb67
+  data.tar.gz: e389bcd63e7e2f2aede5e5620662e46d258e312f
 SHA512:
-  metadata.gz: 6680f8a6043ad9b09d19269f4402085265ee86fec4f6f10c055f2ebe04d5a3d1f1fbe4bd457b515801b5f87aebc922f4e60bbcdb68b3501a07e24a0dfef37745
-  data.tar.gz: 45f0641b2217676ad2d6c066cbb0ee0ed856c8d79d46e6ccc5a2bff09132e2713de066be836be6b8d47ed1e0a93b1020dd498422d044f226f0675d7d62265b72
+  metadata.gz: 32a04b8649cfcfd7b4b4ec723ca3ba94f41ba53137bd25fc0c1bd0e067ae94e9791493beab954fbee7ec9c7992ededa5f56500a53342589656d115c8dd1aabaf
+  data.tar.gz: 224bb4ccb38b5fdd3f37e224ee806975fbd1c8a166908e788cb88146468b5ce149d39381f71327451d2e04083b70fb257e390d0e6c0338db5a3cae4eb6d0ed9d

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/rack/pagelime.rb

@@ -8,6 +8,10 @@ module Rack
     include Rack::Utils
     
     TOGGLE_PROCESSING_ENV_KEY = "pagelime.toggle_processing"
+    ROUTE_RESPONSES = {
+      "index"                   => "working",
+      "after_publish_callback"  => "cache cleared"
+    }
     
     module ClassMethods
       def enable_processing_for_request(env)
@@ -26,6 +30,30 @@ module Rack
         
         return config_option == "on"
       end
+      
+      # responses
+      
+      def handle_publish_callback(env)
+        
+        req = Rack::Request.new(env)
+  
+        ::Pagelime.logger.debug  "PAGELIME CMS RACK PLUGIN: Route for publish callback called!"
+        
+        ::Pagelime.cache.clear_page(req.params["path"].to_s)
+        ::Pagelime.cache.clear_shared
+        
+        [200, {"Content-Type" => "text/html"}, StringIO.new(ROUTE_RESPONSES["after_publish_callback"])]
+      end
+      
+      def handle_status_check(env)
+        
+        req = Rack::Request.new(env)
+  
+        ::Pagelime.logger.debug  "PAGELIME CMS RACK PLUGIN: Route for index called!"
+        
+        [200, {"Content-Type" => "text/html"}, StringIO.new(ROUTE_RESPONSES["index"])]
+      end
+      
     end
     
     include ClassMethods
@@ -51,10 +79,10 @@ module Rack
         case action
         # handle publish callback
         when "after_publish_callback"
-          resp = handle_publish_callback(status, headers, response, env)
+          resp = handle_publish_callback(status, headers, response, env, "after_publish_callback")
         # handle "index"
         when ""
-          resp = handle_status_check(status, headers, response, env)
+          resp = handle_status_check(status, headers, response, env, "index")
         else
           ::Pagelime.logger.debug  "PAGELIME CMS RACK PLUGIN: Unable to route action! (URL prefix: #{::Pagelime.config.url_path}, Request path: #{req.path})"
         end
@@ -63,69 +91,40 @@ module Rack
       end
       
       # only process original output if routing wasn't handled
-      resp ||= handle_html_processing(status, headers, response, env)
-      
-      resp
-    end
-    
-    # responses
-    
-    def handle_publish_callback(status, headers, response, env)
-      
-      req = Rack::Request.new(env)
-
-      ::Pagelime.logger.debug  "PAGELIME CMS RACK PLUGIN: Route for publish callback called!"
-      
-      ::Pagelime.cache.clear_page(req.params["path"].to_s)
-      ::Pagelime.cache.clear_shared
-      
-      [200, {"Content-Type" => "text/html"}, ["cache cleared"]]
-    end
-    
-    def handle_status_check(status, headers, response, env)
-      
-      req = Rack::Request.new(env)
-
-      ::Pagelime.logger.debug  "PAGELIME CMS RACK PLUGIN: Route for index called!"
+      unless resp
       
-      [200, {"Content-Type" => "text/html"}, ["working"]]
-    end
-    
-    def handle_html_processing(status, headers, response, env)
-      
-      req = Rack::Request.new(env)
-
-      status, headers, response = @app.call(env)
-
-      ::Pagelime.logger.debug  "PAGELIME CMS RACK PLUGIN: Headers: #{headers}"
-      ::Pagelime.logger.debug  "PAGELIME CMS RACK PLUGIN: Status: #{status}"
-      ::Pagelime.logger.debug  "PAGELIME CMS RACK PLUGIN: Response: #{response}"
-      
-      if processing_enabled_for_request?(env) && status == 200 && 
-         headers["content-type"] && headers["content-type"].include?("text/html")
+        ::Pagelime.logger.debug  "PAGELIME CMS RACK PLUGIN: Headers: #{headers}"
+        ::Pagelime.logger.debug  "PAGELIME CMS RACK PLUGIN: Status: #{status}"
+        ::Pagelime.logger.debug  "PAGELIME CMS RACK PLUGIN: Response: #{response}"
+        
+        if processing_enabled_for_request?(env) && status == 200 && 
+           headers["content-type"] && headers["content-type"].include?("text/html")
+            
+          body_content = StringIO.new(response)
+          #response.each{|part| body_content << part}
           
-        body_content = StringIO.new(response)
-        #response.each{|part| body_content << part}
+          ::Pagelime.logger.debug  "PAGELIME CMS RACK PLUGIN: Processing For Path: #{req.path}"
+          ::Pagelime.logger.debug  "PAGELIME CMS RACK PLUGIN: Processing Body (size:#{body_content.length})"
+        
+          body = ::Pagelime.process_page(body_content, req.path)
+  
+          headers['content-length'] = body.length.to_s
+  
+          body = [body]
+          
+        else
+  
+          ::Pagelime.logger.debug  "PAGELIME CMS RACK PLUGIN: Not touching this request"
+  
+          body = response
+  
+        end
+        
+        resp = [status, headers, body]
         
-        ::Pagelime.logger.debug  "PAGELIME CMS RACK PLUGIN: Processing For Path: #{req.path}"
-        ::Pagelime.logger.debug  "PAGELIME CMS RACK PLUGIN: Processing Body (size:#{body_content.length})"
-      
-        body = ::Pagelime.process_page(body_content, req.path)
-
-        headers['content-length'] = body.length.to_s
-
-        body = [body]
-
-      else
-
-        ::Pagelime.logger.debug  "PAGELIME CMS RACK PLUGIN: Not touching this request"
-
-        body = response
-
       end
       
-      [status, headers, body]
-      
+      resp
     end
     
   end

data/pagelime-rack.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "pagelime-rack"
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Emil Anticevic", "Joel Van Horn"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pagelime-rack
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Emil Anticevic