locomotivecms_wagon 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65cdfd7e0302e3c737a42acb94faef8f281161f4
-  data.tar.gz: 8845d7c25cf6fd0828e814c668fe1814bd17d349
+  metadata.gz: c16813277aecf384b3c2a2b8b3eeab3db1da8237
+  data.tar.gz: c031bdde8b3277407a0c45e840729e54b2254f9d
 SHA512:
-  metadata.gz: 6e7dced59163627556085acc3ed97376d1450fa601cabf5dbf95ad6535e9267642748f00914da20b1a18f8c353fec0d9fa32633eeacc02376649d57e2502908c
-  data.tar.gz: 29f0d3d74ddbe58800f9a349f06a839adfaa4bf66adfd3de9fe590ab29b37667a89f026282cf0a3060e3a22722e4d420e827971fffd0ecbacc9015613650a2ab
+  metadata.gz: a8ca25014447c4c0909a95fe53bf7869d3469cfd21c67af9a38a3a6201b91c0feaaf3901b7c0b579aaa9ec9de6653ebbfa8fc09afec754f9f02fd6e618931735
+  data.tar.gz: 9cd1c6e2702d962229a20c98a3f3e0be6a1b35bc17da1318644673fa834c8c5d9b13e7a95c183c79ae3c4b8314ce3881609ee59cf01975086fe4be69cb8dfd8d

data/Gemfile

@@ -6,14 +6,14 @@ gemspec
 gem 'rb-fsevent', '~> 0.9.1'
 
 # Development
-# gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: '940837b', require: false
+# gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: 'ee5b98e', require: false
 # gem 'locomotivecms_coal', github: 'locomotivecms/coal', ref: '32b2844', require: false
 # gem 'locomotivecms_common', github: 'locomotivecms/common', ref: '3046b79893', require: false
 
 # Local development
 # gem 'locomotivecms_coal', path: '../gems/coal', require: false
 # gem 'locomotivecms_steam', path: '../gems/steam', require: false
-# gem 'locomotivecms_common', path: '../in_progress/common', require: false
+# gem 'locomotivecms_common', path: '../gems/common', require: false
 
 group :development, :test do
   gem 'pry-byebug',         '~> 3.1.0'

data/README.md

@@ -1,6 +1,6 @@
 # Wagon
 
