locomotivecms_wagon 2.4.1 → 3.0.0.beta2

data/lib/locomotive/wagon/commands/push_sub_commands/push_sections_command.rb

@@ -0,0 +1,23 @@
+module Locomotive::Wagon
+
+  class PushSectionsCommand < PushBaseCommand
+
+    def entities
+      repositories.section.all
+    end
+
+    def decorate(entity)
+      SectionDecorator.new(entity, content_assets_pusher)
+    end
+
+    def persist(decorated_entity)
+      api_client.sections.update(decorated_entity.slug, decorated_entity.to_hash)
+    end
+
+    def label_for(decorated_entity)
+      decorated_entity.name
+    end
+
+  end
+
+end

data/lib/locomotive/wagon/commands/push_sub_commands/push_site_command.rb

@@ -23,6 +23,8 @@ module Locomotive::Wagon
 
       _attributes.delete(:metafields) unless with_data?
 
+      _attributes.delete(:sections_content) unless with_data?
+
       if _attributes.present?
         api_client.current_site.update(_attributes)
       else

data/lib/locomotive/wagon/commands/serve_command.rb

@@ -75,7 +75,7 @@ module Locomotive::Wagon
 
       Locomotive::Steam.configure do |config|
         config.mode           = :test
-        config.adapter        = { name: :filesystem, path: File.expand_path(path) }
+        config.adapter        = { name: :filesystem, path: File.expand_path(path), env: options[:env].to_sym }
         config.asset_path     = File.expand_path(File.join(path, 'public'))
         config.minify_assets  = false
 

data/lib/locomotive/wagon/commands/sync_command.rb

@@ -43,7 +43,7 @@ module Locomotive::Wagon
       site = api_client.current_site.get
 
       each_resource do |klass|
-        klass.sync(api_client, site, path)
+        klass.sync(api_client, site, path, env)
       end
 
       print_result_message

data/lib/locomotive/wagon/commands/sync_sub_commands/concerns/base_concern.rb

@@ -14,8 +14,8 @@ module Locomotive::Wagon
 
     module ClassMethods
 
-      def sync(api_client, current_site, path)
-        new(api_client, current_site, path).sync
+      def sync(api_client, current_site, path, env)
+        new(api_client, current_site, path, env).sync
       end
 
     end

data/lib/locomotive/wagon/commands/sync_sub_commands/sync_pages_command.rb

@@ -1,3 +1,5 @@
+require 'neatjson'
+
 module Locomotive::Wagon
 
   class SyncPagesCommand < PullPagesCommand
@@ -5,59 +7,68 @@ module Locomotive::Wagon
     include Locomotive::Wagon::BaseConcern
 
     def write_page(page, locale = nil)
-      filepath = page_filepath(page, locale)
+      instrument :writing, label: "#{page.fullpath} (#{locale})"
 
-      if File.exists?(filepath)
-        # only copy the content of the editable elements
-        if attributes = editable_elements_attributes(page, locale)
-          new_content = replace_editable_elements(filepath, dump(attributes))
+      filepath = data_path(page, locale)
 
-          write_to_file(filepath, new_content)
-        end
-      else
-        # pull the whole page
-        super
-      end
-    end
+      return if page.fullpath =~ /^layouts(\/.*)?$/
 
-    private
+      attributes = {
+        id:                         page._id,
+        title:                      page.title,
+        slug:                       page.slug,
+        handle:                     page.handle,
+        listed:                     page.listed,
+        published:                  page.published,
+        position:                   page.position,
+        fullpath:                   @fullpaths[page._id]
+      }
 
-    def editable_elements_attributes(page, locale)
-      list = page.editable_elements.inject({}) do |hash, el|
-        hash["#{el['block']}/#{el['slug']}"] = replace_asset_urls(el['content']) if el['content']
-        hash
+      if page.redirect_url.present?
+        attributes.merge!({ redirect_url: page.redirect_url })
+      else
+        attributes.merge!({
+          sections_content:           sections_content(page),
+          sections_dropzone_content:  sections_dropzone_content(page),
+          editable_elements:          editable_elements_attributes(page),
+          seo_title:                  page.seo_title,
+          meta_description:           page.meta_description,
+          meta_keywords:              page.meta_keywords
+        })
+
+        attributes[:raw_template] = page.template if page.handle.blank?
       end
 
