locomotive_cms 2.0.3 → 2.1.0

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

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Locomotive::Liquid::Tags::SEO do
 
   let(:site) do
-    FactoryGirl.build(:site, :seo_title => 'Site title (SEO)', :meta_description => 'A short site description', :meta_keywords => 'test only cat dog')
+    FactoryGirl.build(:site, seo_title: 'Site title (SEO)', meta_description: 'A short site description', meta_keywords: 'test only cat dog')
   end
 
   describe 'rendering' do
@@ -50,7 +50,7 @@ describe Locomotive::Liquid::Tags::SEO do
     context "when page" do
 
       context "has seo title" do
-        let(:page) { site.pages.build(:seo_title => 'Page title (SEO)', :meta_keywords => 'hulk,gamma', :meta_description => "Bruce Banner") }
+        let(:page) { site.pages.build(seo_title: 'Page title (SEO)', meta_keywords: 'hulk,gamma', meta_description: "Bruce Banner") }
         subject { render_seo_title('page' => page) }
         it { should include(%Q[<title>Page title (SEO)</title>]) }
       end
@@ -62,7 +62,7 @@ describe Locomotive::Liquid::Tags::SEO do
       end
 
       context "has metadata" do
-        let(:page) { site.pages.build(:meta_keywords => 'hulk,gamma', :meta_description => "Bruce Banner") }
+        let(:page) { site.pages.build(meta_keywords: 'hulk,gamma', meta_description: "Bruce Banner") }
         subject { render_seo_metadata('page' => page) }
         it { should include(%Q[<meta name="keywords" content="#{page.meta_keywords}">]) }
         it { should include(%Q[<meta name="description" content="#{page.meta_description}">]) }
@@ -80,13 +80,13 @@ describe Locomotive::Liquid::Tags::SEO do
     context "when content instance" do
 
       let(:content_type) do
-        FactoryGirl.build(:content_type, :site => site).tap do |ct|
-          ct.entries_custom_fields.build :label => 'anything', :type => 'string'
+        FactoryGirl.build(:content_type, site: site).tap do |ct|
+          ct.entries_custom_fields.build label: 'anything', type: 'string'
         end.tap { |_ct| _ct.valid? }
       end
 
       context "has seo title" do
-        let(:content_entry) { content_type.entries.build(:seo_title => 'Content title (SEO)', :meta_keywords => 'Libidinous, Angsty', :meta_description => "Quite the combination.") }
+        let(:content_entry) { content_type.entries.build(seo_title: 'Content title (SEO)', meta_keywords: 'Libidinous, Angsty', meta_description: "Quite the combination.") }
         subject { render_seo_title('content_entry' => content_entry) }
         it { should include(%Q[<title>Content title (SEO)</title>]) }
       end
@@ -98,7 +98,7 @@ describe Locomotive::Liquid::Tags::SEO do
       end
 
       context "has metadata" do
-        let(:content_entry) { content_type.entries.build(:meta_keywords => 'Libidinous, Angsty', :meta_description => "Quite the combination.") }
+        let(:content_entry) { content_type.entries.build(meta_keywords: 'Libidinous, Angsty', meta_description: "Quite the combination.") }
         subject { render_seo_metadata('content_entry' => content_entry) }
         it { should include(%Q[<meta name="keywords" content="#{content_entry.meta_keywords}">]) }
         it { should include(%Q[<meta name="description" content="#{content_entry.meta_description}">]) }
@@ -128,7 +128,7 @@ describe Locomotive::Liquid::Tags::SEO do
   end
 
   def render_seo_tag(tag_name, assigns = {})
-    registers = { :site => site }
+    registers = { site: site }
     liquid_context = ::Liquid::Context.new({}, assigns, registers)
     output = Liquid::Template.parse("{% #{tag_name} %}").render(liquid_context)
   end

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

