locomotivecms_wagon 1.4.0 → 1.5.0.rc1

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

@@ -5,8 +5,11 @@ module Locomotive
 
         class Bootstrap3 < Base
 
+          may_use_haml
+          may_use_scss
+
           def choose_haml_over_html
-            if yes?('Do you prefer HAML templates ?')
+            if haml?
               remove_file File.join(self.destination, 'app/views/pages/index.liquid')
               remove_file File.join(self.destination, 'app/views/pages/404.liquid')
               remove_file File.join(self.destination, 'app/views/snippets/footer.liquid')
@@ -17,10 +20,25 @@ module Locomotive
             end
           end
 
+          def choose_scss_over_css
+            if scss?
+              remove_file File.join(self.destination, 'public/stylesheets/application.css')
+              remove_file File.join(self.destination, 'public/stylesheets/bootstrap.css')
+            else
+              remove_dir File.join(self.destination, 'public/stylesheets/bootstrap')
+              remove_file File.join(self.destination, 'public/stylesheets/application.css.scss')
+              remove_file File.join(self.destination, 'public/stylesheets/bootstrap.css.scss')
+            end
+          end
+
+          def bundle_install
+            super
+          end
+
         end
 
         Locomotive::Wagon::Generators::Site.register(:bootstrap3, Bootstrap3, %{
-          A LocomotiveCMS site powered by Twitter bootstrap (v3.0.0).
+          A site powered by Twitter bootstrap (v3.1.1).
         })
       end
     end

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

@@ -16,6 +16,10 @@ module Locomotive
             }.merge(self.connection_info))
           end
 
+          def bundle_install
+            super
+          end
+
         end
       end
     end

data/lib/locomotive/wagon/generators/site/{foundation.rb → foundation4.rb}

@@ -3,10 +3,12 @@ module Locomotive
     module Generators
       module Site
 
-        class Foundation < Base
+        class Foundation4 < Base
+
+          may_use_haml
 
           def choose_haml_over_html
-            if yes?('Do you prefer HAML templates ?')
+            if haml?
               remove_file File.join(self.destination, 'app/views/pages/index.liquid')
               remove_file File.join(self.destination, 'app/views/pages/404.liquid')
               remove_file File.join(self.destination, 'app/views/snippets/footer.liquid')
@@ -17,10 +19,14 @@ module Locomotive
             end
           end
 
+          def bundle_install
+            super
+          end
+
         end
 
