pagelime-rails 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89efb96d666bc2018fa4afb670fb9a3280cbfb76
-  data.tar.gz: 44b9b84b7e0f39348865dbe6438a5fd356f718e4
+  metadata.gz: 98a56419e15fd1630981b3d13471398bf07530a6
+  data.tar.gz: d05819fae445c52f43e2b13d1913206cd013f2f0
 SHA512:
-  metadata.gz: 93874dc43eb8964a0f5f8389555c28ffc22717d9c7e925b7c0dda9a8a5ca525056e1f369c7911cab2d12b702bbd151f48fca618ce5e05796bf9981e9775e6c53
-  data.tar.gz: bb1dc6ab448bacbf48b70721009190900621e9639a8d352b2de1d8fb4bda32eb4e7f91025a87257ce256d77cbc7980f2b5935b7ead96b9572b4b02dfae1c04aa
+  metadata.gz: 5ca9ada4e2d378e325a4513d88378b1ad9ad56ee3119bc0199622d16fa2d3a8948cca09a86ef94776eb9c17a8c490bb74d4eb1f94475b0436f9d9aa7c786a702
+  data.tar.gz: 1d1392d3ce7db894119adbc309f07da79e153d6b0f4334ae7fd1e46242ad752cb1a3609602142ffd784607c2f82143d7e9e25797d2121d1cace2932cd4f7a303

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 
-gem 'pagelime-rack', '>= 0.3.0'
+gem 'pagelime-rack', '>= 0.4.3'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/README.md

@@ -67,6 +67,17 @@ You can pass an `:except` parameter just like with a filter like so:
 
     acts_as_cms_editable :except => :index
 
+Optionally, enable caching and logging:
+
+    Pagelime.configure do |config|
+      # object that responds to `fetch` and `delete`
+      config.cache = Rails.cache
+      # options passed to `fetch(key, options = {}, &block)`
+      config.cache_fetch_options = { :expires_in => 1.year }
+      # any standard logger
+      config.logger = Rails.logger
+    end
+
 #### Only for Rails 2.3.x
 
 Add the plugin routes to your `config/routes.rb` configuration:

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/pagelime-rails.rb

@@ -6,12 +6,22 @@ Pagelime.logger.debug "PAGELIME CMS RAILS PLUGIN: pagelime-rails gem loaded"
 
 # start plugin 
 if Rails::VERSION::MAJOR == 2
-  require_relative 'pagelime/rails/routing_extensions'
+  
+  # TODO: Use pagelime-rack for Rails 2.3+ instead of routes and controllers
+  
+  require_relative 'pagelime/rails2/routing_extensions'
   
   ActionController::Routing::RouteSet::Mapper.send :include, ::Pagelime::Rails::RoutingExtensions
-  # below is not needed in Rails 2 as you can use the map.cms_routes from the routing_extensions
-  # require File.join(File.dirname(__FILE__), "/../config/routes.rb")
+  
+  controllers_path = File.expand_path File.join(File.dirname(__FILE__), 'pagelime', 'rails2', 'controllers')
+  
+  # add dependencies to load paths
+  $LOAD_PATH << controllers_path
+  load_paths << controllers_path
+  load_once_paths.delete(controllers_path)
+  
   Pagelime::Rails.initialize!
+  
 elsif Rails::VERSION::MAJOR >= 3
   require_relative 'pagelime/rails/engine'
 end

data/lib/pagelime/rails.rb

@@ -5,36 +5,20 @@ module Pagelime
         
         ::Rails.logger.debug "PAGELIME CMS RAILS PLUGIN: initializing plugin"
         
-        app_path_relative = File.join('..', '..', 'app')
-        app_path = File.expand_path File.join(File.dirname(__FILE__), app_path_relative)
-        
-        # add dependencies to load paths
-        %w{ models controllers helpers }.each do |dir|
-          path = File.join(app_path, dir)
-          $LOAD_PATH << path
-          
-          if ::Rails::VERSION::MAJOR == 2
-            ActiveSupport::Dependencies.load_paths << path
-            ActiveSupport::Dependencies.load_once_paths.delete(path)
-          elsif ::Rails::VERSION::MAJOR >= 3
-            ActiveSupport::Dependencies.autoload_paths << path
-            ActiveSupport::Dependencies.autoload_once_paths.delete(path)
-          end
-        end
-        
         # wire controller extensions
         require_relative 'rails/controller_extensions'
         ActionController::Base.extend ControllerExtensions
         
         # wire helper