@@ -26,13 +26,19 @@ describe Locomotive::Liquid::Tags::WithScope do
   it 'stores attributes in the context' do
     template = ::Liquid::Template.parse("{% with_scope active:true title:'foo' %}{{ with_scope.active }}-{{ with_scope.title }}{% endwith_scope %}")
     text = template.render
-    text.should == "true-foo"
+    text.should == 'true-foo'
   end
 
   it 'allows a variable condition inside a loop' do
     template = ::Liquid::Template.parse("{%for i in (1..3)%}{% with_scope number: i %}{{ with_scope.number}}{% endwith_scope %}{%endfor%}")
     text = template.render
-    text.should == "123"
+    text.should == '123'
+  end
+
+  it 'replaces _permalink by _slug' do
+    template = ::Liquid::Template.parse("{% with_scope _permalink: 'foo' %}{{ with_scope._slug }}{% endwith_scope %}")
+    text = template.render
+    text.should == 'foo'
   end
 
   describe "advanced queries thanks to h4s" do

data/spec/lib/locomotive/presentable_spec.rb

@@ -4,8 +4,8 @@ require 'ostruct'
 describe Locomotive::Presentable do
 
   before(:each) do
-    @person           = OpenStruct.new(:id => 42, :name => 'John', :age => 23)
-    @project          = OpenStruct.new(:id => 1, :title => 'LocomotiveCMS')
+    @person           = OpenStruct.new(id: 42, name: 'John', age: 23)
+    @project          = OpenStruct.new(id: 1, title: 'LocomotiveCMS')
 
     @presenter        = PersonPresenter.new(@person)
     @other_presenter  = ProjectPresenter.new(@project)
@@ -48,14 +48,14 @@ describe Locomotive::Presentable do
   end
 
   it 'sets directly the attributes' do
-    @presenter.attributes = { :name => 'henry', :age => 33 }
+    @presenter.attributes = { name: 'henry', age: 33 }
     @presenter.name.should == 'Henry'
     @presenter.age.should == '33 years old'
   end
 
   it 'does not call the setter if not registered' do
     @presenter.expects(:unknown=).never
-    @presenter.attributes = { :name => 'henry', :unknown => true }
+    @presenter.attributes = { name: 'henry', unknown: true }
   end
 
   it 'handles with_options' do
@@ -85,7 +85,7 @@ describe Locomotive::Presentable do
       end
 
       it 'does not allow to change the property' do
-        @presenter.attributes = { :retirement_place => 'Mansion [UPDATE]' }
+        @presenter.attributes = { retirement_place: 'Mansion [UPDATE]' }
         @person.retirement_place.should == 'Mansion'
       end
 
@@ -102,7 +102,7 @@ describe Locomotive::Presentable do
       end
 
       it 'changes the property' do
-        @presenter.attributes = { :retirement_place => 'Mansion [UPDATE]' }
+        @presenter.attributes = { retirement_place: 'Mansion [UPDATE]' }
         @person.retirement_place.should == 'Mansion [UPDATE]'
       end
 
@@ -113,7 +113,7 @@ describe Locomotive::Presentable do
   describe '#collection' do
 
     before(:each) do
-      @another_project  = OpenStruct.new(:id => 2, :title => 'SocialTennis')
+      @another_project  = OpenStruct.new(id: 2, title: 'SocialTennis')
       @person.projects  = [@project, @another_project]
 
       @project.to_presenter = @other_presenter
@@ -145,15 +145,15 @@ describe Locomotive::Presentable do
   class PersonPresenter < BasePresenter
 
     properties  :name, :age
-    property    :address, :only_setter => true, :alias => :full_address
+    property    :address, only_setter: true, alias: :full_address
 
     collection  :projects
 
-    with_options :only_getter => true, :allow_nil => false do |presenter|
+    with_options only_getter: true, allow_nil: false do |presenter|
       presenter.property :notes
     end
 
