locomotivecms_steam 1.5.0.beta1 → 1.5.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a416940aeda3a368c649ab613068cb52eca1cab73eb55539c96d7b8669683789
-  data.tar.gz: 4d82964327f6732779fffc0bc0d58761409b0beeb1dcab05c996a7f9f7191aae
+  metadata.gz: 612050310b274060e06a38a72ec026c69b071f3166d6453e2d7f4a8242a3cda1
+  data.tar.gz: 5d92a727d6a162872eddd102d560e0c7840a7fc5142a12907f19411e07793955
 SHA512:
-  metadata.gz: b705994d68051d9abc826b1fae9968bcf48c3c52d3f74487c56ba704755744115a0081f8c65315ce0f3b5ced476472223474aa6a19a9f79814cc28f56ac65263
-  data.tar.gz: c7946edfacbaa652feca82ebba5c41a9f674f1b20a7e5b2f7b7b61d4e1c336ae76fcf4a0ac2028b50d1904d11784fd64ac8c903ee2c722aadf3a1185e293c01c
+  metadata.gz: e9be228b111d043a33b745dcc7bdf7408cf3651d377183394d7c779067186c0e064f0fed97e66cceceeb791b8b1eeebc61af4e959342b0c6975e5720cf8a7ea7
+  data.tar.gz: cc472030e4d96fcd1ca0ef278fb8f9d4a58a502db6a06fad8d1ea1f733272329e057cbe57effa8d18cdb78ffa3bc14d1113181d7ed276d8266d97a65885ffd29

data/Gemfile.lock

@@ -12,7 +12,7 @@ GIT
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.5.0.beta1)
+    locomotivecms_steam (1.5.0.beta2)
       RedCloth (~> 4.3.2)
       autoprefixer-rails (~> 8.0.0)
       bcrypt (~> 3.1.11)
@@ -29,6 +29,7 @@ PATH
       mimetype-fu (~> 0.1.2)
       moneta (~> 1.0.0)
       morphine (~> 0.1.1)
+      multi_json (~> 1.13.1)
       nokogiri (~> 1.8.2)
       pony (~> 1.12)
       rack-cache (~> 1.7.0)
@@ -56,7 +57,7 @@ GEM
     bcrypt (3.1.12)
     bson (4.3.0)
     chronic (0.10.2)
-    chunky_png (1.3.10)
+    chunky_png (1.3.11)
     codeclimate-test-reporter (0.4.8)
       simplecov (>= 0.7.1, < 1.0.0)
     coffee-script (2.4.1)
@@ -97,7 +98,8 @@ GEM
     haml (5.0.4)
       temple (>= 0.8.0)
       tilt
-    httparty (0.16.2)
+    httparty (0.16.3)
+      mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     i18n (1.1.0)
       concurrent-ruby (~> 1.0)
@@ -113,7 +115,7 @@ GEM
     locomotivecms-liquid (4.0.0)
     locomotivecms-solid (4.0.1)
       locomotivecms-liquid (~> 4.0.0)
-    mail (2.7.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
     memory_profiler (0.9.11)
     mime-types (3.1)
@@ -129,7 +131,7 @@ GEM
     morphine (0.1.1)
     multi_json (1.13.1)
     multi_xml (0.6.0)
-    nokogiri (1.8.4)
+    nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
     nokogumbo (1.5.0)
       nokogiri
@@ -190,7 +192,7 @@ GEM
     tins (1.16.3)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (4.1.19)
+    uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)
 
 PLATFORMS

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

@@ -116,7 +116,7 @@ module Locomotive::Steam
 
     def build_yaml_loaders
       %i(sites pages content_types content_entries snippets sections translations theme_assets).inject({}) do |memo, name|
-        memo[name] = build_klass('YAMLLoaders', name).new(site_path)
+        memo[name] = build_klass('YAMLLoaders', name).new(site_path, env)
         memo
       end
     end
@@ -137,5 +137,9 @@ module Locomotive::Steam
     def site_path
       options.respond_to?(:has_key?) ? options[:path] : options
     end
+
+    def env
+      (options.respond_to?(:has_key?) ? options[:env] : nil) || :local
+    end
   end
 end

data/lib/locomotive/steam/adapters/filesystem/sanitizer.rb

@@ -1,7 +1,9 @@
 module Locomotive::Steam
   module Adapters
     module Filesystem
+
       module Sanitizer
+
         extend Forwardable
 
         def_delegators :@scope, :site, :locale, :locales, :default_locale

data/lib/locomotive/steam/adapters/filesystem/sanitizers/content_entry.rb

@@ -47,6 +47,9 @@ module Locomotive::Steam
           end
 
           def set_id(entity)
+            # don't override the id if it was set from a MongoDB dump
+            return if entity._id =~ /[a-z0-9]{12,}/
+
             if (slug = entity[:_slug]).respond_to?(:translations)
               entity[:_id] = slug[locale]
             else

data/lib/locomotive/steam/adapters/filesystem/sanitizers/page.rb

@@ -20,6 +20,7 @@ module Locomotive::Steam
             record_id(entity) # required to get the parent_id
 
             locales.each do |locale|
+              set_automatic_translations(entity, locale)
               set_default_redirect_type(entity, locale)
             end
 
@@ -38,6 +39,7 @@ module Locomotive::Steam
 
                 use_default_locale_template_path(page, locale)
 
+                # make sure we'll deal with a Hash and not a string
                 transform_sections_content(page, locale)
               end
             end