-        require_relative File.join('.', app_path_relative, "helpers", "pagelime_helper")
-        ActionView::Base.send :include, PagelimeHelper
+        require_relative 'rails/view_helper'
+        ActionView::Base.send :include, ViewHelper
         
         configure_pagelime!
       end
       
       def configure_pagelime!
         ::Pagelime.configure do |config|
+          config.toggle_processing    = "per_request"
           config.logger               = ::Rails.logger
           config.cache                = ::Rails.cache
           config.cache_fetch_options  = { :expires_in => 1.year }

data/lib/pagelime/rails/controller_extensions.rb

@@ -11,8 +11,8 @@ module Pagelime
         def cms_process_rendered_body
           ::Rails.logger.debug "PAGELIME CMS RAILS PLUGIN: Processing response body in controller"
           
-          # parse response body, cache, and use result as response body
-          response.body = Pagelime.process_page(response.body, request.path)
+          # tell pagelime-rack to parse response body, cache, and use result as response body
+          ::Rack::Pagelime.enable_processing_for_request(request.env)
         end
       end
     

data/lib/pagelime/rails/engine.rb

@@ -3,9 +3,11 @@ module Pagelime
   module Rails
     class Engine < ::Rails::Engine
       engine_name :pagelime
-      # paths["config/routes"] << 'config/routes.rb'
+      
       initializer "pagelime.initialize" do |app|
         ::Pagelime::Rails.initialize!
+        
+        app.middleware.use Rack::Pagelime
       end
     end
   end

data/lib/pagelime/rails/view_helper.rb

@@ -0,0 +1,20 @@
+module Pagelime
+  module Rails
+    module ViewHelper
+      
+      def cms_content(&block)
+        
+        # TODO: How to let pagelime-rack handle this?
+        
+        # the block contents loaded into a variable
+        editable_content  = capture(&block)
+        processed_html    = ::Pagelime.process_region(editable_content, request.path)
+        
+        # output the final content
+        concat(processed_html)
+        
+      end
+      
+    end
+  end
+end

data/lib/pagelime/rails2/controllers/pagelime_receiver_controller.rb

@@ -0,0 +1,16 @@
+class PagelimeReceiverController < ApplicationController
+  
+  def index
+    ::Rails.logger.debug "PAGELIME RAILS RECEIVER index"
+    status, headers, body = Rack::Pagelime.handle_status_check(request.env)
+    
+    render :inline => body.string, :status => status
+  end
+  
+  def after_publish_callback
+    ::Rails.logger.debug "PAGELIME RAILS RECEIVER after_publish_callback"
+    status, headers, body = Rack::Pagelime.handle_publish_callback(request.env)
+    
+  	render :inline => body.string, :status => status
+  end
+end

data/lib/pagelime/{rails → rails2}/routing_extensions.rb

@@ -1,5 +1,5 @@
 module Pagelime #:nodoc:
-  module Rails #:nodoc:
+  module Rails2 #:nodoc:
     module RoutingExtensions
       def cms_routes
         @set.add_route "/pagelime/:action", :controller => "pagelime_receiver"

