pagelime-rails 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6a600b851478397833e645e4a5861d381fe1e02
-  data.tar.gz: 26992234cd2cd7b30471b1f3cadec3a9267e90b8
+  metadata.gz: 89efb96d666bc2018fa4afb670fb9a3280cbfb76
+  data.tar.gz: 44b9b84b7e0f39348865dbe6438a5fd356f718e4
 SHA512:
-  metadata.gz: 1ad60030c4d9c480bc1ce274464336b9613c455339b4c0b76849a2a82cf2cdb82a586574a3c30449bf26251a5b5a1abad8f7c0587872b433268b85cf0b4fb1e2
-  data.tar.gz: ebd6d0d5138e8b5fc23892572a2c964c4ebb5061e7e41703ac1907e084caecc125ce475bb4665686e9b16c3b3124d4ed5951afb043adaa370fba4c1ff171501a
+  metadata.gz: 93874dc43eb8964a0f5f8389555c28ffc22717d9c7e925b7c0dda9a8a5ca525056e1f369c7911cab2d12b702bbd151f48fca618ce5e05796bf9981e9775e6c53
+  data.tar.gz: bb1dc6ab448bacbf48b70721009190900621e9639a8d352b2de1d8fb4bda32eb4e7f91025a87257ce256d77cbc7980f2b5935b7ead96b9572b4b02dfae1c04aa

data/Gemfile

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

data/{Readme.md → README.md}

@@ -99,4 +99,18 @@ Optionally: If you don't want to have your entire controller CMS editable for so
       </div>
     <% end %>
 
