locomotivecms_wagon 1.0.2 → 1.1.0

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

@@ -2,26 +2,25 @@
 title: <%= config[:slug].humanize -%>
 <% if config[:translated] %>
 
-# TODO: explain it (used only if the page is not for the defaut locale)
+# unique identifier for urls, the same as a permalink
 slug: <%= config[:slug] -%>
 <% end %>
 
-# TODO: explain it
+# true if the page is included in the menu
 listed: true
 
-# TODO: explain it
+# true if the page is published
 published: true
 
-# TODO: explain it
+# position among sibling pages
 # position: 1
 
-# TODO: explain it
+# sets a redirection to the given url (301)
 # redirect_url: "<url to a page or to a remote url>"
 
-# TODO: explain it
+# content type that this page is templatizing
 # content_type: "<slug of one of the content types>"
 
-# TODO: explain it
 # editable_elements:
 #   'some_block/some_slug': "<text>"
 #   'some_block/some_slug': "<relative path to the file under the public/samples folder>"

data/generators/page/template.liquid.tt

@@ -1 +1,34 @@
-TEST LIQUID
+---
+title: <%= config[:slug].humanize -%>
+<% if config[:translated] %>
+
+# unique identifier for urls, the same as a permalink
+slug: <%= config[:slug] -%>
+<% end %>
+
+# true if the page is included in the menu
+listed: true
+
+# true if the page is published
+published: true
+
+# position among sibling pages
+# position: 1
+
+# sets a redirection to the given url (301)
+# redirect_url: "<url to a page or to a remote url>"
+
+# content type that this page is templatizing
+# content_type: "<slug of one of the content types>"
+
+# editable_elements:
+#   'some_block/some_slug': "<text>"
+#   'some_block/some_slug': "<relative path to the file under the public/samples folder>"
+---
+{% extends parent %}
+
+{% block main %}
+
+  <p>Hello world</p>
+
+{% endblock %}

data/lib/locomotive/wagon.rb

@@ -57,9 +57,14 @@ module Locomotive
     #
     def self.push(path, connection_info, options = {})
       if reader = self.require_mounter(path, true)
+        
+        reader.mounting_point.site.domains   = connection_info["domains"]   if connection_info["domains"]
+        reader.mounting_point.site.subdomain = connection_info["subdomain"] if connection_info["subdomain"]
+        require 'bundler'
         Bundler.require 'misc'
 
         writer = Locomotive::Mounter::Writer::Api.instance
+        self.validate_resources(options[:resources], writer.writers)
 
         connection_info[:uri] = "#{connection_info.delete(:host)}/locomotive/api"
 
@@ -88,6 +93,7 @@ module Locomotive
       _options[:only] = _options.delete(:resources)
 
       reader = Locomotive::Mounter::Reader::Api.instance
+      self.validate_resources(_options[:only], reader.readers)
       reader.run!(_options.merge(connection_info))
 
       writer = Locomotive::Mounter::Writer::FileSystem.instance
@@ -112,7 +118,7 @@ module Locomotive
       # generate an almost blank site
       require 'locomotive/wagon/generators/site'
       generator = Locomotive::Wagon::Generators::Site::Cloned
-      generator.start [name, path, connection_info]
+      generator.start [name, path, connection_info.symbolize_keys]
 
       # pull the remote site
       self.pull(target_path, options.merge(connection_info).with_indifferent_access, { disable_misc: true })
@@ -160,5 +166,13 @@ module Locomotive
       end
     end
 
+    protected
+    def self.validate_resources(resources, writers_or_readers)
+      return if resources.nil?
+      valid_resources = writers_or_readers.map { |thing| thing.to_s.demodulize.gsub(/Writer$|Reader$/, '').underscore }
+      resources.each do |resource|
+        raise ArgumentError, "'#{resource}' resource not recognized. Valid resources are #{valid_resources.join(', ')}." unless valid_resources.include?(resource)
+      end
+    end
   end
 end

data/lib/locomotive/wagon/cli.rb