-    property :retirement_place, :if => Proc.new { __source.age > 60 }
+    property :retirement_place, if: Proc.new { __source.age > 60 }
 
     set_callback :set_attributes, :after, :hello_world
 

data/spec/lib/locomotive/render_spec.rb

@@ -9,7 +9,7 @@ describe 'Locomotive rendering system' do
     @site = FactoryGirl.build(:site)
     Locomotive::Site.stubs(:find).returns(@site)
     @controller.current_site = @site
-    @page = FactoryGirl.build(:page, :site => nil, :published => true)
+    @page = FactoryGirl.build(:page, site: nil, published: true)
   end
 
   context '#liquid_context' do
@@ -18,7 +18,7 @@ describe 'Locomotive rendering system' do
       @controller.instance_variable_set(:@page, @page)
       @controller.stubs(:flash).returns({})
       @controller.stubs(:params).returns({})
-      @controller.stubs(:request).returns(OpenStruct.new(:url => '/'))
+      @controller.stubs(:request).returns(OpenStruct.new(url: '/'))
     end
 
     it 'includes the current date and time' do
@@ -91,25 +91,25 @@ describe 'Locomotive rendering system' do
 
     it 'should retrieve the index page /' do
       @controller.request.fullpath = '/'
-      @controller.current_site.pages.expects(:where).with(:depth => 0, :fullpath.in => %w{index}).returns([@page])
+      @controller.current_site.pages.expects(:where).with(depth: 0, :fullpath.in => %w{index}).returns([@page])
       @controller.send(:locomotive_page).should_not be_nil
     end
 
     it 'should also retrieve the index page (index.html)' do
       @controller.request.fullpath = '/index.html'
-      @controller.current_site.pages.expects(:where).with(:depth => 0, :fullpath.in => %w{index}).returns([@page])
+      @controller.current_site.pages.expects(:where).with(depth: 0, :fullpath.in => %w{index}).returns([@page])
       @controller.send(:locomotive_page).should_not be_nil
     end
 
     it 'should retrieve it based on the full path' do
       @controller.request.fullpath = '/about_us/team.html'
-      @controller.current_site.pages.expects(:where).with(:depth => 2, :fullpath.in => %w{about_us/team about_us/content_type_template content_type_template/team}).returns([@page])
+      @controller.current_site.pages.expects(:where).with(depth: 2, :fullpath.in => %w{about_us/team about_us/content_type_template content_type_template/team}).returns([@page])
       @controller.send(:locomotive_page).should_not be_nil
     end
 
     it 'does not include the query string' do
       @controller.request.fullpath = '/about_us/team.html?some=params&we=use'
-      @controller.current_site.pages.expects(:where).with(:depth => 2, :fullpath.in => %w{about_us/team about_us/content_type_template content_type_template/team}).returns([@page])
+      @controller.current_site.pages.expects(:where).with(depth: 2, :fullpath.in => %w{about_us/team about_us/content_type_template content_type_template/team}).returns([@page])
       @controller.send(:locomotive_page).should_not be_nil
     end
 
@@ -126,13 +126,13 @@ describe 'Locomotive rendering system' do
         @page.redirect = true
         @page.redirect_url = 'http://www.example.com/'
         @controller.request.fullpath = '/contact'
-        @controller.current_site.pages.expects(:where).with(:depth => 1, :fullpath.in => %w{contact content_type_template}).returns([@page])
+        @controller.current_site.pages.expects(:where).with(depth: 1, :fullpath.in => %w{contact content_type_template}).returns([@page])
       end
 
       (301..302).each do |status|
         it "redirects to the redirect_url with a #{status} status" do
           @page.redirect_type = status
-          @controller.expects(:redirect_to).with('http://www.example.com/', { :status => status }).returns(true)
+          @controller.expects(:redirect_to).with('http://www.example.com/', { status: status }).returns(true)
           @controller.send(:render_locomotive_page)
         end
       end
