locomotivecms 3.3.0.rc3 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d37da81dfb746c28ecdba02efef450619dcccd87
-  data.tar.gz: e82164ac57b58b259e95202bd6f68b8a7eab3097
+  metadata.gz: 63ada27d247c263d104f61e50c76975e1c60be31
+  data.tar.gz: 9d63c89ace631caf49bc827b42accc9725835409
 SHA512:
-  metadata.gz: d30c1f7da8df089bee6a3081bcc41d6dee1f74fa57752d1aebbede70b9c2c2036bae21a0487bd1f213efad48549269d1b5c023fd2dfdebcbe293abba3ca3ce76
-  data.tar.gz: 91202542e10f83a06b221e33bcffb0b6030cb204e0eabb2e83cc6a174d77159f9fe0518b0ed0b15224e60f596e0181d769b589b3cfc0d3910ad34a39d79f5db3
+  metadata.gz: b4a07cee2278ffe00327ab17fa6f1cdc73fcba68c6883d494e55a1c231b034c0e7119f1052452197611a7b2ba014a3de4f92d33d6675030c75d2b0a492eb3977
+  data.tar.gz: 717311d1ea81fe45d97d991010fd1a2ca126b45ae3ed974e5134c9ffb12d8154e4e72128cb442adeea66f572d370dac6add9968606ae59f489a92c79ed21cbd7

data/Gemfile

@@ -18,13 +18,13 @@ end
 
 group :development do
   # gem 'custom_fields', path: '../gems/custom_fields' # for Developers
-  # gem 'custom_fields', github: 'locomotivecms/custom_fields', ref: '4a612e5'
+  # gem 'custom_fields', github: 'locomotivecms/custom_fields', ref: '27f1d62'
 
   # gem 'locomotivecms_common', path: '../gems/common', require: false
   # 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: '87c8535', require: false
+  # gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: '0cf606c', require: false
 
   # gem 'locomotive_liquid', path: '../gems/liquid' # for Developers
   # gem 'locomotivecms_solid', path: '../gems/solid' # for Developers

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

@@ -7,7 +7,7 @@ module Locomotive
         expose    :name, :handle, :seo_title, :meta_keywords, :meta_description,
                   :robots_txt, :cache_enabled, :private_access
 
-        expose :locales, :domains, :url_redirections
+        expose :locales, :domains, :asset_host, :url_redirections
 
         expose :memberships, using: MembershipEntity
 

data/app/api/locomotive/api/forms/content_entry_form.rb

@@ -4,6 +4,8 @@ module Locomotive
 
       class ContentEntryForm < BaseForm
 
+        NON_CUSTOM_FIELD_ATTRIBUTES = %w{_auth_reset_token _auth_reset_sent_at}
+
         attr_accessor :content_type, :dynamic_attributes
 
         attrs :_slug, :_position, :_visible, :seo_title, :meta_keywords, :meta_description
@@ -41,8 +43,10 @@ module Locomotive
             if respond_to?(:"set_#{field.type}")
               public_send(:"set_#{field.type}", field, args.first)
             else
-              dynamic_attributes[field.name.to_sym] = args.first
+              dynamic_attributes[getter_name(name).to_sym] = args.first
             end
+          elsif NON_CUSTOM_FIELD_ATTRIBUTES.include?(getter_name(name))
+            dynamic_attributes[getter_name(name).to_sym] = args.first
           else
             super
           end
@@ -54,14 +58,19 @@ module Locomotive
 
         private
 
+        def getter_name(name)
+          name.to_s.gsub(/=\z/, '')
+        end
+
         def find_field(name)
-          _name = name.to_s.gsub(/=$/, '')
-          dynamic_setters[_name]
+          dynamic_setters[getter_name(name)]
         end
 
         def dynamic_setters
           @dynamic_setters ||= self.content_type.entries_custom_fields.inject({}) do |hash, field|
             case field.type.to_sym
+            when :password
+              hash[field.name] = hash["#{field.name}_confirmation"] = field
             when :file
               hash[field.name] = hash["remote_#{field.name}_url"] = hash["remove_#{field.name}"] = field
             when :belongs_to