-[![Gem Version](https://badge.fury.io/rb/locomotivecms_wagon.svg)](http://badge.fury.io/rb/locomotivecms_wagon) [![Code Climate](https://codeclimate.com/github/locomotivecms/wagon/badges/gpa.svg)](https://codeclimate.com/github/locomotivecms/wagon) [![Dependency Status](https://gemnasium.com/locomotivecms/wagon.png)](https://gemnasium.com/locomotivecms/wagon) [![Build Status](https://travis-ci.org/locomotivecms/wagon.svg?branch=master)](https://travis-ci.org/locomotivecms/wagon) [![Coverage Status](https://coveralls.io/repos/locomotivecms/wagon/badge.svg?branch=master)](https://coveralls.io/r/locomotivecms/wagon?branch=master)
+[![Gem Version](https://badge.fury.io/rb/locomotivecms_wagon.svg)](http://badge.fury.io/rb/locomotivecms_wagon) [![Code Climate](https://codeclimate.com/github/locomotivecms/wagon/badges/gpa.svg)](https://codeclimate.com/github/locomotivecms/wagon) [![Dependency Status](https://gemnasium.com/locomotivecms/wagon.png)](https://gemnasium.com/locomotivecms/wagon) [![Build Status](https://travis-ci.org/locomotivecms/wagon.svg?branch=master)](https://travis-ci.org/locomotivecms/wagon) [![Coverage Status](https://coveralls.io/repos/locomotivecms/wagon/badge.svg?branch=master)](https://coveralls.io/r/locomotivecms/wagon?branch=master) [![Join the chat at https://gitter.im/locomotivecms/wagon](https://badges.gitter.im/locomotivecms/wagon.svg)](https://gitter.im/locomotivecms/wagon?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 Wagon is a command line tool that let's you develop for Locomotive right on your local machine.
 

data/generators/page/template.liquid.haml.tt

@@ -20,6 +20,9 @@ published: true
 # sets a redirection to the given url (301)
 # redirect_url: "<url to a page or to a remote url>"
 
+# other unique identifier of this page. To be used with the path_to liquid tag.
+# handle: my-page-handle
+
 # content type that this page is templatizing
 <% if config[:content_type] -%>
 content_type: <%= config[:content_type] -%>

data/generators/page/template.liquid.tt

@@ -4,10 +4,12 @@ title: <%= config[:title] -%>
 
 # unique identifier for urls, the same as a permalink
 slug: <%= config[:slug] -%>
-<% end %>
+
+<% else -%>
+
 
 # true if the page is included in the menu
-listed: <% if config[:listed] -%><%= config[:listed] %><% else -%>true<% end -%>
+listed: <% if config[:listed] -%><%= config[:listed] %><% else -%>true<% end %>
 
 # true if the page is published
 published: true
@@ -21,11 +23,15 @@ published: true
 # sets a redirection to the given url (301)
 # redirect_url: "<url to a page or to a remote url>"
 
+# other unique identifier of this page. To be used with the path_to liquid tag.
+# handle: my-page-handle
+
 # content type that this page is templatizing
 <% if config[:content_type] -%>
 content_type: <%= config[:content_type] -%>
 <% else -%>
 # content_type: "<slug of one of the content types>"
+<% end %>
 <% end -%>
 
 # editable_elements:

data/lib/locomotive/wagon.rb

@@ -34,9 +34,9 @@ module Locomotive
     # @param [ String ] path The path of the site
     # @param [ Hash ] options The options for the thin server (host, port)
     #
-    def self.serve(path, options)
+    def self.serve(path, options, shell)
       require_relative 'wagon/commands/serve_command'
-      Locomotive::Wagon::ServeCommand.start(path, options)
+      Locomotive::Wagon::ServeCommand.start(path, options, shell)
     end
 
     # Stop the thin server.
@@ -44,9 +44,9 @@ module Locomotive
     # @param [ String ] path The path of the site
     # @param [ Hash ] force If true, block the current thread for 2s
     #
-    def self.stop(path, force = false)
+    def self.stop(path, force = false, shell)
       require_relative 'wagon/commands/serve_command'
-      Locomotive::Wagon::ServeCommand.stop(path, force)
+      Locomotive::Wagon::ServeCommand.stop(path, force, shell)
     end
 
     # Generate components for the LocomotiveCMS site such as content types, snippets, pages.

data/lib/locomotive/wagon/cli.rb

@@ -270,15 +270,10 @@ module Locomotive
         option :force, aliases: '-f', type: 'boolean', default: false, desc: 'Stop the current daemonized Thin server if found before starting a new one'
         option :verbose, aliases: '-v', type: 'boolean', default: false, desc: 'display the full error stack trace if an error occurs'
         def serve(path = '.')
-          parent_pid = Process.pid
           force_color_if_asked(options)
           if check_path!(path)
             begin
-              Locomotive::Wagon.serve(path, options)
-            rescue SystemExit => e
-              if parent_pid == Process.pid
-                say "Your site is served now.", :green
-              end
+              Locomotive::Wagon.serve(path, options, shell)
             rescue Exception => e
               self.print_exception(e, options[:verbose])
               exit(1)
@@ -291,8 +286,7 @@ module Locomotive
           force_color_if_asked(options)
           if check_path!(path)
             begin
-              Locomotive::Wagon.stop(path)
-              say "Your site is not served anymore.", :green
+              Locomotive::Wagon.stop(path, false, shell)
             rescue Exception => e
               say e.message, :red
               exit(1)

data/lib/locomotive/wagon/commands/pull_sub_commands/pull_content_entries_command.rb

@@ -41,7 +41,7 @@ module Locomotive::Wagon
         end
       end
 
-      { entry[default_locale].attributes[content_type.label_field_name] => clean_attributes(attributes) }
+      { entry[default_locale].attributes[content_type.label_field_name].to_s => clean_attributes(attributes) }
     end
 
     def fetch_content_types(&block)

data/lib/locomotive/wagon/commands/pull_sub_commands/pull_content_types_command.rb

@@ -37,12 +37,18 @@ module Locomotive::Wagon
     end
 
     def select_options_yaml(options)
+      return if options.blank?
+
+      ordered_options = options.sort { |option| option['position'] }
+
       if locales.size > 1
-        locales.inject do |_options, locale|
-          _options[locale] = attributes.map { |option| options['name'][locale.to_s] }
+        {}.tap do |_options|
+          ordered_options.each do |option|
+            locales.each { |locale| (_options[locale] ||= []) << option['name'][locale.to_s] }
+          end
         end
       else
-        options.map { |option| option['name'][default_locale] }
+        ordered_options.map { |option| option['name'][default_locale] }
       end
     end
 

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

@@ -19,6 +19,8 @@ module Locomotive::Wagon
       # push the locales as long as there is no content on the remote site yet
       _attributes.delete(:locales) if remote_site.edited?
 
+      _attributes.delete(:metafields) unless with_data?
+
       if _attributes.present?
         api_client.current_site.update(_attributes)
       else

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

@@ -7,7 +7,7 @@ module Locomotive::Wagon
     end
 
     def decorate(entity)
-      SnippetDecorator.new(entity, locale, default_locale)
+      SnippetDecorator.new(entity, locale, content_assets_pusher)
     end
 
     def persist(decorated_entity)

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

@@ -1,21 +1,18 @@
 module Locomotive::Wagon
 
-  class ServeCommand < Struct.new(:path, :options)
+  class ServeCommand < Struct.new(:path, :options, :shell)
 
-    attr_reader :use_listen
-
-    def initialize(path, options)
-      super(path, options || {})
-
-      @use_listen = !self.options[:disable_listen]
+    def initialize(path, options, shell)
+      super(path, options || {}, shell)
+      @parent_id = nil
     end
 
-    def self.start(path, options = {})
-      new(path, options).start
+    def self.start(path, options = {}, shell)
+      new(path, options, shell).start
     end
 
-    def self.stop(path, force = false)
-      new(path, nil).stop(force)
+    def self.stop(path, force = false, shell)
+      new(path, nil, shell).stop(force)
     end
 
     def start
@@ -25,20 +22,36 @@ module Locomotive::Wagon
       # Steam is our rendering engine
       require_steam
 
-      daemonize if options[:daemonize]
+      if options[:daemonize]
+        daemonize
+      else
+        setup_signals
+
+        show_start_message
+      end
 
       # if a page, a content type or any resources of the site is getting modified,
-      # then the cache of Steam will be notified.
-      listen if use_listen
+      # then the cache of Steam will be cleared.
+      listen if @parent_pid.nil? || Process.pid != @parent_pid
 
       # let's start!
       server.start
+
+    rescue SystemExit => e
+      show_start_message if @parent_pid == Process.pid
     end
 
     def stop(force = false)
+      unless File.exists?(server_pid_file)
+        shell.say "No Wagon server is running.", :red
+        return
+      end
+
       pid = File.read(server_pid_file).to_i
       Process.kill('TERM', pid)
 
+      shell.say "\nShutting down Wagon server"
+
       # make sure we wait enough for the server process to stop
       sleep(2) if force
     end
@@ -54,6 +67,8 @@ module Locomotive::Wagon
 
       configure_logger
 
+      subscribe_to_notifications
+
       Locomotive::Steam.configure do |config|
         config.mode         = :test
         config.adapter      = { name: :filesystem, path: File.expand_path(path) }
@@ -70,7 +85,7 @@ module Locomotive::Wagon
 
     def daemonize
       # very important to get the parent pid in order to differenciate the sub process from the parent one
-      parent_pid = Process.pid
+      @parent_pid = Process.pid
 
       # The Daemons gem closes all file descriptors when it daemonizes the process. So any logfiles that were opened before the Daemons block will be closed inside the forked process.
       # So, close the current logger and set it up again when daemonized.
@@ -78,12 +93,11 @@ module Locomotive::Wagon
 
       server.log_file = server_log_file
       server.pid_file = server_pid_file
-      server.daemonize
 
-      use_listen = use_listen && Process.pid != parent_pid
+      server.daemonize
 
       # A "new logger" inside the daemon.
-      configure_logger if Process.pid != parent_pid
+      configure_logger if Process.pid != @parent_pid
     end
 
     def listen
@@ -103,20 +117,50 @@ module Locomotive::Wagon
       # TODO: new feature -> pick the right Rack handler (Thin, Puma, ...etc)
       require 'thin'
 
-      # Thin in debug mode
-      # Thin::Logging.debug = true
+      # Do not display the default Thin server startup message
+      Thin::Logging.logger = Logger.new(server_log_file)
+
+      # Thin in debug mode only if the THIN_DEBUG_ON has been set in the shell
+      Thin::Logging.debug = ENV['THIN_DEBUG_ON']
 
       app = Locomotive::Steam.to_app
 
-      Thin::Server.new(options[:host], options[:port], { signals: true }, app).tap do |server|
+      Thin::Server.new(options[:host], options[:port], { signals: false }, app).tap do |server|
         server.threaded = true
+        server.log_file = server_log_file
       end
     end
 
     def configure_logger
       Locomotive::Common.reset
       Locomotive::Common.configure do |config|
-        config.notifier = Locomotive::Common::Logger.setup(log_file)
+        logger = options[:daemonize] ? log_file : nil
+        config.notifier = Locomotive::Common::Logger.setup(logger)
+      end
+    end
+
+    def subscribe_to_notifications
+      # Page not found
+      ActiveSupport::Notifications.subscribe('steam.render.page_not_found') do |name, start, finish, id, payload|
+        fullpath, locale, default_locale = payload[:path], payload[:locale], payload[:default_locale]
+
+        filepath = File.join(File.expand_path(path), 'app', 'views', 'pages', fullpath + (locale != default_locale ? ".#{locale}" : '') + '.liquid')
+
+        message = "[Tip]".light_white + " add a new page in your Wagon site at this location: " + filepath.light_white
+
+        Locomotive::Common::Logger.info (' ' * 2) + message
+      end
+    end
+
+    def setup_signals
+      %w(INT TERM).each do |signal|
+        trap(signal) do
+          show_stop_message
+
+          EM.add_timer(1) do
+            server.stop
+          end
+        end
       end
     end
 
@@ -132,6 +176,14 @@ module Locomotive::Wagon
       File.expand_path(File.join(path, 'log', 'wagon.log'))
     end
 
+    def show_start_message
+      shell.say "Your site is served now.\nBrowse http://#{options[:host]}:#{options[:port]}\n\n", :green
+    end
+
+    def show_stop_message
+      shell.say "\nShutting down Wagon server"
+    end
+
   end
 
 end

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

@@ -13,7 +13,7 @@ module Locomotive
       def __attributes__
         %i(name type label hint required localized unique position
           text_formatting select_options
-          target inverse_of order_by ui_enabled)
+          target inverse_of order_by ui_enabled default)
       end
 
       def type
@@ -48,8 +48,8 @@ module Locomotive
       end
 
       def ui_enabled
-        return nil unless is_relationship?
-        self[:order_by]
+        return nil if self[:ui_enabled].nil?
+        self[:ui_enabled]
       end
 
       def select_options

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

@@ -18,14 +18,14 @@ module Locomotive
         end
       end
 
-      %i(robots_txt timezone seo_title meta_keywords meta_description).each do |name|
+      %i(robots_txt timezone seo_title meta_keywords meta_description metafields_schema metafields).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)
+        %i(name handle robots_txt locales timezone seo_title meta_keywords meta_description picture metafields_schema metafields)
       end
 
       def edited?
@@ -37,7 +37,7 @@ module Locomotive
     class UpdateSiteDecorator < SiteDecorator
 
       def __attributes__
-        %i(picture locales)
+        %i(picture locales metafields_schema metafields)
       end
 
     end

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

@@ -4,6 +4,18 @@ module Locomotive
     class SnippetDecorator < Locomotive::Steam::Decorators::TemplateDecorator
 
       include ToHashConcern
+      include PersistAssetsConcern
+
+      attr_accessor :__content_assets_pusher__
+
+      def initialize(object, locale = nil, content_assets_pusher)
+        self.__content_assets_pusher__ = content_assets_pusher
+        super(object, locale, nil)
+      end
+
+      def __attributes__
+        %i(name slug template)
+      end
 
       def id
         slug
@@ -13,16 +25,12 @@ module Locomotive
         {}.tap do |translations|
           __getobj__.template_path.translations.each do |locale, _|
             __with_locale__(locale) do
-              translations[locale] = self.liquid_source
+              translations[locale] = replace_with_content_assets!(self.liquid_source)
             end
           end
         end
       end
 
-      def __attributes__
-        %i(name slug template)
-      end
-
     end
 
   end

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

@@ -62,6 +62,8 @@ module Locomotive
         end
 
         def other_locales
+          return @other_locales if @other_locales
+
           # Rules:
           # #1 default: [fr, en, es], asked: [en, de], result => [en]
           # #2 default: [fr, en, de], asked: [es], result => []
@@ -74,7 +76,7 @@ module Locomotive
           locales   = options[:default_locales]
           locales.shift
 
-          locales & (_locales || [])
+          @other_locales = locales & (_locales || [])
         end
 
       end