@@ -135,11 +135,14 @@ module Locomotive
           end
         end
 
-        desc 'clone NAME HOST EMAIL PASSWORD [PATH]', 'Clone a remote LocomotiveCMS site'
-        method_option :verbose, aliases: '-v', type: 'boolean', default: false, desc: 'display the full error stack trace if an error occurs'
-        def clone(name, host, email, password, path = '.')
+        desc 'clone NAME HOST [PATH]', 'Clone a remote LocomotiveCMS site'
+        method_option :verbose,   aliases: '-v', type: 'boolean', default: false, desc: 'display the full error stack trace if an error occurs'
+        method_option :email,     aliases: '-e', desc: 'email of an administrator account'
+        method_option :password,  aliases: '-p', desc: 'password of an administrator account'
+        method_option :api_key,   aliases: '-a', desc: 'api key of an administrator account'
+        def clone(name, host, path = '.')
           begin
-            if Locomotive::Wagon.clone(name, path, host: host, email: email, password: password)
+            if Locomotive::Wagon.clone(name, path, { host: host }.merge(options))
               self.print_next_instructions_when_site_created(name, path)
             end
           rescue Exception => e
@@ -179,6 +182,7 @@ module Locomotive
         desc 'push ENV [PATH]', 'Push a site to a remote LocomotiveCMS engine'
         method_option :resources, aliases: '-r', type: 'array', default: nil, desc: 'Only push the resource(s) passed in argument'
         method_option :force, aliases: '-f', type: 'boolean', default: false, desc: 'Force the push of a resource'
+        method_option :force_translations, type: 'boolean', default: false, desc: 'Force the push of local translations. You must specify it even if already using -f'
         method_option :data, aliases: '-d', type: 'boolean', default: false, desc: 'Push the content entries and the editable elements (by default, they are not)'
         method_option :verbose, aliases: '-v', type: 'boolean', default: false, desc: 'display the full error stack trace if an error occurs'
         def push(env, path = '.')

data/lib/locomotive/wagon/generators/site/foundation.rb

@@ -27,7 +27,7 @@ module Locomotive
         end
 
         Locomotive::Wagon::Generators::Site.register(:foundation, Foundation, %{
-          A LocomotiveCMS site powered by Foundation (v4.0.9).
+          A LocomotiveCMS site powered by Foundation (v4.2.1).
         })
       end
     end

data/lib/locomotive/wagon/liquid.rb

@@ -1,12 +1,11 @@
-require "locomotive/mounter"
 require 'liquid'
+require 'locomotive/mounter'
 require 'locomotive/wagon/liquid/drops/base'
 
 %w{. drops tags filters}.each do |dir|
   Dir[File.join(File.dirname(__FILE__), 'liquid', dir, '*.rb')].each { |lib| require lib }
 end
 
-
 # add to_liquid methods to main models from the mounter
 %w{site page content_entry}.each do |name|
   klass = "Locomotive::Mounter::Models::#{name.classify}".constantize

data/lib/locomotive/wagon/liquid/drops/content_types.rb

@@ -1,3 +1,5 @@
+require "locomotive/wagon/scopeable"
+
 module Locomotive
   module Wagon
     module Liquid
@@ -12,6 +14,7 @@ module Locomotive
         end
 
         class ProxyCollection < ::Liquid::Drop
+          include Scopeable
 
           def initialize(content_type)
             @content_type = content_type
@@ -31,6 +34,7 @@ module Locomotive
           end
 
           alias :length :size
+          alias :count :size
 
           def each(&block)
             self.collection.each(&block)
@@ -91,28 +95,8 @@ module Locomotive
 
           def collection
             return unless @collection.blank?
-
-            if @context['with_scope'].blank?
-              @collection = @content_type.entries
-            else
-              @collection = []
-
-              conditions = @context['with_scope'].clone.delete_if { |k, _| %w(order_by per_page page).include?(k) }
-
-              @content_type.entries.each do |content|
-                accepted = (conditions.map do |key, value|
-                  case value
-                  when TrueClass, FalseClass, String then content.send(key) == value
-                  else
-                    true
-                  end
-                end).all? # all conditions works ?
-
-                @collection << content if accepted
-              end
-            end
-
-            @collection
+            
+            @collection = apply_scope(@content_type.entries)
           end
         end
       end

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

