locomotive_cms 2.3.1 → 2.4.0

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

@@ -3,30 +3,12 @@ module Locomotive
     module Tags
       class LinkTo < Hybrid
 
-        Syntax = /(#{::Liquid::Expression}+)(#{::Liquid::TagAttributes}?)/
-
+        include PathHelper
         include ActionView::Helpers::UrlHelper
 
-        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 'link_to' - Valid syntax: link_to page_handle, locale es (locale is optional)")
-          end
-
-          super
-        end
-
         def render(context)
-          site  = context.registers[:site]
-
-          if page = self.retrieve_page_from_handle(site, context)
-            label = self.label_from_page(page)
-            path  = self.public_page_url(site, page)
+          render_path(context) do |page, path|
+            label = label_from_page(page)
 
             if @render_as_block
               context.scopes.last['target'] = page
@@ -34,40 +16,14 @@ module Locomotive
             end
 
             link_to label, path
-          else
-            '' # no page found
           end
         end
 
-        protected
-
-        def retrieve_page_from_handle(site, context)
-          handle = context[@handle] || @handle
-
-          case handle
-          when Locomotive::Page                         then handle
-          when Locomotive::Liquid::Drops::Page          then handle.instance_variable_get(:@_source)
-          when String                                   then fetch_page(site, handle)
-          when Locomotive::ContentEntry                 then fetch_page(site, handle, true)
-          when Locomotive::Liquid::Drops::ContentEntry  then fetch_page(site, handle.instance_variable_get(:@_source), true)
-          else
-            nil
-          end
+        def wrong_syntax!
+          raise SyntaxError.new("Syntax Error in 'link_to' - Valid syntax: link_to page_handle, locale es (locale is optional)")
         end
 
-        def fetch_page(site, handle, templatized = false)
-          ::Mongoid::Fields::I18n.with_locale(@options['locale']) do
-            if templatized
-              criteria = site.pages.where(target_klass_name: handle.class.to_s, templatized: true)
-              criteria = criteria.where(handle: @options['with']) if @options['with']
-              criteria.first.tap do |page|
-                page.content_entry = handle if page
-              end
-            else
-              site.pages.where(handle: handle).first
-            end
-          end
-        end
+        protected
 
         def label_from_page(page)
           ::Mongoid::Fields::I18n.with_locale(@options['locale']) do
@@ -79,16 +35,6 @@ module Locomotive
           end
         end
 
-        def public_page_url(site, page)
-          fullpath = site.localized_page_fullpath(page, @options['locale'])
-
-          if page.templatized?
-            fullpath.gsub!('content_type_template', page.content_entry._slug)
-          end
-
-          File.join('/', fullpath)
-        end
-
       end
 
       ::Liquid::Template.register_tag('link_to', LinkTo)

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

@@ -0,0 +1,82 @@
+module Locomotive
+  module Liquid
+    module Tags
+      module 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
+            self.wrong_syntax!
+          end
+
+          super
+        end
+
+        def render_path(context, &block)
+          site  = context.registers[:site]
+
+          if page = self.retrieve_page_from_handle(site, context)
+            path = self.public_page_fullpath(site, page)
+
+            if block_given?
+              block.call page, path
+            else
+              path
+            end
+          else
+            '' # no page found
+          end
+        end
+
+        protected
+
+        def retrieve_page_from_handle(site, context)
+          handle = context[@handle] || @handle
+
+          case handle
+          when Locomotive::Page                         then handle
+          when Locomotive::Liquid::Drops::Page          then handle.instance_variable_get(:@_source)
+          when String                                   then fetch_page(site, handle)
+          when Locomotive::ContentEntry                 then fetch_page(site, handle, true)
+          when Locomotive::Liquid::Drops::ContentEntry  then fetch_page(site, handle.instance_variable_get(:@_source), true)
+          else
+            nil
+          end
+        end
+
+        def fetch_page(site, handle, templatized = false)
+          ::Mongoid::Fields::I18n.with_locale(@options['locale']) do
+            if templatized
+              criteria = site.pages.where(target_klass_name: handle.class.to_s, templatized: true)
+              criteria = criteria.where(handle: @options['with']) if @options['with']
+              criteria.first.tap do |page|
+                page.content_entry = handle if page
+              end
+            else
+              site.pages.where(handle: handle).first
+            end
+          end
+        end
+
+        def public_page_fullpath(site, page)
+          fullpath = site.localized_page_fullpath(page, @options['locale'])
+
+          if page.templatized?
+            fullpath.gsub!('content_type_template', page.content_entry._slug)
+          end
+
+          File.join('/', fullpath)
+        end
+
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+module Locomotive
+  module Liquid
+    module Tags
+      class PathTo < ::Liquid::Tag
+
+        include PathHelper
+
+        def render(context)
+          render_path(context)
+        end
+
+        def wrong_syntax!
+          raise SyntaxError.new("Syntax Error in 'path_to' - Valid syntax: path_to <page|page_handle|content_entry>(, locale: [fr|de|...], with: <page_handle>")
+        end
+
+      end
+
+      ::Liquid::Template.register_tag('path_to', PathTo)
+    end
+  end
+end

data/lib/locomotive/liquid/tags/snippet.rb

@@ -54,7 +54,7 @@ module Locomotive
             @partial = nil
           else
             @snippet_id = snippet.id
-            @partial = ::Liquid::Template.parse(snippet.template, @context.clone)
+            @partial = ::Liquid::Template.parse(snippet.template, context.merge(@context))
             @partial.root.context.clear
           end
         end

data/lib/locomotive/render.rb

@@ -198,7 +198,8 @@ module Locomotive
         'locales'           => current_site.locales,
         'current_user'      => Locomotive::Liquid::Drops::CurrentUser.new(current_locomotive_account),
         'session'           => Locomotive::Liquid::Drops::SessionProxy.new,
-        'wagon'             => false
+        'wagon'             => false,
+        'editing'           => self.editing_page?
       }
     end
 