@@ -88,6 +90,20 @@ module Locomotive::Steam
             page[:fullpath][locale] = fullpath
           end
 
+          def set_automatic_translations(page, locale)
+            return if locale == self.locale
+
+            if page[:template_path][locale].blank?
+              %i(
+                title slug fullpath template_path redirect_url
+                sections_content sections_dropzone_content
+                seo_title meta_description meta_keywords
+              ).each do |name|
+                page[name][locale] ||= page[name][default_locale]
+              end
+            end
+          end
+
           def depth(page)
             return page.depth if page.depth
 
@@ -143,7 +159,12 @@ module Locomotive::Steam
             [:sections_dropzone_content, :sections_content].each do |name|
               if content = page[name][locale]
                 return unless content.is_a?(String)
-                page[name][locale] = JSON.parse(content)
+
+                begin
+                  page[name][locale] = MultiJson.load(content)
+                rescue MultiJson::ParseError => e
+                  raise Locomotive::Steam::JsonParsingError.new(e, page.template_path[locale], content)
+                end
               end
             end
           end

data/lib/locomotive/steam/adapters/filesystem/sanitizers/section.rb

@@ -21,8 +21,13 @@ module Locomotive::Steam
 
             json, template = match[:json], match[:template]
 
-            entity.definition = JSON.parse(json)
-            entity.template   = template
+            begin
+              entity.definition = MultiJson.load(json)
+            rescue MultiJson::ParseError => e
+              raise Locomotive::Steam::JsonParsingError.new(e, entity.template_path, json)
+            end
+
+            entity.template = template
           end
 
           def raise_parsing_error(entity, content)

data/lib/locomotive/steam/adapters/filesystem/yaml_loader.rb

@@ -4,20 +4,20 @@ module Locomotive::Steam
 
       module YAMLLoader
 
-        attr_reader :site_path
+        extend Forwardable
 
-        def initialize(site_path)
-          @site_path = site_path
+        def_delegators :@scope, :locales, :default_locale
+
+        attr_reader :site_path, :env
+
+        def initialize(site_path, env = :local)
+          @site_path, @env = site_path, env
         end
 
         def load(scope = nil)
           @scope = scope
         end
 
-        def default_locale
-          @scope.default_locale
-        end
-
         def _load(path, frontmatter = false, &block)
           if File.exists?(path)
             yaml      = File.open(path).read.force_encoding('utf-8')
@@ -46,6 +46,18 @@ module Locomotive::Steam
           end
         end
 
+        def safe_json_load(path)
+          return {} unless File.exists?(path)
+
+          json = File.read(path)
+
+          begin
+            MultiJson.load(json)
+          rescue MultiJson::ParseError => e
+            raise Locomotive::Steam::JsonParsingError.new(e, path, json)
+          end
+        end
+
         def template_extensions
           @extensions ||= %w(liquid haml)
         end

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

@@ -110,7 +110,11 @@ module Locomotive
             end
 
             def path
-              File.join(site_path, 'data')
+              return @path if @path # memoization
+
+              path = File.join(site_path, 'data', env.to_s, 'content_entries')
+
+              @path = File.exists?(path) ? path : File.join(site_path, 'data') # allow the legacy folder
             end
 
             def content_type

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

@@ -65,7 +65,7 @@ module Locomotive
                 options.each do |locale, values|
                   values.each_with_index do |name, position|
                     if (option = list.at(position)).nil?
-                      list << { _id: position, name: { locale => name }, position: position }
+                      list << { _id: position.to_s, name: { locale => name }, position: position }
                     else
                       option[:name][locale] = name
                     end

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

@@ -8,40 +8,107 @@ module Locomotive
 
             include Adapters::Filesystem::YAMLLoader
 
+            # Basically Load all the pages from both the app/views/pages and data/<env>/pages folders
+            #
+            # The process of loading locally all the pages is pretty complex. Of course, it handles localized pages.
+            # It involves 2 main steps.
+            #
+            # 1/ load all the pages/layouts under app/views/pages. Because of legacy support,
+            # we still grab the data from the YAML header.
+            #
+            # 2/ load the localized content from the data/<env>/pages folder. The content is fetched
+            # from the Wagon sync command. 2 kind of pages are stored in this folder:
+            #   - pages with a not null handle property. We call them core pages. They are not aimed
+            #     to be deleted. When found, we merge their content with the original page found by process #1
+            #   - pages without a handle and created from a layout. These pages don't own a liquid template.
+            #     We just use the liquid template of the layout they belong to.
+            #
             def load(scope)
               super
+
+              @pages_by_fullpath  = {}
+              @pages_by_handle    = {}
+
+              # step #1 (cf description of the method)
               load_tree
+
+              # step #2 (cf description of the method)
+              load_data
+
+              @pages_by_fullpath.values
             end
 
             private
 
-            def path
-              @path ||= File.join(site_path, 'app', 'views', 'pages')
+            def load_tree
+              # load the core pages and layouts from the app/views/pages folder
+              each_file do |filepath, fullpath, locale|
+                if leaf = @pages_by_fullpath[fullpath]
+                  update(leaf, filepath, fullpath, locale)
+                else
+                  leaf = build(filepath, fullpath, locale)
+                end
+
+                @pages_by_fullpath[fullpath]    = leaf
+                @pages_by_handle[leaf[:handle]] = leaf if leaf[:handle].present?
+              end
+
+              each_directory do |filepath, fullpath, locale|
+                @pages_by_fullpath[fullpath] ||= build(filepath, fullpath, locale)
+              end
             end
 