@@ -140,7 +140,7 @@ describe 'Locomotive rendering system' do
       it 'redirects to the redirect_url in the editing version if specified' do
         @page.redirect_url = '/another_page'
         @controller.stubs(:editing_page?).returns(true)
-        @controller.expects(:redirect_to).with('/another_page/_edit', { :status => 301 }).returns(true)
+        @controller.expects(:redirect_to).with('/another_page/_edit', { status: 301 }).returns(true)
         @controller.send(:render_locomotive_page)
       end
 
@@ -149,13 +149,13 @@ describe 'Locomotive rendering system' do
     context 'templatized page' do
 
       before(:each) do
-        @content_type = FactoryGirl.build(:content_type, :site => nil)
-        @content_entry = @content_type.entries.build(:_visible => true)
+        @content_type = FactoryGirl.build(:content_type, site: nil)
+        @content_entry = @content_type.entries.build(_visible: true)
         @page.templatized = true
         @page.stubs(:fetch_target_entry).returns(@content_entry)
         @page.stubs(:fullpath).returns('/projects/content_type_template')
         @controller.request.fullpath = '/projects/edeneo.html'
-        @controller.current_site.pages.expects(:where).with(:depth => 2, :fullpath.in => %w{projects/edeneo projects/content_type_template content_type_template/edeneo}).returns([@page])
+        @controller.current_site.pages.expects(:where).with(depth: 2, :fullpath.in => %w{projects/edeneo projects/content_type_template content_type_template/edeneo}).returns([@page])
       end
 
       it 'sets the content_entry variable' do
@@ -190,7 +190,7 @@ describe 'Locomotive rendering system' do
 
       it 'should return the 404 page if the page has not been published yet' do
         @controller.request.fullpath = '/contact'
-        @controller.current_site.pages.expects(:where).with(:depth => 1, :fullpath.in => %w{contact content_type_template}).returns([@page])
+        @controller.current_site.pages.expects(:where).with(depth: 1, :fullpath.in => %w{contact content_type_template}).returns([@page])
         (klass = Locomotive::Page).expects(:published).returns([true])
         @controller.current_site.pages.expects(:not_found).returns(klass)
         @controller.send(:locomotive_page).should be_true
@@ -199,7 +199,7 @@ describe 'Locomotive rendering system' do
       it 'should not return the 404 page if the page has not been published yet and admin is logged in' do
         @controller.current_locomotive_account = true
         @controller.request.fullpath = '/contact'
-        @controller.current_site.pages.expects(:where).with(:depth => 1, :fullpath.in => %w{contact content_type_template}).returns([@page])
+        @controller.current_site.pages.expects(:where).with(depth: 1, :fullpath.in => %w{contact content_type_template}).returns([@page])
         @controller.send(:locomotive_page).should == @page
       end
 

data/spec/mailers/locomotive/notifications_spec.rb

@@ -4,13 +4,13 @@ describe Locomotive::Notifications do
 
   describe 'new_content_entry' do
 
-    let(:site) { FactoryGirl.build(:site, :domains => %w{www.acme.com}) }
+    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(:content_type) { FactoryGirl.build(:content_type, site: site) }
 
-    let(:content_entry) { FactoryGirl.build(:content_entry, :content_type => 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) }
 

data/spec/models/locomotive/ability_spec.rb

@@ -6,9 +6,9 @@ describe Locomotive::Ability do
     @site = FactoryGirl.create(:site)
     @account = FactoryGirl.create(:account)
 
-    @admin    = FactoryGirl.create(:membership, :account => FactoryGirl.build(:account), :site => FactoryGirl.build(:site))
-    @designer = FactoryGirl.create(:membership, :account => FactoryGirl.build(:account), :site => @site, :role => %(designer))
-    @author   = FactoryGirl.create(:membership, :account => FactoryGirl.build(:account), :site => @site, :role => %(author))
+    @admin    = FactoryGirl.create(:membership, account: FactoryGirl.build(:account), site: FactoryGirl.build(:site))
+    @designer = FactoryGirl.create(:membership, account: FactoryGirl.build(:account), site: @site, role: %(designer))
+    @author   = FactoryGirl.create(:membership, account: FactoryGirl.build(:account), site: @site, role: %(author))
   end
 
   context 'pages' do