data/lib/locomotive/version.rb

@@ -1,3 +1,3 @@
 module Locomotive #:nodoc
-  VERSION = '2.3.1'
+  VERSION = '2.4.0'
 end

data/spec/lib/locomotive/liquid/tags/consume_spec.rb

@@ -48,6 +48,18 @@ describe Locomotive::Liquid::Tags::Consume do
       template = "{% consume blog from url %}{{ blog.title }}{% endconsume %}"
       Liquid::Template.parse(template).render('url' => "http://blog.locomotiveapp.org/api/read").should == 'Locomotive rocks !'
     end
+
+    it 'puts the response into the liquid variable using a url from a variable that changes within an iteration' do
+      base_uri = 'http://blog.locomotiveapp.org'
+      template = "{% consume blog from url %}{{ blog.title }}{% endconsume %}"
+      compiled_template = Liquid::Template.parse(template)
+
+      [['/api/read', 'Locomotive rocks !'], ['/api/read_again', 'Locomotive still rocks !']].each do |path, title|
+        response = mock('response', code: 200, parsed_response: parsed_response('title' => title))
+        Locomotive::Httparty::Webservice.stubs(:get).with(path, {:base_uri => base_uri}).returns(response)
+        compiled_template.render('url' => base_uri + path).should == title
+      end
+    end
   end
 
   context 'timeout' do

data/spec/lib/locomotive/liquid/tags/path_to_spec.rb