data/app/api/locomotive/api/forms/site_form.rb

@@ -4,7 +4,7 @@ module Locomotive
 
       class SiteForm < BaseForm
 
-        attrs :name, :handle, :robots_txt, :locales, :domains, :url_redirections, :timezone, :picture, :cache_enabled, :private_access, :password, :metafields_schema, :metafields, :metafields_ui
+        attrs :name, :handle, :robots_txt, :locales, :domains, :url_redirections, :timezone, :picture, :cache_enabled, :private_access, :password, :metafields_schema, :metafields, :metafields_ui, :asset_host
         attrs :seo_title, :meta_keywords, :meta_description, localized: true
 
         # Make sure locales and domains are in arrays.

data/app/api/locomotive/api/helpers/pagination_helper.rb

@@ -4,7 +4,7 @@ module Locomotive
       module PaginationHelper
 
         def add_pagination_header(collection)
-          header 'X-Total-Pages',   collection.num_pages.to_s
+          header 'X-Total-Pages',   collection.total_pages.to_s
           header 'X-Per-Page',      collection.limit_value.to_s
           header 'X-Total-Entries', collection.total_count.to_s
         end

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

@@ -44,6 +44,7 @@ module Locomotive
               optional :metafields_schema
               optional :metafields
               optional :metafields_ui
+              optional :asset_host
             end
           end
           put do

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

@@ -71,6 +71,7 @@ module Locomotive
               optional :metafields_schema
               optional :metafields
               optional :metafields_ui
+              optional :asset_host
             end
           end
           post do
@@ -101,6 +102,7 @@ module Locomotive
               optional :password
               optional :metafields_schema
               optional :metafields
+              optional :asset_host
             end
           end
           put ':id' do

data/app/controllers/locomotive/translations_controller.rb

@@ -6,7 +6,7 @@ module Locomotive
     before_filter :load_translation, only: [:edit, :update]
 
     def index
-      authorize ThemeAsset
+      authorize Translation
       @translations = service.all(params.slice(:page, :per_page, :q, :filter_by))
       respond_with @translations
     end

data/app/models/locomotive/concerns/site/access_points.rb

@@ -12,6 +12,7 @@ module Locomotive
           field :domains, type: Array, default: []
           field :redirect_to_first_domain, type: Boolean, default: false
           field :redirect_to_https, type: Boolean, default: false
+          field :asset_host
 
           ## indexes ##
           index domains: 1
@@ -24,6 +25,7 @@ module Locomotive
             multiline: true
           validate                  :domains_must_be_valid_and_unique
           validate                  :domains_must_not_be_reserved
+          validate                  :asset_host_must_be_valid
 
           ## callbacks ##
           before_validation :prepare_domain_sync
@@ -54,6 +56,10 @@ module Locomotive
           array = [] if array.blank?; super(array.map(&:downcase))
         end
 
+        def asset_host=(asset_host)
+          super(asset_host.try(:downcase))
+        end
+
         protected
 
         def prepare_domain_sync
@@ -76,6 +82,14 @@ module Locomotive
           end
         end
 
+        def asset_host_must_be_valid
+          return if self.asset_host.blank?
+
+          if not asset_host =~ Locomotive::Regexps::ASSET_HOST
+            self.errors.add(:asset_host, :invalid_domain, value: asset_host)
+          end
+        end
+
         def domains_must_not_be_reserved
           return if self.domains.empty? || Locomotive.config.reserved_domains.blank?
 

data/app/models/locomotive/snippet.rb

@@ -20,6 +20,9 @@ module Locomotive
     ## behaviours ##
     slugify_from :name
 
+    ## indexes ##
+    index site_id: 1, slug: 1
+
     ## methods ##
 
     def touch_site_attribute

data/app/policies/locomotive/site_policy.rb

@@ -46,11 +46,11 @@ module Locomotive
     end
 
     def permitted_attributes
-      plain = [:name, :handle, :picture, :remove_picture, :seo_title, :meta_keywords, :meta_description, :timezone_name, :robots_txt, :cache_enabled, :redirect_to_first_domain, :redirect_to_https, :private_access, :password, :prefix_default_locale]
+      plain = [:name, :handle, :picture, :remove_picture, :seo_title, :meta_keywords, :meta_description, :timezone_name, :robots_txt, :asset_host, :cache_enabled, :redirect_to_first_domain, :redirect_to_https, :private_access, :password, :prefix_default_locale]
       hash  = { domains: [], locales: [], url_redirections: [] }
 
       unless update_advanced?
-        plain -= [:timezone_name, :robots_txt, :cache_enabled, :prefix_default_locale]
+        plain -= [:timezone_name, :robots_txt, :cache_enabled, :prefix_default_locale, :asset_host]
         hash.delete(:locales)
         hash.delete(:url_redirections)
       end

data/app/views/locomotive/current_site/form/_access_points.html.slim

@@ -4,6 +4,8 @@
 
     = f.input :domains, as: :array, hint: t(:domains, scope: 'simple_form.hints.locomotive.site', domain: Locomotive.config.host || request.host).html_safe, placeholder: true, collection: f.object.domains, template: :domain, template_url: new_domain_current_site_path(current_site)
 
+    = f.input :asset_host, hint: t(:asset_host, scope: 'simple_form.hints.locomotive.site').html_safe
+
     = f.input :redirect_to_first_domain, as: :toggle
     = f.input :redirect_to_https, as: :toggle
 

data/config/locales/simple_form.en.yml

@@ -96,6 +96,7 @@ en:
           meta_description: "Meta description used within the head tag of the page. Required for SEO."
           robots_txt: "Content of the <span class='code'>/robots.txt</span> file. Check the following <a href='http://www.w3.org/TR/html4/appendix/notes.html#h-B.4.1.1'>url</a> for more information."
           domains: "Add your domains just below. Documentation <a href=\"https://locomotive-v3.readme.io/docs/domains\">here</a> for more information."
+          asset_host: "Site-specific asset host that overrides engine asset host (ex. \"localhost\", \"asset.dev\", \"https://asset-host.com/\")."
           memberships: "You can invite other accounts to edit/manage the site."
           cache_enabled: "When enabled, your pages will be cached as long as the content doesn't change. Disabling cache per page is allowed."
           redirect_to_first_domain: "When enabled, requests made to any domains listed above will be redirected to the first domain."

data/lib/generators/locomotive/install/install_generator.rb

@@ -67,7 +67,7 @@ end
         RUBY
         end
 
-        gem 'platform-api', '~> 0.3.0'
+        gem 'platform-api', '~> 2'
       end
     end
 

data/lib/generators/locomotive/install/templates/mongoid.yml

@@ -9,7 +9,7 @@ development:
       # Provides the hosts the default client can connect to. Must be an array
       # of host:port pairs. (required)
       hosts:
-        - localhost:27017
+        - 127.0.0.1:27017
       options:
         # Change the default write concern. (default = { w: 1 })
         # write:
@@ -129,7 +129,7 @@ test:
     default:
       database: <%= Rails.application.class.parent.to_s.underscore.downcase %>_test
       hosts:
-        - localhost:27017
+        - 127.0.0.1:27017
       options:
         max_pool_size: 1
 
@@ -138,6 +138,6 @@ production:
     default:
       database: <%= Rails.application.class.parent.to_s.underscore.downcase %>_production
       hosts:
-        - localhost:27017
+        - 127.0.0.1:27017
       options:
         max_pool_size: 1

data/lib/locomotive/action_controller/responder.rb

@@ -40,7 +40,7 @@ module Locomotive
         add_authenticated_header
 
         if get?
-          add_pagination_header if resource.respond_to?(:num_pages)
+          add_pagination_header if resource.respond_to?(:total_pages)
           display(resource)
         elsif has_errors?
           with_flash_message(:alert) do
@@ -100,7 +100,7 @@ module Locomotive
       end
 
       def add_pagination_header
-        controller.headers['X-Total-Pages']   = resource.num_pages.to_s
+        controller.headers['X-Total-Pages']   = resource.total_pages.to_s
         controller.headers['X-Per-Page']      = resource.limit_value.to_s
         controller.headers['X-Total-Entries'] = resource.total_count.to_s
       end

