locomotivecms_wagon 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3eb1d85c3211cccddf3105489a759908fdd12832
-  data.tar.gz: 62a514ee0e9d0a749feb6dc18a09e696cd1b2e0d
+  metadata.gz: 74651ede61e4a001e1a1aabffd7fc88115a80348
+  data.tar.gz: b081bf5ca8a03d1fabcd5975419eaf1535ac4312
 SHA512:
-  metadata.gz: 3f0f662eaa63ae25c3ab9b52bd7f732e7352ca956827b4e2b5471575fe542398e823c6b6b321157163c20b2147cb913d2887bc017469d68811962730d68e9d52
-  data.tar.gz: 3d16d23bec319002eb7a0f185044364eb3dcd69b8bfd99612d04f9afca762f7c90fd7fb5a9e3e7730b0557dc674139963dc8cd898335d939be51836da3eb82e6
+  metadata.gz: 211391f7500d225cf946181e9685ecd04d4a9174e0631bf2b65c27f2b30917e32976facda2661d68b79f10cd2e1dcc0e3733496cbdb337e0848893e434538f7d
+  data.tar.gz: 83bdfb0190f7a255a9e7203196220a17a96b4320e4b1771363cd656c3a5d7363c7a8461f851570b70782d982a1c64b8a3ce0be247ecbdeff9779cc8f21e35cef

data/Gemfile

@@ -14,4 +14,4 @@ gem 'rb-fsevent', '~> 0.9.1'
 group :test do
   gem 'pry'
   gem 'coveralls', require: false
-end
+end

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

@@ -1,3 +1,7 @@
+---
+title: Home page
+published: true
+---
 !!!
 %html{lang: "en"}
   %head

data/generators/blank/config/deploy.yml

@@ -1,15 +1,15 @@
-development:
-  host: dev.example.com
-  email: john@doe.net
-  password: apassword
-  # api_key: <your api key here>
-staging:
-  host: staging.example.com
-  email: john@doe.net
-  password: apassword
-  # api_key: <your api key here>
-production:
-  host: www.example.com
-  email: john@doe.net
-  password: apassword
-  # api_key: <your api key here>
+# development:
+#   host: dev.example.com
+#   email: john@doe.net
+#   password: apassword
+#   # api_key: <your api key here>
+# staging:
+#   host: staging.example.com
+#   email: john@doe.net
+#   password: apassword
+#   # api_key: <your api key here>
+# production:
+#   host: www.example.com
+#   email: john@doe.net
+#   password: apassword
+#   # api_key: <your api key here>

data/generators/content_type/app/content_types/%slug%.yml.tt

@@ -32,7 +32,7 @@ fields: <% config[:fields].each_with_index do |field, index| %>
     type: <%= field.type %>
     required: <%= index == 0 ? true : field.required %>
     hint: Explanatory text displayed in the back office
-    localized: <%= field.required %><% if field.type == 'text' %>
+    localized: <%= field.localized %><% if field.type == 'text' %>
     # text_formatting: html # html (uses rich text editor) or text (uses plain text editor)<% end -%><% if field.type == 'select' -%>
     # if localized, use
     #   en: ['option1_en', 'option2_en']

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

@@ -11,6 +11,9 @@ listed: <% if config[:listed] -%><%= config[:listed] %><% else -%>true<% end %>
 # true if the page is published
 published: true
 
+# true if the page can be used as a layout for new pages created by the editors
+# is_layout: true
+
 # position among sibling pages
 # position: 1
 
@@ -34,4 +37,4 @@ content_type: <%= config[:content_type] -%>
 
 %p Hello world
 
-{% endblock %}
+{% endblock %}

data/generators/page/template.liquid.tt

@@ -12,6 +12,9 @@ listed: <% if config[:listed] -%><%= config[:listed] %><% else -%>true<% end -%>
 # true if the page is published
 published: true
 
+# true if the page can be used as a layout for new pages created by the editors
+# is_layout: true
+
 # position among sibling pages
 # position: 1
 

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

@@ -43,7 +43,7 @@ module Locomotive
               label:      label || name.humanize,
               type:       type || 'string',
               required:   %w(true required).include?(required),
-              localized:  %w(true required).include?(localized)
+              localized:  %w(true localized).include?(localized)
             ).tap do |field|
               if %w(belongs_to has_many many_to_many).include?(type)
                 field.class_name = target_content_type_slug

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

@@ -15,6 +15,7 @@ module Locomotive
           end
 
           alias :_slug :_permalink
+          alias :_id :_permalink
 
           def next
             self

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

@@ -88,7 +88,7 @@ module Locomotive
           end
 
           def paginate(options = {})
-            @collection ||= self.collection.paginate(options)
+            @collection = self.collection.paginate(options)
             {
               collection:       @collection,
               current_page:     @collection.current_page,
@@ -101,7 +101,7 @@ module Locomotive
           end
 
           def collection
-            return unless @collection.blank?
+            return @collection 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)

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

@@ -4,15 +4,29 @@ module Locomotive
       module Drops
         class Page < Base
 
