locomotivecms 3.1.0.rc2 → 3.1.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68959375952f5af98ae54eaa4803399910c58c4a
-  data.tar.gz: a3d522c11a07ba0378869fe223216d49454a7e29
+  metadata.gz: 75dfd7e431d496abe209050d2cf12bf789766106
+  data.tar.gz: 8ea4b2aacb6aaf505f95bc98a4b97e070ad64d27
 SHA512:
-  metadata.gz: 7dc2fd75507c0bbd07a43de5f48f447714b46386fa5a1a7df23f018f3c636b481507e4166ba0ee539cc6c6bf4e698549af5cbc0274db72f56f01623ca91cd5dd
-  data.tar.gz: 0ae3cb47025dd58f397cddfe2ac438d703e6c95e66bfb04985e1403bb0680c39517471eb3bfa6fe7e513a0d6a51affe4de76d2c48eda3d47f4d6afd54fb849a6
+  metadata.gz: 96f2087e9e3eb1f75f6712a376a96c51e81762d50f1c035bcb0376ceeadb6691beeaa9b802cbc582e2a2e3f9a521a7a38a4ef4dccffe8854ff84f7ce9634f568
+  data.tar.gz: 989fe15d4bfbcff552501a75906f87209024d6e9d9fc295f1a7719298da1a7253c505dc06a037b07610a9aabb6c4195ab9f26737b813d80e3d6dff3ee16c7135

data/Gemfile

@@ -25,7 +25,7 @@ group :development do
   # gem 'locomotivecms_common', github: 'locomotivecms/common', ref: '257047b', require: false
 
   # gem 'locomotivecms_steam', path: '../gems/steam', require: false
-  # gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: 'c44f003', require: false
+  # gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: 'a3054f1', require: false
 
   # gem 'locomotive_liquid', path: '../gems/liquid' # for Developers
   # gem 'locomotivecms_solid', path: '../gems/solid' # for Developers

data/app/api/locomotive/api/entities/page_entity.rb

@@ -45,6 +45,7 @@ module Locomotive
       class FullpathPageEntity < BaseEntity
 
         expose :fullpath
+        expose :handle
 
         unexpose :created_at
         unexpose :updated_at

data/app/api/locomotive/api/resources/page_resource.rb

@@ -23,7 +23,7 @@ module Locomotive
           get '/fullpaths' do
             authorize Page, :index?
 
-            present pages.only(:_id, :fullpath), with: Locomotive::API::Entities::FullpathPageEntity
+            present pages.only(:_id, :fullpath, :handle), with: Locomotive::API::Entities::FullpathPageEntity
           end
 
           desc "Show a page"

data/app/controllers/locomotive/base_controller.rb

@@ -9,7 +9,6 @@ module Locomotive
     include Locomotive::Concerns::AuthorizationController
     include Locomotive::Concerns::StoreLocationController
     include Locomotive::Concerns::WithinSiteController
-    include Locomotive::Concerns::WithinSiteController
 
     layout '/locomotive/layouts/application'
 

data/app/controllers/locomotive/concerns/exception_controller.rb

@@ -20,6 +20,8 @@ module Locomotive
           500
         end)
 
+        puts "Backtrace:\n\t#{exception.backtrace.join("\n\t")}" if Rails.env.development? || Rails.env.test?
+
         if request.xhr?
           render json: { error: exception.message }, status: status, layout: false
         else

data/app/helpers/locomotive/base_helper.rb

@@ -16,6 +16,7 @@ module Locomotive
         @content_for_title
       else
         if request.xhr?
+          @content_for_title = '' # won't raise an exception if a layout is applied.
           concat content_tag(:h1, title)
         else
           @content_for_title = title

data/lib/locomotive/action_controller/responder.rb

@@ -17,6 +17,8 @@ module Locomotive
       end
 
       def to_html
+        add_authenticated_header
+
         if controller.request.headers['X-Flash'] == 'true'
           with_flash_message(:notice, true) { super }
         else
@@ -25,6 +27,8 @@ module Locomotive
       end
 
       def to_js
+        add_authenticated_header
+
         if controller.request.headers['X-Flash'] == 'true'
           with_flash_message(:notice, true) { super }
         else
@@ -33,6 +37,8 @@ module Locomotive
       end
 
       def to_json
+        add_authenticated_header
+
         if get?
           add_pagination_header if resource.respond_to?(:num_pages)
           display(resource)
@@ -89,6 +95,10 @@ module Locomotive
         end
       end
 
+      def add_authenticated_header
+        controller.headers['X-Authenticated']   = controller.current_locomotive_account.present?.to_s
+      end
+
       def add_pagination_header
         controller.headers['X-Total-Pages']   = resource.num_pages.to_s
         controller.headers['X-Per-Page']      = resource.limit_value.to_s

data/lib/locomotive/version.rb

@@ -2,5 +2,5 @@
 # MAJOR.MINOR.PATCH format.
 # 1.0.0-alpha < 1.0.0-alpha.1 < 1.0.0-alpha.beta < 1.0.0-beta < 1.0.0-beta.2 < 1.0.0-beta.11 < 1.0.0-rc.1 < 1.0.0
 module Locomotive #:nodoc
-  VERSION = '3.1.0.rc2'
+  VERSION = '3.1.0.rc3'
 end

data/spec/requests/locomotive/steam/cache_spec.rb

@@ -39,7 +39,7 @@ describe Locomotive::Steam::Middlewares::Cache do
 
     subject { middleware.send(:cache_key, steam_env) }
 
-    it { expect(subject).to eq '2bf770af7c75d80bb8e87d21bde9ac4f' }
+    it { expect(subject).to eq '76ecaab214311e09f51d2f2673d13a2b' }
 
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms
 version: !ruby/object:Gem::Version
-  version: 3.1.0.rc2
+  version: 3.1.0.rc3
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc2
+        version: 1.1.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc2
+        version: 1.1.0.rc3
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement