locomotivecms_steam 1.5.0.rc0 → 1.5.0.rc1

data/lib/locomotive/steam/services/auth_service.rb

@@ -96,6 +96,15 @@ module Locomotive
         :invalid_token
       end
 
+      def notify(action, entry, request)
+        ActiveSupport::Notifications.instrument("steam.auth.#{action}",
+          site:     site,
+          entry:    entry,
+          locale:   entries.locale,
+          request:  request
+        )
+      end
+
       private
 
       def send_welcome_email(options, context)
@@ -138,15 +147,6 @@ EMAIL
         res == 0
       end
 
-      def notify(action, entry, request)
-        ActiveSupport::Notifications.instrument("steam.auth.#{action}",
-          site:     site,
-          entry:    entry,
-          locale:   entries.locale,
-          request:  request
-        )
-      end
-
       # Module inject to the content entry to enable
       # related authentication methods.
       #

data/lib/locomotive/steam/services/cookie_service.rb

@@ -5,6 +5,7 @@ module Locomotive
 
       def initialize(request)
         @request = request
+        request.env['steam.cookies'] ||= {}
         @cookies = request.env['steam.cookies']
       end
 

data/lib/locomotive/steam/services/external_api_service.rb

@@ -7,6 +7,11 @@ module Locomotive
 
       include ::HTTParty
 
+      # any HTTP call shouldn't block a thread or a process
+      # for a long time (waiting for 3 seconds seems reasonable).
+      open_timeout 3
+      read_timeout 3
+
       # Available option keys:
       # - method
       # - data

data/lib/locomotive/steam/services/liquid_parser_service.rb

@@ -21,11 +21,13 @@ module Locomotive
       end
 
       def _parse(object, options = {})
-        # Note: the template must not be parsed here
         begin
           Locomotive::Steam::Liquid::Template.parse(object.liquid_source, options)
+        rescue Locomotive::Steam::TemplateError => e
+          # we don't want to hide an exception occured during parsing a section or a snippet
+          raise e
         rescue ::Liquid::Error => e
-          raise Locomotive::Steam::RenderError.new(e, object.template_path, object.liquid_source)
+          raise Locomotive::Steam::LiquidError.new(e, object.template_path, object.liquid_source)
         end
       end
 

data/lib/locomotive/steam/services/page_finder_service.rb

@@ -20,7 +20,7 @@ module Locomotive
           # normal pages have priority over the templatized ones if they're not in the same "folder"
           same_folder?(page_1, page_2) ?
             page_1.position <=> page_2.position :
-            (page_2.fullpath.include?(WILDCARD) ? 0 : 1) <=> (page_1  .fullpath.include?(WILDCARD) ? 0 : 1)
+            (page_2.fullpath.include?(WILDCARD) ? 0 : 1) <=> (page_1.fullpath.include?(WILDCARD) ? 0 : 1)
         end
       end
 

data/lib/locomotive/steam/services/recaptcha_service.rb

@@ -9,8 +9,10 @@ module Locomotive
       GOOGLE_API_URL = 'https://www.google.com/recaptcha/api/siteverify'.freeze
 
       def initialize(site, request)
-        @api      = site.metafields.dig(:google, :recaptcha_api_url) || GOOGLE_API_URL
-        @secret   = site.metafields.dig(:google, :recaptcha_secret)
+        attributes = site.metafields.values.reduce({}, :merge).with_indifferent_access
+
+        @api      = attributes[:recaptcha_api_url] || GOOGLE_API_URL
+        @secret   = attributes[:recaptcha_secret]
         @ip       = request.ip
       end
 

data/lib/locomotive/steam/version.rb

@@ -3,6 +3,6 @@
 # 1.0.0.alpha < 1.0.0.alpha1 < 1.0.0.beta < 1.0.0.beta2 < 1.0.0.beta11 < 1.0.0.rc1 < 1.0.0
 module Locomotive
   module Steam
-    VERSION = '1.5.0.rc0'
+    VERSION = '1.5.0.rc1'
   end
 end

data/lib/locomotive/steam.rb

@@ -1,5 +1,6 @@
 require 'locomotive/common'
 