@@ -4,31 +4,23 @@ module Locomotive
       module Drops
         class Page < Base
 
-          delegate :title, :slug, :fullpath, :parent, :depth, :seo_title, :redirect_url, :meta_description, :meta_keywords, :to => '_source'
+          delegate :title, :slug, :fullpath, :parent, :depth, :seo_title, :redirect_url, :meta_description, :meta_keywords,
+                   :templatized?, :published?, :redirect?, :listed?, to: '_source'
 
           def children
-            _children = @_source.children || []
+            _children = _source.children || []
             _children = _children.sort { |a, b| a.position.to_i <=> b.position.to_i }
             @children ||= liquify(*_children)
           end
 
-          def published?
-            @_source.published?
+          def content_type
+            ProxyCollection.new(_source.content_type) if _source.content_type
           end
-
-          def redirect?
-            self._source.redirect?
-          end
-
+          
           def breadcrumbs
             # TODO
             ''
           end
-
-          def listed?
-            @_source.listed?
-          end
-
         end
       end
     end

data/lib/locomotive/wagon/liquid/drops/site.rb

@@ -1,8 +1,11 @@
+require "locomotive/wagon/scopeable"
+
 module Locomotive
   module Wagon
     module Liquid
       module Drops
         class Site < Base
+          include Scopeable
 
           delegate :name, :seo_title, :meta_description, :meta_keywords, :to => '_source'
 
@@ -11,7 +14,7 @@ module Locomotive
           end
 
           def pages
-            @pages ||= liquify(*self.mounting_point.pages.values)
+            @pages ||= liquify(*apply_scope(self.mounting_point.pages.values))
           end
 
         end

data/lib/locomotive/wagon/liquid/filters/html.rb

@@ -12,7 +12,7 @@ module Locomotive
             options = args_to_options(args)
 
             rel   = options[:rel] || 'alternate'
-            type  = options[:type] || Mime::Type.lookup_by_extension('rss').to_s
+            type  = options[:type] || MIME::Types.type_for('rss').first
             title = options[:title] || 'RSS'
 
             %{<link rel="#{rel}" type="#{type}" title="#{title}" href="#{input}" />}

data/lib/locomotive/wagon/liquid/filters/translate.rb

@@ -4,16 +4,20 @@ module Locomotive
       module Filters
         module Translate
 
-          def translate(key, locale = nil)
-            translation = @context.registers[:mounting_point].translations[key.to_s]
+          def translate(key, locale = nil, scope = nil)
+            locale ||= I18n.locale.to_s
+            if scope.blank?
+              translation = @context.registers[:mounting_point].translations[key.to_s]
 
-            if translation
-              translation.get(locale) || translation.get(Locomotive::Mounter.locale.to_s)
+              if translation
+                translation.get(locale) || translation.get(Locomotive::Mounter.locale.to_s)
+              else
+                "[unknown translation key: #{key}]"
+              end
             else
-              "[unknown translation key: #{key}]"
+              I18n.t(key, scope: scope.split('.'), locale: locale)
             end
           end
-
         end
 
         ::Liquid::Template.register_filter(Translate)

data/lib/locomotive/wagon/liquid/tags/nav.rb

