locomotivecms_wagon 1.2.2 → 1.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: eb39ff86bec9126c980c162d426f7ead8e32e492
+  data.tar.gz: a65b32d9e41c8080aa8d607e5cb5179fff549741
+SHA512:
+  metadata.gz: 41a4b7df5f1d43a0711b49e4da1c289baff7867e3ffd054ae7df5db31fc7d4d6e9b398d998482f3075a926e82f851cea5f29b2fdf12c45d610a13835768b7cf3
+  data.tar.gz: 4499bdf2efbdcfbd628a09a4d4383e97d68f39f5d0828369f97143278ea772503de60d932fd48514293af0aa578735bb612db904faf62d47bbb140c7d354b134

data/Gemfile

@@ -4,6 +4,10 @@ source 'https://rubygems.org'
 gemspec
 
 # Development
+# gem 'locomotivecms_solid', path: '../gems/solid', require: false
 # gem 'locomotivecms_mounter', path: '../gems/mounter', require: false
 
+# gem 'locomotivecms-liquid', path: '../gems/liquid', require: false
+# gem 'locomotivecms-solid', path: '../gems/solid', require: false
+
 gem 'rb-fsevent', '~> 0.9.1'

data/README.md

@@ -51,6 +51,6 @@ Please, visit the documentation website of LocomotiveCMS.
 
 ## Contact
 
-Feel free to contact me at did at locomotivecms dot com.
+Feel free to contact me (did at locomotivecms dot com).
 
 Copyright (c) 2013 NoCoffee, released under the MIT license

data/Rakefile

@@ -39,7 +39,7 @@ namespace :development do
       exit unless Locomotive::Wagon.clone('site', '.', { host: 'sample.example.com:3000', email: 'admin@locomotivecms.com', password: 'locomotive' })
     end
 
-    Locomotive::Wagon.push('site', {host: 'sample.example.com:3000', email: 'admin@locomotivecms.com', password: 'locomotive'}, force: true, force_translations: true, data: true)
+    Locomotive::Wagon.push('site', {host: 'sample.example.com:3000', email: 'admin@locomotivecms.com', password: 'locomotive'}, force: true, translations: false, data: true)
   end
 end
 

data/generators/blank/app/views/pages/404.liquid.haml

@@ -0,0 +1,11 @@
+---
+title: Page not found
+published: false
+---
+{% extends index %}
+
+{% block 'main' %}
+
+%p Page not found
+
+{% endblock %}

data/generators/blank/app/views/pages/index.liquid.haml

@@ -0,0 +1,12 @@
+!!!
+%html{lang: "en"}
+  %head
+    %meta{charset: "utf-8"}
+    %title {{ site.name }}
+    %meta{name: "keywords", value: "{{ site.meta_keywords }}"}
+    %meta{name: "description", value: "{{ site.meta_description }}"}
+  %body
+    %h1 {{ page.title }}
+    {% block 'main' %}
+    %p Lorem ipsum....
+    {% endblock %}

data/generators/blank/config/site.yml.tt

@@ -10,6 +10,9 @@ name: <%= config[:name] %>
 # TODO: explain it
 locales: [en]
 
+# TODO: explain it
+# timezone: Paris
+
 # TODO: explain it
 seo_title: <%= @name %>
 meta_keywords: "some meta keywords"

data/generators/bootstrap/config/site.yml.tt

@@ -10,6 +10,9 @@ name: <%= config[:name] %>
 # TODO: explain it
 locales: [en]
 
+# TODO: explain it
+# timezone: Paris
+
 # TODO: explain it
 seo_title: <%= @name %>
 meta_keywords: "some meta keywords"

data/generators/content_type/data/%name%.yml.tt

@@ -11,7 +11,7 @@
 <% when 'boolean' -%>
     <%= field.name -%>: true # Or false
 <% when 'date' -%>
