pagelime-rails 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddac54bee1ac47332a0054f74466c9b5e9a1a971
-  data.tar.gz: 5c10ca005226fa7c5cdc4c0b1fd1e9b8389458d3
+  metadata.gz: fa1a0e99acbcdfb19c39cbfb2691e14939026d5f
+  data.tar.gz: 2ed9b3b3d00bc9c357b1b500197f57256152de17
 SHA512:
-  metadata.gz: ee0f1f4b425a75ece577bdab6c018f03a3378029d4a52cb1deee1df9d3714e9ba4bd18230773d43b0703ff9f7c18a15ed1d767861c97bb546c300f4c3c39bc12
-  data.tar.gz: a733dec1d73bb52d5a0dc769c1aba2686bba6aac0511547227ee229dc426ccc0bb6b836dd58b09add9c6fac9c876ff54640777e48df83e9a98fb658fad024105
+  metadata.gz: c3070f871611ac2b907772bae1c329c2dec404eed073f82682c3c578d3790b0771752d6b79c0d50606da747d0381a1366055694eff1ba1e80bfb59001e3ce2b5
+  data.tar.gz: fb2ac21c1ff0b9be04c823d2fd1c5f74b29ff218db25a37493aef2632df77bc48d6aa13c0d152b6391a49080ae90949847b4ccf7083f19e1d11ca751407dd0a5

data/Gemfile

@@ -3,6 +3,7 @@ source "http://rubygems.org"
 # Example:
 
 gem 'pagelime-rack', '>= 0.4.4'
+gem 'rails', '>= 2.3'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/lib/pagelime-rails.rb

@@ -4,24 +4,15 @@ require 'pagelime/rails'
 
 Pagelime.logger.debug "PAGELIME CMS RAILS PLUGIN: pagelime-rails gem loaded"
 
-# start plugin 
-if Rails::VERSION::MAJOR == 2
-  
-  # 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
-  
-  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)
+# Support Rails 2.3+
+
+if Rails::VERSION::MAJOR == 2 && Rails::VERSION::MINOR >= 3
   
   Pagelime::Rails.initialize!
   
+  ::Rails.application.config.middleware.use Rack::Pagelime
+  
 elsif Rails::VERSION::MAJOR >= 3
   require_relative 'pagelime/rails/engine'
-end
+end
+

data/lib/pagelime/rails/view_helper.rb

@@ -10,6 +10,11 @@ module Pagelime
         editable_content  = capture(&block)
         processed_html    = ::Pagelime.process_region(editable_content, request.path)
         
+        # tell pagelime-rack NOT to parse response body for whole page.
+        # this helper method automatically disables auto-processing, 
+        # so all editable areas on this page need to use this helper method.
+        ::Rack::Pagelime.disable_processing_for_request(request)
+        
         # output the final content
         concat(processed_html)
         

data/pagelime-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "pagelime-rails"
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   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-24"
+  s.date = "2013-09-25"
   s.description = ""
   s.email = "emil@pagelime.com"
   s.extra_rdoc_files = [
@@ -29,8 +29,6 @@ Gem::Specification.new do |s|
     "lib/pagelime/rails/controller_extensions.rb",
     "lib/pagelime/rails/engine.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,15 +47,18 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<pagelime-rack>, [">= 0.4.4"])
+      s.add_runtime_dependency(%q<rails>, [">= 2.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.4.4"])
+      s.add_dependency(%q<rails>, [">= 2.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.4.4"])
+    s.add_dependency(%q<rails>, [">= 2.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.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Emil Anticevic
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pagelime-rack
@@ -25,6 +25,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.4
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -73,8 +87,6 @@ files:
 - lib/pagelime/rails/controller_extensions.rb
 - lib/pagelime/rails/engine.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/lib/pagelime/rails2/controllers/pagelime_receiver_controller.rb

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

data/lib/pagelime/rails2/routing_extensions.rb

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