locomotive_cms 2.1.4 → 2.2.0

data/spec/lib/locomotive/liquid/tags/editable/text_spec.rb

@@ -0,0 +1,85 @@
+require 'spec_helper'
+
+describe Locomotive::Liquid::Tags::Editable::Text do
+
+  let(:markup) { "'title', hint: 'Simple short text'" }
+  subject { build_tag }
+
+  context 'valid syntax' do
+
+    it 'does not raise an error' do
+      expect { subject }.to_not raise_error
+    end
+
+  end
+
+  context 'without a slug' do
+
+    let(:markup) { '' }
+
+    it 'requires a slug' do
+      expect { subject }.to raise_error(::Liquid::SyntaxError, "Syntax Error in 'editable_xxx' - Valid syntax: editable_xxx <slug>(, <options>)")
+    end
+
+  end
+
+  describe '.default_element_attributes' do
+
+    let(:content) { '' }
+    subject { build_tag('text', content).send(:default_element_attributes) }
+
+    it { should include(slug: 'title') }
+    it { should include(hint: 'Simple short text') }
+    it { should include(_type: 'Locomotive::EditableText') }
+    it { should include(format: 'html') }
+    it { should include(rows: 10) }
+    it { should include(line_break: true) }
+
+    describe 'default content' do
+
+      context 'only text' do
+
+        let(:content) { 'Lorem ipsum' }
+        it { should include(content_from_default: 'Lorem ipsum') }
+
+      end
+
+      context 'liquid tags' do
+
+        let(:content) { ['hello ', ::Liquid::Variable.new("{{ 'world' }}")] }
+        it { expect { subject }.to raise_error(::Liquid::SyntaxError, "Error in the default block for the title editable_element - No liquid tags are allowed inside.") }
+
+      end
+
+    end
+
+    context 'editable_short_text' do
+
+      subject { build_tag('short_text').send(:default_element_attributes) }
+
+      it { should include(format: 'raw') }
+      it { should include(rows: 2) }
+      it { should include(line_break: false) }
+
+    end
+
+    context 'editable_long_text' do
+
+      subject { build_tag('long_text').send(:default_element_attributes) }
+
+      it { should include(format: 'html') }
+      it { should include(rows: 15) }
+      it { should include(line_break: true) }
+
+    end
+
+  end
+
+  def build_tag(tag_name = 'text', content = nil)
+    klass = "Locomotive::Liquid::Tags::Editable::#{tag_name.camelize}".constantize
+    klass.new("editable_#{tag_name}", markup, ["{% endeditable_#{tag_name} %}"], {}).tap do |tag|
+      tag.instance_variable_set(:@nodelist, [*content]) if content
+    end
+  end
+
+end

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

@@ -0,0 +1,111 @@
+require 'spec_helper'
+
+describe Locomotive::Liquid::Tags::LinkTo 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) { "{% link_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)  { "{% link_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)  { "{% link_to my-page %}" }
+    before(:each)   { page }
+
+    it { should == %{<a href="/hello-world">Hello world</a>} }
+
+    context 'passing a page directly' do
+
+      let(:assigns)   { { 'page' => page } }
+      let(:template)  { "{% link_to page %}" }
+
+      it { should == %{<a href="/hello-world">Hello world</a>} }
+
+    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) { "{% link_to project %}" }
+
+      it { should == %{<a href="/list-of-projects/my-fancy-project">My fancy project</a>} }
+
+    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)              { "{% link_to project, with: another-project-template %}" }
+      before(:each)               { another_page }
+
+      it { should == %{<a href="/another-list-of-projects/my-fancy-project">My fancy project</a>} }
+
+    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/lib/locomotive/liquid/tags/with_scope_spec.rb

@@ -10,6 +10,12 @@ describe Locomotive::Liquid::Tags::WithScope do
     attributes['title'].should == 'foo'
     attributes['hidden'].should == false
   end
