locomotive_cms 2.5.6 → 2.5.7

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

@@ -23,6 +23,12 @@ describe Locomotive::Liquid::Tags::WithScope do
     options[:category].should == 'posts'
   end
 
+  it 'decodes a regexp stored in a context variable' do
+    scope   = Locomotive::Liquid::Tags::WithScope.new('with_scope', 'title: my_regexp', ["{% endwith_scope %}"], {})
+    options = decode_options(scope, { 'my_regexp' => '/^Hello World/' })
+    options[:title].should == /^Hello World/
+  end
+
   it 'allows order_by option' do
     scope   = Locomotive::Liquid::Tags::WithScope.new('with_scope', 'order_by:\'name DESC\'', ["{% endwith_scope %}"], {})
     options = decode_options(scope)

data/spec/mailers/locomotive/notifications_spec.rb

@@ -4,15 +4,13 @@ describe Locomotive::Notifications do
 
   describe 'new_content_entry' do
 
-    let(:site) { FactoryGirl.build(:site, domains: %w{www.acme.com}) }
-
-    let(:account) { FactoryGirl.build(:account) }
-
-    let(:content_type) { FactoryGirl.build(:content_type, site: site) }
-
+    let(:now)           { Time.parse('Sep 16 1982 9:00pm') }
+    let(:site)          { FactoryGirl.build(:site, domains: %w{www.acme.com}, timezone_name: 'CET') }
+    let(:account)       { FactoryGirl.build(:account) }
+    let(:content_type)  { FactoryGirl.build(:content_type, site: site) }
     let(:content_entry) { FactoryGirl.build(:content_entry, content_type: content_type, site: site) }
 
-    let(:mail) { Locomotive::Notifications.new_content_entry(account, content_entry) }
+    let(:mail) { set_timezone { Locomotive::Notifications.new_content_entry(account, content_entry) } }
 
     it 'renders the subject' do
       mail.subject.should == '[www.acme.com][My project] new entry'
@@ -26,6 +24,11 @@ describe Locomotive::Notifications do
       mail.from.should == ['support@dummy.com']
     end
 
+    it 'outputs the current time in the correct time zone' do
+      Time.stubs(:now).returns(now)
+      mail.body.encoded.should match('a new instance has been created on 09/16/1982 21:00')
+    end
+
     it 'outputs the domain in the email body' do
       mail.body.encoded.should match('<b>www.acme.com</b>')
     end
@@ -54,4 +57,8 @@ describe Locomotive::Notifications do
 
   end
 
-end
+  def set_timezone(&block)
+    Time.use_zone(site.try(:timezone) || 'UTC', &block)
+  end
+
+end

data/spec/models/locomotive/content_entry_spec.rb

@@ -176,7 +176,7 @@ describe Locomotive::ContentEntry do
       @content_type.update_attribute :order_by, '_position'
 
       %w(first second third).each_with_index do |item, index|
-        content = build_content_entry(title: item.to_s, _position: index, published_at: (index + 1).days.ago, visible: true)
+        content = build_content_entry(title: item.to_s, _position: index, published_at: (index + 2).days.ago, visible: true)
         content.save!
         instance_variable_set "@#{item}", content
       end

data/spec/models/locomotive/editable_control_spec.rb

@@ -10,7 +10,7 @@ describe Locomotive::EditableControl do
   describe '#simple' do
 
     before(:each) do
-      @home.update_attributes raw_template: "{% block body %}{% editable_control 'menu', options: 'true=Yes,false=No' %}false{% endeditable_control %}{% endblock %}"
+      @home.update_attributes raw_template: %({% block body %}{% editable_control 'menu', options: "true=Yes,false=No" %}false{% endeditable_control %}{% endblock %}%)
 
       @sub_page_1 = FactoryGirl.create(:page, slug: 'sub_page_1', parent: @home, raw_template: "{% extends 'parent' %}")
     end
@@ -76,4 +76,4 @@ describe Locomotive::EditableControl do
 
   end
 