@@ -20,7 +20,7 @@ module Locomotive
           def initialize(tag_name, markup, tokens, context)
             if markup =~ Syntax
               @source = ($1 || 'page').gsub(/"|'/, '')
-              @options = { :id => 'nav', :class => '', :active_class => 'on', :bootstrap => false }
+              @options = { id: 'nav', class: '', active_class: 'on', bootstrap: false }
               markup.scan(::Liquid::TagAttributes) { |key, value| @options[key.to_sym] = value.gsub(/"|'/, '') }
 
               @options[:exclude] = Regexp.new(@options[:exclude]) if @options[:exclude]
@@ -55,7 +55,8 @@ module Locomotive
             output = children_output.join("\n")
 
             if @options[:no_wrapper] != 'true'
-              output = %{<ul id="#{@options[:id]}" class="#{@options[:class]}">\n#{output}</ul>}
+              list_class  = !@options[:class].blank? ? %( class="#{@options[:class]}") : ''
+              output      = %{<nav id="#{@options[:id]}"#{list_class}><ul>\n#{output}</ul></nav>}
             end
 
             output

data/lib/locomotive/wagon/misc/dragonfly.rb

@@ -54,7 +54,7 @@ module Locomotive
 
           ## configure it ##
           ::Dragonfly[:images].configure do |c|
-            convert = `which convert`.strip.presence || '/usr/local/bin/convert'
+            convert = `which convert`.strip.presence || '/usr/bin/env convert'
             c.convert_command  = convert
             c.identify_command = convert
 

data/lib/locomotive/wagon/scopeable.rb

@@ -0,0 +1,28 @@
+module Locomotive
+  module Wagon
+    module Scopeable
+      def apply_scope(entries)
+        if @context['with_scope'].blank?
+          entries
+        else
+          collection = []
+
+          conditions = @context['with_scope'].clone.delete_if { |k, _| %w(order_by per_page page).include?(k) }
+
+          entries.each do |content|
+            accepted = (conditions.map do |key, value|
+              case value
+              when TrueClass, FalseClass, String then content.send(key) == value
+              else
+                true
+              end
+            end).all? # all conditions works ?
+
+            collection << content if accepted
+          end
+          collection
+        end
+      end
+    end
+  end
+end

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

@@ -29,10 +29,16 @@ module Locomotive::Wagon
       def fetch_page
         matchers = self.path_combinations(self.path)
 
-        self.mounting_point.pages.values.detect do |_page|
+        pages = self.mounting_point.pages.values.find_all do |_page|
           matchers.include?(_page.safe_fullpath) ||
           matchers.include?(_page.safe_fullpath.try(:underscore))
+        end.sort { |a, b| a.position <=> b.position }
+
+        if pages.size > 1
+          self.log "Found multiple pages: #{pages.collect(&:title).join(', ')}"
         end
+
+        pages.first
       end
 
       def path_combinations(path)

data/lib/locomotive/wagon/version.rb

@@ -1,5 +1,5 @@
 module Locomotive
   module Wagon
-    VERSION = '1.0.2'
+    VERSION = '1.1.0'
   end
 end

data/locales/de.yml

@@ -1,16 +1,17 @@
 de:
-  locales:
-    en: Englisch
-    de: Deutsch
-    fr: Französisch
-    pl: Polnisch
-    pt-BR: "Bras. Portugiesisch"
-    it: Italienisch
-    nl: Niederländisch
-    nb: Norwegisch
-    es: Spanisch
-    ru: Russisch
-    et: Estnisch
+  locomotive:
+    locales:
+      en: Englisch
+      de: Deutsch
+      fr: Französisch
+      pl: Polnisch
+      pt-BR: "Bras. Portugiesisch"
+      it: Italienisch
+      nl: Niederländisch
+      nb: Norwegisch
+      es: Spanisch
+      ru: Russisch
+      et: Estnisch
 
   errors:
     messages:

data/locales/en.yml

@@ -1,16 +1,17 @@
 en:
-  locales:
-    en: English
-    de: German
-    fr: French
-    pl: Polish
-    pt-BR: "Brazilian Portuguese"
-    it: Italian
-    nl: Dutch
-    nb: Norwegian
-    es: Spanish
-    ru: Russian
-    et: Estonian
+  locomotive:
+    locales:
+      en: English
+      de: German
+      fr: French
+      pl: Polish
+      pt-BR: "Brazilian Portuguese"
+      it: Italian
+      nl: Dutch
+      nb: Norwegian
+      es: Spanish
+      ru: Russian
+      et: Estonian
 
   errors:
     messages: