locomotivecms_steam 1.4.1 → 1.5.0.beta1

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

@@ -33,6 +33,7 @@ module Locomotive
 
             def build_field(name, attributes, position)
               attributes.tap do |attributes|
+                attributes[:_id]      = name.to_s
                 attributes[:name]     = name.to_s
                 attributes[:type]     = (attributes[:type] || 'string').to_s.downcase
                 attributes[:position] ||= position
@@ -64,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: name, name: { locale => name }, position: position }
+                      list << { _id: position, name: { locale => name }, position: position }
                     else
                       option[:name][locale] = name
                     end
@@ -76,8 +77,8 @@ module Locomotive
             def build_select_options_from_array(options)
               [].tap do |list|
                 options.each_with_index do |name, position|
-                  _id = name.is_a?(Hash) ? name.values.first : name
-                  list << { _id: _id, name: name, position: position }
+                  # _id = name.is_a?(Hash) ? name.values.first : name
+                  list << { _id: position, name: name, position: position }
                 end
               end
             end

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

@@ -0,0 +1,40 @@
+module Locomotive
+  module Steam
+    module Adapters
+      module Filesystem
+        module YAMLLoaders
+          class Section
+
+            include Adapters::Filesystem::YAMLLoader
+
+            def load(scope)
+              super
+              load_list
+            end
+
+            private
+
+            def load_list
+              Dir.glob(File.join(path, "*.{#{template_extensions.join(',')}}")).map do |filepath|
+                slug = File.basename(filepath).split('.').first
+                build(filepath, slug.permalink)
+              end
+            end
+
+            def build(filepath, slug)
+              {
+                name:           slug.humanize,
+                slug:           slug,
+                template_path:  filepath
+              }
+            end
+
+            def path
+              @path ||= File.join(site_path, 'app', 'views', 'sections')
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -45,7 +45,6 @@ module Locomotive
 
             def each_file(&block)
               Dir.glob(File.join(path, "*.{#{template_extensions.join(',')}}")).each do |filepath|
-
                 slug, locale = File.basename(filepath).split('.')[0..1]
                 locale = default_locale if template_extensions.include?(locale)
 

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

@@ -39,7 +39,7 @@ module Locomotive::Steam
 
     def memoized_dataset(mapper, scope)
       return @dataset if @dataset
-      dataset(mapper, scope)
+      @dataset = dataset(mapper, scope)
     end
 
     def dataset(mapper, scope)

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

@@ -190,9 +190,21 @@ module Locomotive::Steam
     end
 
     def _cast_select(field)
-      _cast_convertor(:"#{field.name}_id", true) do |value, locale|
-        name = field.select_options.find(value).try(:name)
-        locale.nil? ? name : name.try(:[], locale)
+      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)
+        end
+      else
+        # the field is not localized, we only have the id of the option,
+        # 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
+          attributes[field.name] = name.dup
+        end
       end
     end
 

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

@@ -31,7 +31,8 @@ module Locomotive::Steam
     end
 
     def localized_names
-      # FIXME: select_fields ALWAYS returns I18nField even if the site is not localized
+      # FIXME: select type fields are a bit specific. The label of the options is localized
+      # even if the select itself is not (see the _cast_select method in the content_entry entity class)
       fields.localized_names + select_fields.map(&:name)
     end
 

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

@@ -8,25 +8,27 @@ module Locomotive::Steam
 
     def initialize(attributes)
       super({
-        handle:             nil,
-        listed:             false,
-        published:          true,
-        templatized:        false,
-        cache_enabled:      true,
-        fullpath:           {},
-        response_type:      nil,
-        content_type:       nil,
-        target_klass_name:  nil,
-        position:           99,
-        raw_template:       nil,
-        source:             nil,
-        editable_elements:  {},
-        redirect:           nil,
-        redirect_url:       {},
-        redirect_type:      nil,
-        parent_id:          nil,
-        parent_ids:         nil,
-        updated_at:         Time.zone.now
+        handle:                     nil,
+        listed:                     false,
+        published:                  true,
+        templatized:                false,
+        cache_enabled:              true,
+        fullpath:                   {},
+        response_type:              nil,
+        content_type:               nil,
+        target_klass_name:          nil,
+        position:                   99,
+        raw_template:               nil,
+        source:                     nil,
+        editable_elements:          {},
+        sections_content:           {},
+        sections_dropzone_content:  [],
+        redirect:                   nil,
+        redirect_url:               {},
+        redirect_type:              nil,
+        parent_id:                  nil,
+        parent_ids:                 nil,
+        updated_at:                 Time.zone.now
       }.merge(attributes))
     end
 

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

@@ -0,0 +1,24 @@
+module Locomotive::Steam
+  class Section
+
+    include Locomotive::Steam::Models::Entity
+
+    def initialize(attributes = {})
+      super({
+        slug:       nil,
+        template:   nil,
+        source:     nil,
+        definition: nil
+      }.merge(attributes))
+    end
+
+    def source
+      self[:template]
+    end
+
+    def type
+      self[:slug]
+    end
+
+  end
+end

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

@@ -19,7 +19,9 @@ module Locomotive::Steam
         password:                 nil,
         metafields_schema:        {},
         metafields:               nil,
-        asset_host:               nil
+        sections:                 nil,
+        asset_host:               nil,
+        routes:                   []
       }.merge(attributes))
     end
 

data/lib/locomotive/steam/liquid.rb

@@ -5,4 +5,6 @@ require_relative 'liquid/patches'
 require_relative 'liquid/drops/base'
 require_relative 'liquid/drops/i18n_base'
 require_relative 'liquid/tags/hybrid'
+require_relative 'liquid/tags/concerns/section'
+require_relative 'liquid/tags/section'
 require_relative_all %w(. drops filters tags/concerns tags), 'liquid'

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

