locomotivecms_wagon 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76b2020908c1a171019f9559425d9cd3765ca893
-  data.tar.gz: 87806b21c18e81bb3c7e1ffe89fc62cef2737398
+  metadata.gz: ddf389fd19683084ab7f2c71ceb20bba27a863a8
+  data.tar.gz: 7fb14dffa20d08c0df5bcf5a887f84803de98e5d
 SHA512:
-  metadata.gz: 0af0ad2b617f60e733a1bf04e6fb414246507e1468957176f4653740e6c7b9d2f71db7e15e1a808d1b707681d88563c885e5ca78f858205b908705c0609282f1
-  data.tar.gz: 971d7d9f06a6e68a3d93d52d577880b5e0d38e35fc2eebc9bf664e9d23d7b9bb67b5f323fbfafa9d5c7d992ba11f62c46f0287a6086f04303bc5b601279f9fef
+  metadata.gz: a65598dd4dd41faddc22c6b358d06e0b821f8d212eea46f03977eded9cc3aad65a92de840b2302151719ffdeb8b8e329ed1212baf2e724f1d37703214b1927e1
+  data.tar.gz: 37eb257956b84207ac3bb598a4e24e739b99082540d9626234ac02e6b1f8a5050a66f780dd25e16bc88f3ed6ce1932e348a8b67d62e9dc739eb7f133979b6cd3

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

@@ -26,28 +26,25 @@ module Locomotive
               raise ::Liquid::SyntaxError.new(options[:locale].t("errors.syntax.consume"), options[:line])
             end
 
-            @cache_key = Digest::SHA1.hexdigest(@target)
             @local_cache_key = self.hash
 
             super
           end
 
           def render(context)
-            if @is_var
-              @url = context[@url]
+            if instance_variable_defined? :@variable_name
+              @url = context[@variable_name]
             end
             render_all_without_cache(context)
           end
 
           protected
 