data/lib/locomotive/dependencies.rb

@@ -8,7 +8,8 @@ require 'devise'
 require 'devise/orm/mongoid'
 require 'devise-encryptable'
 require 'simple_token_authentication'
-require 'kaminari'
+require 'kaminari/mongoid'
+require 'kaminari/actionview'
 require 'bootstrap-kaminari-views'
 require 'bootstrap-sass'
 require 'font-awesome-sass'

data/lib/locomotive/regexps.rb

@@ -9,5 +9,8 @@ module Locomotive
 
     URL_AND_MAILTO      = /\A((https?:\/\/\S+)|(ftp:\/\S+)|(mailto:\S+)|\/\S*)\Z/
 
+    # e.g. hostname, hostname.com, http(s)://hostname, http(s)://hostname.com/
+    ASSET_HOST			= /\A((https?:\/\/)?)(([a-z\d])([a-z\d-]){0,61}([a-z\d]))(\.([a-z\d])([a-z\d-]){0,61}([a-z\d]))*\/?$/i
+
   end
 end

data/lib/locomotive/steam/middlewares/wysihtml_css.rb

@@ -4,6 +4,8 @@ module Locomotive
 
       class WysihtmlCss
 
+        GOOGLE_AMP_PATH = '_amp'
+
         def initialize(app, opts = {})
           @app = app
         end
@@ -11,7 +13,7 @@ module Locomotive
         def call(env)
           status, headers, response = @app.call(env)
 