@@ -4,8 +4,10 @@ module Locomotive
       module Drops
         class Page < I18nBase
 
-          delegate :position, :fullpath, :depth, :seo_title, :meta_keywords, :meta_description, :redirect_url, :handle, to: :@_source
-          delegate :listed?, :published?, :redirect?, :is_layout?, :templatized?, to: :@_source
+          delegate :position, :fullpath, :depth, :redirect_url, :handle, to: :@_source
+          delegate :seo_title, :meta_keywords, :meta_description, to: :@_source
+          delegate :listed?, :published?, :redirect?, :index?, :is_layout?, :templatized?, to: :@_source
+          delegate :sections_content, :sections_dropzone_content, to: :@_source
 
           def title
             title =  @_source.templatized? ? @context['entry'].try(:_label) : nil

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

@@ -0,0 +1,51 @@
+module Locomotive
+  module Steam
+    module Liquid
+      module Drops
+
+        class Params < ::Liquid::Drop
+
+          def initialize(params)
+            @_params = params.stringify_keys
+          end
+
+          def before_method(meth)
+            Param.new(@_params[meth.to_s])
+          end
+
+          def as_json
+            @_params.as_json
+          end
+
+        end
+
+        class Param < ::Liquid::Drop
+
+          def initialize(param)
+            @param = param
+          end
+
+          def html_safe
+            @param
+          end
+
+          def to_liquid
+            @param.is_a?(String) ? html_escape(@param) : @param
+          end
+
+          def to_s
+            to_liquid.to_s
+          end
+
+          private
+
+          def html_escape(string)
+            string.blank? ? '' : CGI::escapeHTML(string)
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,56 @@
+module Locomotive
+  module Steam
+    module Liquid
+      module Drops
+
+        class Section < ::Liquid::Drop
+
+          def initialize(section, content)
+            @section    = section
+            @content    = content
+
+            if @content.blank?
+              @content = section.definition['default'] || { 'settings' => {}, 'blocks' => [] }
+            end
+          end
+
+          # FIXME: id acts as the domID to build HTML tags
+          def id
+            @content['id']
+          end
+
+          def id=(id)
+            @content['id'] = id
+          end
+
+          def type
+            @section.type
+          end
+
+          def settings
+            @content_proxy ||= SectionContentProxy.new(
+              @content['settings'] || {},
+              @section.definition['settings'] || []
+            )
+          end
+
+          def css_class
+            @section.definition['class']
+          end
+
+          def blocks
+            (@content['blocks'] || []).each_with_index.map do |block, index|
+              SectionBlock.new(@section, block, index)
+            end
+          end
+
+          def editor_setting_data
+            SectionEditorSettingData.new(@section)
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,47 @@
+module Locomotive
+  module Steam
+    module Liquid
+      module Drops
+
+        # Section block drop
+        class SectionBlock < ::Liquid::Drop
+
+          def initialize(section, block, index)
+            @section    = section
+            @block      = block || { 'settings' => {} }
+            @index      = index
+            @definition = section.definition['blocks'].find do |block|
+              block['type'] == type
+            end
+          end
+
+          def id
+            @block['id'] || @index
+          end
+
+          def type
+            @block['type']
+          end
+
+          def settings
+            @content_proxy ||= SectionContentProxy.new(
+              @block['settings'] || {},
+              @definition['settings'] || []
+            )
+          end
+
+          def locomotive_attributes
+            if @context.registers[:live_editing]
+              value = "section-#{@context['section'].id}-block-#{id}"
+              %(data-locomotive-block="#{value}")
+            else
+              ''
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,97 @@
+module Locomotive
+  module Steam
+    module Liquid
+      module Drops
+
+        # Represent the content of a section or a block
+        # This abstraction is required to handle content manipulation
+        # based on field setting type (url for instance).
+        class SectionContentProxy < ::Liquid::Drop
+
+          def initialize(content, settings)
+            @content, @settings = content, settings
+          end
+
+          def before_method(name)
+            value = @content[name.to_s]
+
+            case type_of(name)
+            when 'url'          then SectionUrlField.new(*url_finder.url_for(value))
+            when 'image_picker' then SectionImagePickerField.new(value)
+            when 'text'         then url_finder.decode_urls_for(value)
+            else value
+            end
+          end
+
+          private
+
+          def type_of(name)
+            setting_of(name).try(:[], 'type')
+          end
+
+          def setting_of(name)
+            @settings.find { |setting| setting['id'] == name.to_s }
+          end
+
+          def url_finder
+            @context.registers[:services].url_finder
+          end
+
+        end
+
+        # Drop representing the valud of an image picker.
+        # It holds extra attributes like:
+        # the width, height, format and cropped of the image
+        class SectionImagePickerField < ::Liquid::Drop
+
+          def initialize(url_or_attributes)
+            if url_or_attributes.is_a?(String) || url_or_attributes.blank?
+              @attributes = { source: url_or_attributes }
+            else
+              @attributes = url_or_attributes.symbolize_keys || {}
+            end
+          end
+
+          def source
+            @attributes[:source]
+          end
+
+          def width
+            @attributes[:width]
+          end
+
+          def height
+            @attributes[:height]
+          end
+
+          def cropped
+            @attributes[:cropped]
+          end
+
+          def to_s
+            self.cropped || self.source || ''
+          end
+
+        end
+
+        # Drop representing the value of an url attribute
+        class SectionUrlField < ::Liquid::Drop
+
+          def initialize(url, new_window = false)
+            @url, @new_window = url || '#', new_window
+          end
+
+          def new_window
+            @new_window
+          end
+
+          def to_s
+            @url
+          end
+
+        end
+
+      end
+    end
+  end
+end