-          def prepare_url(url)
-            @url    = url
-            @is_var = false
-            if @url.match(::Liquid::QuotedString)
-              @url.gsub!(/['"]/, '')
-            elsif @url.match(::Liquid::VariableSignature)
-              @is_var = true
+          def prepare_url(token)
+            if token.match(::Liquid::QuotedString)
+              @url = token.gsub(/['"]/, '')
+            elsif token.match(::Liquid::VariableSignature)
+              @variable_name = token
             else
               raise ::Liquid::SyntaxError.new("Syntax Error in 'consume' - Valid syntax: consume <var> from \"<url>\" [username: value, password: value]")
             end
@@ -77,14 +74,14 @@ module Locomotive
               begin
                 context.scopes.last[@target.to_s] = Locomotive::Wagon::Httparty::Webservice.consume(@url, @options.symbolize_keys)
                 self.cached_response = context.scopes.last[@target.to_s]
-              # rescue Errno::ECONNREFUSED
-              #   raise ConnectionRefused.new(@markup)
               rescue Timeout::Error
                 context.scopes.last[@target.to_s] = self.cached_response
               rescue ::Liquid::Error => e
                 raise e
               rescue => e
-                raise ::Liquid::Error.new(e.message, line)
+                liquid_e = ::Liquid::Error.new(e.message, line)
+                liquid_e.set_backtrace(e.backtrace)
+                raise liquid_e
               end
 
               render_all(@nodelist, context)

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

@@ -6,6 +6,8 @@ module Locomotive
 
           Syntax = /(#{::Liquid::Expression}+)(#{::Liquid::TagAttributes}?)/
 
+          include PathHelper
+
           def initialize(tag_name, markup, tokens, options)
             if markup =~ Syntax
               @handle = $1
@@ -21,9 +23,8 @@ module Locomotive
           end
 
           def render(context)
-            if page = self.retrieve_page_from_handle(context)
-              label = self.label_from_page(page)
-              path  = self.public_page_url(context, page)
+            render_path(context) do |page, path|
+              label = label_from_page(page)
 
               if @render_as_block
                 context.scopes.last['target'] = page
@@ -31,54 +32,11 @@ module Locomotive
               end
 
               %{<a href="#{path}">#{label}</a>}
-            else
-              raise Liquid::PageNotTranslated.new(%{[link_to] Unable to find a page for the #{@handle}. Wrong handle or missing template for your content.})
             end
           end
 
           protected
 
-          def retrieve_page_from_handle(context)
-            mounting_point = context.registers[:mounting_point]
-
-            context.scopes.reverse_each do |scope|
-              handle = scope[@handle] || @handle
-
-              page = case handle
-              when Locomotive::Mounter::Models::Page          then handle
-              when Liquid::Drops::Page                        then handle.instance_variable_get(:@_source)
-              when String                                     then fetch_page(mounting_point, handle)
-              when Liquid::Drops::ContentEntry                then fetch_page(mounting_point, handle.instance_variable_get(:@_source), true)
-              when Locomotive::Mounter::Models::ContentEntry  then fetch_page(mounting_point, handle, true)
-              else
-                nil
-              end
-
-              return page unless page.nil?
-            end
-
-            nil
-          end
-
-          def fetch_page(mounting_point, handle, templatized = false)
-            ::Locomotive::Mounter.with_locale(@_options['locale']) do
-              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
-
-                page.content_entry = handle if page
-
-                page
-              else
-                mounting_point.pages.values.find { |_page| _page.handle == handle }
-              end
-            end
-          end
-
           def label_from_page(page)
             ::Locomotive::Mounter.with_locale(@_options['locale']) do
               if page.templatized?
@@ -89,32 +47,6 @@ module Locomotive
             end
           end
 
-          def public_page_url(context, page)
-            mounting_point  = context.registers[:mounting_point]
-            locale          = @_options['locale'] || ::I18n.locale
-
-            if !page.translated_in?(locale)
-              title = page.title_translations.values.compact.first
-              raise Liquid::PageNotTranslated.new(%{the "#{title}" page is not translated in #{locale.upcase}})
-            end
-
-            fullpath = ::Locomotive::Mounter.with_locale(locale) do
-              page.fullpath.clone
-            end
-
-            fullpath = "#{::I18n.locale}/#{fullpath}" if ::I18n.locale.to_s != mounting_point.default_locale.to_s
-
-            if page.templatized?
-              if page.content_entry._slug.nil?
-                title = %{#{page.content_entry.content_type.name.singularize} "#{page.content_entry.send(page.content_entry.content_type.label_field_name)}"}
-                raise Liquid::ContentEntryNotTranslated.new(%{the #{title} slug is not translated in #{locale.upcase}})
-              end
-              fullpath.gsub!(/(content[_-]type[_-]template|template)/, page.content_entry._slug)
-            end
-
-            File.join('/', fullpath)
-          end
-
         end
 
         ::Liquid::Template.register_tag('link_to', LinkTo)

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

@@ -78,7 +78,7 @@ module Locomotive
             when 'page'     then self.current_page
             else
               self.mounting_point.pages[@source]
-            end).children.clone
+            end).children.try(:clone) || []
 
             children.delete_if { |p| !include_page?(p) }
           end

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

@@ -0,0 +1,98 @@
+module Locomotive
+  module Wagon
+    module Liquid
+      module Tags
+
+        module PathHelper
+
+          def render_path(context, &block)
+            site  = context.registers[:site]
+
+            if page = self.retrieve_page_from_handle(context)
+              path = self.public_page_fullpath(context, page)
+
+              if block_given?
+                block.call page, path
+              else
+                path
+              end
+            else
+              raise Liquid::PageNotTranslated.new(%{[link_to] Unable to find a page for the #{@handle}. Wrong handle or missing template for your content.})
+            end
+          end
+
+          protected
+
+          def retrieve_page_from_handle(context)
+            mounting_point = context.registers[:mounting_point]
+
+            context.scopes.reverse_each do |scope|
+              handle = scope[@handle] || @handle
+
+              page = case handle
+              when Locomotive::Mounter::Models::Page          then handle
+              when Liquid::Drops::Page                        then handle.instance_variable_get(:@_source)
+              when String                                     then fetch_page(mounting_point, handle)
+              when Liquid::Drops::ContentEntry                then fetch_page(mounting_point, handle.instance_variable_get(:@_source), true)
+              when Locomotive::Mounter::Models::ContentEntry  then fetch_page(mounting_point, handle, true)
+              else
+                nil
+              end
+
+              return page unless page.nil?
+            end
+
+            nil
+          end
+
+          def fetch_page(mounting_point, handle, templatized = false)
+            ::Locomotive::Mounter.with_locale(@_options['locale']) do
+              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
+
+                page.content_entry = handle if page
+
+                page
+              else
+                mounting_point.pages.values.find { |_page| _page.handle == handle }
+              end
+            end
+          end
+
+          def public_page_fullpath(context, page)
+            mounting_point  = context.registers[:mounting_point]
+            locale          = @_options['locale'] || ::I18n.locale
+
+            if !page.translated_in?(locale)
+              title = page.title_translations.values.compact.first
+              raise Liquid::PageNotTranslated.new(%{the "#{title}" page is not translated in #{locale.upcase}})
+            end
+
+            fullpath = ::Locomotive::Mounter.with_locale(locale) do
+              page.fullpath.clone
+            end
+
+            fullpath = "#{::I18n.locale}/#{fullpath}" if ::I18n.locale.to_s != mounting_point.default_locale.to_s
+
+            if page.templatized?
+              if page.content_entry._slug.nil?
+                title = %{#{page.content_entry.content_type.name.singularize} "#{page.content_entry.send(page.content_entry.content_type.label_field_name)}"}
+                raise Liquid::ContentEntryNotTranslated.new(%{the #{title} slug is not translated in #{locale.upcase}})
+              end
+              fullpath.gsub!(/(content[_-]type[_-]template|template)/, page.content_entry._slug)
+            end
+
+            File.join('/', fullpath)
+          end
+
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+module Locomotive
+  module Wagon
+    module Liquid
+      module Tags
+
+        class PathTo < ::Liquid::Tag
+
+          include PathHelper
+
+          Syntax = /(#{::Liquid::Expression}+)(#{::Liquid::TagAttributes}?)/
+
+          def initialize(tag_name, markup, tokens, context)
+            if markup =~ Syntax
+              @handle = $1
+              @_options = {}
+              markup.scan(::Liquid::TagAttributes) do |key, value|
+                @_options[key] = value
+              end
+            else
+              raise SyntaxError.new("Syntax Error in 'path_to' - Valid syntax: path_to <page|page_handle|content_entry>(, locale: [fr|de|...], with: <page_handle>")
+            end
+
+            super
+          end
+
+          def render(context)
+            render_path(context)
+          end
+
+        end
+
+        ::Liquid::Template.register_tag('path_to', PathTo)
+      end
+    end
+  end
+end

data/lib/locomotive/wagon/liquid.rb

@@ -3,6 +3,7 @@ require 'locomotive/mounter'
 require 'locomotive/wagon/liquid/scopeable'
 require 'locomotive/wagon/liquid/drops/base'
 require 'locomotive/wagon/liquid/tags/hybrid'
+require 'locomotive/wagon/liquid/tags/path_helper'
 
 %w{. drops tags filters}.each do |dir|
   Dir[File.join(File.dirname(__FILE__), 'liquid', dir, '*.rb')].each { |lib| require lib }

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

@@ -32,7 +32,7 @@ module Locomotive::Wagon
           raise RendererException.new(e, self.page.title, self.page.template, context)
         end
       end
-      
+
       def render_404
         if self.page = self.mounting_point.pages['404']
           self.render_page
@@ -92,7 +92,8 @@ module Locomotive::Wagon
           'locales'           => self.mounting_point.locales.map(&:to_s),
           'current_user'      => {},
           'session'           => Locomotive::Wagon::Liquid::Drops::SessionProxy.new,
-          'wagon'             => true
+          'wagon'             => true,
+          'editing'           => false
         }
       end
 

data/lib/locomotive/wagon/version.rb

@@ -1,5 +1,5 @@
 module Locomotive
   module Wagon
-    VERSION = '1.3.2'
+    VERSION = '1.3.3'
   end
 end

data/locomotivecms_wagon.gemspec

@@ -34,7 +34,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.3.2'
+  gem.add_dependency 'locomotivecms_mounter', '~> 1.3.3'
 
   gem.add_dependency 'faker',                 '~> 0.9.5'
 

data/spec/fixtures/default/app/views/pages/music.liquid.haml

@@ -34,6 +34,8 @@ position: 2
   {% endwith_scope %}
   {% for s in selected_songs %}
   %p.scoped_song {{ s._label }}
+  %p.scoped_song_link
+    %a{ href: "{% path_to s %}" } {{ s._label }}
   {% endfor %}
   %p.collection_equality {{ contents.songs.all.size }}={{ contents.songs.size }}
 

data/spec/integration/server/liquid_spec.rb

@@ -71,15 +71,16 @@ describe Locomotive::Wagon::Server do
     it "evaluates collection when called all inside of scope" do
       get '/music'
       last_response.body.should =~ /<p class=.scoped_song.>Song #3/
+      last_response.body.should =~ /<p class=.scoped_song_link.>\s+<a href=.\/songs\/song-3.>Song #3/m
     end
 
-    it "size of evaluated unscoped collection eqaul to unevaluated one" do
+    it "size of evaluated unscoped collection equal to unevaluated one" do
       get '/music'
       last_response.body.should =~ /class=.collection_equality.>8=8/
     end
 
   end
-  
+
   describe 'html helpers' do
     it 'bypass url for css resource' do
       get '/'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_wagon
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-11 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -213,14 +213,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -516,6 +516,8 @@ files:
 - lib/locomotive/wagon/liquid/tags/locale_switcher.rb
 - lib/locomotive/wagon/liquid/tags/nav.rb
 - lib/locomotive/wagon/liquid/tags/paginate.rb
+- lib/locomotive/wagon/liquid/tags/path_helper.rb
+- lib/locomotive/wagon/liquid/tags/path_to.rb
 - lib/locomotive/wagon/liquid/tags/seo.rb
 - lib/locomotive/wagon/liquid/tags/session_assign.rb
 - lib/locomotive/wagon/liquid/tags/snippet.rb