locomotivecms_steam 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa05c0dc0b32bc49ebf656666399a7f113d074776c8ee477262a4513d32f8cb1
-  data.tar.gz: 6e8b0f85fddc936a5d40ae83b1d4cb8bdf00afbfcb53db4f736bd5bfaaf64961
+  metadata.gz: b39383656db0b143ed8aa7df54aa656ed34d7104ea4b201a5be7ad87bc6c5005
+  data.tar.gz: 83e94cde0a6206f0cab0c2908cf1159a1c389cc55f4534c8883d0843b22ececa
 SHA512:
-  metadata.gz: 1501b73e5f9494159ae306cba9b1198ffcbc494ae5f123f7e3ac04d5d72c4d0790fc54160cdbaae1da4875d7dafbac4ff75aacf1814af0e32d910d4610b227c7
-  data.tar.gz: 8ff17b310eb98131cd895dbf714e3bb8b801085aa4bc88fa78d3caf2f5a688f221335ef7f2df8738f8b63a787014930ca8194324a58bff58dd71ba7ec0e8e7a1
+  metadata.gz: c04b7ed843d8c66d1eff244521db444db057ccf40a67b71fff9cced61d5107a2d63c6417856a77af1f48d42a223d9af92ae567a65940a0705c216e6e506c9c97
+  data.tar.gz: fa161306ac9c4752c2693cffca31d737bc4a622055a104ae226c7f44bd0ace67ab69f1201690bfcb23aea7ea436452257d2d35deeb7ddcba18839fe5169dd250

data/Gemfile

@@ -9,7 +9,7 @@ group :development do
   # gem 'duktape', github: 'judofyr/duktape.rb', ref: '20ef6a5'
   # gem 'duktape', github: 'did/duktape.rb', branch: 'any-fixnum'
 
-  gem 'puma',               '~> 4.3.0'
+  gem 'puma',               '~> 4.3.1'
   gem 'haml',               '~> 5.0.4'
 
   gem 'rack-mini-profiler', '~> 0.10.1'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.5.0)
+    locomotivecms_steam (1.5.1)
       RedCloth (~> 4.3.2)
       autoprefixer-rails (~> 8.0.0)
       bcrypt (~> 3.1.11)
@@ -33,7 +33,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    activesupport (5.2.3)
+    activesupport (5.2.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -82,7 +82,7 @@ GEM
       rack (>= 1.3)
     duktape (2.0.1.1)
     execjs (2.7.0)
-    ffi (1.11.2)
+    ffi (1.11.3)
     flamegraph (0.9.5)
     haml (5.0.4)
       temple (>= 0.8.0)
@@ -124,17 +124,17 @@ GEM
     multi_json (1.13.1)
     multi_xml (0.6.0)
     nio4r (2.5.2)
-    nokogiri (1.10.5)
+    nokogiri (1.10.7)
       mini_portile2 (~> 2.4.0)
     nokogumbo (1.5.0)
       nokogiri
     origin (2.3.1)
     pony (1.13.1)
       mail (>= 2.0)
-    public_suffix (4.0.1)
-    puma (4.3.0)
+    public_suffix (4.0.2)
+    puma (4.3.1)
       nio4r (~> 2.0)
-    rack (2.0.7)
+    rack (2.0.8)
     rack-cache (1.7.2)
       rack (>= 0.4)
     rack-mini-profiler (0.10.7)
@@ -146,7 +146,7 @@ GEM
       rack (>= 1.1.0)
     rake (13.0.1)
     rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
@@ -184,7 +184,7 @@ GEM
     tilt (2.0.10)
     timecop (0.9.1)
     tins (1.22.2)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
     uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)
@@ -203,7 +203,7 @@ DEPENDENCIES
   memory_profiler
   mongo (~> 2.8.0)
   origin (~> 2.3.1)
-  puma (~> 4.3.0)
+  puma (~> 4.3.1)
   rack-mini-profiler (~> 0.10.1)
   rack-test (~> 0.8.2)
   rake (~> 13.0.1)

data/MIT-LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 NoCoffee
+Copyright (c) 2020 NoCoffee
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/README.md

@@ -94,4 +94,4 @@ Note: you do not need to prefix with bundle exec as the docky-ruby image already
 
 ## License
 
-Copyright (c) 2019 NoCoffee. MIT Licensed, see MIT-LICENSE for details.
+Copyright (c) 2020 NoCoffee. MIT Licensed, see MIT-LICENSE for details.

data/lib/locomotive/steam/adapters/filesystem/yaml_loaders/site.rb

@@ -11,6 +11,10 @@ module Locomotive
             def load(scope)
               attributes = _load(File.join(site_path, 'config', 'site.yml'))
 
+              # NOTE: we can't use the locales and default_local methods here
+              # since the loading is not done yet.
+              locales, default_locale = attributes[:locales], attributes[:locales].first
+
               (attributes[:domains] ||= []).concat(%w(0.0.0.0 localhost))
 
               attributes[:picture] = File.expand_path(File.join(site_path, 'icon.png'))
@@ -19,6 +23,12 @@ module Locomotive
 
               attributes.merge!(load_from_env)
 
+              # special treatment for the sections_content which may or may not be translated
+              sections_content = attributes[:sections_content]
+              if sections_content.present? && locales.size == 1 && sections_content[default_locale].nil?
+                attributes[:sections_content] = { default_locale => sections_content }
+              end
+
               [attributes]
             end
 

data/lib/locomotive/steam/adapters/memory/query.rb

@@ -97,6 +97,7 @@ module Locomotive::Steam
                 break # no to go further
               end
             end
+
             accepted
           end
         end # filtered

data/lib/locomotive/steam/liquid/patches.rb

@@ -1,8 +1,10 @@
 # Enhance the IF condition to write the following statement:
 #
 # {% if value is present %}Value is not blank{% endif %}
+# {% if 'Hello world' starts_with 'Hello' %}Value starts with 'hello'{% endif %}
 #
-Liquid::Condition.operators['is'.freeze] = lambda { |cond, left, right|  cond.send(:equal_variables, left, right) }
+Liquid::Condition.operators['is'.freeze] = proc { |cond, left, right|  cond.send(:equal_variables, left, right) }
+Liquid::Condition.operators['starts_with'.freeze] = proc { |_cond, left, right| left.present? && right.present? && left.starts_with?(right) }
 
 module Liquid
 

data/lib/locomotive/steam/liquid/tags/snippet.rb

@@ -5,37 +5,55 @@ module Locomotive
 
         class Snippet < ::Liquid::Include
 
-          attr_reader :name
+          attr_reader :template_name
 
           def initialize(tag_name, markup, options)
             super
 
-            # we use a convention to differentiate sections from snippets
-            @name               = evaluate_snippet_name
-            @template_name_expr = "snippets--#{@name}"
+            if markup =~ Syntax
+              @template_name = $1
+            end
           end
 
           def parse(tokens)
-            ActiveSupport::Notifications.instrument('steam.parse.include', page: parse_context[:page], name: name)
+            ActiveSupport::Notifications.instrument('steam.parse.include', page: parse_context[:page], name: template_name)
 
             # look for editable elements (only used by the Engine)
             # In the next version of Locomotive (v5), we won't support the editable elements
-            if parse_context[:snippet_finder] && snippet = parse_context[:snippet_finder].find(name)
-              parse_context[:parser]._parse(snippet, parse_context.merge(snippet: name))
+            #
+            # NOTE: it doesn't support dynamically choosen template
+            #
+            if parse_context[:snippet_finder] && snippet = parse_context[:snippet_finder].find(template_name)
+              parse_context[:parser]._parse(snippet, parse_context.merge(snippet: template_name))
             end
           end
 
           def render(context)
             # parse_context (previously @options) doesn't include the page key if cache is on
             parse_context[:page] = context.registers[:page]