+  
+  it 'decodes regexps' do
+    scope = Locomotive::Liquid::Tags::WithScope.new('with_scope', 'title: /Like this one|or this one/', ["{% endwith_scope %}"], {})
+    attributes = scope.send(:decode, scope.instance_variable_get(:@attributes), ::Liquid::Context.new)
+    attributes['title'].should == /Like this one|or this one/
+  end
 
   it 'decodes context variable' do
     scope = Locomotive::Liquid::Tags::WithScope.new('with_scope', 'category: params.type', ["{% endwith_scope %}"], {})

data/spec/models/locomotive/content_entry_spec.rb

@@ -37,7 +37,7 @@ describe Locomotive::ContentEntry do
 
   end
 
-  describe '#slug' do
+  describe '.slug' do
 
     before :each do
       build_content_entry(_slug: 'dogs').tap(&:save!)._slug.should == 'dogs'
@@ -73,6 +73,12 @@ describe Locomotive::ContentEntry do
         build_content_entry(_slug: 'dogs').tap(&:save!)._slug.should == "dogs-#{i}"
       end
     end
+
+    it 'copies the slug in ALL the locales of the site' do
+      Locomotive::Site.any_instance.stubs(:locales).returns(%w(en fr ru))
+      entry = build_content_entry(_slug: 'monkeys').tap(&:save!)
+      entry._slug_translations.should == { 'en' => 'monkeys', 'fr' => 'monkeys', 'ru' => 'monkeys' }
+    end
   end
 
   describe '#I18n' do
@@ -81,6 +87,7 @@ describe Locomotive::ContentEntry do
       localize_content_type @content_type
       ::Mongoid::Fields::I18n.locale = 'en'
       @content_entry = build_content_entry(title: 'Hello world')
+      @content_entry.send(:set_slug)
       ::Mongoid::Fields::I18n.locale = 'fr'
     end
 
@@ -94,6 +101,19 @@ describe Locomotive::ContentEntry do
       @content_entry.translated?.should be_true
     end
 
+    describe '.slug' do
+
+      it 'is not nil in the default locale' do
+        ::Mongoid::Fields::I18n.locale = 'en'
+        @content_entry._slug.should == 'hello-world'
+      end
+
+      it 'is not translated by default in the other locale' do
+        @content_entry._slug.should be_nil # French
+      end
+
+    end
+
   end
 
   describe 'csv' do
@@ -108,17 +128,17 @@ describe Locomotive::ContentEntry do
 
         subject { build_content_entry.to_values(host: 'example.com') }
 
-        its(:size) { should eq(4) }
+        its(:size) { should eq(5) }
 
         its(:first) { should eq('Locomotive') }
 
-        its(:last) { should eq('') }
+        its(:last) { should eq('July 05, 2013 00:00') }
 
         context 'with a file' do
 
-          subject { build_content_entry(file: FixturedAsset.open('5k.png')).tap(&:save).to_values(host: 'example.com') }
+          subject { build_content_entry(file: FixturedAsset.open('5k.png')).tap(&:save).to_values(host: 'example.com')[3] }
 
-          its(:last) { should match(/^http:\/\/example.com\/sites\/[0-9a-f]+\/content_entry[0-9a-f]+\/[0-9a-f]+\/files\/5k.png$/) }
+          it { should match(/^http:\/\/example.com\/sites\/[0-9a-f]+\/content_entry[0-9a-f]+\/[0-9a-f]+\/files\/5k.png$/) }
 
         end
 
@@ -160,12 +180,12 @@ describe Locomotive::ContentEntry do
 
     it 'should find previous item when available' do
       @second.previous.title.should == 'first'
-      @second.previous._position.should == 1
+      @second.previous._position.should == 0
     end
 
     it 'should find next item when available' do
       @second.next.title.should == 'third'
-      @second.next._position.should == 3
+      @second.next._position.should == 2
     end
 
     it 'should return nil when fetching previous item on first in list' do