-            def load_tree
-              {}.tap do |hash|
-                each_file do |filepath, fullpath, locale|
+            def load_data
+              Dir.glob(File.join(data_path, '**', '*.json')).each do |filepath|
+                filepath  =~ /#{data_path}\/([a-z]+)\//
+                data      = safe_json_load(filepath)
+                locale    = $1.to_sym
 
-                  if leaf = hash[fullpath]
-                    update(leaf, filepath, fullpath, locale)
-                  else
-                    leaf = build(filepath, fullpath, locale)
-                  end
+                next unless locales.include?($1.to_sym)
 
-                  hash[fullpath] = leaf
+                if data['handle'].present? # yeah, core page found!
+                  attributes = @pages_by_handle[data['handle']]
+                else
+                  @pages_by_fullpath[data['fullpath']] ||= {}
+                  attributes = @pages_by_fullpath[data['fullpath']]
                 end
 
-                each_directory do |filepath, fullpath, locale|
-                  hash[fullpath] ||= build(filepath, fullpath, locale)
+                complete_attributes_from_data(attributes, data, locale)
+              end
+            end
+
+            def complete_attributes_from_data(attributes, data, locale)
+              return if attributes.nil? # shouldn't happen (undeleted page? local files out of date?)
+
+              # this is super important to handle correctly url type settings in sections
+              attributes[:_id] = data['id']
+
+              # required by pages which are not present locally
+              attributes[:_fullpath] = data['fullpath']
+
+              # set the attributes
+              %i(
+                title slug redirect_url seo_title meta_description meta_keywords
+                listed published position
+                sections_content sections_dropzone_content editable_elements raw_template
+              ).each do |name|
+                next if (value = data[name.to_s]).nil?
+
+                if name == :editable_elements
+                  update_editable_elements(attributes, value, locale)
+                elsif %i(listed published position).include?(name)
+                  attributes[name] = value
+                elsif name != :raw_template || (name == :raw_template && data['handle'].blank?)
+                  (attributes[name] ||= {})[locale] = value
                 end
-              end.values
+              end
             end
 
             def build(filepath, fullpath, locale)
-              slug        = fullpath.split('/').last
-              attributes  = get_attributes(filepath, fullpath)
+              slug            = fullpath.split('/').last
+              attributes      = get_attributes(filepath, fullpath)
 
+              # use first the attributes of the liquid template
               _attributes = {
                 title:              { locale => attributes.delete(:title) || (default_locale == locale ? slug.humanize : nil) },
                 slug:               { locale => attributes.delete(:slug) || slug.dasherize },
@@ -50,7 +117,10 @@ module Locomotive
                 _fullpath:          fullpath
               }
 
-              [:redirect_url, :seo_title, :meta_description, :meta_keywords].each do |name|
+              %i(
+                redirect_url seo_title meta_description meta_keywords
+                sections_content sections_dropzone_content
+              ).each do |name|
                 _attributes[name] = { locale => attributes.delete(name) }
               end
 
@@ -58,19 +128,22 @@ module Locomotive
             end
 
             def update(leaf, filepath, fullpath, locale)
-              slug        = fullpath.split('/').last
-              attributes  = get_attributes(filepath, fullpath)
+              slug            = fullpath.split('/').last
+              attributes      = get_attributes(filepath, fullpath)
 
-              leaf[:title][locale]              = attributes.delete(:title) || slug.humanize
-              leaf[:slug][locale]               = attributes.delete(:slug) || slug.dasherize
+              leaf[:title][locale]              ||= attributes.delete(:title) || slug.humanize
+              leaf[:slug][locale]               ||= attributes.delete(:slug) || slug.dasherize
               leaf[:template_path][locale]      = template_path(filepath, attributes, locale)
 
-              [:redirect_url, :seo_title, :meta_description, :meta_keywords].each do |name|
-                leaf[name][locale] = attributes.delete(name)
-              end
-
               update_editable_elements(leaf, attributes.delete(:editable_elements), locale)
 
+              %i(
+                redirect_url seo_title meta_description meta_keywords
+                sections_content sections_dropzone_content
+              ).each do |name|
+                leaf[name][locale] ||= attributes.delete(name)
+              end
+
               leaf.merge!(attributes)
             end
 
@@ -148,7 +221,7 @@ module Locomotive
 
               list.each do |name, content|
                 if el = find_editable_element(leaf, name)
-                  el[:content][locale] = content
+                  el[:content][locale] ||= content
                 else
                   leaf[:editable_elements] << build_editable_element(name, content, locale)
                 end
@@ -175,6 +248,14 @@ module Locomotive
               attributes[:published]  = false
             end
 
+            def data_path
+              File.join(self.site_path, 'data', env.to_s, 'pages')
+            end
+
+            def path
+              @path ||= File.join(site_path, 'app', 'views', 'pages')
+            end
+
           end
 
         end

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

@@ -17,11 +17,19 @@ module Locomotive
 
               attributes[:metafields_schema] = load_metafields_schema
 
+              attributes.merge!(load_from_env)
+
               [attributes]
             end
 
             private
 
+            def load_from_env
+              return {} if env == :local
+
+              safe_json_load(File.join(site_path, 'data', env.to_s, 'site.json')).symbolize_keys
+            end
+
             def load_metafields_schema
               _load(File.join(site_path, 'config', 'metafields_schema.yml'))
             end

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

@@ -16,15 +16,19 @@ module Locomotive
             private
 
             def load_array