-        Locomotive::Wagon::Generators::Site.register(:foundation, Foundation, %{
-          A LocomotiveCMS site powered by Foundation (v4.3.2).
+        Locomotive::Wagon::Generators::Site.register(:foundation4, Foundation4, %{
+          A site powered by Foundation (v4.3.2).
         })
       end
     end

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

@@ -0,0 +1,48 @@
+module Locomotive
+  module Wagon
+    module Generators
+      module Site
+
+        class Foundation5 < Base
+
+          may_use_haml
+          may_use_scss
+
+          def choose_haml_over_html
+            if haml?
+              remove_file File.join(self.destination, 'app/views/pages/index.liquid')
+              remove_file File.join(self.destination, 'app/views/pages/404.liquid')
+              remove_file File.join(self.destination, 'app/views/snippets/footer.liquid')
+            else
+              remove_file File.join(self.destination, 'app/views/pages/index.liquid.haml')
+              remove_file File.join(self.destination, 'app/views/pages/404.liquid.haml')
+              remove_file File.join(self.destination, 'app/views/snippets/footer.liquid.haml')
+            end
+          end
+
+          def choose_scss_over_css
+            if scss?
+              remove_file File.join(self.destination, 'public/stylesheets/application.css')
+              remove_file File.join(self.destination, 'public/stylesheets/foundation.css')
+              remove_file File.join(self.destination, 'public/stylesheets/normalize.css')
+            else
+              remove_dir File.join(self.destination, 'public/stylesheets/foundation')
+              remove_file File.join(self.destination, 'public/stylesheets/application.css.scss')
+              remove_file File.join(self.destination, 'public/stylesheets/foundation.css.scss')
+              remove_file File.join(self.destination, 'public/stylesheets/normalize.css.scss')
+            end
+          end
+
+          def bundle_install
+            super
+          end
+
+        end
+
+        Locomotive::Wagon::Generators::Site.register(:foundation5, Foundation5, %{
+          A site powered by Foundation (v5.2.3.0).
+        })
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+module Locomotive
+  module Wagon
+    module Generators
+      module Site
+
+        class LineCase < Base
+
+          def bundle_install
+            super
+          end
+
+        end
+
+        Locomotive::Wagon::Generators::Site.register(:line_case, LineCase, %{
+          A simple portfolio site.
+        })
+      end
+    end
+  end
+end

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

@@ -8,13 +8,17 @@ module Locomotive
 
         class Unzip < Base
 
+          class_option :location, type: :string, default: nil, required: false, desc: 'Location of the zip file'
+
+          @@source_root = nil
+
           def prepare
             remove_file join('tmp')
             empty_directory join('tmp')
           end
 
           def ask_for_location
-            @location = ask('What is the location (on the filesystem or url) of the zip file ?')
+            @location = options[:location] || ask('What is the location (on the filesystem or url) of the zip file ?')
             raise GeneratorException.new('Please enter a location') if @location.blank?
           end
 
@@ -55,6 +59,10 @@ module Locomotive
             directory('.', self.destination, { recursive: true })
           end
 
+          def bundle_install
+            super
+          end
+
           def self.source_root
             # only way to change the source root from the instance
             @@source_root
@@ -73,7 +81,7 @@ module Locomotive
         end
 
         Locomotive::Wagon::Generators::Site.register(:unzip, Unzip, %{
-          Unzip a local or remote (http, https, ftp) zipped LocomotiveCMS site.
+          Unzip a local or remote (http, https, ftp) zipped site.
         })
       end
     end

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

@@ -37,6 +37,14 @@ module Locomotive
           Locomotive::Wagon::Generators::Site::List.instance._list
         end
 
+        # JSON output of the generators list
+        #
+        # @return [ String ] The JSON output
+        #
+        def self.list_to_json
+          Locomotive::Wagon::Generators::Site::List.instance.to_json
+        end
+
         # Tell if the list of generators is empty or not .
         #
         # @return [ Boolean ] True if empty
@@ -84,6 +92,44 @@ module Locomotive
 
             self._list.last
           end
+
+          # Return the list of site templates in JSON
+          #
+          # @return [ String ] JSON output
+          #
+          def to_json
+            self._list.map do |template|
+              # puts template.klass.class_options.inspect
+              # puts class_options_to_json
+              path = template.klass.source_root ? File.expand_path(template.klass.source_root) : nil
+              icon = path ? File.join(path, 'icon.png') : nil
+
+              {
+                name:         template.name,
+                description:  template.description,
+                path:         path,
+                icon:         icon && File.exists?(icon) ? icon : nil,
+                options:      class_options_to_json(template)
+
+
+              }
+            end.to_json
+          end
+
+          protected
+
+          def class_options_to_json(template)
+            [].tap do |list|
+              template.klass.class_options.each do |name, option|
+                list << {
+                  name:   name,
+                  label:  option.description,
+                  type:   option.type
+                }
+              end
+            end
+          end
+
         end
 
       end
@@ -94,8 +140,8 @@ end
 
 require 'locomotive/wagon/generators/site/base'
 require 'locomotive/wagon/generators/site/blank'
-require 'locomotive/wagon/generators/site/bootstrap2'
+require 'locomotive/wagon/generators/site/line_case'
 require 'locomotive/wagon/generators/site/bootstrap3'
-require 'locomotive/wagon/generators/site/foundation'
+require 'locomotive/wagon/generators/site/foundation5'
 require 'locomotive/wagon/generators/site/unzip'
 require 'locomotive/wagon/generators/site/cloned'

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

@@ -8,10 +8,11 @@ module Locomotive
       class Snippet < Thor::Group
 
         include Thor::Actions
+        include Locomotive::Wagon::CLI::ForceColor
 
         argument :slug
-        argument :target_path # path to the site
         argument :locales
+        argument :target_path # path to the site
 
         attr_accessor :haml
 

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

@@ -24,6 +24,10 @@ module Locomotive
             self.collection
           end
 
+          def any
+            self.collection.any?
+          end
+
           def first
             self.collection.first
           end
@@ -100,8 +104,10 @@ module Locomotive
             return unless @collection.blank?
 
             # define the default order_by if not set
-            if @context['with_scope'] && !@context['with_scope']['order_by'].blank? && !%w(manually position).include?(@content_type.order_by)
-              @context['with_scope']['order_by'] = @content_type.order_by + '.' + @content_type.order_direction
+            if @context['with_scope'] && @context['with_scope']['order_by'].blank? && !%w(manually position).include?(@content_type.order_by)
+              field     = @content_type.order_by || 'created_at'
+              direction = @content_type.order_direction || 'asc'
+              @context['with_scope']['order_by'] = "#{field}.#{direction}"
             end
 
             @collection = apply_scope(@content_type.entries)
@@ -110,4 +116,4 @@ module Locomotive
       end
     end
   end
-end
+end

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

@@ -4,9 +4,17 @@ module Locomotive
       module Drops
         class Page < Base
 
-          delegate :title, :slug, :fullpath, :parent, :depth, :seo_title, :redirect_url, :meta_description, :meta_keywords,
+          delegate :slug, :fullpath, :parent, :depth, :seo_title, :redirect_url, :meta_description, :meta_keywords,
                    :templatized?, :published?, :redirect?, :listed?, :handle, to: :@_source
 
+          def title
+            if @_source.templatized?
+              @context['entry'].try(:_label) || @_source.title
+            else
+              @_source.title
+            end
+          end
+
           def children
             _children = @_source.children || []
             _children = _children.sort { |a, b| a.position.to_i <=> b.position.to_i }

data/lib/locomotive/wagon/liquid/scopeable.rb

@@ -36,7 +36,7 @@ module Locomotive
         def _apply_scope_order(entries, order_by)
           return entries if order_by.blank?
 
-          name, direction = order_by.split.map(&:to_sym)
+          name, direction = order_by.split(/[\s\.]/).map(&:to_sym)
 
           Locomotive::Wagon::Logger.info "[with_scope] order_by #{name} #{direction || 'asc'}"
 

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

@@ -0,0 +1,41 @@
+module Locomotive
+  module Wagon
+    module Liquid
+      module Tags
+
+        # Fetch a page from its handle and assign it to a liquid variable.
+        #
+        # Usage:
+        #
+        # {% fetch_page 'about_us' as a_page %}
+        # <p>{{ a_page.title }}</p>
+        #
+        class FetchPage < ::Liquid::Tag
+
+          Syntax = /(#{::Liquid::VariableSignature}+)\s+as\s+(#{::Liquid::VariableSignature}+)/
+
+          def initialize(tag_name, markup, tokens, context)
+            if markup =~ Syntax
+              @handle = $1
+              @var = $2
+            else
+              raise SyntaxError.new("Syntax Error in 'fetch_page' - Valid syntax: fetch_page page_handle as variable")
+            end
+
+            super
+          end
+
+          def render(context)
+            mounting_point = context.registers[:mounting_point]
+            context.scopes.last[@var] = mounting_point.pages.values.find { |_page| _page.handle == @handle }
+            ''
+          end
+
+        end
+
+        ::Liquid::Template.register_tag('fetch_page', FetchPage)
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,67 @@
+module Locomotive
+  module Wagon
+    module Liquid
+      module Tags
+
+        # Display the form html tag with the appropriate hidden fields in order to create
+        # a content entry from a public site.
+        # It handles callbacks, csrf and target url out of the box.
+        #
+        # Usage:
+        #
+        # {% model_form 'newsletter_addresses' %}
+        #    <input type='text' name='content[email]' />
+        #     <input type='submit' value='Add' />
+        # {% endform_form %}
+        #
+        # {% model_form 'newsletter_addresses', class: 'a-css-class', success: 'http://www.google.fr', error: '/error' %}...{% endform_form %}
+        #
+        class ModelForm < Solid::Block
+
+          tag_name :model_form
+
+          def display(*options, &block)
+            name    = options.shift
+            options = options.shift || {}
+
+            form_attributes = { method: 'POST', enctype: 'multipart/form-data' }.merge(options.slice(:id, :class))
+
+            html_content_tag :form,
+              content_type_html(name) + callbacks_html(options) + yield,
+              form_attributes
+          end
+
+          def content_type_html(name)
+            html_tag :input, type: 'hidden', name: 'content_type_slug', value: name
+          end
+
+          def callbacks_html(options)
+            options.slice(:success, :error).map do |(name, value)|
+              html_tag :input, type: 'hidden', name: "#{name}_callback", value: value
+            end.join('')
+          end
+
+          private
+
+          def html_content_tag(name, content, options = {})
+            "<#{name} #{inline_options(options)}>#{content}</#{name}>"
+          end
+
+          def html_tag(name, options = {})
+            "<#{name} #{inline_options(options)} />"
+          end
+
+          # Write options (Hash) into a string according to the following pattern:
+          # <key1>="<value1>", <key2>="<value2", ...etc
+          def inline_options(options = {})
+            return '' if options.empty?
+            (options.stringify_keys.to_a.collect { |a, b| "#{a}=\"#{b}\"" }).join(' ')
+          end
+
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -77,7 +77,7 @@ module Locomotive
               page.fullpath.clone
             end
 
-            fullpath = "#{::I18n.locale}/#{fullpath}" if ::I18n.locale.to_s != mounting_point.default_locale.to_s
+            fullpath = "#{locale}/#{fullpath}" if locale.to_s != mounting_point.default_locale.to_s
 
             if page.templatized?
               if page.content_entry._slug.nil?
@@ -95,4 +95,4 @@ module Locomotive
 
     end
   end
-end
+end

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

@@ -31,7 +31,7 @@ module Locomotive
               when /^\/[^\/]*\/$/     then Regexp.new(value[1..-2])
               when /^["|'](.+)["|']$/ then $1.gsub(/^["|']/, '').gsub(/["|']$/, '')
               else
-                context[value] || value
+                context[value].nil? ? value : context[value]
               end)
             end
           end

data/lib/locomotive/wagon/listen.rb

@@ -10,7 +10,7 @@ module Locomotive::Wagon
     end
 
     def start(reader)
-      self.reader = reader
+      @reader = reader
 
       self.definitions.each do |definition|
         self.apply(definition)
@@ -20,9 +20,10 @@ module Locomotive::Wagon
     def definitions
       [
         ['config', /\.yml/, [:site, :content_types, :pages, :snippets, :content_entries, :translations]],
-        ['app/views', /\.liquid/, [:pages, :snippets]],
+        ['app/views', %r{(pages|snippets)/(.+\.liquid).*}, [:pages, :snippets]],
         ['app/content_types', /\.yml/, [:content_types, :content_entries]],
-        ['data', /\.yml/, :content_entries]
+        ['data', /\.yml/, :content_entries],
+        ['public', %r{((stylesheets|javascripts)/(.+\.(css|js))).*}, []]
       ]
     end
 
@@ -33,12 +34,14 @@ module Locomotive::Wagon
         resources = [*definition.last]
         names     = resources.map { |n| "\"#{n}\"" }.join(', ')
 
-        Locomotive::Wagon::Logger.info "* Reloaded #{names} at #{Time.now}"
+        unless resources.empty?
+          Locomotive::Wagon::Logger.info "* Reloaded #{names} at #{Time.now}"
 
-        begin
-          reader.reload(resources)
-        rescue Exception => e
-          Locomotive::Wagon::MounterException.new('Unable to reload', e)
+          begin
+            reader.reload(resources)
+          rescue Exception => e
+            Locomotive::Wagon::MounterException.new('Unable to reload', e)
+          end
         end
       end
 
@@ -46,10 +49,15 @@ module Locomotive::Wagon
       path    = File.join(self.reader.mounting_point.path, definition.first)
       path    = File.expand_path(path)
 
-      listener = ::Listen.to(path).filter(filter).change(&reloader)
+      listener = ::Listen.to(path, only: filter, &reloader)
 
       # non blocking listener
-      listener.start(false)
+      listener.start
+    end
+
+    def relative_path(path)
+      base_path = self.reader.mounting_point.path
+      relative_path = path.sub(base_path, '')
     end
 
   end

data/lib/locomotive/wagon/logger.rb

@@ -40,6 +40,10 @@ module Locomotive
         self.instance.setup(path, stdout)
       end
 
+      def self.close
+        self.instance.logger.close
+      end
+
       class << self
         %w(debug info warn error fatal unknown).each do |name|
           define_method(name) do |message|

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

@@ -52,3 +52,11 @@ unless Array.instance_methods.include?(:contains?)
   end
 end
 
+unless Integer.instance_methods.include?(:to_datetime)
+  class Integer
+    def to_datetime
+      Time.at(self).to_datetime
+    end
+  end
+end
+

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

@@ -0,0 +1,120 @@
+require 'locomotive/wagon/misc/hosting_api'
+require 'active_support/core_ext/hash'
+require 'netrc'
+require 'erb'
+
+module Locomotive
+  module Wagon
+
+    class DeploymentConnection
+
+      # Create a connection for the deployment
+      # from the path of a Wagon site.
+      #
+      # @param [ String ] path Path to a Wagon site
+      #
+      def initialize(path, shell = nil)
+        @path   = path
+        @shell  = shell
+      end
+
+      # Retrieve information connection from the
+      # config/deploy.yml file and for a specific environment.
+      # If the env is hosting and does not have an entry in that file,
+      # then it looks for an api key in the ~/.netrc file, assuming
+      # that the user authenticates himself previously thanks to the
+      # auth wagon command.
+      #
+      # @param [ String ] env The target environment to deploy the site.
+      #
+      def get_information(env)
+        connection_info = read_from_yaml_file(env)
+
+        # is the user owns a hosting account, then use his credentials
+        # to create a new site.
+        if connection_info.nil? && env == 'hosting'
+          connection_info = read_from_hosting
+        end
+
+        if connection_info.nil?
+          raise "No #{env.to_s} environment found in the config/deploy.yml file"
+        end
+
+        connection_info = connection_info.with_indifferent_access
+
+        if connection_info[:ssl] && !connection_info[:host].start_with?('https')
+          connection_info[:host] = 'https://' + connection_info[:host]
+        end
+
+        connection_info
+      end
+
+      private
+
+      def deploy_file
+        File.join(@path, 'config', 'deploy.yml')
+      end
+
+      def read_from_yaml_file(env)
+        # pre-processing: erb code to parse and render?
+        parsed_deploy_file = ERB.new(File.open(deploy_file).read).result
+
+        # finally, get the hash from the YAML file
+        environments = YAML::load(parsed_deploy_file)
+        (environments.is_a?(Hash) ? environments : {})[env.to_s]
+      rescue Exception => e
+        raise "Unable to read the config/deploy.yml file (#{e.message})"
+      end
+
+      def read_from_hosting
+        hosting_api = new_hosting_api
+
+        # create the site (READ the site.yml file to get the information)
+        site = hosting_api.create_site(site_attributes)
+
+        if site.success?
+          # now we've got the subdomain, build the target host
+          host = [site['subdomain'], hosting_api.domain_with_port].join('.')
+
+          # return the connection information
+          { 'host' => host, 'api_key' => hosting_api.api_key }.tap do |hash|
+            # add ssl only if it is asked
+            hash['ssl'] if hosting_api.ssl?
+
+            # insert a new entry for hosting env in the current deploy.yml
+            File.open(deploy_file, 'a+') do |f|
+              f.write({ 'hosting' => hash }.to_yaml.sub(/^---/, ''))
+            end
+          end
+        else
+          raise "We were unable to create a new site on the hosting, reason(s): #{site.error_messages.join(', ')}"
+        end
+      end
+
+      def new_hosting_api
+        Locomotive::HostingAPI.new.tap do |hosting_api|
+          netrc = Netrc.read
+          email, api_key = netrc[hosting_api.domain_with_port]
+
+          # get a new auth token for further API calls
+          hosting_api.authenticate(api_key: api_key)
+        end
+      end
+
+      def config_file
+        File.join(@path, 'config', 'site.yml')
+      end
+
+      def site_attributes
+        YAML::load(File.read(config_file)).tap do |attributes|
+          # ask for the subdomain
+          if attributes['subdomain'].blank? && @shell
+            attributes['subdomain'] = @shell.ask("Please, what's your subdomain? (leave it blank for a random one)")
+          end
+        end
+      end
+
+    end
+
+  end
+end