-            super
+
+            begin
+              super
+            rescue ::Liquid::ArgumentError
+              # NOTE: Locomotive site developers should always use quotes (or doubles quotes) for the name of a snippet.
+              # Unfortunately, a lot of sites don't use them. So here is a little patch to not break those sites.
+              Locomotive::Common::Logger.warn("Use quotes if the name of your snippet (#{template_name}) is not dynamic.")
+
+              @template_name_expr = template_name
+
+              super
+            end
           end
 
           private
 
-          def evaluate_snippet_name
-            (!template_name_expr.is_a?(String) && template_name_expr.send(:state).first) ||
-            template_name_expr
+          def read_template_from_file_system(context)
+            file_system = context.registers[:file_system] || Liquid::Template.file_system
+
+            # we use a convention to differentiate sections from snippets
+            template_path = "snippets--#{context.evaluate(@template_name_expr)}"
+
+            file_system.read_template_file(template_path)
           end
 
         end

data/lib/locomotive/steam/liquid/tags/with_scope.rb

@@ -24,6 +24,7 @@ module Locomotive
 
           # a slight different from the Shopify implementation because we allow stuff like `started_at.le`
           TagAttributes   = /([a-zA-Z_0-9\.]+)\s*\:\s*(#{ArrayFragment}|#{RegexpFragment}|#{::Liquid::QuotedFragment})/o.freeze
+          SingleVariable  = /(#{::Liquid::VariableSignature}+)/om.freeze
 
           REGEX_OPTIONS = {
             'i' => Regexp::IGNORECASE,
@@ -31,14 +32,21 @@ module Locomotive
             'x' => Regexp::EXTENDED
           }.freeze
 
-          attr_reader :attributes
+          attr_reader :attributes, :attributes_var_name
 
           def initialize(tag_name, markup, options)
             super
 
+            # simple hash?
             parse_attributes(markup) { |value| parse_attribute(value) }
 
-            if attributes.empty?
+            if attributes.empty? && markup =~ SingleVariable
+              # alright, maybe we'vot got a single variable built
+              # with the Action liquid tag instead?
+              @attributes_var_name = Regexp.last_match(1)
+            end
+
+            if attributes.empty? && attributes_var_name.blank?
               raise ::Liquid::SyntaxError.new("Syntax Error in 'with_scope' - Valid syntax: with_scope <name_1>: <value_1>, ..., <name_n>: <value_n>")
             end
           end
@@ -69,6 +77,8 @@ module Locomotive
           end
 
           def evaluate_attributes(context)
+            @attributes = context[attributes_var_name] || {} if attributes_var_name.present?
+
             HashWithIndifferentAccess.new.tap do |hash|
               attributes.each do |key, value|
                 # _slug instead of _permalink

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

@@ -17,7 +17,7 @@ module Locomotive::Steam
         # extract the slug of the content entry
         %r(^#{page.fullpath.gsub(Locomotive::Steam::WILDCARD, '([^\/]+)')}$) =~ path
 
-        if entry = fetch_content_entry($1)
+        if entry = fetch_content_entry($1 || params['id'])
           # the entry will be available in the template under different keys
           ['content_entry', 'entry', entry.content_type.slug.singularize].each do |key|
            liquid_assigns[key] = entry

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

@@ -58,7 +58,7 @@ module Locomotive::Steam::Middlewares
     end
 
     def params
-      @params ||= if request.content_type == 'application/json' && (request.post? || request.put?)
+      @params ||= if request.content_type&.start_with?('application/json') && (request.post? || request.put?)
         request.body.rewind
         JSON.parse(request.body.read).with_indifferent_access
       else

data/lib/locomotive/steam/models/repository.rb

@@ -91,7 +91,7 @@ module Locomotive::Steam
 
         first = { order_by: _local_conditions.delete(:order_by) }.delete_if { |_, v| v.blank? }
 
-        [first, *conditions.flatten].inject({}) do |memo, hash|
+        [first, *conditions.flatten].inject(HashWithIndifferentAccess.new) do |memo, hash|
           memo.merge!(hash) unless hash.blank?
           memo
         end.merge(_local_conditions)

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'
+    VERSION = '1.5.1'
   end
 end

data/spec/fixtures/default/data/accounts.yml

@@ -6,7 +6,7 @@
     email: 'jane@doe.net'
     password: 'anotherone'
     _auth_reset_token: '420000000000000'
-    _auth_reset_sent_at: '2020-01-01T15:00:00.000Z'
+    _auth_reset_sent_at: '2030-01-01T15:00:00.000Z'
 
 - "Mickey":
     email: 'mickey@doe.net'

data/spec/fixtures/default/data/production/site.json

@@ -1,3 +1,10 @@
 {
-  "name": "My awesome site"
+  "name": "My awesome site",
+  "sections_content": {
+    "header": {
+      "settings": {
+        "title": "Hello world"
+      }
+    }
+  }
 }

data/spec/unit/adapters/filesystem/yaml_loaders/site_spec.rb

@@ -32,6 +32,13 @@ describe Locomotive::Steam::Adapters::Filesystem::YAMLLoaders::Site do
         expect(subject[:name]).to eq('My awesome site')
       end
 
+      it 'localizes the sections_content from the production environment' do
+        allow(loader).to receive(:_load).with(File.join(site_path, 'config', 'site.yml')).and_return(name: 'Test', locales: ['fr'])
+        allow(loader).to receive(:_load).with(File.join(site_path, 'config', 'metafields_schema.yml')).and_return(nil)
+        expect(subject[:sections_content]).to eq('fr' => { 'header' => { 'settings' => {
+          'title' => 'Hello world' } } })
+      end
+
     end
 
   end

data/spec/unit/liquid/patches_spec.rb

@@ -1,6 +1,55 @@
 require 'spec_helper'
 
-describe Liquid::StandardFilters do
+describe ::Liquid::Condition do
+
+  let(:context)   { Liquid::Context.new }
+  let(:condition) { described_class.new(left, op, right) }
+
+  subject { condition.evaluate(context) }
+
+  describe 'custom proc operator: starts_with' do
+
+    let(:op)    { 'starts_with' }
+    let(:left)  { 'Hello world' }
+    let(:right) { 'Hello' }
+
+    it { is_expected.to eq true }
+
+    context "the left variable doesn't start with the right variable" do
+      let(:right) { 'hello' }
+      it { is_expected.to eq false }
+    end
+
+    context 'the left variable is nil' do
+      let(:left) { nil }
+      it { is_expected.to eq false }
+    end
+
+    context 'the right variable is nil' do
+      let(:right) { nil }
+      it { is_expected.to eq false }
+    end
+
+  end
+
+  describe 'custom proc operator: is' do
+
+    let(:op)    { 'is' }
+    let(:left)  { 42 }
+    let(:right) { 42 }
+
+    it { is_expected.to eq true }
+
+    context "the left variable doesn't equal to the right variable" do
+      let(:right) { nil }
+      it { is_expected.to eq false }
+    end
+
+  end
+
+end
+
+describe ::Liquid::StandardFilters do
 
   describe '#to_number' do
 

data/spec/unit/liquid/tags/snippet_spec.rb

@@ -2,14 +2,15 @@ require 'spec_helper'
 
 describe Locomotive::Steam::Liquid::Tags::Snippet do
 
-  let(:request)     { instance_double('Request', env: {}) }
-  let(:services)    { Locomotive::Steam::Services.build_instance(request) }
-  let(:finder)      { services.snippet_finder }
-  let(:file_system) { Locomotive::Steam::Liquid::FileSystem.new(snippet_finder: finder) }
-  let(:snippet)     { instance_double('Snippet', template: nil, :template= => nil, liquid_source: 'built by NoCoffee') }
-  let(:source)      { 'Locomotive {% include footer %}' }
+  let(:request)         { instance_double('Request', env: {}) }
+  let(:services)        { Locomotive::Steam::Services.build_instance(request) }
+  let(:finder)          { services.snippet_finder }
+  let(:file_system)     { Locomotive::Steam::Liquid::FileSystem.new(snippet_finder: finder) }
+  let(:snippet_source)  { 'built by NoCoffee' }
+  let(:snippet)         { instance_double('Snippet', template: nil, :template= => nil, liquid_source: snippet_source) }
+  let(:source)          { 'Locomotive {% include footer %}' }
 
-  before { allow(finder).to receive(:find).and_return(snippet) }
+  before { allow(finder).to receive(:find).with('footer').and_return(snippet) }
 
   describe 'parsing' do
 
@@ -33,15 +34,16 @@ describe Locomotive::Steam::Liquid::Tags::Snippet do
 
   describe 'rendering' do
 
-    let(:context) { ::Liquid::Context.new({}, {}, { services: services, file_system: file_system }) }
+    let(:assigns) { {} }
+    let(:context) { ::Liquid::Context.new(assigns, {}, { services: services, file_system: file_system }) }
 
     subject { render_template(source, context) }
 
     it { is_expected.to eq 'Locomotive built by NoCoffee' }
 
-    context 'rendering error (action) found in the snippet' do
+    context 'a rendering error (action) has been found in the snippet' do
 
-      let(:snippet) { instance_double('Snippet', template: nil, :template= => nil, liquid_source: '{% action "Hello world" %}a.b(+}{% endaction %}') }
+      let(:snippet_source) { '{% action "Hello world" %}a.b(+}{% endaction %}' }
 
       it 'raises a TemplateError' do
         expect { subject }.to raise_exception(Locomotive::Steam::TemplateError)
@@ -49,6 +51,15 @@ describe Locomotive::Steam::Liquid::Tags::Snippet do
 
     end
 
+    context 'use a variable as the name of the snippet' do
+
+      let(:assigns) { { 'my_snippet' => 'footer' } }
+      let(:source)  { 'Locomotive {% include my_snippet %}' }
+
+      it { is_expected.to eq 'Locomotive built by NoCoffee' }
+
+    end
+
   end
 
 end

data/spec/unit/liquid/tags/with_scope_spec.rb

@@ -33,6 +33,25 @@ describe Locomotive::Steam::Liquid::Tags::WithScope do
 
     end
 
+    describe 'pass directly a hash built with the Action liquid tag for example' do
+
+      let(:assigns) { { 'my_filters' => { active: true, price: 42, title: "/like this/ix", hidden: false } } }
+
+      let(:source)  { "{% with_scope my_filters %}{% assign conditions = with_scope %}{% assign content_type = with_scope_content_type %}{% endwith_scope %}" }
+
+      it { expect(context['conditions'].keys).to eq(%w(active price title hidden)) }
+      it { expect(conditions['active']).to eq true }
+      it { expect(conditions['title']).to eq(/like this/ix) }
+
+      context "the variable doesn't exist" do
+
+        let(:assigns) { { } }
+        it { expect(context['conditions']).to eq({}) }
+
+      end
+
+    end
+
     describe 'decode basic options (boolean, integer, ...)' do
 
       let(:source) { "{% with_scope active: true, price: 42, title: 'foo', hidden: false %}{% assign conditions = with_scope %}{% endwith_scope %}" }

data/spec/unit/middlewares/cache_spec.rb

@@ -55,11 +55,11 @@ describe Locomotive::Steam::Middlewares::Cache do
 
       let(:response) { nil }
 
-      before { expect(cache).to receive(:read).with('1c538f12ddad36b3fd5cb7211aac60a2').and_return(response) }
+      before { expect(cache).to receive(:read).with('49876cf5daaa47d21daccd3b805b5b79').and_return(response) }
 
       context 'the cache is empty' do
 
-        before { expect(cache).to receive(:write).with('1c538f12ddad36b3fd5cb7211aac60a2', Marshal.dump([200, {}, ["Hello world!"]])) }
+        before { expect(cache).to receive(:write).with('49876cf5daaa47d21daccd3b805b5b79', Marshal.dump([200, {}, ["Hello world!"]])) }
 
         it 'tells the CDN to cache the page and also cache it internally' do
           is_expected.to eq ['max-age=0, s-maxage=3600, public, must-revalidate', 'Accept-Language']
@@ -69,7 +69,7 @@ describe Locomotive::Steam::Middlewares::Cache do
 
           subject { send_request[:env]['steam.cache_etag'] }
 
-          it { is_expected.to eq '1c538f12ddad36b3fd5cb7211aac60a2' }
+          it { is_expected.to eq '49876cf5daaa47d21daccd3b805b5b79' }
 
         end
 
@@ -104,7 +104,7 @@ describe Locomotive::Steam::Middlewares::Cache do
 
       context 'based on the ETag' do
 
-        let(:etag) { '1c538f12ddad36b3fd5cb7211aac60a2' }
+        let(:etag) { '49876cf5daaa47d21daccd3b805b5b79' }
 
         it 'returns a 304 (Not modified) without no cache headers' do
           expect(subject.first).to eq 304

data/spec/unit/models/repository_spec.rb

@@ -39,6 +39,31 @@ describe Locomotive::Steam::Models::Repository do
 
   end
 
+  describe '#prepare_conditions' do
+
+    let(:conditions) { [{ 'band_id' => 42, 'order_by' => 'created_at.desc' }] }
+
+    subject { repository.prepare_conditions(*conditions) }
+
+    it { is_expected.to eq({ 'band_id' => 42, 'order_by' => 'created_at.desc' }) }
+
+    context 'with local conditions' do
+
+      let(:local_conditions) { { parent_id: 1, order_by: { position: 'asc' } } }
+
+      before { repository.local_conditions = local_conditions }
+
+      it { is_expected.to eq({ 'parent_id' => 1, 'band_id' => 42, 'order_by' => 'created_at.desc' }) }
+
+      it "doesn't modify the local conditions" do
+        subject
+        expect(local_conditions).to eq({ parent_id: 1, order_by: { position: 'asc' } })
+      end
+
+    end
+
+  end
+
   class ArticleRepository
     include Locomotive::Steam::Models::Repository
   end

data/spec/unit/repositories/content_entry_repository_spec.rb

@@ -378,7 +378,7 @@ describe Locomotive::Steam::ContentEntryRepository do
 
     subject { repository.with(type).send(:conditions_without_order_by, conditions) }
 
-    it { is_expected.to eq([{ _visible: true, content_type_id: 1 }, nil]) }
+    it { is_expected.to eq([{ '_visible' => true, 'content_type_id' => 1 }, nil]) }
 
     context 'select fields' do
 
@@ -389,7 +389,7 @@ describe Locomotive::Steam::ContentEntryRepository do
       let(:_fields)     { instance_double('Fields', selects: [field], belongs_to: [], many_to_many: [], dates_and_date_times: []) }
       let(:conditions)  { { 'category' => value } }
 
-      it { is_expected.to eq([{ _visible: true, content_type_id: 1, 'category_id' => 42 }, nil]) }
+      it { is_expected.to eq([{ '_visible' => true, 'content_type_id' => 1, 'category_id' => 42 }, nil]) }
 
     end
 
@@ -400,7 +400,7 @@ describe Locomotive::Steam::ContentEntryRepository do
       let(:_fields)     { instance_double('Fields', selects: [], belongs_to: [], many_to_many: [], dates_and_date_times: [field]) }
       let(:conditions)  { { 'launched_at' => value } }
 
-      it { is_expected.to eq([{ _visible: true, content_type_id: 1, 'launched_at' => Date.parse('2009/09/10') }, nil]) }
+      it { is_expected.to eq([{ '_visible' => true, 'content_type_id' => 1, 'launched_at' => Date.parse('2009/09/10') }, nil]) }
 
     end
 
@@ -413,7 +413,7 @@ describe Locomotive::Steam::ContentEntryRepository do
       let(:_fields)     { instance_double('Fields', selects: [], belongs_to: [], many_to_many: [], dates_and_date_times: [field]) }
       let(:conditions)  { { 'launched_at' => value } }
 
-      it { is_expected.to eq([{ _visible: true, content_type_id: 1, 'launched_at' => Time.zone.parse('2007/06/29 21:15:00').to_datetime }, nil]) }
+      it { is_expected.to eq([{ '_visible' => true, 'content_type_id' => 1, 'launched_at' => Time.zone.parse('2007/06/29 21:15:00').to_datetime }, nil]) }
 
     end
 
@@ -424,13 +424,13 @@ describe Locomotive::Steam::ContentEntryRepository do
       let(:_fields)     { instance_double('Fields', selects: [], belongs_to: [field], many_to_many: [], dates_and_date_times: []) }
       let(:conditions)  { { 'person' => value } }
 
-      it { is_expected.to eq([{ _visible: true, content_type_id: 1, 'person_id' => 42 }, nil]) }
+      it { is_expected.to eq([{ '_visible' => true, 'content_type_id' => 1, 'person_id' => 42 }, nil]) }
 
       context 'the target value is a content entry' do
 
         let(:value) { instance_double('TargetContentEntry', _id: 1) }
 
-        it { is_expected.to eq([{ _visible: true, content_type_id: 1, 'person_id' => 1 }, nil]) }
+        it { is_expected.to eq([{ '_visible' => true, 'content_type_id' => 1, 'person_id' => 1 }, nil]) }
 
       end
 
@@ -438,7 +438,7 @@ describe Locomotive::Steam::ContentEntryRepository do
 
         let(:value) { { '_id' => 42 } }
 
-        it { is_expected.to eq([{ _visible: true, content_type_id: 1, 'person_id' => 42 }, nil]) }
+        it { is_expected.to eq([{ '_visible' => true, 'content_type_id' => 1, 'person_id' => 42 }, nil]) }
 
       end
 
@@ -447,21 +447,21 @@ describe Locomotive::Steam::ContentEntryRepository do
         let(:value) { [instance_double('TargetContentEntry', _id: 1), instance_double('TargetContentEntry', _id: 2)] }
         let(:conditions)  { { 'person.in' => value } }
 
-        it { is_expected.to eq([{ _visible: true, content_type_id: 1, 'person_id.in' => [1, 2] }, nil]) }
+        it { is_expected.to eq([{ '_visible' => true, 'content_type_id' => 1, 'person_id.in' => [1, 2] }, nil]) }
 
       end
 
       context 'testing a nil value (field => nil)' do
 
         let(:value) { nil }
-        it { is_expected.to eq([{ _visible: true, content_type_id: 1, 'person_id' => nil }, nil]) }
+        it { is_expected.to eq([{ '_visible' => true, 'content_type_id' => 1, 'person_id' => nil }, nil]) }
 
       end
 
       context 'testing a nil value (field.ne => nil)' do
 
         let(:conditions)  { { 'person.ne' => nil } }
-        it { is_expected.to eq([{ _visible: true, content_type_id: 1, 'person_id.ne' => nil }, nil]) }
+        it { is_expected.to eq([{ '_visible' => true, 'content_type_id' => 1, 'person_id.ne' => nil }, nil]) }
 
       end
 
@@ -474,13 +474,13 @@ describe Locomotive::Steam::ContentEntryRepository do
       let(:_fields)     { instance_double('Fields', selects: [], belongs_to: [], many_to_many: [field], dates_and_date_times: []) }
       let(:conditions)  { { 'tags.in' => value } }
 
-      it { is_expected.to eq([{ _visible: true, content_type_id: 1, 'tag_ids.in' => [42] }, nil]) }
+      it { is_expected.to eq([{ '_visible' => true, 'content_type_id' => 1, 'tag_ids.in' => [42] }, nil]) }
 
       context 'the target value is a content entry' do
 
         let(:value) { [instance_double('TargetContentEntry', _id: 1), 42] }
 
-        it { is_expected.to eq([{ _visible: true, content_type_id: 1, 'tag_ids.in' => [1, 42] }, nil]) }
+        it { is_expected.to eq([{ '_visible' => true, 'content_type_id' => 1, 'tag_ids.in' => [1, 42] }, nil]) }
 
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_steam
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-20 00:00:00.000000000 Z
+date: 2020-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -971,7 +971,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: The LocomotiveCMS Steam is the rendering stack used by both Wagon and Engine