@@ -17,15 +17,29 @@ describe Locomotive::Ability do
 
     context 'management' do
       it 'should allow management of pages from (admin, designer, author)' do
-        should     allow_permission_from :manage, @admin
-        should     allow_permission_from :manage, @designer
-        should_not allow_permission_from :manage, @author
+        should      allow_permission_from :manage, @admin
+        should      allow_permission_from :manage, @designer
+        should_not  allow_permission_from :manage, @author
       end
     end
 
-    context 'touching' do
-      it 'should allow touching of pages from (author)' do
-        should allow_permission_from :touch, @author
+    context 'customizing' do
+      it 'should allow customization of pages from (admin, designer, author)' do
+        should      allow_permission_from :customizing, @admin
+        should      allow_permission_from :customizing, @designer
+        should_not  allow_permission_from :customizing, @author
+      end
+    end
+
+    context 'author operations' do
+      it 'should allow read/create/update operations for pages' do
+        should  allow_permission_from :read, @author
+        should  allow_permission_from :create, @author
+        should  allow_permission_from :update, @author
+      end
+
+      it 'should not allow deletion of pages' do
+        should_not  allow_permission_from :destroy, @author
       end
     end
 

data/spec/models/locomotive/account_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Locomotive::Account do
-  let!(:existing_account) { FactoryGirl.create(:account, :email => 'another@email.com') }
+  let!(:existing_account) { FactoryGirl.create(:account, email: 'another@email.com') }
 
   it 'has a valid factory' do
     FactoryGirl.build(:account).should be_valid
@@ -31,8 +31,8 @@ describe Locomotive::Account do
 
   it 'owns many sites' do
     account = FactoryGirl.create(:account)
-    site_1  = FactoryGirl.create(:site, :memberships => [Locomotive::Membership.new(:account => account)])
-    site_2  = FactoryGirl.create(:site, :subdomain => 'another_one', :memberships => [Locomotive::Membership.new(:account => account)])
+    site_1  = FactoryGirl.create(:site, memberships: [Locomotive::Membership.new(account: account)])
+    site_2  = FactoryGirl.create(:site, subdomain: 'another_one', memberships: [Locomotive::Membership.new(account: account)])
     sites   = [site_1, site_2].map(&:_id)
     account.reload.sites.all? { |s| sites.include?(s._id) }.should be_true
   end
@@ -41,8 +41,8 @@ describe Locomotive::Account do
 
     before(:each) do
       @account = FactoryGirl.build(:account)
-      @site_1 = FactoryGirl.build(:site,:memberships => [FactoryGirl.build(:membership, :account => @account)])
-      @site_2 = FactoryGirl.build(:site,:memberships => [FactoryGirl.build(:membership, :account => @account)])
+      @site_1 = FactoryGirl.build(:site,memberships: [FactoryGirl.build(:membership, account: @account)])
+      @site_2 = FactoryGirl.build(:site,memberships: [FactoryGirl.build(:membership, account: @account)])
       @account.stubs(:sites).returns([@site_1, @site_2])
       Locomotive::Site.any_instance.stubs(:save).returns(true)
     end
@@ -64,7 +64,7 @@ describe Locomotive::Account do
 
   end
 
-  describe '#admin?' do
+  describe '.admin?' do
 
     it 'is considered as an admin if she/he has a membership with an admin role' do
       create_site_and_account
@@ -78,8 +78,30 @@ describe Locomotive::Account do
 
     def create_site_and_account(role = 'admin')
       @account    = FactoryGirl.create(:account)
