push_type_core 0.10.0.beta.3 → 0.10.0.beta.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fd6cd0064cd63d1dd950087f1ac29d726f4c008
-  data.tar.gz: 7f4324b860c06b86ca5544bbe74483228e9109ce
+  metadata.gz: 01c112917483c5214c46adac7908e1f325ece658
+  data.tar.gz: 984f05936884a2251f744836be2d47e2e22003d6
 SHA512:
-  metadata.gz: 4d6b466d5f153fd3175aaa49d8730a4dd72e4d9936d69ceef3da9283570859f57d26dec1e801a0870ae28698efd0c49a9d7f9baff867364f19c5b781f78ce451
-  data.tar.gz: fce3f8f57b3a02994a556a3dae73b6ecaec3c9206ca314ff1f12d013bc9e49a7e9e71c5e252d0b26204187c526681d01554e5ec96714ca0930062a292107004c
+  metadata.gz: 757c53adbab7868036862aa189ad61e7162741d4291afa88e7be46774db619b6d25cda0367852601d81907eb4f754a0c9b2a6ea6039f5bd42d5789f9c886fdb0
+  data.tar.gz: a8629fcc234ce54aeba05f52718b06bde6fdf014ed03a357dda81c48f1cfb632205ff8f2d1c605e00459c4906078a5a8009790aefe04c47afecf04cebca33177

data/app/controllers/concerns/push_type/application_controller_methods.rb

@@ -8,6 +8,8 @@ module PushType
 
     included do
       class_attribute *FILTERS
+      helper PushType::MediaUrlHelper
+      helper PushType::NodeUrlHelper
     end
 
     protected

data/app/controllers/front_end_controller.rb

@@ -2,29 +2,31 @@ class FrontEndController < ApplicationController
 
   include PushType::Filterable
 
-  before_action :load_node, only: :show
+  before_action :load_node,         only: :show
+  before_action :load_preview_node, only: :preview
+  before_action :build_presenter
   node_filters
 
   def show
     render *@node.template_args
   end
 
-  private
-
-  def root_path?
-    request.fullpath == '/'
+  def preview
+    response.headers['X-Robots-Tag'] = 'none'
+    show
   end
 
-  def raise_404
-    if root_path?
-      render template: 'push_type/setup', layout: nil, status: 404
-    else
-      raise ActiveRecord::RecordNotFound
-    end
-  end
+  private  
 
   def load_node
     @node = PushType::Node.exposed.published.find_by_path permalink_path
+  end
+
+  def load_preview_node
+    @node = PushType::Node.exposed.find_by_base64_id params[:id]
+  end
+
+  def build_presenter
     if @node
       instance_variable_set "@#{ @node.type.underscore }", @node.present!(view_context)
     else
@@ -32,4 +34,16 @@ class FrontEndController < ApplicationController
     end
   end
 
+  def root_path?
+    request.fullpath == main_app.home_node_path
+  end
+
+  def raise_404
+    if root_path?
+      render template: 'push_type/setup', layout: nil, status: 404
+    else
+      raise ActiveRecord::RecordNotFound
+    end
+  end
+
 end

data/app/models/push_type/node.rb

@@ -17,9 +17,19 @@ module PushType
     validates :title, presence: true
     validates :slug,  presence: true, uniqueness: { scope: :parent_id }
 
+    def self.find_by_base64_id(secret)
+      find Base64.urlsafe_decode64(secret)
+    rescue ArgumentError
+      raise ActiveRecord::RecordNotFound
+    end
+
+    def base64_id
+      Base64.urlsafe_encode64 id.to_s
+    end
+
     def permalink
       @permalink ||= self_and_ancestors.map(&:slug).reverse.join('/')
-    end
+    end    
 
     def orphan?
       parent && parent.trashed?

data/lib/push_type/core/engine.rb

@@ -30,17 +30,6 @@ module PushType
         end
       end
 