+### Step 5: Edit your pages!
+
+#### For Heroku users
+
+If you're using the Pagelime Heroku add-on, go to the Heroku admin for your app and under the "Resources" tab you will see the Pagelime add-on listed. 
+Click on the add-on name and you will be redirected to the Pagelime CMS editor. 
+From there you can edit any page in your Rails app!
+
+#### For Pagelime.com users
+
+If you have a standalone Pagelime account, simply go to [pagelime.com](http://pagelime.com) and edit your site as usual (see Step 2). 
+
+
+
 Copyright (c) 2013 Pagelime LLC, released under the MIT license

data/Rakefile

@@ -1,8 +1,5 @@
 # encoding: utf-8
 
-require 'yaml'
-YAML::ENGINE.yamler= 'syck'
-
 require 'rubygems'
 require 'bundler'
 begin

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/app/controllers/pagelime_receiver_controller.rb

@@ -5,91 +5,9 @@ class PagelimeReceiverController < ApplicationController
   end
   
   def after_publish_callback
-    
-    Pagelime.client.clear params[:path]
-    Pagelime.client.clear_shared
+    Pagelime.cache.clear_page params[:path]
+    Pagelime.cache.clear_shared
 
-# don't do the prefetch below, as the page isn't done publishing (mySQL transaction hasn't completed) at the point when this gets called  	
-=begin
-  	begin
-  		new_content = fetch_cms_xml(params[:path]);
-  	rescue
-  	end
-=end
-  	
   	render :inline => "cache cleared", :status => 200
-  	
   end
-  
-  def after_publish_callback_old
-    
-    # the page_id will come from the request
-    page_id = params[:page_id]
-    
-    # TODO: use the API to get content    
-    uri = URI.parse("http://qa.cms.pagelime.com/API/Account/SOAP/Page.asmx/Get")
-    http = Net::HTTP.new(uri.host, uri.port)
-    # http.use_ssl = true
-    http.open_timeout = 2
-    http.read_timeout = 7
-    # http.set_debug_output $stderr
-    data = {:apiKey => "0fa155c4-9c42-4df6-856a-5cff6e2ff631", :pageId => page_id}.to_json
-    response = http.post(uri.path,data,{"content-type"=>"application/json; charset=utf-8","accept"=>"application/json, text/javascript, */*"})
-
-    page_json = JSON.parse(response.body)
-    page_json = page_json["d"]
-    
-    # try to find existing page
-    page = PagelimePage.find_by_page_id(page_id)
-    if (page)
-      # delete existing content
-      page.editable_areas.destroy
-      page.meta_data.destroy
-    else
-      # if no page is found, create a new one
-      page = PagelimePage.new
-    end
-
-    # set the page data
-    page.page_id = page_id
-    page.path = page_json[:Path]
-    page.title = page_json[:Title]
-    page.date_published = DateTime.now
-    
-    # save the page
-    page.save
-    
-    # for each piece of content
-    for page_content_json in page_json["EditableRegions"]
-      
-      # create the content data
-      page_content = PagelimeContent.new
-      page_content.client_id = page_content_json[:ClientID]
-      page_content.page = page
-      page_content.html = page_content_json[:Html]
-      
-      # save content
-      page_content.save
-      
-    end
-    
-    # for each piece of meta data
-    for metadata_json in page_json["MetaDataJSON"]
-      
-      # create the content data
-      page_metadata = PagelimeMetaData.new
-      page_metadata.name = metadata_json[0]
-      page_metadata.content = metadata_json[1]
-      page_metadata.page = page
-      
-      # save content
-      page_metadata.save
-      
-    end
-    
-    # respond with an OK status or CREATED status
-    render :status => 200
-    
-  end
-  
 end

data/app/helpers/pagelime_helper.rb

@@ -3,7 +3,7 @@ module PagelimeHelper
   def cms_content(&block)
     # the block contents loaded into a variable
     input_content = capture(&block)
-    html          = ::Pagelime.processor.process_fragment(input_content, request.path)
+    html          = ::Pagelime.process_region(input_content, request.path)
     # output the final content
     concat(html)
     # raw capture(&block) + "<div>hello world</div>"

data/lib/pagelime-rails.rb

@@ -1,7 +1,6 @@
 require 'pagelime-rack'
 require 'pagelime'
 require 'pagelime/rails'
-require 'pagelime/s3_rails_cache'
 
 Pagelime.logger.debug "PAGELIME CMS RAILS PLUGIN: pagelime-rails gem loaded"
 

data/lib/pagelime/rails.rb

@@ -35,8 +35,9 @@ module Pagelime
       
       def configure_pagelime!
         ::Pagelime.configure do |config|
-          config.client_class = ::Pagelime::S3RailsCache
-          config.logger       = ::Rails.logger
+          config.logger               = ::Rails.logger
+          config.cache                = ::Rails.cache
+          config.cache_fetch_options  = { :expires_in => 1.year }
         end
       end
     end

data/lib/pagelime/rails/controller_extensions.rb

@@ -12,7 +12,7 @@ module Pagelime
           ::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.processor.process_document(response.body, request.path)
+          response.body = Pagelime.process_page(response.body, request.path)
         end
       end
     

data/pagelime-rails.gemspec

@@ -5,19 +5,22 @@
 
 Gem::Specification.new do |s|
   s.name = "pagelime-rails"
-  s.version = "0.2.2"
+  s.version = "0.3.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-05"
+  s.date = "2013-09-11"
   s.description = ""
   s.email = "emil@pagelime.com"
+  s.extra_rdoc_files = [
+    "README.md"
+  ]
   s.files = [
     "Gemfile",
     "Heroku.md",
     "MIT-LICENSE",
+    "README.md",
     "Rakefile",
-    "Readme.md",
     "VERSION",
     "app/controllers/pagelime_receiver_controller.rb",
     "app/helpers/pagelime_helper.rb",
@@ -29,7 +32,6 @@ Gem::Specification.new do |s|
     "lib/pagelime/rails/controller_extensions.rb",
     "lib/pagelime/rails/engine.rb",
     "lib/pagelime/rails/routing_extensions.rb",
-    "lib/pagelime/s3_rails_cache.rb",
     "lib/tasks/pagelime.rake",
     "pagelime-rails.gemspec",
     "rails/init.rb",
@@ -47,16 +49,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.2.0"])
+      s.add_runtime_dependency(%q<pagelime-rack>, [">= 0.3.0"])
       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.2.0"])
+      s.add_dependency(%q<pagelime-rack>, [">= 0.3.0"])
       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.2.0"])
+    s.add_dependency(%q<pagelime-rack>, [">= 0.3.0"])
     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.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Emil Anticevic
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-09-11 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.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -57,13 +57,14 @@ description: ''
 email: emil@pagelime.com
 executables: []
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- README.md
 files:
 - Gemfile
 - Heroku.md
 - MIT-LICENSE
+- README.md
 - Rakefile
-- Readme.md
 - VERSION
 - app/controllers/pagelime_receiver_controller.rb
 - app/helpers/pagelime_helper.rb
@@ -75,7 +76,6 @@ files:
 - lib/pagelime/rails/controller_extensions.rb
 - lib/pagelime/rails/engine.rb
 - lib/pagelime/rails/routing_extensions.rb
-- lib/pagelime/s3_rails_cache.rb
 - lib/tasks/pagelime.rake
 - pagelime-rails.gemspec
 - rails/init.rb

data/lib/pagelime/s3_rails_cache.rb

@@ -1,53 +0,0 @@
-module Pagelime
-  class S3RailsCache < S3Client
-    module ClassMethods
-      def generate_cache_key(page_path, format = default_format)
-        "pagelime:cms:#{format}:page:#{Base64.encode64(page_path)}"
-      end
-      
-      def shared_cache_key(format = default_format)
-        "pagelime:cms:#{format}:shared"
-      end
-    end
-    
-    extend ClassMethods
-    
-    def fetch(page_path, format = self.class.default_format)
-      cache_key = self.class.generate_cache_key(page_path, format)
-      
-      value = ::Rails.cache.fetch(cache_key, :expires_in => 1.year) do
-        Pagelime.logger.debug "PAGELIME CMS RAILS PLUGIN: NO '#{page_path}' CACHE... loading #{format}"
-        super
-      end
-      
-      Pagelime.logger.debug "PAGELIME CMS RAILS PLUGIN: fetch (#{page_path}) value: #{value.inspect}"
-      
-      value
-    end
-    
-    def fetch_shared(format = self.class.default_format)
-      cache_key = self.class.shared_cache_key(format)
-      
-      value = ::Rails.cache.fetch(cache_key, :expires_in => 1.year) do
-        Pagelime.logger.debug "PAGELIME CMS RAILS PLUGIN: NO SHARED CACHE... loading #{format}"
-        super
-      end
-      
-      Pagelime.logger.debug "PAGELIME CMS RAILS PLUGIN: fetch_shared value: #{value.inspect}"
-      
-      value
-    end
-    
-    def clear(page_path, format = self.class.default_format)
-      cache_key = self.class.generate_cache_key(page_path, format)
-      
-      ::Rails.cache.delete cache_key
-    end
-    
-    def clear_shared(format = self.class.default_format)
-      cache_key = self.class.shared_cache_key(format)
-      
-      ::Rails.cache.delete cache_key
-    end
-  end
-end