-end
+end

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

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe Locomotive::Extensions::Page::Layout do
+
+  let(:site)          { FactoryGirl.build(:site) }
+  let(:allow_layout)  { true }
+  let(:layout)        { Locomotive::Page.new(is_layout: true, fullpath: 'awesome-layout') }
+  let(:page)          { Locomotive::Page.new(layout: layout, allow_layout: allow_layout, site: site) }
+
+  describe 'allow_layout default value' do
+
+    let(:page) { Locomotive::Page.new }
+
+    subject { page.allow_layout }
+
+    describe 'true for a new page' do
+
+      it { should eq true }
+
+    end
+
+    describe 'false for an existing page without the allow_layout attribute' do
+
+      let(:page) { p = Locomotive::Page.new; p.save(validate: false); p.unset(:allow_layout); Locomotive::Page.find(p._id) }
+
+      it { should eq false }
+
+    end
+
+  end
+
+  describe 'use a layout' do
+
+    before { page.valid? }
+
+    subject { page.raw_template }
+
+    it { should eq '{% extends "awesome-layout" %}' }
+
+    describe 'but changing the layout is not allowed' do
+
+      let(:allow_layout) { false }
+
+      it { should eq "{% extends 'parent' %}" }
+
+    end
+
+  end
+
+end

data/spec/models/locomotive/site_spec.rb

@@ -59,7 +59,7 @@ describe Locomotive::Site do
   end
 
   it 'should validate format of domains' do
-    site = FactoryGirl.build(:site, domains: ['barformat.a', '-foo.net', 'goodformat.superlong', 'local.lb-service'])
+    site = FactoryGirl.build(:site, domains: ['www.9troisquarts.com', 'barformat.a', '-foo.net', 'goodformat.superlong', 'local.lb-service'])
     site.should_not be_valid
     site.errors[:domains].should == ['barformat.a is invalid', '-foo.net is invalid']
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locomotive_cms
 version: !ruby/object:Gem::Version
-  version: 2.5.6
+  version: 2.5.7
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.19
+        version: 3.2.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.19
+        version: 3.2.21
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,34 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.6.7
+- !ruby/object:Gem::Dependency
+  name: moped
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.3
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.5
+        version: 3.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.5
+        version: 3.1.7
 - !ruby/object:Gem::Dependency
   name: mongoid-tree
   requirement: !ruby/object:Gem::Requirement
@@ -767,6 +781,7 @@ files:
 - app/controllers/locomotive/api/theme_assets_controller.rb
 - app/controllers/locomotive/api/tokens_controller.rb
 - app/controllers/locomotive/api/translations_controller.rb
+- app/controllers/locomotive/api/version_controller.rb
 - app/controllers/locomotive/base_controller.rb
 - app/controllers/locomotive/content_assets_controller.rb
 - app/controllers/locomotive/content_entries_controller.rb
@@ -829,6 +844,7 @@ files:
 - app/models/locomotive/extensions/content_type/item_template.rb
 - app/models/locomotive/extensions/content_type/sync.rb
 - app/models/locomotive/extensions/page/editable_elements.rb
+- app/models/locomotive/extensions/page/layout.rb
 - app/models/locomotive/extensions/page/listed.rb
 - app/models/locomotive/extensions/page/parse.rb
 - app/models/locomotive/extensions/page/redirect.rb
@@ -863,6 +879,7 @@ files:
 - app/presenters/locomotive/snippet_presenter.rb
 - app/presenters/locomotive/theme_asset_presenter.rb
 - app/presenters/locomotive/translation_presenter.rb
+- app/services/locomotive/content_entry_service.rb
 - app/uploaders/locomotive/content_asset_uploader.rb
 - app/uploaders/locomotive/editable_file_uploader.rb
 - app/uploaders/locomotive/theme_asset_uploader.rb
@@ -1370,6 +1387,7 @@ files:
 - spec/models/locomotive/editable_text_spec.rb
 - spec/models/locomotive/extensions/content_entry/csv_spec.rb
 - spec/models/locomotive/extensions/page/editable_elements_spec.rb
+- spec/models/locomotive/extensions/page/layout_spec.rb
 - spec/models/locomotive/extensions/page/redirect_spec.rb
 - spec/models/locomotive/extensions/page/render_spec.rb
 - spec/models/locomotive/extensions/site/locales_spec.rb
@@ -1462,7 +1480,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A Next Generation Sexy CMS for Rails 3
@@ -1611,6 +1629,7 @@ test_files:
 - spec/models/locomotive/editable_text_spec.rb
 - spec/models/locomotive/extensions/content_entry/csv_spec.rb
 - spec/models/locomotive/extensions/page/editable_elements_spec.rb
+- spec/models/locomotive/extensions/page/layout_spec.rb
 - spec/models/locomotive/extensions/page/redirect_spec.rb
 - spec/models/locomotive/extensions/page/render_spec.rb
 - spec/models/locomotive/extensions/site/locales_spec.rb