-      list.empty? ? nil : { 'editable_elements' => list }
+      write_to_file(filepath, replace_asset_urls(JSON.neat_generate(attributes)))
+
+      instrument :write_with_success
     end
 
-    def replace_editable_elements(filepath, replacement)
-      content   = File.read(File.join(path, filepath), encoding: 'utf-8')
-      existing  = content =~ /\A.*?editable_elements:.*?\n---/m
+    private
 
-      content.gsub /\A---(.*?)\n---/m do |s|
-        if existing
-          s.gsub(/editable_elements:\n(.*?)\n(\S)/m) { |_s| "#{replacement}#{$2}" }
-        else
-          s.gsub(/---\Z/) { |_s| "#{replacement}\n---" }
-        end
-      end
+    def sections_content(page)
+      JSON.parse(page.sections_content)
     end
 
-    def page_filepath(page, locale)
-      fullpath = locale == default_locale ? page.fullpath : "#{fullpaths[page._id]}.#{locale}"
+    def sections_dropzone_content(page)
+      JSON.parse(page.sections_dropzone_content)
+    end
 
-      # HAML template?
-      if File.exists?(filepath = _page_filepath(fullpath, '.haml'))
-        return filepath
+    def editable_elements_attributes(page)
+      page.editable_elements.inject({}) do |hash, el|
+        hash["#{el['block']}/#{el['slug']}"] = el['content'] if el['content']
+        hash
       end
+    end
 
-      # simple Liquid template OR the page does not exist in the local site
-      _page_filepath(fullpath)
+    def page_handle(page)
+      page.handle || (%w(index 404).include?(page.fullpath) ? page.fullpath : nil)
     end
 
-    def _page_filepath(fullpath, additional_extension = '')
-      File.join('app', 'views', 'pages', fullpath + ".liquid#{additional_extension}")
+    def data_path(page, locale)
+      filepath = @fullpaths[page._id]
+      filepath = 'index' if filepath.blank? || filepath == '/' || filepath == "/#{default_locale}"
+      File.join('data', env.to_s, 'pages', locale, filepath + '.json')
     end
 
   end

data/lib/locomotive/wagon/commands/sync_sub_commands/sync_site_command.rb

@@ -5,25 +5,28 @@ module Locomotive::Wagon
     include Locomotive::Wagon::BaseConcern
 
     def _sync
-      attributes = current_site.attributes.slice('metafields')
+      attributes = current_site.attributes.slice('name', 'timezone', 'seo_title', 'meta_keywords', 'meta_description', 'robots_txt', 'metafields', 'sections_content')
+
+      locales.each_with_index do |locale, index|
+        if index == 0
+          transform_in_default_locale(attributes, locale)
+        else
+          add_other_locale(attributes, locale)
+        end
+      end if locales.size > 1
 
-      # convert to hash + download assets and use the asset local version
       decode_metafields(attributes)
+      decode_sections_content(attributes)
 
-      # modify the config/site.yml file accordingly
-      replace_metafields_in_file(attributes['metafields'])
+      write_to_file(site_filepath, replace_asset_urls(JSON.neat_generate(attributes, {
+        sort: true, short: false, padding: 1, object_padding: 1, after_colon: 1, after_comma: 1, wrap: 20, aligned: false
+      })))
     end
 
     protected
 
-    def replace_metafields_in_file(metafields)
-      return if metafields.blank?
-
-      content = File.read(File.join(path, 'config', 'site.yml'))
-
-      content.gsub!(/^metafields:\n.+\n\s+.*?\n/m, { 'metafields' => metafields }.to_yaml.to_s.gsub(/\A---\n/, ''))
-
-      File.write(File.join(path, 'config', 'site.yml'), content)
+    def site_filepath
+      File.join('data', env.to_s, 'site.json')
     end
 
   end