-          if content?(env['steam.page'], response)
+          if content?(env['steam.page'], env['steam.path'], response)
             url   = ::ActionController::Base.helpers.stylesheet_path('locomotive/wysihtml5_editor')
             html  = %(<link rel="stylesheet" type="text/css" href="#{url}">)
             response.first.gsub!('</head>', %(#{html}</head>))
@@ -22,8 +24,11 @@ module Locomotive
 
         protected
 
-        def content?(page, response)
-          page && !page.redirect && page.response_type == 'text/html' && response.first
+        def content?(page, path, response)
+          !path.starts_with?(GOOGLE_AMP_PATH + '/') &&
+          !page.redirect &&
+          page.response_type == 'text/html' &&
+          response.first
         end
 
       end

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.3.0.rc3'
+  VERSION = '3.3.0'
 end

data/spec/dummy/config/mongoid.yml

@@ -10,7 +10,7 @@ development:
       # Provides the hosts the default client can connect to. Must be an array
       # of host:port pairs. (required)
       hosts:
-        - localhost:27017
+        - 127.0.0.1:27017
       options:
         # Change the default write concern. (default = { w: 1 })
         # write:
@@ -129,7 +129,7 @@ test:
     default:
       database: locomotive_engine_test
       hosts:
-        - localhost:27017
+        - 127.0.0.1:27017
       options:
         truncate_logs: false
         max_pool_size: 1

data/spec/models/locomotive/concerns/site/access_points_spec.rb

@@ -3,96 +3,176 @@ require 'spec_helper'
 describe Locomotive::Concerns::Site::AccessPoints do
 
   let(:domains) { [] }
-  let(:site) { build(:site, domains: domains) }
+  let(:asset_host) { nil }
+  let(:site) { build(:site, domains: domains, asset_host: asset_host) }
 
-  describe '#domains=' do
+  describe 'domains' do
 
-    it 'downcases the domains' do
-      site.domains = ['FIRST.com', 'second.com', 'THIRD.com']
+    describe '#domains=' do
 
-      expect(site.domains).to eq(['first.com', 'second.com', 'third.com'])
+      it 'downcases the domains' do
+        site.domains = ['FIRST.com', 'second.com', 'THIRD.com']
+
+        expect(site.domains).to eq(['first.com', 'second.com', 'third.com'])
+      end
     end
-  end
 
-  describe '#valid?' do
+    describe '#valid?' do
 
-    subject { site.valid? }
+      subject { site.valid? }
 
-    it { is_expected.to eq true }
+      it { is_expected.to eq true }
 
-    describe 'forbidden domains defined' do
+      describe 'forbidden domains defined' do
 
-      before { allow(Locomotive.config).to receive(:reserved_domains).and_return(['www.locomotiveapp.com', /.+\.acme\.org/]) }
+        before { allow(Locomotive.config).to receive(:reserved_domains).and_return(['www.locomotiveapp.com', /.+\.acme\.org/]) }
 
-      let(:domains) { ['example.fr', 'acme.org'] }
+        let(:domains) { ['example.fr', 'acme.org'] }
 
-      it { is_expected.to eq true }
+        it { is_expected.to eq true }
+
+        context 'setting a forbidden domain name' do
 
-      context 'setting a forbidden domain name' do
+          let(:domains) { ['example.fr', 'www.locomotiveapp.com', 'staging.acme.org'] }
 
-        let(:domains) { ['example.fr', 'www.locomotiveapp.com', 'staging.acme.org'] }
+          it 'adds errors for each invalid domain' do
+            is_expected.to eq false
+            expect(site.errors['domains']).to eq(["www.locomotiveapp.com is already taken", "staging.acme.org is already taken"])
+          end
 
-        it 'adds errors for each invalid domain' do
-          is_expected.to eq false
-          expect(site.errors['domains']).to eq(["www.locomotiveapp.com is already taken", "staging.acme.org is already taken"])
         end
 
       end
 
     end
 
-  end
+    describe 'domain sync' do
 
-  describe 'domain sync' do
+      let!(:listener) { DomainEventListener.new }
+      after { listener.shutdown }
 
-    let!(:listener) { DomainEventListener.new }
-    after { listener.shutdown }
+      subject { listener }
 
-    subject { listener }
+      describe 'on saving' do
 
-    describe 'on saving' do
+        before  { site.save }
 
-      before  { site.save }
+        it 'does not emit an event' do
+          expect(subject.size).to eq 0
+        end
 
-      it 'does not emit an event' do
-        expect(subject.size).to eq 0
-      end
+        context 'new site' do
 
-      context 'new site' do
+          let(:domains) { ['www.example.com', 'example.com'] }
 
-        let(:domains) { ['www.example.com', 'example.com'] }
+          it 'only tracks new domains' do
+            expect(subject.added).to eq(['www.example.com', 'example.com'])
+            expect(subject.removed).to eq([])
+          end
+
+        end
+
+        context 'existing site' do
+
+          let(:domains) { ['www.boring.org', 'www.awesome.io'] }
+
+          before { listener.clear; site.domains = ['www.acme.com', 'www.awesome.io']; site.save; site.reload }
+
+          it 'tracks new domains and removed ones' do
+            expect(subject.added).to eq(['www.acme.com'])
+            expect(subject.removed).to eq(['www.boring.org'])
+          end
 
-        it 'only tracks new domains' do
-          expect(subject.added).to eq(['www.example.com', 'example.com'])
-          expect(subject.removed).to eq([])
         end
 
       end
 
-      context 'existing site' do
+      describe 'on destroying' do
 
-        let(:domains) { ['www.boring.org', 'www.awesome.io'] }
+        let(:domains) { ['www.example.com', 'example.com'] }
 
-        before { listener.clear; site.domains = ['www.acme.com', 'www.awesome.io']; site.save; site.reload }
+        before { site.save; listener.clear; site.destroy }
 
-        it 'tracks new domains and removed ones' do
-          expect(subject.added).to eq(['www.acme.com'])
-          expect(subject.removed).to eq(['www.boring.org'])
+        it 'tracks removed domains' do
+          expect(subject.added).to eq([])
+          expect(subject.removed).to eq(['www.example.com', 'example.com'])
         end
 
       end
 
     end
+  end
+
+  describe 'asset_host' do
+
+    describe '#asset_host=' do
+      it 'downcases the asset host' do
+        site.asset_host = 'ASSET.DEV'
+
+        expect(site.asset_host).to eq('asset.dev')
+      end
+    end
+
+    describe '#valid?' do
+
+      subject { site.valid? }
+
+      it { is_expected.to eq true }
 
-    describe 'on destroying' do
+      describe 'valid hostname defined' do
 
-      let(:domains) { ['www.example.com', 'example.com'] }
+        let(:asset_host) { 'asset.dev' }
 
-      before { site.save; listener.clear; site.destroy }
+        it { is_expected.to eq true }
+
+      end
+
+      describe 'valid urls defined' do
+
+        let(:asset_host) { 'https://asset.dev' }
+
+        it { is_expected.to eq true }
+
+        let(:asset_host) { 'https://asset.dev/' }
+
+        it { is_expected.to eq true }
+
+      end
+
+      describe 'invalid hostname or url defined' do
+
+        let(:asset_host) { 'asset.d' }
+
+        it { is_expected.to eq false }
+
+        let(:asset_host) { 'https://asset.d-' }
+
+        it { is_expected.to eq false }
+
+        context 'setting an invalid hostname' do
+
+          let(:asset_host) { 'asset.d' }
+
+          it 'adds error to asset_host field' do
+            is_expected.to eq false
+
+            expect(site.errors['asset_host']).to eq(['asset.d is invalid'])
+          end
+
+        end
+
+        context 'setting an invalid url' do
+
+          let(:asset_host) { 'http://asset.d-' }
+
+          it 'adds error to asset_host field' do
+            is_expected.to eq false
+
+            expect(site.errors['asset_host']).to eq(['http://asset.d- is invalid'])
+          end
+
+        end
 
-      it 'tracks removed domains' do
-        expect(subject.added).to eq([])
-        expect(subject.removed).to eq(['www.example.com', 'example.com'])
       end
 
     end
@@ -126,4 +206,4 @@ describe Locomotive::Concerns::Site::AccessPoints do
     end
   end
 
-end
+end

data/spec/models/locomotive/site_spec.rb

@@ -37,6 +37,42 @@ describe Locomotive::Site do
 
   end
 
+  describe 'asset_host' do
+
+    let(:asset_host) { nil }
+    subject { FactoryGirl.build(:site, asset_host: asset_host) }
+
+    it { is_expected.to be_valid }
+
+    context 'good format without protocol' do
+
+      let(:asset_host) { 'asset.dev' }
+
+      it { is_expected.to be_valid}
+
+    end
+
+    context 'good format with protocol' do
+
+      let(:asset_host) { 'https://asset.dev' }
+
+      it { is_expected.to be_valid}
+
+    end
+
+    context 'bad format' do
+
+      let(:asset_host) { 'http://asset.d' }
+
+      it { is_expected.to_not be_valid }
+
+      it 'tells if asset_host is invalid' do
+        subject.valid?
+        expect(subject.errors[:asset_host]).to eq(['http://asset.d is invalid'])
+      end
+    end
+  end
+
   describe 'handle' do
 
     it 'validates presence of handle' do

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

@@ -40,7 +40,7 @@ describe Locomotive::Steam::Middlewares::Cache do
 
     subject { middleware.send(:cache_key, steam_env) }
 
-    it { expect(subject).to eq 'e86d1e803b59f9eeeca84cce457808e3' }
+    it { expect(subject).to eq '391a69da7791de5c9d1d48087e0677c4' }
 
   end
 

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

@@ -3,10 +3,11 @@ require 'spec_helper'
 describe Locomotive::Steam::Middlewares::WysihtmlCss do
 
   let(:url)         { 'http://example.com/' }
+  let(:path)        { 'index' }
   let(:html)        { 'Hello world' }
   let(:page)        { nil }
   let(:app)         { ->(env) { [200, env, [html]] } }
-  let(:env)         { env_for(url).tap { |e| e['steam.page'] = page } }
+  let(:env)         { env_for(url).tap { |e| e['steam.page'] = page; e['steam.path'] = path } }
   let(:middleware)  { described_class.new(app) }
 
   subject { middleware.call(env).last.first }
@@ -35,6 +36,14 @@ describe Locomotive::Steam::Middlewares::WysihtmlCss do
 
       it { is_expected.to match(%r(<html><head><link rel="stylesheet" type="text/css" href="/assets/locomotive/wysihtml5_editor-[^.]+.css"></head><body></body></html>)) }
 
+      context 'Google AMP page' do
+
+        let(:path) { '_amp/simple' }
+
+        it { is_expected.to eq('<html><head></head><body></body></html>') }
+
+      end
+
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms
 version: !ruby/object:Gem::Version
-  version: 3.3.0.rc3
+  version: 3.3.0
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2018-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.2.1
 - !ruby/object:Gem::Dependency
   name: mongoid-tree
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0.rc2
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0.rc2
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -193,19 +193,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.4.0
 - !ruby/object:Gem::Dependency
-  name: kaminari
+  name: kaminari-actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 1.1.1
+- !ruby/object:Gem::Dependency
+  name: kaminari-mongoid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: bootstrap-kaminari-views
   requirement: !ruby/object:Gem::Requirement
@@ -1380,9 +1394,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.2
@@ -1390,108 +1404,108 @@ signing_key:
 specification_version: 4
 summary: A platform to create, publish and edit sites
 test_files:
-- spec/fixtures/assets/5k.png
-- spec/fixtures/assets/5k@2x.png
-- spec/fixtures/assets/5k_2.png
-- spec/fixtures/assets/application.js
-- spec/fixtures/assets/magic_mime_type.js
-- spec/fixtures/assets/main.css
-- spec/fixtures/assets/ruby_logo.svg
-- spec/fixtures/assets/specs.pdf
-- spec/fixtures/assets/wrong.txt
+- spec/fixtures/images/rails_2.png
 - spec/fixtures/images/logo1.jpg
 - spec/fixtures/images/logo2.jpg
 - spec/fixtures/images/rails.png
-- spec/fixtures/images/rails_2.png
-- spec/lib/action_view_spec.rb
-- spec/lib/core_ext_spec.rb
-- spec/lib/locomotive/configuration_spec.rb
-- spec/lib/locomotive/steam/services/api_content_entry_service_spec.rb
+- spec/fixtures/assets/specs.pdf
+- spec/fixtures/assets/5k@2x.png
+- spec/fixtures/assets/ruby_logo.svg
+- spec/fixtures/assets/5k.png
+- spec/fixtures/assets/wrong.txt
+- spec/fixtures/assets/magic_mime_type.js
+- spec/fixtures/assets/5k_2.png
+- spec/fixtures/assets/main.css
+- spec/fixtures/assets/application.js
 - spec/lib/locomotive/steam/services/api_entry_submission_service_spec.rb
 - spec/lib/locomotive/steam/services/async_email_service_spec.rb
+- spec/lib/locomotive/steam/services/api_content_entry_service_spec.rb
 - spec/lib/locomotive/steam/services/liquid_parser_with_cache_service_spec.rb
+- spec/lib/locomotive/configuration_spec.rb
+- spec/lib/core_ext_spec.rb
+- spec/lib/action_view_spec.rb
 - spec/mailers/locomotive/notifications_spec.rb
+- spec/models/locomotive/content_type_spec.rb
+- spec/models/locomotive/theme_asset_spec.rb
+- spec/models/locomotive/membership_spec.rb
 - spec/models/locomotive/account_spec.rb
-- spec/models/locomotive/concerns/content_entry/counter_spec.rb
-- spec/models/locomotive/concerns/content_entry/csv_spec.rb
-- spec/models/locomotive/concerns/content_entry/file_size_spec.rb
-- spec/models/locomotive/concerns/content_type/entry_template_spec.rb
-- spec/models/locomotive/concerns/page/editable_elements_spec.rb
-- spec/models/locomotive/concerns/page/layout_spec.rb
-- spec/models/locomotive/concerns/page/redirect_spec.rb
-- spec/models/locomotive/concerns/page/render_spec.rb
-- spec/models/locomotive/concerns/site/access_points_spec.rb
-- spec/models/locomotive/concerns/site/cache_spec.rb
-- spec/models/locomotive/concerns/site/locales_spec.rb
-- spec/models/locomotive/concerns/site/metafields_spec.rb
-- spec/models/locomotive/concerns/site/url_redirections_spec.rb
 - spec/models/locomotive/content_asset_spec.rb
-- spec/models/locomotive/content_entry_spec.rb
-- spec/models/locomotive/content_type_spec.rb
 - spec/models/locomotive/editable_element_spec.rb
-- spec/models/locomotive/membership_spec.rb
-- spec/models/locomotive/page_spec.rb
+- spec/models/locomotive/translation_spec.rb
 - spec/models/locomotive/site_spec.rb
+- spec/models/locomotive/content_entry_spec.rb
+- spec/models/locomotive/page_spec.rb
 - spec/models/locomotive/snippet_spec.rb
-- spec/models/locomotive/theme_asset_spec.rb
-- spec/models/locomotive/translation_spec.rb
-- spec/requests/locomotive/image_thumbnail_spec.rb
-- spec/requests/locomotive/site_spec.rb
+- spec/models/locomotive/concerns/page/render_spec.rb
+- spec/models/locomotive/concerns/page/layout_spec.rb
+- spec/models/locomotive/concerns/page/redirect_spec.rb
+- spec/models/locomotive/concerns/page/editable_elements_spec.rb
+- spec/models/locomotive/concerns/content_type/entry_template_spec.rb
+- spec/models/locomotive/concerns/site/url_redirections_spec.rb
+- spec/models/locomotive/concerns/site/locales_spec.rb
+- spec/models/locomotive/concerns/site/metafields_spec.rb
+- spec/models/locomotive/concerns/site/access_points_spec.rb
+- spec/models/locomotive/concerns/site/cache_spec.rb
+- spec/models/locomotive/concerns/content_entry/csv_spec.rb
+- spec/models/locomotive/concerns/content_entry/counter_spec.rb
+- spec/models/locomotive/concerns/content_entry/file_size_spec.rb
 - spec/requests/locomotive/steam/cache_spec.rb
 - spec/requests/locomotive/steam/wysihtml_css_spec.rb
+- spec/requests/locomotive/site_spec.rb
+- spec/requests/locomotive/image_thumbnail_spec.rb
 - spec/support/capybara.rb
 - spec/support/carrierwave.rb
-- spec/support/database_cleaner.rb
-- spec/support/entity.rb
-- spec/support/factories.rb
+- spec/support/matchers.rb
 - spec/support/features/session_helpers.rb
 - spec/support/features/site_helpers.rb
-- spec/support/locomotive.rb
-- spec/support/matchers.rb
+- spec/support/entity.rb
 - spec/support/middlewares.rb
-- spec/support/mongoid.rb
+- spec/support/shared_contexts/api_header_setup.rb
+- spec/support/shared_contexts/api_site_setup.rb
 - spec/support/pundit_matcher.rb
 - spec/support/response.rb
+- spec/support/mongoid.rb
+- spec/support/locomotive.rb
+- spec/support/factories.rb
+- spec/support/database_cleaner.rb
 - spec/support/sequences.rb
-- spec/support/shared_contexts/api_header_setup.rb
-- spec/support/shared_contexts/api_site_setup.rb
 - spec/support/shared_examples/site_scope_examples.rb
 - spec/dummy/Rakefile
 - spec/dummy/config.ru
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/javascripts/locomotive_misc.js.coffee
-- spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/cells/locomotive/main_menu_cell.rb
+- spec/dummy/app/models/foo.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/foo_controller.rb
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/models/foo.rb
-- spec/dummy/app/views/foo/index.html.slim
-- spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/locomotive/shared/_main_app_head.html.slim
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/foo/index.html.slim
+- spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/javascripts/locomotive_misc.js.coffee
+- spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/config/secrets.yml
+- spec/dummy/config/routes.rb
+- spec/dummy/config/mongoid.yml
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/locales/fr.yml
 - spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/profile.rb
+- spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/assets.rb
+- spec/dummy/config/environments/profile.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/config/application.rb
+- spec/dummy/config/boot.rb
 - spec/dummy/config/initializers/carrierwave.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
+- spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/initializers/devise.rb
-- spec/dummy/config/initializers/dragonfly.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/locomotive.rb
 - spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/locales/fr.yml
-- spec/dummy/config/mongoid.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/config/secrets.yml
+- spec/dummy/config/initializers/dragonfly.rb
 - spec/dummy/script/rails
-- spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
+- spec/dummy/public/404.html