pagelime-rack 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c53d944af22030c23943ecc9142cbfb47a22a5ba
-  data.tar.gz: e1811a3b570a8ddace3e6b1c386e705b144cf555
+  metadata.gz: fdec71cd996f8f302c5fd9bef4554d1189c7ad61
+  data.tar.gz: e1ae03616bbb61da3a4f261b359d22df1eba153f
 SHA512:
-  metadata.gz: 6ad4150bb797dac36ccb364b08baa39eef9ab86be178fa88c2f5eeecdf467456f5d7b1c98c703b227747d188bf8ecb840a2733677ca3401d09996d840dcbc8ef
-  data.tar.gz: 98ba3b7ebf9cbc9e066e7d11f5ed3456c65afd52ccc663e0deb70dd0bf972667d90683419719bf36ce7acd2c9a0abfb4f5c26707989f15b76b84252ab42ceee4
+  metadata.gz: 349138a21b9189f7bad9bc7c7dfdf51247b666344b0ffdd025b96b3f14d0c954e866edf314694b04521a4836121024bfb626bde56612a02ec9517824af819a64
+  data.tar.gz: 8e1b9e818b8f3ce2f4405829309de29758449e927b1d4d26068d245d74964ad33440d8ed0ebd96f70a82394656999c5a9287638ebda389703662908142092efc

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/lib/rack/pagelime.rb

@@ -7,51 +7,71 @@ module Rack
   class Pagelime
     include Rack::Utils
     
-    TOGGLE_PROCESSING_ENV_KEY = "pagelime.toggle_processing"
-    ROUTE_RESPONSES = {
-      "index"                   => "working",
-      "after_publish_callback"  => "cache cleared"
+    ENV_KEYS = {
+      :toggle_processing => "pagelime.toggle_processing"
     }
     
     module ClassMethods
-      def enable_processing_for_request(env)
-        env[TOGGLE_PROCESSING_ENV_KEY] = "on"
+      def enable_processing_for_request(req)
+        req.env[ENV_KEYS[:toggle_processing]] = "on"
       end
       
-      def disable_processing_for_request(env)
-        env[TOGGLE_PROCESSING_ENV_KEY] = "off"
+      def disable_processing_for_request(req)
+        req.env[ENV_KEYS[:toggle_processing]] = "off"
       end
       
-      def processing_enabled_for_request?(env)
+      def processing_enabled_for_request?(req)
         config_option = ::Pagelime.config.toggle_processing
-        config_option = env[TOGGLE_PROCESSING_ENV_KEY] if config_option == "per_request"
+        config_option = req.env[ENV_KEYS[:toggle_processing]] if config_option == "per_request"
         
-        ::Pagelime.logger.debug  "PAGELIME CMS RACK PLUGIN: Procesing enabled for request? (config: #{::Pagelime.config.toggle_processing}, env: #{env[TOGGLE_PROCESSING_ENV_KEY]}, evaluated as: #{config_option})"
+        ::Pagelime.logger.debug  "PAGELIME CMS RACK PLUGIN: Procesing enabled for request? (config: #{::Pagelime.config.toggle_processing}, env: #{req.env[ENV_KEYS[:toggle_processing]]}, evaluated as: #{config_option})"
         
         return config_option == "on"
       end
       
       # responses
       
-      def handle_publish_callback(env)
+      def handle_route(req)
+        if req.get?
+          path    = req.path.gsub(/\A\/+|\/+\Z/, "")
+          prefix  = ::Pagelime.config.url_path.gsub(/\A\/+|\/+\Z/, "")
+          action  = path["#{prefix}/".size..-1].to_s
+          
+          # hijack response if a pagelime route, otherwise process output if so required
+          if path.start_with?("#{prefix}/") || path == prefix
+            case action
+            # handle publish callback
+            when "after_publish_callback"
+              resp = handle_publish_callback(req)
+            # handle "index"
+            when ""
+              resp = handle_status_check(req)
+            else
+              ::Pagelime.logger.debug  "PAGELIME CMS RACK PLUGIN: Unable to route action! (URL prefix: #{::Pagelime.config.url_path}, Request path: #{req.path})"
+            end
+          else
+            ::Pagelime.logger.debug  "PAGELIME CMS RACK PLUGIN: Unable to route prefix! (URL prefix: #{::Pagelime.config.url_path}, Request path: #{req.path})"
+          end
+        end
+        
+        resp
+      end
+      
+      def handle_publish_callback(req)
         
-        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"])]
+        [200, {"Content-Type" => "text/html"}, ["cache cleared"]]
       end
       
-      def handle_status_check(env)
+      def handle_status_check(req)
         
-        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"])]
+        [200, {"Content-Type" => "text/html"}, ["working"]]
       end
       
     end
@@ -67,40 +87,20 @@ module Rack
 
     def call(env)
       
-      status, headers, response = @app.call(env)
-
-      req     = Rack::Request.new(env)
-      path    = req.path.gsub(/\A\/+|\/+\Z/, "")
-      prefix  = ::Pagelime.config.url_path.gsub(/\A\/+|\/+\Z/, "")
-      action  = path["#{prefix}/".size..-1].to_s
-      
-      # hijack response if a pagelime route, otherwise process output if so required
-      if path.start_with?("#{prefix}/") || path == prefix
-        case action
-        # handle publish callback
-        when "after_publish_callback"
-          resp = handle_publish_callback(env)
-        # handle "index"
-        when ""
-          resp = handle_status_check(env)
-        else
-          ::Pagelime.logger.debug  "PAGELIME CMS RACK PLUGIN: Unable to route action! (URL prefix: #{::Pagelime.config.url_path}, Request path: #{req.path})"
-        end
-      else
-        ::Pagelime.logger.debug  "PAGELIME CMS RACK PLUGIN: Unable to route prefix! (URL prefix: #{::Pagelime.config.url_path}, Request path: #{req.path})"
-      end
+      app_resp  = @app.call(env)
+      req       = Rack::Request.new(env)
+      resp      = handle_route(req)
       
       # only process original output if routing wasn't handled
       unless resp
+        
+        status, headers, response = app_resp
       
         ::Pagelime.logger.debug  "PAGELIME CMS RACK PLUGIN: Headers: #{headers}"
         ::Pagelime.logger.debug  "PAGELIME CMS RACK PLUGIN: Status: #{status.inspect}"
         ::Pagelime.logger.debug  "PAGELIME CMS RACK PLUGIN: Response: #{response}"
         
-        ::Pagelime.logger.debug "enabled? (#{processing_enabled_for_request?(env)}) status (#{status == 200}) headers (#{headers["Content-Type"] != nil}) html (#{headers["Content-Type"]}) class (#{headers["Content-Type"].class})"
-        
-        if processing_enabled_for_request?(env) && status == 200 && 
-           headers["Content-Type"] != nil && headers["Content-Type"].include?("text/html")
+        if status == 200 && headers["Content-Type"].to_s.include?("text/html") && processing_enabled_for_request?(req)
             
           html = ""
           response.each{|part| html << part}

data/pagelime-rack.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "pagelime-rack"
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   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.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Emil Anticevic