+require_relative      'steam/version'
 require_relative      'steam/configuration'
 require_relative_all  'steam/decorators'
 require_relative      'steam/liquid'
@@ -14,7 +15,8 @@ module Locomotive
   module Steam
 
     FRONTMATTER_REGEXP      = /^(?<yaml>(---\s*\n.*?\n?)^(---\s*$\n?))?(?<template>.*)/mo.freeze
-    JSON_FRONTMATTER_REGEXP = /^---\s*\n(?<json>(.*?\n?))?^(---\s*$\n?)(?<template>.*)/mo.freeze
+    YAML_FRONTMATTER_REGEXP = /^---\s*\n(?<yaml>(.*?\n?))?^(---\s*$\n?)(?<template>.*)/mo.freeze
+    JSON_FRONTMATTER_REGEXP = /^---\s*\n(?<json>\s*\{(.*?\n?))?^(---\s*$\n?)(?<template>.*)/mo.freeze
 
     WILDCARD = 'content_type_template'.freeze
 
@@ -24,6 +26,8 @@ module Locomotive
     SECTIONS_BLOCK_FORLOOP_REGEXP     = /(?<name>.+)-section\.blocks$/o.freeze
     SECTIONS_LINK_TARGET_REGEXP       = /[^\"]+\/_locomotive-link\/(?<link>[^\"]+)/mo.freeze
 
+    ASSET_URL_REGEXP                  = /("|')(https:\/\/[^\/]+)?\/(sites|steam)\/(\S+)("|')/.freeze
+
     IsHTTP    = /\Ahttps?:\/\//o.freeze
 
     IsLAYOUT  = /\Alayouts(\/|\z)/o.freeze

data/locomotivecms_steam.gemspec

@@ -17,16 +17,17 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'rake',       '~> 12.3.0'
 
-  spec.add_development_dependency 'mongo',      '~> 2.5.1'
+  spec.add_development_dependency 'mongo',      '~> 2.8.0'
   spec.add_development_dependency 'origin',     '~> 2.3.1'
 
-  spec.add_dependency 'nokogiri',               '~> 1.8.2'
+  spec.add_dependency 'nokogiri',               '~> 1.10.4'
   spec.add_dependency 'sanitize',               '~> 4.6.4'
   spec.add_dependency 'morphine',               '~> 0.1.1'
   spec.add_dependency 'httparty',               '~> 0.16.0'
   spec.add_dependency 'chronic',                '~> 0.10.2'
   spec.add_dependency 'bcrypt',                 '~> 3.1.11'
   spec.add_dependency 'multi_json',             '~> 1.13.1'
+  spec.add_dependency 'liquid',                 '~> 4.0.3'
 
   spec.add_dependency 'rack-rewrite',           '~> 1.5.1'
   spec.add_dependency 'rack-cache',             '~> 1.7.0'
@@ -45,10 +46,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'RedCloth',               '~> 4.3.2'
   spec.add_dependency 'mimetype-fu',            '~> 0.1.2'
   spec.add_dependency 'mime-types',             '~> 3.1.0'
-  spec.add_dependency 'duktape',                '~> 1.6.1.0'
+  spec.add_dependency 'duktape',                '~> 2.0.1.1'
   spec.add_dependency 'pony',                   '~> 1.12'
 
-  spec.add_dependency 'locomotivecms-solid',      '~> 4.0.1'
   spec.add_dependency 'locomotivecms_common',     '~> 0.3.1'
 
   spec.required_ruby_version = '>= 2.0'

data/spec/fixtures/default/app/views/pages/basic.liquid.haml

@@ -14,6 +14,7 @@ position: 6
       This is a basic page
 
     %ul
+      %li Font={{ site.metafields.theme.font }}
       %li Color scheme={{ site.metafields.theme.color_scheme }}
       %li Facebook ID={{ site.metafields.social.facebook_id }}
       %li Google ID={{ site.metafields.social.google_id }}

data/spec/fixtures/default/app/views/pages/music.liquid.haml

@@ -2,11 +2,17 @@
 listed: true
 handle: our-music
 position: 2
+sections_content:
+  carousel:
+    settings:
+      brand: "My brand"
 ---
 {% extends parent %}
 
 {% block content %}
 
+{% section 'carousel' %}
+
 {% editable_long_text 'introduction' %}
 
 %p

data/spec/fixtures/default/app/views/sections/carousel.liquid

@@ -1,20 +1,19 @@
 ---
-{
-  "name": "carousel",
-  "category": "carousel",
-  "class": "section-carousel",
-  "settings":
-  [
-    {
-      "id": "brand",
-      "type": "text",
-      "label": "Text to display in the carousel",
-      "default": "Header"
-    }
-  ]
-}
+name: carousel
+category: carousel
+class: section-carousel
+settings:
+- id: brand
+  type: text
+  label: Text to display in the carousel
+  default: Header
+dropzone_presets:
+- name: Carousel
+  category: Content
+  settings:
+    brand: Acme
+  blocks: []
 ---
-
 <h2>
-  FOOTER PLAIN TEXT
+  CAROUSEL
 </h2>

data/spec/fixtures/default/app/views/sections/footer.liquid

@@ -10,9 +10,40 @@
       "type": "text",
       "label": "Text to display in the footer",
       "default": "Header"
+    },
+    {
+      "id": "copyright",
+      "type": "text",
+      "label": "Copyright",
+      "default": "(c) NoCoffee"
+    }
+  ],
+  "blocks": [
+    {
+      "type": "link",
+      "settings": [
+        {
+          "id": "label",
+          "type": "text",
+          "label": "Label",
+          "default": "Link"
+        },
+        {
+          "id": "url",
+          "type": "url",
+          "label": "Url",
+          "default": "https://www.locomotivecms.com"
+        },
+        {
+          "id": "new_tab",
+          "type": "checkbox",
+          "label": "Open in a new tab?",
+          "default": true
+        }
+      ]
     }
   ],
-  "default":
+  "global_content":
   {
     "settings":
     {
@@ -26,7 +57,7 @@
         {
           "label": "Link #1",
           "url": "https://www.nocoffee.fr",
-          "new_tab": "true"
+          "new_tab": true
         }
       },
       {
@@ -35,8 +66,11 @@
         {
           "label": "Link #2",
           "url": "https://www.nocoffee.fr",
-          "new_tab": "true"
+          "new_tab": true
         }
+      },
+      {
+        "type": "link"
       }
     ]
   }