+              all = env == :local ? _load(path) : _load_from_env
+
               [].tap do |array|
-                if (all = _load(path))
-                  all.each do |key, values|
-                    array << { key: key.to_s, values: HashConverter.to_string(values) }
-                  end
+                (all || {}).each do |key, values|
+                  array << { key: key.to_s, values: HashConverter.to_string(values) }
                 end
               end
             end
 
+            def _load_from_env
+              safe_json_load(File.join(site_path, 'data', env.to_s, 'translations.json'))
+            end
+
             def path
               File.join(site_path, 'config', 'translations.yml')
             end

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

@@ -48,7 +48,7 @@ module Locomotive::Steam
         protected
 
         def entry_value(entry)
-          value = entry.send(@field) rescue nil # not just it's safe to rely on rescue (hidden errors)
+          value = entry.send(@field) rescue nil # TODO: not safe to rely on rescue (hidden errors)
 
           if value.respond_to?(:translations)
             value[@locale]

data/lib/locomotive/steam/entities/content_entry.rb

@@ -95,7 +95,7 @@ module Locomotive::Steam
       _attributes += content_type.persisted_field_names
 
       _attributes.each do |name|
-        hash[name.to_s] = send(name) rescue nil
+        hash[name.to_s] = send(name)
       end
 
       # errors?
@@ -121,6 +121,7 @@ module Locomotive::Steam
         _cast_value(field)
       rescue Exception => e
         Locomotive::Common::Logger.info "[#{content_type.slug}][#{_label}] Unable to cast the \"#{name}\" field, reason: #{e.message}".yellow
+        puts e.message
         nil
       end
     end
@@ -190,19 +191,28 @@ module Locomotive::Steam
     end
 
     def _cast_select(field)
-      if (_value = attributes[:"#{field.name}_id"]).respond_to?(:translations)
-        # the field is localized, so get the labels in all the locales (2 different locales might point to different options)
-        # FIXME: dup is used because we want to preserve the original ids
-        attributes[field.name] = attributes[:"#{field.name}_id"].dup
-
-        _cast_convertor(field.name, true) do |value, locale|
-          name = field.select_options.find(value)&.name
-          locale.nil? ? name&.default : name.try(:[], locale)
+      options = field.select_options
+
+      if (_value = @attributes[:"#{field.name}_id"]).respond_to?(:translations)
+        # the field is localized, so get the labels in all the locales
+        # (2 different locales might point to different options)
+        if _value.default
+          # unique value for all the locales, so grab the option
+          name = options.by_id_or_name(_value.default)&.name
+          name&.duplicate(field.name)
+        else
+          @attributes[field.name] = _value.duplicate(field.name)
+
+          _cast_convertor(field.name, true) do |value, locale|
+            name = options.by_id_or_name(value)&.name
+            name.try(:[], locale)
+          end
         end
       else
-        # the field is not localized, we only have the id of the option,
+        # the field is not localized, we only have the id of the option (or its name if a
+        # contact form submission in Wagon for instance),
         # so just copy the labels (in all the locales) of the matching select option
-        if name = field.select_options.find(_value)&.name # this should either return an i18nField or nil
+        if name = options.by_id_or_name(_value)&.name # this should either return an i18nField or nil
           attributes[field.name] = name.dup
         end
       end

data/lib/locomotive/steam/errors.rb

@@ -55,6 +55,20 @@ module Locomotive::Steam
 
   end
 
+  class JsonParsingError < ParsingRenderingError
+
+    def initialize(error, file, source)
+      line = if error.message =~ /at line ([0-9]+)/
+        $1.to_i
+      else
+        0
+      end
+
+      super(error.message, file, source, line, error.backtrace)
+    end
+
+  end
+
   class ActionError < ParsingRenderingError
 
     attr_accessor :action

data/lib/locomotive/steam/liquid/drops/content_entry_collection.rb

@@ -82,13 +82,38 @@ module Locomotive
 
             (content_type_repository.select_options(@content_type, name) || []).map do |option|
               _option = Locomotive::Steam::Decorators::I18nDecorator.new(option, locale, default_locale)
-              _option.name
+              ContentTypeFieldSelectOption.new(_option)
             end
           end
 
         end
 
       end
+
+      class ContentTypeFieldSelectOption < ::Liquid::Drop
+
+        def initialize(option)
+          @option = option
+        end
+
+        def id
+          @option._id.to_s
+        end
+
+        def name
+          @option.name
+        end
+
+        def ==(other_object)
+          self.name == other_object
+        end
+
+        def to_s
+          self.name
+        end
+
+      end
+
     end
   end
 end

data/lib/locomotive/steam/liquid/drops/section_block.rb

@@ -12,7 +12,7 @@ module Locomotive
             @index      = index
             @definition = section.definition['blocks'].find do |block|
               block['type'] == type
-            end
+            end || {}
           end
 
           def id
@@ -31,12 +31,8 @@ module Locomotive
           end
 
           def locomotive_attributes
-            if @context.registers[:live_editing]
-              value = "section-#{@context['section'].id}-block-#{id}"
-              %(data-locomotive-block="#{value}")
-            else
-              ''
-            end
+            value = "section-#{@context['section'].id}-block-#{id}"
+            %(data-locomotive-block="#{value}")
           end
 
         end

data/lib/locomotive/steam/liquid/tags/concerns/section.rb

@@ -29,16 +29,18 @@ module Locomotive::Steam::Liquid::Tags::Concerns
         editor_settings_lookup(template.root)
       end
 