@@ -0,0 +1,111 @@
+require 'spec_helper'
+
+describe Locomotive::Liquid::Tags::PathTo do
+
+  before(:each) { I18n.locale = :en }
+
+  let(:site)    { FactoryGirl.create("test site") }
+  let(:assigns) { {} }
+
+  subject { render(template, assigns) }
+
+  context 'no page responding to the handle' do
+
+    let(:template) { "{% path_to unknown-page %}" }
+
+    it { should be_blank }
+
+  end
+
+  context 'no page responding to the handle' do
+
+    let(:assigns)   { { 'project' => Locomotive::ContentEntry.new(_slug: 'hello-world', _label_field_name: :_slug ) } }
+    let(:template)  { "{% path_to project %}" }
+
+    it { should be_blank }
+
+  end
+
+  describe 'page responding to the handle' do
+
+    let(:page)      { create_page(site, 'Hello world', 'my-page') }
+    let(:template)  { "{% path_to my-page %}" }
+    before(:each)   { page }
+
+    it { should == %{/hello-world} }
+
+    context 'passing a page directly' do
+
+      let(:assigns)   { { 'page' => page } }
+      let(:template)  { "{% path_to page %}" }
+
+      it { should == %{/hello-world} }
+
+    end
+
+  end
+
+  describe 'templatized page' do
+
+    let(:parent_page)   { create_page(site, 'List of projects') }
+    let(:page)          { create_templatized_page(site, 'Template', 'project-template', parent_page, content_type) }
+    let(:content_type)  { create_content_type(site, 'Projects') }
+    let(:content_entry) { create_content_entry(content_type, name: 'My fancy project') }
+    let(:assigns)       { { 'project' => content_entry } }
+    before(:each)       { page }
+
+    context 'without passing the handle' do
+
+      let(:template) { "{% path_to project %}" }
+
+      it { should == %{/list-of-projects/my-fancy-project} }
+
+    end
+
+    context 'forcing the page' do
+
+      let(:another_parent_page)   { create_page(site, 'Another list of projects') }
+      let(:another_page)          { create_templatized_page(site, 'Template', 'another-project-template', another_parent_page, content_type) }
+      let(:template)              { "{% path_to project, with: another-project-template %}" }
+      before(:each)               { another_page }
+
+      it { should == %{/another-list-of-projects/my-fancy-project} }
+
+    end
+
+  end
+
+  def render(template, assigns = {})
+    liquid_context = ::Liquid::Context.new({},
+      { 'contents' => Locomotive::Liquid::Drops::ContentTypes.new }.merge(assigns),
+      { site: site })
+    output = Liquid::Template.parse(template).render(liquid_context)
+    output.gsub(/\n\s{0,}/, '')
+  end
+
+  def create_page(site, title, handle = nil, parent = nil)
+    parent ||= site.pages.root.first
+    site.pages.create!(parent: parent, title: title, slug: title.permalink, handle: handle)
+  end
+
+  def create_templatized_page(site, title, handle, parent, content_type)
+    site.pages.create!(
+      parent:             parent,
+      title:              title,
+      handle:             handle,
+      templatized:        true,
+      target_klass_name:  content_type.klass_with_custom_fields(:entries).to_s)
+  end
+
+  def create_content_type(site, name)
+    FactoryGirl.build(:content_type, site: site, name: name).tap do |content_type|
+      content_type.entries_custom_fields.build(name: 'name', type: 'string', label: 'name')
+      content_type.save!
+    end
+  end
+
+  def create_content_entry(content_type, attributes)
+    content_type.entries.create!(attributes)
+  end
+
+end

data/spec/models/locomotive/content_entry_spec.rb

@@ -176,8 +176,8 @@ describe Locomotive::ContentEntry do
       @content_type.save
 
       %w(first second third).each_with_index do |item, index|
-        content = build_content_entry(title: item.to_s, _position: index)
-        content.save
+        content = build_content_entry(title: item.to_s, _position: index, visible: true)
+        content.save!
         instance_variable_set "@#{item}", content
       end
     end

data/spec/models/locomotive/snippet_spec.rb

@@ -49,6 +49,27 @@ describe Locomotive::Snippet do
 
     end
 