-    <%= field.name -%>: <%= Time.now.strftime('%Y/%M/%d') -%> # YYYY/MM/DD
+    <%= field.name -%>: <%= Time.now.strftime('%Y/%m/%d') -%> # YYYY/MM/DD
 <% when 'file' -%>
     <%= field.name -%>: null # Path to a file in the public/samples folder or to a remote and external file.
 <% when 'belongs_to' -%>
@@ -21,4 +21,4 @@
 <% end -%>
 <% end -%>
 
-<% end -%>
+<% end -%>

data/generators/foundation/config/site.yml.tt

@@ -10,6 +10,9 @@ name: <%= config[:name] %>
 # TODO: explain it
 locales: [en]
 
+# TODO: explain it
+# timezone: Paris
+
 # TODO: explain it
 seo_title: <%= @name %>
 meta_keywords: "some meta keywords"

data/lib/locomotive/wagon.rb

@@ -24,12 +24,20 @@ module Locomotive
       if reader = self.require_mounter(path, true)
         Bundler.require 'misc'
 
-        require 'thin'
         require 'locomotive/wagon/server'
+        app = Locomotive::Wagon::Server.new(reader)
 
-        server = Thin::Server.new(options[:host], options[:port], Locomotive::Wagon::Server.new(reader))
+        require 'thin'
+        server = Thin::Server.new(options[:host], options[:port], app)
         server.threaded = true # TODO: make it an option ?
         server.start
+
+        # require 'unicorn' # TODO: gem 'unicorn'
+        # server = Unicorn::HttpServer.new(app)
+        # server.start
+
+        # require 'rack'
+        # Rack::Handler::WEBrick.run(app, { :'Port' => options[:port], :'Host' => options[:host] })
       end
     end
 

data/lib/locomotive/wagon/cli.rb

@@ -182,7 +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 :translations, aliases: '-t', type: 'boolean', default: false, desc: 'Push the local translations (by default, they are not)'
         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/exceptions.rb

@@ -20,6 +20,33 @@ module Locomotive
 
     end
 
+    class RendererException < DefaultException
+
+      attr_accessor :name, :template, :liquid_context
+
+      def initialize(exception, name, template, liquid_context)
+        self.name, self.template, self.liquid_context = name, template, liquid_context
+
+        self.log_page_into_backtrace(exception)
+
+        super(exception.message)
+
+        self.set_backtrace(exception.backtrace)
+      end
+
+      def log_page_into_backtrace(exception)
+        line = self.template.line_offset
+        line += (exception.respond_to?(:line) ? exception.line : 0) + 1
+
+        message = "#{self.template.filepath}:#{line}:in `#{self.name}'"
+
+        Locomotive::Wagon::Logger.fatal "[ERROR] #{exception.message} - #{message}\n".red
+
+        exception.backtrace.unshift message
+      end
+
+    end
+
     class MounterException < DefaultException
     end
 

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

@@ -11,7 +11,16 @@ module Locomotive
               version:  Locomotive::Wagon::VERSION
             })
           end