data/lib/locomotive/wagon/commands/sync_sub_commands/sync_translations_command.rb

@@ -4,6 +4,18 @@ module Locomotive::Wagon
 
     include Locomotive::Wagon::BaseConcern
 
+    private
+
+    def write_translations(translations)
+      write_to_file(translations_filepath, JSON.neat_generate(translations, {
+        sort: true, short: false, padding: 1, object_padding: 1, after_colon: 1, after_comma: 1, wrap: 20, aligned: false
+      }))
+    end
+
+    def translations_filepath
+      File.join('data', env.to_s, 'translations.json')
+    end
+
   end
 
 end

data/lib/locomotive/wagon/decorators/concerns/persist_assets_concern.rb

@@ -7,7 +7,7 @@ module Locomotive::Wagon
     def replace_with_content_assets!(text)
       return text if text.blank?
 
-      text.to_s.gsub(/([^a-zA-Z0-9])(\/samples\/\S*\.[a-zA-Z0-9]+)/) do
+      text.to_s.gsub(/([^a-zA-Z0-9])(\/samples\/[\/a-zA-Z0-9_-]+\.[a-zA-Z0-9]+)/) do
         url = __content_assets_pusher__.persist($2) || $2
         $1 + url
       end

data/lib/locomotive/wagon/decorators/content_entry_decorator.rb

@@ -78,7 +78,7 @@ module Locomotive
     class ContentEntryWithLocalizedAttributesDecorator < ContentEntryDecorator
 
       def __attributes__
-        %i(_slug) + fields.localized_names
+        %i(_slug) + fields.localized_names(include_select_field_id: false)
       end
 
     end

data/lib/locomotive/wagon/decorators/content_type_decorator.rb

@@ -11,7 +11,7 @@ module Locomotive
       end
 
       def __attributes__
-        %i(name slug description label_field_name fields
+        %i(name slug description label_field_name tree_parent_field_name fields
           order_by order_direction group_by
           public_submission_enabled
           public_submission_accounts
@@ -70,6 +70,10 @@ module Locomotive
         self[:filter_fields]
       end
 
+      def tree_parent_field_name
+        self[:tree_parent_field_name]
+      end
+
       def with_relationships?
         __getobj__.fields.associations.count > 0
       end

data/lib/locomotive/wagon/decorators/content_type_field_decorator.rb

@@ -13,7 +13,11 @@ module Locomotive
       def __attributes__
         %i(name type label hint required localized unique position
           text_formatting select_options
-          target inverse_of order_by ui_enabled default)
+          target inverse_of order_by ui_enabled default group)
+      end
+
+      def group
+        self[:group] || 'main'
       end
 
       def type

data/lib/locomotive/wagon/decorators/page_decorator.rb

@@ -22,13 +22,15 @@ module Locomotive
           redirect_url redirect_type
           seo_title meta_keywords meta_description
           editable_elements
+          sections_dropzone_content
+          sections_content
           content_type
           template
           display_settings)
 
         # remove the attributes that end-users might have modified in the back-office
         if persisted? && !__persist_content__
-          _attributes -= %i(title published listed position seo_title meta_keywords meta_description editable_elements)
+          _attributes -= %i(title published listed position seo_title meta_keywords meta_description editable_elements sections_dropzone_content sections_content)
         end
 
         # no need to update the slug if this is for an update
@@ -83,6 +85,14 @@ module Locomotive
         end
       end
 
+      def sections_dropzone_content
+        replace_with_content_assets!(super&.to_json)
+      end
+
+      def sections_content
+        replace_with_content_assets!(super&.to_json)
+      end
+
       def template
         replace_with_content_assets!(self.liquid_source)
       end

data/lib/locomotive/wagon/decorators/section_decorator.rb