+    context 'for snippets inside a snippet' do
+      before :each do
+        @nested_snippet = FactoryGirl.create(:snippet, site: @site, slug: 'my_nested_test_snippet', template: "{% include 'my_test_snippet' %}")
+        @page = FactoryGirl.create(:page, site: @site, slug: 'my_page_here', raw_template: "{% include 'my_nested_test_snippet' %}")
+      end
+
+      it 'renders the nested snippet' do
+        Locomotive::Page.find(@page.id).render({}).should == 'a testing template'
+      end
+
+      it 'updates parent snippets with the new snippet template' do
+        @snippet.update_attributes(template: 'a new template')
+        Locomotive::Page.find(@page.id).render({}).should == 'a new template'
+      end
+
+      it 'when the parent snippet is updated child snippets are rendered correctly' do
+        @nested_snippet.update_attributes(template: "hello {% include 'my_test_snippet' %}")
+        Locomotive::Page.find(@page.id).render({}).should == 'hello a testing template'
+      end
+    end
+
     context '#i18n' do
 
       before :each do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locomotive_cms
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-10 00:00:00.000000000 Z
+date: 2013-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -42,16 +42,16 @@ dependencies:
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.7
 - !ruby/object:Gem::Dependency
   name: devise-encryptable
   requirement: !ruby/object:Gem::Requirement
@@ -610,6 +610,7 @@ files:
 - app/assets/javascripts/locomotive/views/pages/list_view.js.coffee
 - app/assets/javascripts/locomotive/views/pages/new_view.js.coffee
 - app/assets/javascripts/locomotive/views/shared/asset_picker_view.js.coffee
+- app/assets/javascripts/locomotive/views/shared/fields/_relationship_view.js.coffee
 - app/assets/javascripts/locomotive/views/shared/fields/belongs_to_view.js.coffee
 - app/assets/javascripts/locomotive/views/shared/fields/file_view.js.coffee
 - app/assets/javascripts/locomotive/views/shared/fields/has_many_view.js.coffee
@@ -788,6 +789,7 @@ files:
 - app/models/locomotive/extensions/asset/types.rb
 - app/models/locomotive/extensions/asset/vignette.rb
 - app/models/locomotive/extensions/content_entry/csv.rb
+- app/models/locomotive/extensions/content_entry/localized.rb
 - app/models/locomotive/extensions/content_type/default_values.rb
 - app/models/locomotive/extensions/content_type/item_template.rb
 - app/models/locomotive/extensions/content_type/sync.rb
@@ -799,6 +801,7 @@ files:
 - app/models/locomotive/extensions/page/templatized.rb
 - app/models/locomotive/extensions/page/tree.rb
 - app/models/locomotive/extensions/shared/seo.rb
+- app/models/locomotive/extensions/shared/slug.rb
 - app/models/locomotive/extensions/site/first_installation.rb
 - app/models/locomotive/extensions/site/locales.rb
 - app/models/locomotive/extensions/site/subdomain_domains.rb
@@ -1084,6 +1087,8 @@ files:
 - lib/locomotive/liquid/tags/locale_switcher.rb
 - lib/locomotive/liquid/tags/nav.rb
 - lib/locomotive/liquid/tags/paginate.rb
+- lib/locomotive/liquid/tags/path_helper.rb
+- lib/locomotive/liquid/tags/path_to.rb
 - lib/locomotive/liquid/tags/seo.rb
 - lib/locomotive/liquid/tags/session_assign.rb
 - lib/locomotive/liquid/tags/snippet.rb
@@ -1299,6 +1304,7 @@ files:
 - spec/lib/locomotive/liquid/tags/locale_switcher_spec.rb
 - spec/lib/locomotive/liquid/tags/nav_spec.rb
 - spec/lib/locomotive/liquid/tags/paginate_spec.rb
+- spec/lib/locomotive/liquid/tags/path_to_spec.rb
 - spec/lib/locomotive/liquid/tags/seo_spec.rb
 - spec/lib/locomotive/liquid/tags/with_scope_spec.rb
 - spec/lib/locomotive/presentable_spec.rb
@@ -1514,6 +1520,7 @@ test_files:
 - spec/lib/locomotive/liquid/tags/locale_switcher_spec.rb
 - spec/lib/locomotive/liquid/tags/nav_spec.rb
 - spec/lib/locomotive/liquid/tags/paginate_spec.rb
+- spec/lib/locomotive/liquid/tags/path_to_spec.rb
 - spec/lib/locomotive/liquid/tags/seo_spec.rb
 - spec/lib/locomotive/liquid/tags/with_scope_spec.rb
 - spec/lib/locomotive/presentable_spec.rb