-
+          
+          def choose_haml_over_html
+            if yes?('Do you prefer HAML templates ?')
+              remove_file File.join(self.destination, 'app/views/pages/index.liquid')
+              remove_file File.join(self.destination, 'app/views/pages/404.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')
+            end
+          end
         end
 
         Locomotive::Wagon::Generators::Site.register(:blank, Blank, %{

data/lib/locomotive/wagon/liquid.rb

@@ -1,4 +1,4 @@
-require 'liquid'
+require 'solid'
 require 'locomotive/mounter'
 require 'locomotive/wagon/liquid/scopeable'
 require 'locomotive/wagon/liquid/drops/base'

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

@@ -99,6 +99,11 @@ module Locomotive
           def collection
             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
+            end
+
             @collection = apply_scope(@content_type.entries)
           end
         end

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

@@ -0,0 +1,18 @@
+module Locomotive
+  module Wagon
+    module Liquid
+      module Drops
+
+        class SessionProxy < ::Liquid::Drop
+
+          def before_method(meth)
+            request = @context.registers[:request]
+            request.session[meth.to_sym]
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -15,6 +15,10 @@ module Locomotive
             @pages ||= liquify(*apply_scope(self.mounting_point.pages.values))
           end
 
+          def domains
+            self._source.domains
+          end
+
         end
       end
     end

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

@@ -2,6 +2,16 @@ module Locomotive
   module Wagon
     module Liquid
       class PageNotFound < ::Liquid::Error; end
+
+      class PageNotTranslated < ::Liquid::Error; end
+
+      class ContentEntryNotTranslated < ::Liquid::Error; end
+
+      class UnknownConditionInScope < ::Liquid::Error; end
+
+      class UnknownConditionInScope < ::Liquid::Error; end
+
+      class ConnectionRefused < ::Liquid::Error; end
     end
   end
 end

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

@@ -4,65 +4,92 @@ module Locomotive
       module Filters
         module Date
 
+          def parse_date_time(input, format = nil)
+            return '' if input.blank?
+
+            format    ||= I18n.t('time.formats.default')
+            date_time = ::DateTime._strptime(input, format)
+
+            if date_time
+              ::Time.zone.local(date_time[:year], date_time[:mon], date_time[:mday], date_time[:hour], date_time[:min], date_time[:sec] || 0)
+            else
+              ::Time.zone.parse(input) rescue ''
+            end
+          end
+
+          def parse_date(input, format)
+            return '' if input.blank?
+
+            format  ||= I18n.t('date.formats.default')
+            date    = ::Date._strptime(input, format)
+
+            if date
+              ::Date.new(date[:year], date[:mon], date[:mday])
+            else
+              ::Date.parse(value) rescue ''
+            end
+          end
+
           def localized_date(input, *args)
             return '' if input.blank?
 
             format, locale = args
 
             locale ||= I18n.locale
-            format ||= I18n.t('date.formats.default', :locale => locale)
+            format ||= I18n.t('date.formats.default', locale: locale)
 
             if input.is_a?(String)
               begin
                 fragments = ::Date._strptime(input, format)
                 input = ::Date.new(fragments[:year], fragments[:mon], fragments[:mday])
               rescue
-                input = Time.parse(input)
+                input = Time.zone.parse(input)
               end
             end
 
             return input.to_s unless input.respond_to?(:strftime)
 
-            I18n.l input, :format => format, :locale => locale
+            I18n.l input, format: format, locale: locale
           end
 
           alias :format_date :localized_date
 
-          def distance_of_time_in_words(input, *args)
+          def distance_of_time_in_words(input, from_time = Time.zone.now, include_seconds = false)
             return '' if input.blank?
 
-            from_time = input
-            to_time   = args[0] || Time.now
+            # make sure we deals with instances of Time
+            to_time   = to_time(input)
+            from_time = to_time(from_time)
 
             from_time = from_time.to_time if from_time.respond_to?(:to_time)
             to_time = to_time.to_time if to_time.respond_to?(:to_time)
             distance_in_minutes = (((to_time - from_time).abs)/60).round
             distance_in_seconds = ((to_time - from_time).abs).round
 
-            ::I18n.with_options({ :scope => :'datetime.distance_in_words' }) do |locale|
+            ::I18n.with_options({ scope: :'datetime.distance_in_words' }) do |locale|
 
               case distance_in_minutes
                 when 0..1
                   return distance_in_minutes == 0 ?
-                         locale.t(:less_than_x_minutes, :count => 1) :
-                         locale.t(:x_minutes, :count => distance_in_minutes) unless include_seconds
+                         locale.t(:less_than_x_minutes, count: 1) :
+                         locale.t(:x_minutes, count: distance_in_minutes) unless include_seconds
 
                   case distance_in_seconds
-                    when 0..4   then locale.t :less_than_x_seconds, :count => 5
-                    when 5..9   then locale.t :less_than_x_seconds, :count => 10
-                    when 10..19 then locale.t :less_than_x_seconds, :count => 20
+                    when 0..4   then locale.t :less_than_x_seconds, count: 5
+                    when 5..9   then locale.t :less_than_x_seconds, count: 10
+                    when 10..19 then locale.t :less_than_x_seconds, count: 20
                     when 20..39 then locale.t :half_a_minute
-                    when 40..59 then locale.t :less_than_x_minutes, :count => 1
-                    else             locale.t :x_minutes,           :count => 1
+                    when 40..59 then locale.t :less_than_x_minutes, count: 1
+                    else             locale.t :x_minutes,           count: 1
                   end
 
-                when 2..44           then locale.t :x_minutes,      :count => distance_in_minutes
-                when 45..89          then locale.t :about_x_hours,  :count => 1
-                when 90..1439        then locale.t :about_x_hours,  :count => (distance_in_minutes.to_f / 60.0).round
-                when 1440..2519      then locale.t :x_days,         :count => 1
-                when 2520..43199     then locale.t :x_days,         :count => (distance_in_minutes.to_f / 1440.0).round
-                when 43200..86399    then locale.t :about_x_months, :count => 1
-                when 86400..525599   then locale.t :x_months,       :count => (distance_in_minutes.to_f / 43200.0).round
+                when 2..44           then locale.t :x_minutes,      count: distance_in_minutes
+                when 45..89          then locale.t :about_x_hours,  count: 1
+                when 90..1439        then locale.t :about_x_hours,  count: (distance_in_minutes.to_f / 60.0).round
+                when 1440..2519      then locale.t :x_days,         count: 1
+                when 2520..43199     then locale.t :x_days,         count: (distance_in_minutes.to_f / 1440.0).round
+                when 43200..86399    then locale.t :about_x_months, count: 1
+                when 86400..525599   then locale.t :x_months,       count: (distance_in_minutes.to_f / 43200.0).round
                 else
                   fyear = from_time.year
                   fyear += 1 if from_time.month >= 3
@@ -79,16 +106,27 @@ module Locomotive
                   remainder                   = (minutes_with_offset % 525600)
                   distance_in_years           = (minutes_with_offset / 525600)
                   if remainder < 131400
-                    locale.t(:about_x_years,  :count => distance_in_years)
+                    locale.t(:about_x_years,  count: distance_in_years)
                   elsif remainder < 394200
-                    locale.t(:over_x_years,   :count => distance_in_years)
+                    locale.t(:over_x_years,   count: distance_in_years)
                   else
-                    locale.t(:almost_x_years, :count => distance_in_years + 1)
+                    locale.t(:almost_x_years, count: distance_in_years + 1)
                   end
               end
             end
           end
 
+          private
+
+          def to_time(input)
+            case input
+            when Date   then input.to_time
+            when String then Time.zone.parse(input)
+            else
+              input
+            end
+          end
+
         end
 
         ::Liquid::Template.register_filter(Date)

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

@@ -23,11 +23,13 @@ module Locomotive
           def stylesheet_url(input)
             return '' if input.nil?
 
-            input = "/stylesheets/#{input}" unless input =~ /^(\/|https?:)/
-
-            input = "#{input}.css" unless input.ends_with?('.css')
-
-            input
+            if input =~ /^https?:/
+              input
+            else
+              input = "/stylesheets/#{input}" unless input =~ /^\//
+              input = "#{input}.css" unless input.ends_with?('.css')
+              input
+            end
           end
 
           # Write the link to a stylesheet resource

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

@@ -22,6 +22,23 @@ module Locomotive
             rand(input.to_i)
           end
 
+          # map/collect on a given property (support to_f, to_i)
+          def map(input, property)
+            flatten_if_necessary(input).map do |e|
+              e = e.call if e.is_a?(Proc)
+
+              if property == "to_liquid"
+                e
+              elsif property == "to_f"
+                e.to_f
+              elsif property == "to_i"
+                e.to_i
+              elsif e.respond_to?(:[])
+                e[property]
+              end
+            end
+          end
+
         end
 
         ::Liquid::Template.register_filter(Misc)