@@ -0,0 +1,35 @@
+module Locomotive
+  module Wagon
+
+    class SectionDecorator < Locomotive::Steam::Decorators::TemplateDecorator
+
+      include ToHashConcern
+      include PersistAssetsConcern
+
+      attr_accessor :__content_assets_pusher__
+
+      def initialize(object, content_assets_pusher)
+        self.__content_assets_pusher__ = content_assets_pusher
+        super(object, nil, nil)
+      end
+
+      def __attributes__
+        %i(name slug template definition)
+      end
+
+      def id
+        slug
+      end
+
+      def template
+        replace_with_content_assets!(self.liquid_source)
+      end
+
+      def definition
+        replace_with_content_assets!(__getobj__.definition.to_json)
+      end
+
+    end
+
+  end
+end

data/lib/locomotive/wagon/decorators/site_decorator.rb

@@ -22,7 +22,15 @@ module Locomotive
 
       def metafields
         replace_with_content_assets_in_hash!(self[:metafields])
-        self[:metafields].try(:to_json)
+        self[:metafields]&.to_json
+      end
+
+      def sections_content
+        replace_with_content_assets!(super&.to_json)
+      end
+
+      def routes
+        self[:routes]&.to_json
       end
 
       def picture
@@ -34,14 +42,14 @@ module Locomotive
         end
       end
 
-      %i(robots_txt timezone seo_title meta_keywords meta_description asset_host).each do |name|
+      %i(robots_txt timezone seo_title meta_keywords meta_description asset_host sections_content routes).each do |name|
         define_method(name) do
           self[name]
         end
       end
 
       def __attributes__
-        %i(name handle robots_txt locales timezone seo_title meta_keywords meta_description picture metafields_schema metafields metafields_ui asset_host)
+        %i(name handle robots_txt locales timezone seo_title meta_keywords meta_description picture metafields_schema metafields metafields_ui asset_host sections_content routes)
       end
 
       def edited?
@@ -53,7 +61,7 @@ module Locomotive
     class UpdateSiteDecorator < SiteDecorator
 
       def __attributes__
-        %i(picture locales metafields_schema metafields metafields_ui asset_host)
+        %i(picture locales metafields_schema metafields metafields_ui asset_host sections_content routes)
       end
 
     end

data/lib/locomotive/wagon/decorators/theme_asset_decorator.rb

@@ -29,7 +29,7 @@ module Locomotive
       end
 
       def stylesheet_or_javascript?
-        File.extname(realname) =~ /^\.(css|scss|less|js|coffee)/
+        File.extname(realname) =~ /^\.(css|scss|less|js|coffee)$/
       end
 
       def checksum
@@ -71,7 +71,7 @@ module Locomotive
           File.basename(filename, extension) + new_extension
         end
       end
-      
+
       def _readfile(path, &block)
         File.open(path, 'rb', &block)
       end

data/lib/locomotive/wagon/generators/page.rb

@@ -14,8 +14,6 @@ module Locomotive
         argument :target_path # path to the site
 
         def create_page
-          extension = haml? ? 'liquid.haml' : 'liquid'
-
           segments      = self.slug.split('/').find_all { |segment| segment != '' }
           max_segments  = segments.size
 
@@ -26,11 +24,11 @@ module Locomotive
             # the content type option is never deleted for the first segment (the requested template)
             _options.delete(:content_type) unless segments.size == (max_segments - 1)
 
-            template "template.#{extension}.tt", "#{file_path}.#{extension}", _options
+            template 'template.liquid.tt', "#{file_path}.liquid", _options
 
             self.other_locales.each do |locale|
               _options[:translated] = true
-              template "template.#{extension}.tt", "#{file_path}.#{locale}.#{extension}", _options
+              template 'template.liquid.tt', "#{file_path}.#{locale}.liquid", _options
             end
           end
         end
@@ -41,14 +39,6 @@ module Locomotive
 
         protected
 
-        def haml?
-          if options[:haml].nil?
-            yes?('Do you prefer a HAML template ?')
-          else
-            options[:haml]
-          end
-        end
-
         def pages_path
           File.join(target_path, 'app', 'views', 'pages')
         end