-      @membership = Locomotive::Membership.new(:account => @account, :role => role)
-      @site       = FactoryGirl.create(:site, :memberships => [@membership])
+      @membership = Locomotive::Membership.new(account: @account, role: role)
+      @site       = FactoryGirl.create(:site, memberships: [@membership])
+    end
+
+  end
+
+  describe 'api_key' do
+
+    let(:account) { FactoryGirl.build(:account) }
+
+    it 'is not nil for a new account (after validation)' do
+      account.valid?
+      account.api_key.should_not be_nil
+    end
+
+    it 'can be not changed by mass assignment' do
+      account.attributes = { api_key: 'foo' }
+      account.api_key.should_not == 'foo'
+    end
+
+    it 'can be regenerated over and over' do
+      key_1 = account.regenerate_api_key
+      key_1.should_not be_nil
+      account.regenerate_api_key.should_not == key_1
     end
 
   end

data/spec/models/locomotive/content_asset_spec.rb

@@ -28,7 +28,7 @@ describe Locomotive::ContentAsset do
   describe 'vignette' do
 
     before(:each) do
-      @asset = FactoryGirl.build(:asset, :source => FixturedAsset.open('5k.png'))
+      @asset = FactoryGirl.build(:asset, source: FixturedAsset.open('5k.png'))
     end
 
     it 'does not resize image smaller than 50x50' do

data/spec/models/locomotive/content_entry_spec.rb

@@ -67,9 +67,15 @@ describe Locomotive::ContentEntry do
       build_content_entry(_slug: 'fish-1-hi').tap(&:save!)._slug.should == 'fish-1-hi'
       build_content_entry(_slug: 'fish-1-hi').tap(&:save!)._slug.should == 'fish-1-hi-1'
     end
+    
+    it 'correctly handles more than 13 slugs with the same name' do
+      (1..15).each do |i|
+        build_content_entry(_slug: 'dogs').tap(&:save!)._slug.should == "dogs-#{i}"
+      end
+    end
   end
 
-  describe '#i18n' do
+  describe '#I18n' do
 
     before(:each) do
       localize_content_type @content_type
@@ -90,6 +96,55 @@ describe Locomotive::ContentEntry do
 
   end
 
+  describe 'csv' do
+
+    context 'entry itself' do
+
+      subject { build_content_entry }
+
+      it { should respond_to(:to_values) }
+
+      describe '#to_values' do
+
+        subject { build_content_entry.to_values(host: 'example.com') }
+
+        its(:size) { should eq(4) }
+
+        its(:first) { should eq('Locomotive') }
+
+        its(:last) { should eq('') }
+
+        context 'with a file' do
+
+          subject { build_content_entry(file: FixturedAsset.open('5k.png')).tap(&:save).to_values(host: 'example.com') }
+
+          its(:last) { should match(/^http:\/\/example.com\/sites\/[0-9a-f]+\/content_entry\/[0-9a-f]+\/files\/5k.png$/) }
+
+        end
+
+      end
+
+    end
+
+    context 'set of entries' do
+
+      before(:each) do
+        @content_type.save
+        3.times { build_content_entry(file: FixturedAsset.open('5k.png')).save! }
+      end
+
+      subject { @content_type.ordered_entries.to_csv(host: 'example.com').split("\n") }
+
+      its(:size) { should eq(4) }
+
+      its(:first) { should eq("Title,Description,Visible ?,File") }
+
+      its(:last) { should match(/^Locomotive,Lorem ipsum....,false,http:\/\/example.com\/sites\/[0-9a-f]+\/content_entry\/[0-9a-f]+\/files\/5k.png$/) }
+
+    end
+
+  end
+
   describe "#navigation" do
 
     before(:each) do
@@ -277,6 +332,6 @@ describe Locomotive::ContentEntry do
   end
 
   def fake_bson_id(id)
-    BSON::ObjectId(id.to_s.rjust(24, '0'))
+    Moped::BSON::ObjectId(id.to_s.rjust(24, '0'))
   end
 end