-          delegate :slug, :fullpath, :parent, :depth, :seo_title, :redirect_url, :meta_description, :meta_keywords,
+          delegate :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
+            title =  @_source.templatized? ? @context['entry'].try(:_label) : nil
+            title || @_source.title
+          end
+
+          def slug
+            slug = @_source.templatized? ? @context['entry'].try(:_slug).try(:singularize) : nil
+            slug || @_source.slug
+          end
+
+          def is_layout?
+            @_source.is_layout
+          end
+
+          def original_title
+            @_source.title
+          end
+
+          def original_slug
+            @_source.slug
           end
 
           def children
@@ -25,12 +39,46 @@ module Locomotive
             ProxyCollection.new(@_source.content_type) if @_source.content_type
           end
 
+          def editable_elements
+            @editable_elements_hash ||= build_editable_elements_hash
+          end
+
           def breadcrumbs
             # TODO
             ''
           end
+
+          private
+
+          def build_editable_elements_hash
+            {}.tap do |hash|
+              @_source.editable_elements.each do |el|
+                safe_slug = el.slug.parameterize.underscore
+                keys      = el.block.try(:split, '/').try(:compact) || []
+
+                _hash = _build_editable_elements_hashes(hash, keys)
+
+                _hash[safe_slug] = el.content
+              end
+            end
+          end
+
+          def _build_editable_elements_hashes(hash, keys)
+            _hash = hash
+
+            keys.each do |key|
+              safe_key = key.parameterize.underscore
+
+              _hash[safe_key] = {} if _hash[safe_key].nil?
+
+              _hash = _hash[safe_key]
+            end
+
+            _hash
+          end
+
         end
       end
     end
   end
-end
+end

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

@@ -23,4 +23,4 @@ module Locomotive
       end
     end
   end
-end
+end

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

@@ -56,6 +56,8 @@ module Locomotive
           def initialize(name, value)
             self.name, self.right_operand = name, value
 
+            self.name = :_slug if %w(id _id).include?(name.to_s)
+
             self.process_right_operand
 
             # default value

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

@@ -14,14 +14,14 @@ module Locomotive
         #
         class Consume < ::Liquid::Block
 