-      context.stack do
-        html    = template.render(context)
-        section = context['section']
+      html        = template.render(context)
+      section     = context['section']
+      css_class   = context['section_css_class']
 
-        tag_id    = %(id="locomotive-section-#{section.id}")
-        tag_class = %(class="#{['locomotive-section', section.css_class].compact.join(' ')}")
-        tag_data  = %(data-locomotive-section-type="#{section.type}")
+      # we need the section_css_class once
+      context.scopes.last.delete('section_css_class')
 
-        %(<div #{tag_id} #{tag_class} #{tag_data}>#{html}</div>)
-      end
+      tag_id    = %(id="locomotive-section-#{section.id}")
+      tag_class = %(class="#{['locomotive-section', section.css_class, css_class].compact.join(' ')}")
+      tag_data  = %(data-locomotive-section-type="#{section.type}")
+
+      %(<div #{tag_id} #{tag_class} #{tag_data}>#{html}</div>)
     end
 
     # in order to enable string/text synchronization with the editor:

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

@@ -89,7 +89,7 @@ module Locomotive
           end
 
           def cache_options
-            @expires_in.blank? ? { force: true } : { expires_in: @expires_in }
+            @expires_in.blank? || @expires_in == 0 ? { force: true } : { expires_in: @expires_in }
           end
 
           def last_response(context)

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

@@ -18,10 +18,6 @@ module Locomotive::Steam
         request.get_header('HTTP_LOCOMOTIVE_SECTION_TYPE')
       end
 
-      def section_finder
-        services.section_finder
-      end
-
       def render(section_type)
         document = Liquid::Template.parse(liquid_source(section_type))
         document.render(liquid_context)

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

@@ -53,10 +53,6 @@ module Locomotive::Steam::Middlewares
       @locale ||= env.fetch('steam.locale')
     end
 
-    def liquid_assigns
-      @liquid_assigns ||= env.fetch('steam.liquid_assigns')
-    end
-
     def locales
       site.locales
     end
@@ -83,6 +79,10 @@ module Locomotive::Steam::Middlewares
       env['rack.session']
     end
 
+    def liquid_assigns
+      @liquid_assigns ||= env.fetch('steam.liquid_assigns')
+    end
+
     def live_editing?
       !!env['steam.live_editing']
     end

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

@@ -57,6 +57,10 @@ module Locomotive::Steam
         self
       end
 
+      def duplicate(new_name)
+        self.class.new(new_name, self.translations)
+      end
+
       alias :__translations__ :translations
 
       alias :to_hash :translations

data/lib/locomotive/steam/repositories/content_type_field_repository.rb

@@ -61,9 +61,9 @@ module Locomotive
         query { where(required: true) }.all
       end
 
-      def localized_names
+      def localized_names(include_select_field_id: true)
         query { where(localized: true) }.all.map do |field|
-          field.type == :select ? [field.name, "#{field.name}_id"] : field.name
+          field.type == :select && include_select_field_id ? [field.name, "#{field.name}_id"] : field.name
         end.flatten
       end
 

data/lib/locomotive/steam/repositories/content_type_field_select_option_repository.rb

@@ -22,6 +22,10 @@ module Locomotive
         query { where(name: name) }.first
       end
 
+      def by_id_or_name(id_or_name)
+        find(id_or_name) || by_name(id_or_name)
+      end
+
     end
   end
 end

data/lib/locomotive/steam/repositories/page_repository.rb

@@ -8,7 +8,7 @@ module Locomotive
       # Entity mapping
       mapping :pages, entity: Page do
         localized_attributes :title, :slug, :permalink,
-          :source, :raw_template, :template_path, :redirect_url, :fullpath,
+          :source, :raw_template, :template_path, :data_path, :redirect_url, :fullpath,
           :sections_content, :sections_dropzone_content,
           :seo_title, :meta_description, :meta_keywords
 

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

@@ -27,7 +27,9 @@ module Locomotive
       # Warning: do not work with localized and file fields
       def create(type_slug, attributes, as_json = false)
         with_repository(type_slug) do |_repository|
-          entry = _repository.build(clean_attributes(attributes))
+          _attributes = prepare_attributes(_repository.content_type, attributes)
+
+          entry = _repository.build(_attributes)
 
           yield(entry) if block_given?
 
@@ -46,8 +48,10 @@ module Locomotive
       # Warning: do not work with localized and file fields
       def update(type_slug, id_or_slug, attributes, as_json = false)
         with_repository(type_slug) do |_repository|
-          entry = _repository.by_slug(id_or_slug) || _repository.find(id_or_slug)
-          decorated_entry = i18n_decorate { entry.change(clean_attributes(attributes)) }
+          entry       = _repository.by_slug(id_or_slug) || _repository.find(id_or_slug)
+          _attributes = prepare_attributes(_repository.content_type, attributes)
+
+          decorated_entry = i18n_decorate { entry.change(_attributes) }
 
           if validate(_repository, decorated_entry)
             _repository.update(entry)
@@ -61,9 +65,10 @@ module Locomotive
 
       def update_decorated_entry(decorated_entry, attributes)
         with_repository(decorated_entry.content_type) do |_repository|
-          entry = decorated_entry.__getobj__
+          entry       = decorated_entry.__getobj__
+          _attributes = prepare_attributes(_repository.content_type, attributes)
 
-          entry.change(clean_attributes(attributes))
+          entry.change(_attributes)
 
           _repository.update(entry)
 
@@ -117,12 +122,19 @@ module Locomotive
         as_json ? entry.as_json : entry
       end
 
-      def clean_attributes(attributes)
+      def prepare_attributes(content_type, attributes)
+        select_field_names = content_type.fields.selects.map(&:name)
+
         attributes.each do |key, value|
           next unless value.is_a?(String)
           attributes[key] = Sanitize.clean(value, Sanitize::Config::BASIC)
         end
-        attributes
+
+        # special case: select fields. <name> becomes <name>_id
+        attributes.map do |key, value|
+          _key = select_field_names.include?(key.to_s) ? "#{key}_id" : key
+          [_key, value]
+        end.to_h
       end
 
       def validate(_repository, entry)

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.beta1'
+    VERSION = '1.5.0.beta2'
   end
 end

data/locomotivecms_steam.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   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 'rack-rewrite',           '~> 1.5.1'
   spec.add_dependency 'rack-cache',             '~> 1.7.0'

data/spec/fixtures/default/data/production/pages/fr/index.json

@@ -0,0 +1,4 @@
+{
+  "title": "Ma page d'accueil en production",
+  "fullpath": "index"
+}

data/spec/fixtures/default/data/production/pages/fr/music.json

@@ -0,0 +1,8 @@
+{
+  "title": "Our music",
+  "handle": "our-music",
+  "fullpath": "our-music",
+  "editable_elements": {
+    "content/introduction": "Simple content"
+  }
+}

data/spec/fixtures/default/data/production/pages/fr/unknown.json

@@ -0,0 +1,8 @@
+{
+  "title": "A page created in the back-office",
+  "fullpath": "unknown",
+  "listed": true,
+  "published": true,
+  "position": 42,
+  "raw_template": "Hello world"
+}

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

@@ -0,0 +1,3 @@
+{
+  "name": "My awesome site"
+}

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

@@ -0,0 +1,6 @@
+{
+  "hello_world": {
+    "en": "Hello world",
+    "fr": "Bonjour le monde"
+  }
+}

data/spec/fixtures/default/data/staging/pages/fr/index.json

@@ -0,0 +1,3 @@
+{
+  "title": "invalid json
+}

data/spec/unit/adapters/filesystem/sanitizers/section_spec.rb

@@ -57,7 +57,7 @@ LIQUID
         let(:template_path) { 'spec/fixtures/errors/section_bad_json_content.liquid' }
 
         it 'should throw an error' do
-          expect { subject }.to raise_error(JSON::ParserError)
+          expect { subject }.to raise_error(Locomotive::Steam::JsonParsingError)
         end
       end
     end

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

@@ -29,7 +29,11 @@ describe Locomotive::Steam::Adapters::Filesystem::YAMLLoaders::ContentType do
 
     subject { loader.send(:build_select_options_from_hash, options) }
 
-    it { is_expected.to eq [{ _id: 0, name: { en: 'General', fr: 'Général' }, position: 0 }, { _id: 1, name: { en: 'Gigs', fr: 'Concerts' }, position: 1 }, { _id: 2, name: { en: 'Bands', fr: 'Groupes' }, position: 2 }] }
+    it { is_expected.to eq [
+      { _id: '0', name: { en: 'General', fr: 'Général' }, position: 0 },
+      { _id: '1', name: { en: 'Gigs', fr: 'Concerts' }, position: 1 },
+      { _id: '2', name: { en: 'Bands', fr: 'Groupes' }, position: 2 }]
+    }
 
   end
 

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

@@ -10,7 +10,7 @@ describe Locomotive::Steam::Adapters::Filesystem::YAMLLoaders::Page do
 
   describe '#load' do
 
-    let(:scope) { instance_double('Scope', locale: :fr, default_locale: :en) }
+    let(:scope) { instance_double('Scope', locale: :fr, default_locale: :en, locales: [:en, :fr]) }
 
     subject { loader.load(scope).sort { |a, b| a[:_fullpath] <=> b[:_fullpath] } }
 
@@ -25,6 +25,28 @@ describe Locomotive::Steam::Adapters::Filesystem::YAMLLoaders::Page do
       expect(subject[25][:template_path]).to eq(en: false)
     end
 
+    context 'a different environment' do
+
+      let(:env)     { :production }
+      let(:loader)  { described_class.new(site_path, env) }
+
+      it 'completes the data with the ones from the production environment' do
+        expect(subject.size).to eq 36
+        expect(subject[21][:title]).to eq(en: 'Home page', fr: "Ma page d'accueil en production")
+      end
+
+      describe 'invalid json' do
+
+        let(:env) { :staging }
+
+        it 'raises a parsing exception' do
+          expect { subject }.to raise_exception(Locomotive::Steam::JsonParsingError)
+        end
+
+      end
+
+    end
+
   end
 
 end

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

@@ -24,6 +24,16 @@ describe Locomotive::Steam::Adapters::Filesystem::YAMLLoaders::Site do
 
     end
 
+    context 'a different environment' do
+
+      let(:loader) { described_class.new(site_path, :production) }
+
+      it 'completes the data with the ones from the production environment' do
+        expect(subject[:name]).to eq('My awesome site')
+      end
+
+    end
+
   end
 
 end

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

@@ -20,6 +20,18 @@ describe Locomotive::Steam::Adapters::Filesystem::YAMLLoaders::Translation do
       expect(subject.first[:values]).to eq({ 'en' => 'Powered by', 'fr' => 'Propulsé par' })
     end
 
+    context 'a different environment' do
+
+      let(:loader) { described_class.new(site_path, :production) }
+
+      it 'replaces the data with the ones from the production environment' do
+        expect(subject.size).to eq 1
+        expect(subject.first[:key]).to eq('hello_world')
+        expect(subject.first[:values]).to eq('en' => 'Hello world', 'fr' => 'Bonjour le monde')
+      end
+
+    end
+
   end
 
 end

data/spec/unit/entities/content_entry_spec.rb

@@ -230,11 +230,49 @@ describe Locomotive::Steam::ContentEntry do
     end
 
     context 'a select' do
-      let(:option)      { instance_double('SelectOption', name: { en: 'Category #1', fr: 'Categorie #1' }) }
-      let(:field)       { instance_double('Field', name: :my_field, type: :select, select_options: instance_double('SelectOptions')) }
-      let(:attributes)  { { my_field_id: 42 } }
-      before { expect(field.select_options).to receive(:find).with(42).and_return(option) }
-      it { is_expected.to eq({ en: 'Category #1', fr: 'Categorie #1' }) }
+      let(:translations)  { instance_double('Translations', translations: { en: 'Category #1', fr: 'Categorie #1' }) }
+      let(:option)        { instance_double('SelectOption', name: translations) }
+      let(:options)       { instance_double('SelectOptions') }
+      let(:field)         { instance_double('Field', name: :my_field, type: :select, select_options: options) }
+      let(:attributes)    { { my_field_id: attribute } }
+
+      context 'the attribute is not localized' do
+
+        let(:option)    { instance_double('SelectOption', name: 'Category #1') }
+        let(:attribute) { 42 }
+
+        before { expect(options).to receive(:by_id_or_name).with(42).and_return(option) }
+
+        it { expect(subject).to eq('Category #1') }
+      end
+
+      context 'the attribute is localized' do
+
+        context 'the attribute has values in all the locales' do
+
+          let(:attribute) { instance_double('FieldValue', default: nil, translations: true) }
+
+          before do
+            expect(attribute).to receive(:duplicate).with(:my_field).and_return(translations)
+            expect(translations).to receive(:apply).and_return(translations)
+          end
+
+          it { expect(subject.translations).to eq({ en: 'Category #1', fr: 'Categorie #1' }) }
+
+        end
+
+        context 'the attribute has the same value in all the locales' do
+
+          let(:attribute) { instance_double('FieldValue', default: 42, translations: true) }
+
+          before { expect(translations).to receive(:duplicate).with(:my_field).and_return(translations) }
+          before { expect(options).to receive(:by_id_or_name).with(42).and_return(option) }
+
+          it { expect(subject.translations).to eq({ en: 'Category #1', fr: 'Categorie #1' }) }
+
+        end
+
+      end
     end
 
     context 'a json' do

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

@@ -80,6 +80,30 @@ describe Locomotive::Steam::Liquid::Tags::Consume do
 
   end
 
+  describe 'with an expires_in option' do
+
+    let(:assigns)     { { 'secret_password' => 'bar' } }
+    let(:source)      { "{% consume blog from \"http://blog.locomotiveapp.org/api/read\", username: 'foo', password: secret_password, expires_in: #{expires_in} %}{{ blog.title }}{% endconsume %}" }
+    let(:expires_in)  { 42 }
+
+    it 'passes the expires_in value to the cache' do
+      expect(services.cache).to receive(:fetch).with('Steam-consume-d1249cd56af82e108d383f981ad953347dbb94dc', { expires_in: 42 }).and_return('Locomotive rocks!')
+      is_expected.to eq 'Locomotive rocks!'
+    end
+
+    describe 'expires_in set to 0 (so basically, meaning non cache at all)' do
+
+      let(:expires_in)  { 0 }
+
+      it "doesn't pass the expires_in value to the cache" do
+        expect(services.cache).to receive(:fetch).with('Steam-consume-d1249cd56af82e108d383f981ad953347dbb94dc', { force: true }).and_return('Locomotive rocks!')
+        is_expected.to eq 'Locomotive rocks!'
+      end
+
+    end
+
+  end
+
   describe 'timeout' do
 
     let(:response)  { { 'title' => 'first response' } }

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

@@ -80,27 +80,6 @@ describe Locomotive::Steam::Liquid::Tags::SectionsDropzone do
         .strip.gsub(/\n\s+/, '')
       end
 
-      context 'live editing is off' do
-
-        let(:live_editing) { false }
-
-        it 'renders the list of sections' do
-          is_expected.to eq <<-HTML
-            <div class="locomotive-sections">
-              <div id="locomotive-section-dropzone-0" class="locomotive-section" data-locomotive-section-type="hero">
-                <h1>Hello world</h1>
-              </div>
-              <div id="locomotive-section-dropzone-1" class="locomotive-section" data-locomotive-section-type="slideshow">
-                <div ><p>Slide 1</p></div>
-                <div ><p>Slide 2</p></div>
-              </div>
-            </div>
-          HTML
-          .strip.gsub(/\n\s+/, '')
-        end
-
-      end
-
     end
 
   end

data/spec/unit/repositories/content_entry_repository_spec.rb

@@ -248,27 +248,27 @@ describe Locomotive::Steam::ContentEntryRepository do
 
       let(:options) {
         [
-          instance_double('SelectOption1', _id: 0, name: instance_double('I18nField', :[] => 'cooking', translations: { 'en' => 'cooking' })),
-          instance_double('SelectOption2', _id: 1, name: instance_double('I18nField', :[] => 'wine', translations: { 'en' => 'wine' })),
-          instance_double('SelectOption3', _id: 2, name: instance_double('I18nField', :[] => 'bread', translations: { 'en' => 'bread' }))
+          instance_double('SelectOption1', _id: '0', name: instance_double('I18nField', :[] => 'cooking', translations: { 'en' => 'cooking' })),
+          instance_double('SelectOption2', _id: '1', name: instance_double('I18nField', :[] => 'wine', translations: { 'en' => 'wine' })),
+          instance_double('SelectOption3', _id: '2', name: instance_double('I18nField', :[] => 'bread', translations: { 'en' => 'bread' }))
         ]
       }
 
       let(:entries) do
         [
-          { content_type_id: 1, _position: 0, _label: 'Recipe #1', category_id: { 'en' => 0 } },
-          { content_type_id: 1, _position: 1, _label: 'Recipe #2', category_id: { 'en' => 2 } },
-          { content_type_id: 1, _position: 2, _label: 'Recipe #3', category_id: { 'en' => 2 } },
-          { content_type_id: 1, _position: 3, _label: 'Recipe #4', category_id: { 'en' => 42 } } # unknown category
+          { content_type_id: 1, _position: 0, _label: 'Recipe #1', category_id: { 'en' => '0' } },
+          { content_type_id: 1, _position: 1, _label: 'Recipe #2', category_id: { 'en' => '2' } },
+          { content_type_id: 1, _position: 2, _label: 'Recipe #3', category_id: { 'en' => '2' } },
+          { content_type_id: 1, _position: 3, _label: 'Recipe #4', category_id: { 'en' => '42' } } # unknown category
         ]
       end
 
       before {
         allow(content_type_repository).to receive(:select_options).and_return(options)
         %w(cooking wine bread).each_with_index do |name, position|
-          allow(fields[:category].select_options).to receive(:find).with(position).and_return(options.at(position))
+          allow(fields[:category].select_options).to receive(:by_id_or_name).with(position.to_s).and_return(options.at(position))
         end
-        allow(fields[:category].select_options).to receive(:find).with(42).and_return(nil)
+        allow(fields[:category].select_options).to receive(:by_id_or_name).with('42').and_return(nil)
       }
 
       it { expect(subject.size).to eq 4 }

data/spec/unit/repositories/content_type_field_repository_spec.rb

@@ -80,4 +80,22 @@ describe Locomotive::Steam::ContentTypeFieldRepository do
 
   end
 
+  describe '#localized_names' do
+
+    let(:collection)  { [{ name: 'name', type: 'string', localized: true }, { name: 'picture', type: 'file' }, { name: 'category', type: 'select', localized: true }] }
+
+    subject { repository.localized_names }
+
+    it { expect(subject).to eq(['name', 'category', 'category_id']) }
+
+    context 'without the select field id' do
+
+      subject { repository.localized_names(include_select_field_id: false) }
+
+      it { expect(subject).to eq(['name', 'category']) }
+
+    end
+
+  end
+
 end

data/spec/unit/repositories/page_repository_spec.rb

@@ -71,7 +71,7 @@ describe Locomotive::Steam::PageRepository do
       it { expect(subject.templatized?).to eq true }
       it { expect(subject.content_type_id).to eq 'articles' }
       it { expect(subject.slug[:en]).to eq 'comments' }
-      it { expect(subject.slug[:fr]).to eq nil }
+      it { expect(subject.slug[:fr]).to eq 'comments' }
       it { expect(subject.fullpath[:en]).to eq 'articles/content_type_template/comments' }
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_steam
 version: !ruby/object:Gem::Version
-  version: 1.5.0.beta1
+  version: 1.5.0.beta2
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-30 00:00:00.000000000 Z
+date: 2018-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -153,6 +153,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.11
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.13.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.13.1
 - !ruby/object:Gem::Dependency
   name: rack-rewrite
   requirement: !ruby/object:Gem::Requirement
@@ -709,7 +723,13 @@ files:
 - spec/fixtures/default/data/bands.yml
 - spec/fixtures/default/data/events.yml
 - spec/fixtures/default/data/messages.yml
+- spec/fixtures/default/data/production/pages/fr/index.json
+- spec/fixtures/default/data/production/pages/fr/music.json
+- spec/fixtures/default/data/production/pages/fr/unknown.json
+- spec/fixtures/default/data/production/site.json
+- spec/fixtures/default/data/production/translations.json
 - spec/fixtures/default/data/songs.yml
+- spec/fixtures/default/data/staging/pages/fr/index.json
 - spec/fixtures/default/data/updates.yml
 - spec/fixtures/default/public/fonts/chunkfive-webfont.eot
 - spec/fixtures/default/public/fonts/chunkfive-webfont.svg
@@ -1007,7 +1027,13 @@ test_files:
 - spec/fixtures/default/data/bands.yml
 - spec/fixtures/default/data/events.yml
 - spec/fixtures/default/data/messages.yml
+- spec/fixtures/default/data/production/pages/fr/index.json
+- spec/fixtures/default/data/production/pages/fr/music.json
+- spec/fixtures/default/data/production/pages/fr/unknown.json
+- spec/fixtures/default/data/production/site.json
+- spec/fixtures/default/data/production/translations.json
 - spec/fixtures/default/data/songs.yml
+- spec/fixtures/default/data/staging/pages/fr/index.json
 - spec/fixtures/default/data/updates.yml
 - spec/fixtures/default/public/fonts/chunkfive-webfont.eot
 - spec/fixtures/default/public/fonts/chunkfive-webfont.svg