data/spec/models/locomotive/{editable_short_text_spec.rb → editable_text_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Locomotive::EditableShortText do
+describe Locomotive::EditableText do
 
   describe 'a simple case' do
 
@@ -8,7 +8,7 @@ describe Locomotive::EditableShortText do
       @site = FactoryGirl.create(:site)
       @home = @site.pages.root.first
 
-      @home.update_attributes raw_template: "{% block body %}{% editable_short_text 'body' %}Lorem ipsum{% endeditable_short_text %}{% endblock %}"
+      @home.update_attributes raw_template: "{% block body %}{% editable_text 'body' %}Lorem ipsum{% endeditable_text %}{% endblock %}"
 
       @sub_page_1 = FactoryGirl.create(:page, slug: 'sub_page_1', parent: @home, raw_template: "{% extends 'parent' %}")
       @sub_page_2 = FactoryGirl.create(:page, slug: 'sub_page_2', parent: @home, raw_template: "{% extends 'parent' %}")
@@ -18,7 +18,34 @@ describe Locomotive::EditableShortText do
       @sub_page_1_1 = FactoryGirl.create(:page, slug: 'sub_page_1_1', parent: @sub_page_1, raw_template: "{% extends 'parent' %}")
     end
 
-    context '#locales' do
+    describe 'properties' do
+
+      it 'exists' do
+        @sub_page_1.editable_elements.size.should == 1
+      end
+
+      it 'has a non-nil slug' do
+        @sub_page_1.editable_elements.first.slug.should == 'body'
+      end
+
+      it 'has a default content at first' do
+        @sub_page_1.editable_elements.first.default_content.should be_true
+        @sub_page_1.editable_elements.first.content.should == 'Lorem ipsum'
+      end
+
+      it 'is still default when it gets modified by the exact same value' do
+        @sub_page_1.editable_elements.first.content = 'Lorem ipsum'
+        @sub_page_1.editable_elements.first.default_content.should be_true
+      end
+
+      it 'strips the content' do
+        @sub_page_1.editable_elements.first.update_attribute :content, "   Lorem ipsum\n\n   "
+        @sub_page_1.editable_elements.first.content.should == 'Lorem ipsum'
+      end
+
+    end
+
+    describe 'locales' do
 
       it 'assigns the default locale' do
         @sub_page_1_el.locales.should == ['en']
@@ -35,7 +62,7 @@ describe Locomotive::EditableShortText do
 
       it 'adds new locale within sub page elements' do
         ::Mongoid::Fields::I18n.with_locale 'fr' do
-          @home.update_attributes title: 'Accueil', raw_template: "{% block body %}{% editable_short_text 'body' %}Lorem ipsum{% endeditable_short_text %}{% endblock %}"
+          @home.update_attributes title: 'Accueil', raw_template: "{% block body %}{% editable_text 'body' %}Lorem ipsum{% endeditable_text %}{% endblock %}"
           page = Locomotive::Page.find(@sub_page_1._id)
           page.editable_elements.first.content = 'Lorem ipsum (FR)'
           page.save
@@ -45,7 +72,25 @@ describe Locomotive::EditableShortText do
 
     end
 
-    context '#editable?' do
+    describe 'when modifying the raw template' do
+
+      it 'can update its content from the raw template if the user has not modified it' do
+        @home.update_attributes raw_template: "{% block body %}{% editable_text 'body' %}Lorem ipsum v2{% endeditable_text %}{% endblock %}"
+        @home.editable_elements.first.default_content.should be_true
+        @home.editable_elements.first.content.should == 'Lorem ipsum v2'
+      end
+
+      it 'does not touch the content if the user has modified it before' do
+        @home.editable_elements.first.content = 'Hello world'
+        @home.raw_template = "{% block body %}{% editable_text 'body' %}Lorem ipsum v2{% endeditable_text %}{% endblock %}"
+        @home.save
+        @home.editable_elements.first.default_content.should be_false
+        @home.editable_elements.first.content.should == 'Hello world'
+      end
+
+    end
+
+    describe '.editable?' do
 
       it 'is editable' do
         @sub_page_1_el.editable?.should be_true
@@ -78,7 +123,7 @@ describe Locomotive::EditableShortText do
 
     end
 
-    context 'in sub pages level #1' do
+    describe 'in sub pages level #1' do
 
       before(:each) do
         @sub_page_1.reload
@@ -101,7 +146,7 @@ describe Locomotive::EditableShortText do
 
     end
 
-    context 'in sub pages level #2' do
+    describe 'in sub pages level #2' do
 
       before(:each) do
         @sub_page_1_1.reload
@@ -131,7 +176,7 @@ describe Locomotive::EditableShortText do
       @site = FactoryGirl.create(:site)
       @home = @site.pages.root.first
 
-      @home.update_attributes raw_template: "{% block body %}{% editable_short_text 'body', fixed: true %}Lorem ipsum{% endeditable_short_text %}{% endblock %}"
+      @home.update_attributes raw_template: "{% block body %}{% editable_text 'body', fixed: true %}Lorem ipsum{% endeditable_text %}{% endblock %}"
       @home_el = @home.editable_elements.first
 
       @sub_page_1 = FactoryGirl.create(:page, slug: 'sub_page_1', parent: @home, raw_template: "{% extends 'parent' %}")

data/spec/models/locomotive/extensions/page/editable_elements_spec.rb

@@ -6,7 +6,7 @@ describe Locomotive::Extensions::Page::EditableElements do
     @site = FactoryGirl.create(:site)
     @home = @site.pages.root.first
 
-    @home.update_attributes raw_template: "{% editable_short_text 'body' %}Lorem ipsum{% endeditable_short_text %}"
+    @home.update_attributes raw_template: "{% editable_text 'body' %}Lorem ipsum{% endeditable_text %}"
 
     @sub_page_1 = FactoryGirl.create(:page, slug: 'sub_page_1', parent: @home, raw_template: "{% extends 'parent' %}")
     @sub_page_2 = FactoryGirl.create(:page, slug: 'sub_page_2', parent: @home, raw_template: "{% extends 'parent' %}")
@@ -23,15 +23,15 @@ describe Locomotive::Extensions::Page::EditableElements do
     end
 
     it 'changes the type of the element in all the children' do
-      @home.update_attributes raw_template: "{% editable_long_text 'body' %}Lorem ipsum{% endeditable_long_text %}"
+      @home.update_attributes raw_template: "{% editable_file 'body' %}/nowhere.pdf{% endeditable_file %}"
       @sub_page_1.reload
-      @sub_page_1.editable_elements.first._type.should == 'Locomotive::EditableLongText'
+      @sub_page_1.editable_elements.first._type.should == 'Locomotive::EditableFile'
       @sub_page_1_1.reload
-      @sub_page_1_1.editable_elements.first._type.should == 'Locomotive::EditableLongText'
+      @sub_page_1_1.editable_elements.first._type.should == 'Locomotive::EditableFile'
     end
 
     it 'changes the hint of the element in all the children' do
-      @home.update_attributes raw_template: "{% editable_long_text 'body', hint: 'My very useful hint' %}Lorem ipsum{% endeditable_long_text %}"
+      @home.update_attributes raw_template: "{% editable_text 'body', hint: 'My very useful hint' %}Lorem ipsum{% endeditable_text %}"
       @sub_page_1.reload
       @sub_page_1.editable_elements.first.hint.should == 'My very useful hint'
       @sub_page_1_1.reload
@@ -44,7 +44,7 @@ describe Locomotive::Extensions::Page::EditableElements do
 
     it 'does not remove the editable elements in other locales' do
       Mongoid::Fields::I18n.with_locale(:fr) do
-        @home.update_attributes raw_template: "{% editable_short_text 'corps' %}Lorem ipsum{% endeditable_short_text %}"
+        @home.update_attributes raw_template: "{% editable_text 'corps' %}Lorem ipsum{% endeditable_text %}"
       end
       @home.reload
       @home.editable_elements.count.should == 2

data/spec/models/locomotive/site_spec.rb

@@ -107,54 +107,74 @@ describe Locomotive::Site do
 
   describe 'once created' do
 
-    before(:each) do
-      @site = FactoryGirl.create(:site)
-    end
+    let(:site) { FactoryGirl.create(:site, locales: locales) }
 
-    it 'should create index and 404 pages' do
-      @site.pages.size.should == 2
-      @site.pages.map(&:fullpath).sort.should == %w{404 index}
-    end
+    context 'the default locale is fr' do
 
-    it 'translates the index/404 pages if a new locale is added' do
-      @site.update_attributes locales: %w(en fr)
+      let(:locales) { ['fr'] }
 
-      @site.errors.should be_empty
+      it 'creates the index and 404 pages' do
+        site.pages.size.should == 2
 
-      ::Mongoid::Fields::I18n.with_locale('fr') do
-        @site.pages.root.first.tap do |page|
-          page.title.should == "Page d'accueil"
-          page.slug.should == 'index'
-        end
+        site.pages.map(&:fullpath).sort.should == [nil, nil]
 
-        @site.pages.not_found.first.tap do |page|
-          page.title.should == 'Page non trouvée'
-          page.slug.should == '404'
+        ::Mongoid::Fields::I18n.with_locale('fr') do
+          site.pages.map(&:fullpath).sort.should == %w{404 index}
         end
       end
+
     end
 
-    it 'translates the index/404 pages if the default locale changes' do
-      @site.update_attributes locales: %w(fr en)
+    context 'the default locale is en' do
+
+      let(:locales) { ['en'] }
+
+      it 'should create the index and 404 pages' do
+        site.pages.size.should == 2
+        site.pages.map(&:fullpath).sort.should == %w{404 index}
+      end
+
+      it 'translates the index/404 pages if a new locale is added' do
+        site.update_attributes locales: %w(en fr)
+
+        site.errors.should be_empty
 
-      @site.errors.should be_empty
+        ::Mongoid::Fields::I18n.with_locale('fr') do
+          site.pages.root.first.tap do |page|
+            page.title.should == "Page d'accueil"
+            page.slug.should == 'index'
+          end
 
-      ::Mongoid::Fields::I18n.with_locale('fr') do
-        @site.pages.root.first.tap do |page|
-          page.title.should == "Page d'accueil"
-          page.slug.should == 'index'
+          site.pages.not_found.first.tap do |page|
+            page.title.should == 'Page non trouvée'
+            page.slug.should == '404'
+          end
         end
+      end
+
+      it 'translates the index/404 pages if the default locale changes' do
+        site.update_attributes locales: %w(fr en)
+
+        site.errors.should be_empty
 
-        @site.pages.not_found.first.tap do |page|
-          page.title.should == 'Page non trouvée'
-          page.slug.should == '404'
+        ::Mongoid::Fields::I18n.with_locale('fr') do
+          site.pages.root.first.tap do |page|
+            page.title.should == "Page d'accueil"
+            page.slug.should == 'index'
+          end
+
+          site.pages.not_found.first.tap do |page|
+            page.title.should == 'Page non trouvée'
+            page.slug.should == '404'
+          end
         end
       end
-    end
 
-    it 'does not allow to remove the default locale' do
-      @site.update_attributes locales: %w(fr)
-      @site.errors[:locales].should == ['The previous default locale can not be removed right away.']
+      it 'does not allow to remove the default locale' do
+        site.update_attributes locales: %w(fr)
+        site.errors[:locales].should == ['The previous default locale can not be removed right away.']
+      end
+
     end
 
   end