-      initializer 'push_type.url_helpers' do
-        ActiveSupport.on_load :action_controller do
-          helper PushType::MediaUrlHelper
-          helper PushType::NodeUrlHelper
-        end
-        ActiveSupport.on_load :action_view do
-          include PushType::MediaUrlHelper
-          include PushType::NodeUrlHelper
-        end
-      end
-
       initializer 'push_type.menu_helpers' do
         ActiveSupport.on_load :action_view do
           include PushType::MenuBuilder::Helpers

data/lib/push_type/rails/routes.rb

@@ -17,9 +17,9 @@ module ActionDispatch::Routing
           asset.media params[:style]
         }, as: 'media'
 
-        # A catch-all root for the nodes
-        get '*permalink' => 'front_end#show', as: 'node'
-        get '/' => 'front_end#show', as: 'home', permalink: PushType.config.home_slug if PushType.config.home_slug.present?
+        get '/node/preview/:id' => 'front_end#preview', as: 'preview_node'
+        get '*permalink'    => 'front_end#show',    as: 'node'
+        get '/' => 'front_end#show', as: 'home_node', permalink: PushType.config.home_slug if PushType.config.home_slug.present?
       end
     end
 

data/lib/push_type/version.rb

@@ -1,3 +1,3 @@
 module PushType
-  VERSION = '0.10.0.beta.3'
+  VERSION = '0.10.0.beta.5'
 end

data/test/controllers/front_end_controller_test.rb

@@ -27,6 +27,25 @@ class FrontEndControllerTest < ActionController::TestCase
     end
   end
 
+  describe 'GET #preview' do
+    let(:page)      { Page.create FactoryGirl.attributes_for(:node, type: 'Page') }
+    let(:id)        { page.base64_id }
+    let(:action!)   { get :preview, params: { id: id } }
+
+    describe 'when node does not exist' do
+      let(:id) { 'abcefg12345' }
+      it { proc { action! }.must_raise ActiveRecord::RecordNotFound }
+    end
+    describe 'when node not published' do
+      before { action! }
+      it { response.must_render_template 'nodes/page' }
+      it { response.headers.must_include 'X-Robots-Tag' }
+      it { response.headers['X-Robots-Tag'].must_equal 'none' }
+      it { assigns[:node].must_equal page }
+      it { assigns[:page].must_equal page }
+    end
+  end
+
   describe 'node filters' do
     
     ApplicationController.module_eval do

data/test/dummy/config/initializers/push_type.rb

@@ -45,6 +45,6 @@ PushType.setup do |config|
   #   secret_access_key:  ENV['SECRET_ACCESS_KEY_ID']
   # }
 
-  # config.dragonfly_secret = 'db0e7c33e8b359951d22f8e750068f5c5896b6adfa07cbb839b895550378c153'
+  # config.dragonfly_secret = '4c23a3d0cfad7fc78e7ade796a3df4a5dc6e412b000e922098d44bd017991386'
 
 end

data/test/dummy/config/secrets.yml

@@ -11,10 +11,10 @@
 # if you're sharing your code publicly.
 
 development:
-  secret_key_base: a3f3c85b457a43f7bc749ac36a23dfbe8c276f37e549629681d926ddc777a60b1de8b51423b7eeb88d83cf12899d57df2874e8764ff2658f1b4c25ef71d1e5c2
+  secret_key_base: 6e97ea80ddab01674da00aa37e9b31e25a9baf853f8bd0cffbf5112ba33c66fd1be767b6cf5ab8fc59781faa9ec6ebca2d7c9e188bb9f40cc4a88e77d391ec30
 
 test:
-  secret_key_base: 733f6bf04272401ea3a441bf8371d6075c2a60649e4b9360bdd7c6130bc0d262b40adf47d0176794d8404c08badc03339b814841f132c92e06285db7583746c9
+  secret_key_base: e8c528eb48d3d486b52671932881ba94aa5e867f4c017624f58a75e9f3e6d10cf9e3d12858a5f7aca48f122021a3191b1322d67641e183b60cb9c66c68318ff2
 
 # Do not keep production secrets in the repository,
 # instead read values from the environment.

data/test/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20161116222806) do
+ActiveRecord::Schema.define(version: 20161117154447) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"