data/pagelime-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "pagelime-rails"
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Emil Anticevic", "Joel Van Horn"]
-  s.date = "2013-09-11"
+  s.date = "2013-09-24"
   s.description = ""
   s.email = "emil@pagelime.com"
   s.extra_rdoc_files = [
@@ -22,16 +22,15 @@ Gem::Specification.new do |s|
     "README.md",
     "Rakefile",
     "VERSION",
-    "app/controllers/pagelime_receiver_controller.rb",
-    "app/helpers/pagelime_helper.rb",
-    "config/routes.rb",
     "init.rb",
     "install.rb",
     "lib/pagelime-rails.rb",
     "lib/pagelime/rails.rb",
     "lib/pagelime/rails/controller_extensions.rb",
     "lib/pagelime/rails/engine.rb",
-    "lib/pagelime/rails/routing_extensions.rb",
+    "lib/pagelime/rails/view_helper.rb",
+    "lib/pagelime/rails2/controllers/pagelime_receiver_controller.rb",
+    "lib/pagelime/rails2/routing_extensions.rb",
     "lib/tasks/pagelime.rake",
     "pagelime-rails.gemspec",
     "rails/init.rb",
@@ -49,16 +48,16 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<pagelime-rack>, [">= 0.3.0"])
+      s.add_runtime_dependency(%q<pagelime-rack>, [">= 0.4.3"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, [">= 1.6.4"])
     else
-      s.add_dependency(%q<pagelime-rack>, [">= 0.3.0"])
+      s.add_dependency(%q<pagelime-rack>, [">= 0.4.3"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, [">= 1.6.4"])
     end
   else
-    s.add_dependency(%q<pagelime-rack>, [">= 0.3.0"])
+    s.add_dependency(%q<pagelime-rack>, [">= 0.4.3"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<jeweler>, [">= 1.6.4"])
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pagelime-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Emil Anticevic
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-11 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pagelime-rack
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,16 +66,15 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- app/controllers/pagelime_receiver_controller.rb
-- app/helpers/pagelime_helper.rb
-- config/routes.rb
 - init.rb
 - install.rb
 - lib/pagelime-rails.rb
 - lib/pagelime/rails.rb
 - lib/pagelime/rails/controller_extensions.rb
 - lib/pagelime/rails/engine.rb
-- lib/pagelime/rails/routing_extensions.rb
+- lib/pagelime/rails/view_helper.rb
+- lib/pagelime/rails2/controllers/pagelime_receiver_controller.rb
+- lib/pagelime/rails2/routing_extensions.rb
 - lib/tasks/pagelime.rake
 - pagelime-rails.gemspec
 - rails/init.rb

data/app/controllers/pagelime_receiver_controller.rb

@@ -1,13 +0,0 @@
-class PagelimeReceiverController < ApplicationController
-  
-  def index
-    render :inline => "working", :status => 200
-  end
-  
-  def after_publish_callback
-    Pagelime.cache.clear_page params[:path]
-    Pagelime.cache.clear_shared
-
-  	render :inline => "cache cleared", :status => 200
-  end
-end

data/app/helpers/pagelime_helper.rb

@@ -1,13 +0,0 @@
-module PagelimeHelper
-  
-  def cms_content(&block)
-    # the block contents loaded into a variable
-    input_content = capture(&block)
-    html          = ::Pagelime.process_region(input_content, request.path)
-    # output the final content
-    concat(html)
-    # raw capture(&block) + "<div>hello world</div>"
-    # raw "BLA!";
-  end
-  
-end

data/config/routes.rb

@@ -1,32 +0,0 @@
-
-if Rails::VERSION::MAJOR == 2
-
-  ActionController::Routing::Routes.draw do |map|
-    Rails.logger.debug "PAGELIME CMS RAILS PLUGIN: setting up rails 2 routes"
-    
-    map.connect "pagelime/:action", :controller => :pagelime_receiver_controller  
-  end
-
-elsif Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR == 0
-
-  Rails.application.routes.draw do
-    Rails.logger.debug "PAGELIME CMS RAILS PLUGIN: setting up rails 3 routes"
-    
-    match 'pagelime/:action' => 'pagelime_receiver'
-  end
-  
-elsif Rails::VERSION::MAJOR >= 3
-  
-  Pagelime::Rails::Engine.routes.draw do
-    Rails.logger.debug "PAGELIME CMS RAILS PLUGIN: setting up rails 3.1+ routes"
-    
-    get 'pagelime/:action' => 'pagelime_receiver'
-  end
-
-  Rails.application.routes.draw do
-    Rails.logger.debug "PAGELIME CMS RAILS PLUGIN: mounting Pagelime in rails 3.1+ routes"
-    
-    mount Pagelime::Rails::Engine => "/"
-  end
-  
-end