data/spec/fixtures/default/app/views/sections/header.liquid

@@ -3,30 +3,57 @@
   "name": "header",
   "category": "header",
   "class": "section-header",
-  "settings":
-  [
+  "settings": [
     {
       "id": "brand",
       "type": "text",
       "label": "Text to display in the header",
       "default": "Header"
+    },
+    {
+      "id": "logo",
+      "type": "image_picker",
+      "label": "Logo",
+      "default": "/images/logo.png"
     }
   ],
-  "default":
-  {
-    "settings":
+  "blocks": [
     {
+      "type": "link",
+      "settings": [
+        {
+          "id": "label",
+          "type": "text",
+          "label": "Label",
+          "default": "Link"
+        },
+        {
+          "id": "url",
+          "type": "url",
+          "label": "Url",
+          "default": "https://www.locomotivecms.com"
+        },
+        {
+          "id": "new_tab",
+          "type": "checkbox",
+          "label": "Open in a new tab?",
+          "default": true
+        }
+      ]
+    }
+  ],
+  "default": {
+    "settings": {
       "brand": "MY COMPANY"
     },
-    "blocks":
-    [
+    "blocks": [
       {
         "type": "link",
         "settings":
         {
           "label": "Link #1",
           "url": "https://www.nocoffee.fr",
-          "new_tab": "true"
+          "new_tab": true
         }
       },
       {
@@ -35,11 +62,21 @@
         {
           "label": "Link #2",
           "url": "https://www.nocoffee.fr",
-          "new_tab": "true"
+          "new_tab": true
         }
+      },
+      {
+        "type": "link"
       }
     ]
-  }
+  },
+  "dropzone_presets": [
+    {
+      "name": "Default header",
+      "category": "Header",
+      "use_default": true
+    }
+  ]
 }
 ---
 <h1> {{ section.settings.brand }} </h1>

data/spec/fixtures/default/app/views/sections/misc/hero.liquid

@@ -0,0 +1,28 @@
+---
+{
+  "name": "Hero",
+  "class": "section-hero",
+  "settings":
+  [
+    {
+      "id": "title",
+      "type": "text",
+      "label": "Title",
+      "default": "Title goes here"
+    }
+  ],
+  "dropzone_presets": [
+    {
+      "name": "Simple Hero",
+      "category": "Content",
+      "settings": {
+        "title": "Hello world!"
+      },
+      "blocks": []
+    }
+  ]
+}
+---
+<h2>
+  HERO
+</h2>

data/spec/fixtures/default/config/metafields_schema.yml

@@ -1,5 +1,8 @@
 theme:
   fields:
+    font:
+      type: string
+      sample: 'OpenSans'
     color_scheme:
       localized: true
 

data/spec/integration/liquid/tags/section_spec.rb

@@ -0,0 +1,82 @@
+require 'spec_helper'
+
+describe Locomotive::Steam::Liquid::Tags::Section do
+
+  let(:assigns) { {} }
+  let(:context) { ::Liquid::Context.new(assigns, {}, {}) }
+
+  subject { render_template(source, context).strip }
+
+  describe 'image_picker field' do
+
+    let(:source) { <<-EOF
+      {% if image is present %}
+        We've got an image!
+      {% else %}
+        Nope
+      {% endif %}
+  EOF
+    }
+
+    let(:assigns)   { { 'image' => Locomotive::Steam::Liquid::Drops::SectionImagePickerField.new(image) } }
+
+    context 'the image is nil' do
+
+      let(:image) { nil }
+      it { is_expected.to eq 'Nope' }
+
+    end
+
+    context 'the image is an empty string' do
+
+      let(:image) { '' }
+      it { is_expected.to eq 'Nope' }
+
+    end
+
+    context 'the image is an url' do
+
+      let(:image) { 'https://cdn.somewhere.net/images/banner.png' }
+      it { is_expected.to eq "We've got an image!" }
+
+    end
+
+  end
+
+  describe 'link field' do
+
+    let(:source) { <<-EOF
+      {% if link is present %}
+        We've got a link!
+      {% else %}
+        Nope
+      {% endif %}
+  EOF
+    }
+
+    let(:assigns) { { 'link' => Locomotive::Steam::Liquid::Drops::SectionUrlField.new(url) } }
+
+    context 'the link is nil' do
+
+      let(:url) { nil }
+      it { is_expected.to eq 'Nope' }
+
+    end
+
+    context 'the link is an empty string' do
+
+      let(:url) { '' }
+      it { is_expected.to eq 'Nope' }
+
+    end
+
+    context 'the link is an url' do
+
+      let(:url) { 'https://www.locomotivecms.com' }
+      it { is_expected.to eq "We've got a link!" }
+
+    end
+
+  end
+
+end

data/spec/integration/repositories/content_entry_repository_spec.rb

@@ -142,6 +142,15 @@ describe Locomotive::Steam::ContentEntryRepository do
       let(:adapter)   { Locomotive::Steam::MongoDBAdapter.new(database: mongodb_database, hosts: ['127.0.0.1:27017']) }
       let(:entry_id)  { BSON::ObjectId.from_string('5baf7d38a953300567956448') }
 
+      describe 'filter by a date field' do
+
+        let(:type) { type_repository.by_slug('events') }
+
+        subject { repository.all(:date.lte => Time.now.to_date, order_by: 'date desc') }
+        it { expect(subject.map { |entry| entry[:place] }.slice(0, 2)).to eq(["Avogadro's Number", "Quixote's True Blue"]) }
+
+      end
+
     end
 
   end

data/spec/integration/server/basic_spec.rb

@@ -178,14 +178,14 @@ describe Locomotive::Steam::Server do
     context 'liquid parsing error' do
 
       subject { get '/about-us/john-doe'; last_response.body }
-      it { expect { subject }.to raise_error(Locomotive::Steam::RenderError, "Liquid syntax error (line 1): Syntax Error in 'for loop' - Valid syntax: for [item] in [collection]") }
+      it { expect { subject }.to raise_error(Locomotive::Steam::LiquidError, "Liquid syntax error (line 1): Syntax Error in 'for loop' - Valid syntax: for [item] in [collection]") }
 
     end
 
     context 'rendering error' do
 
       subject { get '/fr/a-notre-sujet/jean-personne'; last_response.body }
-      it { expect { subject }.to raise_error(Locomotive::Steam::ActionError, "identifier 'foo' undefined") }
+      it { expect { subject }.to raise_error(Locomotive::Steam::ActionError, "Action error - identifier 'foo' undefined") }
 
     end
 

data/spec/integration/server/metafields_spec.rb

@@ -10,6 +10,7 @@ describe 'Site metafields' do
 
   it 'returns all the values of the site metafields' do
     get '/basic'
+    expect(last_response.body).to include 'Font=OpenSans'
     expect(last_response.body).to include 'Color scheme=white'
     expect(last_response.body).to include 'Facebook ID=FB42'
     expect(last_response.body).to include 'Google ID=G42'

data/spec/integration/services/content_entry_service_spec.rb

@@ -105,6 +105,18 @@ describe Locomotive::Steam::ContentEntryService do
           it { expect(subject['errors']).to eq({ 'name' => ["can't be blank"], 'email' => ["can't be blank"], 'message' => ["can't be blank"] }) }
 
         end
+
+        context 'with a belongs_to relationship' do
+
+          let(:attributes) { { title: 'Do the evolution', band_id: 'pearl-jam' } }
+
+          subject { service.create('songs', attributes, false) }
+
+          it { expect { subject }.to change { service.all('songs').size } }
+          it { expect(subject.band.name).to eq 'Pearl Jam' }
+
+        end
+
       end
 
       describe '#update' do

data/spec/support/helpers.rb

@@ -22,6 +22,7 @@ module Spec
     def setup_common(logger_output = nil)
       Locomotive::Common.reset
       Locomotive::Common.configure do |config|
+        logger_output ||= File.join(default_fixture_site_path, 'log/steam.log')
         config.notifier = Locomotive::Common::Logger.setup(logger_output)
       end
     end

data/spec/support/liquid.rb

@@ -1,6 +1,9 @@
 def render_template(source, context = nil, options = {})
   context ||= ::Liquid::Context.new
-  context.exception_handler = ->(e) { true }
+  context.exception_renderer = ->(e) do
+    # puts e.message # UN-COMMENT IT FOR DEBUGGING
+    raise e
+  end
   Locomotive::Steam::Liquid::Template.parse(source, options).render(context)
 end
 
@@ -15,7 +18,7 @@ module Liquid
       @_source = source.with_indifferent_access
     end
 
-    def before_method(meth)
+    def liquid_method_missing(meth)
       @_source[meth.to_sym]
     end
 
@@ -40,6 +43,33 @@ module Liquid
       @stack || []
     end
   end
+
+  class LayoutFileSystem
+    def read_template_file(template_path, _)
+      case template_path
+      when "base"
+        "<body>base</body>"
+
+      when "inherited"
+        "{% extends base %}"
+
+      when "page_with_title"
+        "<body><h1>{% block title %}Hello{% endblock %}</h1><p>Lorem ipsum</p></body>"
+
+      when "product"
+        "<body><h1>Our product: {{ name }}</h1>{% block info %}{% endblock %}</body>"
+
+      when "product_with_warranty"
+        "{% extends product %}{% block info %}<p>mandatory warranty</p>{% endblock %}"
+
+      when "product_with_static_price"
+        "{% extends product %}{% block info %}<h2>Some info</h2>{% block price %}<p>$42.00</p>{% endblock %}{% endblock %}"
+
+      else
+        template_path
+      end
+    end
+  end
 end
 
 def liquid_instance_double(doubled_class, stubs)

data/spec/support/mongo.rb

@@ -1,4 +1,5 @@
 require 'mongo'
 
 Mongo::Logger.logger.level = Logger::INFO
+# Mongo::Logger.logger       = Logger.new($stdout)
 # Mongo::Logger.logger.level = Logger::DEBUG