-          Syntax = /(#{::Liquid::VariableSignature}+)\s*from\s*(#{::Liquid::QuotedString}|#{::Liquid::VariableSignature}+)/
+          Syntax = /(#{::Liquid::VariableSignature}+)\s*from\s*(#{::Liquid::QuotedString}|#{::Liquid::VariableSignature}+)(.*)?/
 
           def initialize(tag_name, markup, tokens, options)
             if markup =~ Syntax
               @target = $1
 
               self.prepare_url($2)
-              self.prepare_options(markup)
+              self.prepare_api_arguments($3)
             else
               raise ::Liquid::SyntaxError.new(options[:locale].t("errors.syntax.consume"), options[:line])
             end
@@ -32,6 +32,8 @@ module Locomotive
           end
 
           def render(context)
+            self.set_api_options(context)
+
             if instance_variable_defined? :@variable_name
               @url = context[@variable_name]
             end
@@ -50,13 +52,14 @@ module Locomotive
             end
           end
 
-          def prepare_options(markup)
-            @options = {}
-            markup.scan(::Liquid::TagAttributes) do |key, value|
-              @options[key] = value if key != 'http'
-            end
-            @options['timeout'] = @options['timeout'].to_f if @options['timeout']
-            @expires_in = (@options.delete('expires_in') || 0).to_i
+          def prepare_api_arguments(string)
+            string = string.gsub(/^(\s*,)/, '').strip
+            @api_arguments = Solid::Arguments.parse(string)
+          end
+
+          def set_api_options(context)
+            @api_options  = @api_arguments.interpolate(context).first || {}
+            @expires_in   = @api_options.delete(:expires_in) || 0
           end
 
           def cached_response
@@ -72,7 +75,7 @@ module Locomotive
           def render_all_without_cache(context)
             context.stack do
               begin
-                context.scopes.last[@target.to_s] = Locomotive::Wagon::Httparty::Webservice.consume(@url, @options.symbolize_keys)
+                context.scopes.last[@target.to_s] = Locomotive::Wagon::Httparty::Webservice.consume(@url, @api_options)
                 self.cached_response = context.scopes.last[@target.to_s]
               rescue Timeout::Error
                 context.scopes.last[@target.to_s] = self.cached_response

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

@@ -50,7 +50,6 @@ module Locomotive
               if templatized
                 page = mounting_point.pages.values.find do |_page|
                   _page.templatized? &&
-                  !_page.templatized_from_parent &&
                   _page.content_type.slug == handle.content_type.slug &&
                   (@_options['with'].nil? || _page.handle == @_options['with'])
                 end

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

@@ -94,13 +94,15 @@ module Locomotive
       end
 
       def errors
-        return nil if success? || (self['errors'].nil? && self['error'].nil?)
+        return nil if success?
 
         @errors ||= if self['error']
           [[nil, [self['error']]]]
+        elsif self['errors']
+          self['errors']
         else
-          self['errors'].delete_if { |attribute, errors| errors.empty? }
-        end
+          self.to_a
+        end.delete_if { |attribute, errors| errors.empty? }
       end
 
       def error_messages
@@ -112,4 +114,4 @@ module Locomotive
     end
 
   end
-end
+end

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

@@ -115,4 +115,4 @@ module Locomotive::Wagon
     end
 
   end
-end
+end

data/lib/locomotive/wagon/version.rb

@@ -1,5 +1,5 @@
 module Locomotive
   module Wagon
-    VERSION = '1.5.0'
+    VERSION = '1.5.1'
   end
 end

data/lib/locomotive/wagon.rb

@@ -103,6 +103,7 @@ module Locomotive
           if Process.pid != parent_pid
             # A "new logger" inside the daemon.
             Locomotive::Wagon::Logger.setup(path, false)
+            Locomotive::Mounter.logger = Locomotive::Wagon::Logger.instance.logger
           end
         end
 
@@ -294,4 +295,4 @@ module Locomotive
     end
 
   end
-end
+end

data/locomotivecms_wagon.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'httmultiparty',         '0.3.10'
   gem.add_dependency 'will_paginate',         '~> 3.0.3'
-  gem.add_dependency 'locomotivecms_mounter', '~> 1.4.4'
+  gem.add_dependency 'locomotivecms_mounter', '~> 1.5.0'
 
   gem.add_dependency 'faker',                 '~> 0.9.5'
 

data/spec/fixtures/default/app/views/pages/layouts/simple.liquid.haml

@@ -0,0 +1,13 @@
+---
+title: My simple layout
+is_layout: true
+---
+!!! XML
+!!!
+%html{ lang: "en" }
+  %head
+
+  %body
+    %h1 {% editable_short_text title %}[TODO]{% endeditable_short_text %}
+    .text
+      {% editable_text content, format: html, rows: 5 %}[TODO]{% editable_text %}

data/spec/unit/locomotive/wagon/liquid/drops/page_spec.rb

@@ -0,0 +1,41 @@
+# encoding: utf-8
+
+require 'locomotive/wagon/liquid'
+
+describe Locomotive::Wagon::Liquid::Drops::Page do
+
+  let(:attributes) { { title: "Hello world" } }
+  let(:source) { Locomotive::Mounter::Models::Page.new(attributes) }
+
+  subject { source.to_liquid }
+
+  describe 'the title' do
+
+    its(:title) { should eq "Hello world" }
+
+  end
+
+  describe 'with editable elements' do
+
+    let(:text_a) { Locomotive::Mounter::Models::EditableElement.new(block: 'sidebar/header', slug: 'ads', content: 'foo' ) }
+    let(:text_b) { Locomotive::Mounter::Models::EditableElement.new(block: 'sidebar/footer', slug: 'ads', content: 'foo ter' ) }
+    let(:text_c) { Locomotive::Mounter::Models::EditableElement.new(block: '', slug: 'simple_text', content: 'bar' ) }
+    let(:text_d) { Locomotive::Mounter::Models::EditableElement.new(block: 'My footer/wrapper/inner', slug: 'text', content: 'hello world' ) }
+    let(:attributes) { { editable_elements: [text_a, text_b, text_c, text_d] } }
+
+    its(:editable_elements) do
+      should eq({
+        'sidebar' => {
+          'header' => { 'ads' => 'foo' },
+          'footer' => { 'ads' => 'foo ter' }
+        },
+        'simple_text' => 'bar',
+        'my_footer' => {
+          'wrapper' => { 'inner' => { 'text' => 'hello world' } }
+        }
+      })
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_wagon
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -227,14 +227,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -775,6 +775,7 @@ files:
 - spec/fixtures/default/app/views/pages/grunge_bands.liquid.haml
 - spec/fixtures/default/app/views/pages/index.fr.liquid.haml
 - spec/fixtures/default/app/views/pages/index.liquid.haml
+- spec/fixtures/default/app/views/pages/layouts/simple.liquid.haml
 - spec/fixtures/default/app/views/pages/music.fr.liquid.haml
 - spec/fixtures/default/app/views/pages/music.liquid.haml
 - spec/fixtures/default/app/views/pages/songs/template.fr.liquid.haml
@@ -831,6 +832,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/helpers.rb
 - spec/support/matchers.rb
+- spec/unit/locomotive/wagon/liquid/drops/page_spec.rb
 homepage: http://www.locomotivecms.com
 licenses: []
 metadata: {}
@@ -879,6 +881,7 @@ test_files:
 - spec/fixtures/default/app/views/pages/grunge_bands.liquid.haml
 - spec/fixtures/default/app/views/pages/index.fr.liquid.haml
 - spec/fixtures/default/app/views/pages/index.liquid.haml
+- spec/fixtures/default/app/views/pages/layouts/simple.liquid.haml
 - spec/fixtures/default/app/views/pages/music.fr.liquid.haml
 - spec/fixtures/default/app/views/pages/music.liquid.haml
 - spec/fixtures/default/app/views/pages/songs/template.fr.liquid.haml
@@ -935,3 +938,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/helpers.rb
 - spec/support/matchers.rb
+- spec/unit/locomotive/wagon/liquid/drops/page_spec.rb