locomotive_cms 2.0.3 → 2.1.0

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

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Locomotive::Extensions::Page::Redirect do
 
-  let(:page) { FactoryGirl.build(:page, :redirect => true, :redirect_url => 'http://www.locomotivecms.com') }
+  let(:page) { FactoryGirl.build(:page, redirect: true, redirect_url: 'http://www.locomotivecms.com') }
 
   describe 'redirect option enabled' do
 

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

@@ -5,8 +5,7 @@ describe Locomotive::Extensions::Page::Render do
   before(:each) do
     Locomotive::Site.any_instance.stubs(:create_default_pages!).returns(true)
     @site = FactoryGirl.create(:site)
-    @home = FactoryGirl.create(:page, :site => @site, :raw_template =>
-    """
+    @home = FactoryGirl.create(:page, site: @site, raw_template:     """
     Hello world
     {% block header %}Home header{% endblock %}
     {% block main %}My home page{% endblock %}
@@ -20,20 +19,17 @@ describe Locomotive::Extensions::Page::Render do
   describe '#inheritance' do
 
     before(:each) do
-      @inner = FactoryGirl.create(:sub_page, :slug => 'innerpage', :site => @site, :raw_template =>
-      """
+      @inner = FactoryGirl.create(:sub_page, slug: 'innerpage', site: @site, raw_template:       """
       {% extends parent %}
       {% block header %}Inner header{% endblock %}
       {% block main %}Inner page{% endblock %}
       """)
-      @contact = FactoryGirl.create(:sub_page, :slug => 'contact', :site => @site, :raw_template =>
-      """
+      @contact = FactoryGirl.create(:sub_page, slug: 'contact', site: @site, raw_template:       """
       {% extends 'innerpage' %}
       {% block header %}Contact header{% endblock %}
       {% block main %}Contact page{% endblock %}
       """)
-      @about = FactoryGirl.create(:sub_page, :slug => 'about', :site => @site, :raw_template =>
-      """
+      @about = FactoryGirl.create(:sub_page, slug: 'about', site: @site, raw_template:       """
       {% extends 'innerpage' %}
       {% block main %}About page{% endblock %}
       """)

data/spec/models/locomotive/extensions/site/locales_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Locomotive::Extensions::Site::Locales do
 
-  let(:site) { FactoryGirl.build(:site, :locales => [:en, :fr]) }
+  let(:site) { FactoryGirl.build(:site, locales: [:en, :fr]) }
 
   describe '#localized_page_fullpath' do
 
@@ -22,7 +22,7 @@ describe Locomotive::Extensions::Site::Locales do
 
     context 'another page' do
 
-      let(:page) { build_page('about-us', { :fr => 'a-notre-sujet' }) }
+      let(:page) { build_page('about-us', { fr: 'a-notre-sujet' }) }
 
       it 'returns only the fullpath if default locale' do
         site.localized_page_fullpath(page).should == 'about-us'

data/spec/models/locomotive/membership_spec.rb

@@ -3,11 +3,11 @@ require 'spec_helper'
 describe Locomotive::Membership do
 
   it 'should have a valid factory' do
-    FactoryGirl.build(:membership, :account => FactoryGirl.build(:account)).should be_valid
+    FactoryGirl.build(:membership, account: FactoryGirl.build(:account)).should be_valid
   end
 
   it 'should validate presence of account' do
-    membership = FactoryGirl.build(:membership, :account => nil)
+    membership = FactoryGirl.build(:membership, account: nil)
     membership.should_not be_valid
     membership.errors[:account].should == ["can't be blank"]
   end
@@ -15,7 +15,7 @@ describe Locomotive::Membership do
   it 'should assign account from email' do
     Locomotive::Account.stubs(:where).returns([FactoryGirl.build(:account)])
     Locomotive::Account.stubs(:find).returns(FactoryGirl.build(:account))
-    membership = FactoryGirl.build(:membership, :account => nil)
+    membership = FactoryGirl.build(:membership, account: nil)
     membership.email = 'bart@simpson.net'
     membership.account.should_not be_nil
     membership.account.name.should == 'Bart Simpson'
@@ -24,7 +24,7 @@ describe Locomotive::Membership do
   describe 'next action to take' do
 
     before(:each) do
-      @membership = FactoryGirl.build(:membership, :site => FactoryGirl.build(:site))
+      @membership = FactoryGirl.build(:membership, site: FactoryGirl.build(:site))
       @account = FactoryGirl.build(:account)
       @account.stubs(:save).returns(true)
       Locomotive::Account.stubs(:where).returns([@account])
@@ -53,7 +53,7 @@ describe Locomotive::Membership do
     end
 
     def build_membership(account = nil)
-      FactoryGirl.build(:membership, :site => FactoryGirl.build(:site), :account => account || FactoryGirl.build(:account))
+      FactoryGirl.build(:membership, site: FactoryGirl.build(:site), account: account || FactoryGirl.build(:account))
     end
 
   end

data/spec/models/locomotive/page_spec.rb

@@ -180,6 +180,15 @@ describe Locomotive::Page do
       archives.reload.children.count.should == 2
       archives.children.last.depth.should == 2
       archives.children.last.children.first.depth.should == 3
+      
+    end
+    
+    it "builds children fullpaths" do
+      sub_child_1 = FactoryGirl.create(:page, title: 'Sub Subpage 1', slug: 'bar', parent: @child_1, site: @home.site)
+      sub_child_1.fullpath.should == "foo/bar"
+      @child_1.slug = "milky"
+      @child_1.save
+      sub_child_1.reload.fullpath.should == "milky/bar"
     end
 
     it 'destroys descendants as well' do
@@ -421,7 +430,7 @@ describe Locomotive::Page 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

data/spec/models/locomotive/site_spec.rb

@@ -11,33 +11,33 @@ describe Locomotive::Site do
   ## Validations ##
 
   it 'should validate presence of name' do
-    site = FactoryGirl.build(:site, :name => nil)
+    site = FactoryGirl.build(:site, name: nil)
     site.should_not be_valid
     site.errors[:name].should == ["can't be blank"]
   end
 
   it 'should validate presence of subdomain' do
-    site = FactoryGirl.build(:site, :subdomain => nil)
+    site = FactoryGirl.build(:site, subdomain: nil)
     site.should_not be_valid
     site.errors[:subdomain].should == ["can't be blank"]
   end
 
   %w{test test42 foo_bar}.each do |subdomain|
     it "should accept subdomain like '#{subdomain}'" do
-      FactoryGirl.build(:site, :subdomain => subdomain).should be_valid
+      FactoryGirl.build(:site, subdomain: subdomain).should be_valid
     end
   end
 
   ['-', '_test', 'test_', 't est', '42', '42test'].each do |subdomain|
     it "should not accept subdomain like '#{subdomain}'" do
-      (site = FactoryGirl.build(:site, :subdomain => subdomain)).should_not be_valid
+      (site = FactoryGirl.build(:site, subdomain: subdomain)).should_not be_valid
       site.errors[:subdomain].should == ['is invalid']
     end
   end
 
   it "should not use reserved keywords as subdomain" do
     %w{www admin email blog webmail mail support help site sites}.each do |subdomain|
-      (site = FactoryGirl.build(:site, :subdomain => subdomain)).should_not be_valid
+      (site = FactoryGirl.build(:site, subdomain: subdomain)).should_not be_valid
       site.errors[:subdomain].should == ['is reserved']
     end
   end
@@ -49,26 +49,26 @@ describe Locomotive::Site do
   end
 
   it 'should validate uniqueness of domains' do
-    FactoryGirl.create(:site, :domains => %w{www.acme.net www.acme.com})
+    FactoryGirl.create(:site, domains: %w{www.acme.net www.acme.com})
 
-    (site = FactoryGirl.build(:site, :domains => %w{www.acme.com})).should_not be_valid
+    (site = FactoryGirl.build(:site, domains: %w{www.acme.com})).should_not be_valid
     site.errors[:domains].should == ["www.acme.com is already taken"]
 
-    (site = FactoryGirl.build(:site, :subdomain => 'foo', :domains => %w{acme.example.com})).should_not be_valid
+    (site = FactoryGirl.build(:site, subdomain: 'foo', domains: %w{acme.example.com})).should_not be_valid
     site.errors[:domains].should == ["acme.example.com is already taken"]
   end
 
   it 'should validate format of domains' do
-    site = FactoryGirl.build(:site, :domains => ['barformat.superlongextension', '-foo.net'])
+    site = FactoryGirl.build(:site, domains: ['barformat.a', '-foo.net', 'goodformat.superlong'])
     site.should_not be_valid
-    site.errors[:domains].should == ['barformat.superlongextension is invalid', '-foo.net is invalid']
+    site.errors[:domains].should == ['barformat.a is invalid', '-foo.net is invalid']
   end
 
   ## Named scopes ##
 
   it 'should retrieve sites by domain' do
-    site_1 = FactoryGirl.create(:site, :domains => %w{www.acme.net})
-    site_2 = FactoryGirl.create(:site, :subdomain => 'test', :domains => %w{www.example.com})
+    site_1 = FactoryGirl.create(:site, domains: %w{www.acme.net})
+    site_2 = FactoryGirl.create(:site, subdomain: 'test', domains: %w{www.example.com})
 
     sites = Locomotive::Site.match_domain('www.acme.net')
     sites.size.should == 1
@@ -90,9 +90,9 @@ describe Locomotive::Site do
 
   it 'should have many accounts' do
     site = FactoryGirl.build(:site)
-    account_1, account_2 = FactoryGirl.create(:account), FactoryGirl.create(:account, :name => 'homer', :email => 'homer@simpson.net')
-    site.memberships.build(:account => account_1, :admin => true)
-    site.memberships.build(:account => account_2)
+    account_1, account_2 = FactoryGirl.create(:account), FactoryGirl.create(:account, name: 'homer', email: 'homer@simpson.net')
+    site.memberships.build(account: account_1, admin: true)
+    site.memberships.build(account: account_2)
     site.memberships.size.should == 2
     site.accounts.should == [account_1, account_2]
   end
@@ -100,7 +100,7 @@ describe Locomotive::Site do
   ## Methods ##
 
   it 'should return domains without subdomain' do
-    site = FactoryGirl.create(:site, :domains => %w{www.acme.net www.acme.com})
+    site = FactoryGirl.create(:site, domains: %w{www.acme.net www.acme.com})
     site.domains.should == %w{www.acme.net www.acme.com acme.example.com}
     site.domains_without_subdomain.should == %w{www.acme.net www.acme.com}
   end
@@ -117,7 +117,7 @@ describe Locomotive::Site do
     end
 
     it 'translates the index/404 pages if a new locale is added' do
-      @site.update_attributes :locales => %w(en fr)
+      @site.update_attributes locales: %w(en fr)
 
       @site.errors.should be_empty
 
@@ -135,7 +135,7 @@ describe Locomotive::Site do
     end
 
     it 'translates the index/404 pages if the default locale changes' do
-      @site.update_attributes :locales => %w(fr en)
+      @site.update_attributes locales: %w(fr en)
 
       @site.errors.should be_empty
 
@@ -153,7 +153,7 @@ describe Locomotive::Site do
     end
 
     it 'does not allow to remove the default locale' do
-      @site.update_attributes :locales => %w(fr)
+      @site.update_attributes locales: %w(fr)
       @site.errors[:locales].should == ['The previous default locale can not be removed right away.']
     end
 

data/spec/models/locomotive/snippet_spec.rb

@@ -19,18 +19,18 @@ describe Locomotive::Snippet do
   describe '#update_templates' do
 
     before :each do
-      @site    = FactoryGirl.create(:site, :subdomain => 'omg')
-      @snippet = FactoryGirl.create(:snippet, :site => @site, :slug => 'my_test_snippet', :template => 'a testing template')
+      @site    = FactoryGirl.create(:site, subdomain: 'omg')
+      @snippet = FactoryGirl.create(:snippet, site: @site, slug: 'my_test_snippet', template: 'a testing template')
     end
 
     context 'with a normal top level snippet' do
 
       before :each do
-        @page = FactoryGirl.create(:page, :site => @site, :slug => 'my_page_here', :raw_template => "{% include 'my_test_snippet'  %}")
+        @page = FactoryGirl.create(:page, site: @site, slug: 'my_page_here', raw_template: "{% include 'my_test_snippet'  %}")
       end
 
       it 'updates templates with the new snippet template' do
-        @snippet.update_attributes(:template => 'a new template')
+        @snippet.update_attributes(template: 'a new template')
         Locomotive::Page.find(@page.id).render({}).should == 'a new template'
       end
 
@@ -39,11 +39,11 @@ describe Locomotive::Snippet do
     context 'for snippets inside of a block' do
 
       before :each do
-        @page = FactoryGirl.create(:page, :site => @site, :slug => 'my_page_here', :raw_template => "{% block main %}{% include 'my_test_snippet'  %}{% endblock %}")
+        @page = FactoryGirl.create(:page, site: @site, slug: 'my_page_here', raw_template: "{% block main %}{% include 'my_test_snippet'  %}{% endblock %}")
       end
 
       it 'updates templates with the new snippet template' do
-        @snippet.update_attributes(:template => 'a new template')
+        @snippet.update_attributes(template: 'a new template')
         Locomotive::Page.find(@page.id).render({}).should == 'a new template'
       end
 
@@ -53,8 +53,8 @@ describe Locomotive::Snippet do
 
       before :each do
         Mongoid::Fields::I18n.with_locale(:fr) do
-          @snippet = FactoryGirl.create(:snippet, :site => @site, :slug => 'my_localized_test_snippet', :template => 'a testing template')
-          @page = FactoryGirl.create(:page, :site => @site, :slug => 'my_localized_test_snippet', :raw_template => "{% block main %}{% include 'my_localized_test_snippet' %}{% endblock %}")
+          @snippet = FactoryGirl.create(:snippet, site: @site, slug: 'my_localized_test_snippet', template: 'a testing template')
+          @page = FactoryGirl.create(:page, site: @site, slug: 'my_localized_test_snippet', raw_template: "{% block main %}{% include 'my_localized_test_snippet' %}{% endblock %}")
         end
       end
 
@@ -65,7 +65,7 @@ describe Locomotive::Snippet do
 
       it 'updates the templates with the new snippet' do
         Mongoid::Fields::I18n.with_locale(:fr) do
-          @snippet.update_attributes(:template => 'a new template')
+          @snippet.update_attributes(template: 'a new template')
           Locomotive::Page.find(@page.id).render({}).should == 'a new template'
         end
       end

data/spec/models/locomotive/theme_asset_spec.rb

@@ -4,25 +4,24 @@ require 'spec_helper'
 
 describe Locomotive::ThemeAsset do
 
-  describe 'attaching a file' do
+  let(:site) { FactoryGirl.build(:site, domains: %w{www.acme.com}) }
 
-    before(:each) do
-      Locomotive::ThemeAsset.any_instance.stubs(:site_id).returns('test')
-      @asset = FactoryGirl.build(:theme_asset)
-    end
+  let(:asset) { FactoryGirl.build(:theme_asset, site: site) }
+
+  describe 'attaching a file' do
 
     describe 'file is a picture' do
 
       it 'should process picture' do
-        @asset.source = FixturedAsset.open('5k.png')
-        @asset.source.file.content_type.should_not be_nil
-        @asset.image?.should be_true
+        asset.source = FixturedAsset.open('5k.png')
+        asset.source.file.content_type.should_not be_nil
+        asset.image?.should be_true
       end
 
       it 'should get width and height from the image' do
-        @asset.source = FixturedAsset.open('5k.png')
-        @asset.width.should == 32
-        @asset.height.should == 32
+        asset.source = FixturedAsset.open('5k.png')
+        asset.width.should == 32
+        asset.height.should == 32
       end
 
     end
@@ -30,30 +29,30 @@ describe Locomotive::ThemeAsset do
     describe 'local path and folder' do
 
       it 'should set the local path based on the content type' do
-        @asset.source = FixturedAsset.open('5k.png')
-        @asset.save
-        @asset.local_path.should == 'images/5k.png'
+        asset.source = FixturedAsset.open('5k.png')
+        asset.save
+        asset.local_path.should == 'images/5k.png'
       end
 
       it 'should set the local path based on the folder' do
-        @asset.folder = 'trash'
-        @asset.source = FixturedAsset.open('5k.png')
-        @asset.save
-        @asset.local_path.should == 'images/trash/5k.png'
+        asset.folder = 'trash'
+        asset.source = FixturedAsset.open('5k.png')
+        asset.save
+        asset.local_path.should == 'images/trash/5k.png'
       end
 
       it 'should not only use the folder to build the local path' do
-        @asset.folder = 'images42'
-        @asset.source = FixturedAsset.open('5k.png')
-        @asset.save
-        @asset.local_path.should == 'images/images42/5k.png'
+        asset.folder = 'images42'
+        asset.source = FixturedAsset.open('5k.png')
+        asset.save
+        asset.local_path.should == 'images/images42/5k.png'
       end
 
       it 'should set sanitize the local path' do
-        @asset.folder = '/images/à la poubelle'
-        @asset.source = FixturedAsset.open('5k.png')
-        @asset.save
-        @asset.local_path.should == 'images/a_la_poubelle/5k.png'
+        asset.folder = '/images/à la poubelle'
+        asset.source = FixturedAsset.open('5k.png')
+        asset.save
+        asset.local_path.should == 'images/a_la_poubelle/5k.png'
       end
 
     end
@@ -61,16 +60,16 @@ describe Locomotive::ThemeAsset do
     describe '#validation' do
 
       it 'does not accept text file' do
-        @asset.source = FixturedAsset.open('wrong.txt')
-        @asset.valid?.should be_false
-        @asset.errors[:source].should_not be_blank
+        asset.source = FixturedAsset.open('wrong.txt')
+        asset.valid?.should be_false
+        asset.errors[:source].should_not be_blank
       end
 
       it 'is not valid if another file with the same path exists' do
-        @asset.source = FixturedAsset.open('5k.png')
-        @asset.save!
+        asset.source = FixturedAsset.open('5k.png')
+        asset.save!
 
-        another_asset = FactoryGirl.build(:theme_asset, :site => @asset.site)
+        another_asset = FactoryGirl.build(:theme_asset, site: asset.site)
         another_asset.source = FixturedAsset.open('5k.png')
         another_asset.valid?.should be_false
         another_asset.errors[:local_path].should_not be_blank
@@ -79,48 +78,83 @@ describe Locomotive::ThemeAsset do
     end
 
     it 'should process stylesheet' do
-      @asset.source = FixturedAsset.open('main.css')
-      @asset.source.file.content_type.should_not be_nil
-      @asset.stylesheet?.should be_true
+      asset.source = FixturedAsset.open('main.css')
+      asset.source.file.content_type.should_not be_nil
+      asset.stylesheet?.should be_true
     end
 
     it 'should process javascript' do
-      @asset.source = FixturedAsset.open('application.js')
-      @asset.source.file.content_type.should_not be_nil
-      @asset.javascript?.should be_true
+      asset.source = FixturedAsset.open('application.js')
+      asset.source.file.content_type.should_not be_nil
+      asset.javascript?.should be_true
     end
 
     it 'should get size' do
-      @asset.source = FixturedAsset.open('main.css')
-      @asset.size.should == 25
+      asset.source = FixturedAsset.open('main.css')
+      asset.size.should == 25
+    end
+
+    it 'sets the checksum when it is saved' do
+      asset.source = FixturedAsset.open('5k.png')
+      asset.save
+      asset.checksum.should == 'f1af16493e6cba9eaed7bc8a8643246e'
     end
 
   end
 
   describe 'creating from plain text' do
 
-    before(:each) do
-      Locomotive::ThemeAsset.any_instance.stubs(:site_id).returns('test')
-      @asset = FactoryGirl.build(:theme_asset, {
-        :site => FactoryGirl.build(:site),
-        :plain_text_name => 'test',
-        :plain_text => 'Lorem ipsum',
-        :performing_plain_text => true
-      })
-    end
+    let(:asset) { FactoryGirl.build(:theme_asset,
+        site: site,
+        plain_text_name: 'test',
+        plain_text: 'Lorem ipsum',
+        performing_plain_text: true) }
 
     it 'should handle stylesheet' do
-      @asset.plain_text_type = 'stylesheet'
-      @asset.valid?.should be_true
-      @asset.stylesheet?.should be_true
-      @asset.source.should_not be_nil
+      asset.plain_text_type = 'stylesheet'
+      asset.valid?.should be_true
+      asset.stylesheet?.should be_true
+      asset.source.should_not be_nil
     end
 
     it 'should handle javascript' do
-      @asset.plain_text_type = 'javascript'
-      @asset.valid?.should be_true
-      @asset.javascript?.should be_true
-      @asset.source.should_not be_nil
+      asset.plain_text_type = 'javascript'
+      asset.valid?.should be_true
+      asset.javascript?.should be_true
+      asset.source.should_not be_nil
+    end
+
+  end
+
+  describe '.escape_shortcut_urls' do
+
+    before(:each) do
+      site.theme_assets.stubs(:where).returns([image])
+    end
+
+    let(:image) { stub(source: OpenStruct.new(url: 'http://engine.dev/images/banner.png')) }
+
+    subject { asset.send(:escape_shortcut_urls, text) }
+
+    context 'simple url' do
+
+      let(:text) { "background: url(/images/banner.png) no-repeat 0 0" }
+      it { should == "background: url(http://engine.dev/images/banner.png) no-repeat 0 0" }
+
+    end
+
+    context 'url with quotes' do
+
+      let(:text) { "background: url(\"/images/banner.png\") no-repeat 0 0" }
+      it { should == "background: url(\"http://engine.dev/images/banner.png\") no-repeat 0 0" }
+
+    end
+
+    context 'url with quotes and timestamps' do
+
+      let(:text) { "background: url(\"/images/banner.png?123456\") no-repeat 0 0" }
+      it { should == "background: url(\"http://engine.dev/images/banner.png\") no-repeat 0 0" }
+
     end
 
   end