locomotivecms 3.0.0.pre.beta.1 → 3.0.0.rc1

data/spec/models/locomotive/concerns/site/cache_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+
+describe Locomotive::Concerns::Site::Cache do
+
+  let(:enabled) { false }
+  let(:site)    { build(:site, cache_enabled: enabled) }
+
+  describe '#last_modified_at' do
+
+    subject { site.last_modified_at }
+
+    it { is_expected.to eq nil }
+
+    context 'only updated_at is defined' do
+
+      let(:site) { build(:site, updated_at: DateTime.parse('2015/10/16 00:00:00')) }
+      it { is_expected.to eq DateTime.parse('2015/10/16 00:00:00') }
+
+    end
+
+    context 'template_version or content_version are defined' do
+
+      let(:site) { build(:site, updated_at: DateTime.parse('2015/10/16 00:00:00'), template_version: DateTime.parse('2007/06/29 00:00:00'), content_version: DateTime.parse('2009/09/10 00:00:00')) }
+      it { is_expected.to eq DateTime.parse('2009/09/10 00:00:00') }
+
+    end
+
+  end
+
+  describe '#cache_enabled?' do
+
+    subject { site.cache_enabled? }
+
+    it { expect(subject).to eq false }
+
+    context 'cache enabled' do
+
+      let(:enabled) { true }
+      it { expect(subject).to eq true }
+
+    end
+
+  end
+
+  describe '#save' do
+
+    let(:date) { Time.zone.local(2015, 4, 1, 12, 0, 0) }
+
+    before { site.save }
+
+    it 'bumps content_version' do
+      site.name = 'New name'
+      Timecop.freeze(date) do
+        expect { site.save! }.to change { site.content_version }.to date
+      end
+    end
+
+  end
+
+end

data/spec/models/locomotive/content_entry_spec.rb

@@ -388,6 +388,13 @@ describe Locomotive::ContentEntry do
 
   end
 
+  it_should_behave_like 'model scoped by a site' do
+
+    let(:model)         { build_content_entry }
+    let(:attribute)     { :content_version }
+
+  end
+
   def localize_content_type(content_type)
     content_type.entries_custom_fields.first.localized = true
     content_type.save

data/spec/models/locomotive/content_type_spec.rb

@@ -9,7 +9,7 @@ describe Locomotive::ContentType do
   context 'when validating' do
 
     it 'haves a valid factory' do
-      content_type = FactoryGirl.build(:content_type)
+      content_type = build(:content_type)
       content_type.entries_custom_fields.build label: 'anything', type: 'string'
       expect(content_type).to be_valid
     end
@@ -18,36 +18,36 @@ describe Locomotive::ContentType do
 
     %w{site name}.each do |field|
       it "requires the presence of #{field}" do
-        content_type = FactoryGirl.build(:content_type, field.to_sym => nil)
+        content_type = build(:content_type, field.to_sym => nil)
         expect(content_type).to_not be_valid
         expect(content_type.errors[field.to_sym]).to eq(["can't be blank"])
       end
     end
 
     it 'requires the presence of slug' do
-      content_type = FactoryGirl.build(:content_type, name: nil, slug: nil)
+      content_type = build(:content_type, name: nil, slug: nil)
       expect(content_type).to_not be_valid
       expect(content_type.errors[:slug]).to eq(["can't be blank"])
     end
 
     it 'is not valid if slug is not unique' do
-      content_type = FactoryGirl.build(:content_type)
+      content_type = build(:content_type)
       content_type.entries_custom_fields.build label: 'anything', type: 'string'
       content_type.save
-      content_type = FactoryGirl.build(:content_type, site: content_type.site, slug: content_type.slug)
+      content_type = build(:content_type, site: content_type.site, slug: content_type.slug)
       expect(content_type).to_not be_valid
       expect(content_type.errors[:slug]).to eq(["is already taken"])
     end
 
     it 'is not valid if there is not at least one field' do
-      content_type = FactoryGirl.build(:content_type)
+      content_type = build(:content_type)
       expect(content_type).to_not be_valid
       expect(content_type.errors[:entries_custom_fields]).to eq({ base: ['At least, one custom field is required'] })
     end
 
     %w(created_at updated_at).each do |name|
       it "does not allow #{name} as name" do
-        content_type = FactoryGirl.build(:content_type)
+        content_type = build(:content_type)
         field = content_type.entries_custom_fields.build label: 'anything', type: 'string', name: name
         expect(field.valid?).to eq(false)
         expect(field.errors[:name]).to eq(['is reserved'])
@@ -55,13 +55,13 @@ describe Locomotive::ContentType do
     end
 
     it 'sets a slug from the name before the validation' do
-      content_type = FactoryGirl.build(:content_type, name: 'my content Type')
+      content_type = build(:content_type, name: 'my content Type')
       content_type.valid?
       expect(content_type.slug).to match(/slug_of_content_type_/)
     end
 
     it 'make sure the slug is correctly set before the validation' do
-      content_type = FactoryGirl.build(:content_type, slug: 'my content-type')
+      content_type = build(:content_type, slug: 'my content-type')
       content_type.valid?
       expect(content_type.slug).to eq('my_content_type')
     end
@@ -177,7 +177,7 @@ describe Locomotive::ContentType do
   describe 'custom fields' do
 
     before(:each) do
-      site = FactoryGirl.build(:site)
+      site = build(:site)
       allow(Locomotive::Site).to receive(:find).and_return(site)
 
       @content_type = build_content_type(site: site)
@@ -361,8 +361,15 @@ describe Locomotive::ContentType do
 
   end
 
+  it_should_behave_like 'model scoped by a site' do
+
+    let(:model)         { build_content_type(slug: 'my_project') }
+    let(:attribute)     { :content_version }
+
+  end
+
   def build_content_type(options = {}, &block)
-    FactoryGirl.build(:content_type, options).tap do |content_type|
+    build(:content_type, options).tap do |content_type|
       content_type.entries_custom_fields.build label: 'Name',        type: 'string'
       content_type.entries_custom_fields.build label: 'Description', type: 'text'
       content_type.entries_custom_fields.build label: 'Active',      type: 'boolean'

data/spec/models/locomotive/page_spec.rb

@@ -15,12 +15,16 @@ describe Locomotive::Page do
 
   describe 'validation' do
 
-    %w{site title}.each do |field|
-      it "requires the presence of the #{field}" do
-        page = build(:page, field.to_sym => nil)
-        expect(page).to_not be_valid
-        expect(page.errors[field.to_sym]).to eq(["can't be blank"])
-      end
+    it 'requires the presence of a site' do
+      page = build(:page, site: nil)
+      expect(page).to_not be_valid
+      expect(page.errors[:site]).to eq(["can't be blank"])
+    end
+
+    it 'requires the presence of a title' do
+      page = build(:page, title: nil, site: build(:site))
+      expect(page).to_not be_valid
+      expect(page.errors[:title]).to eq(["can't be blank"])
     end
 
     it 'requires the presence of the slug' do
@@ -121,9 +125,9 @@ describe Locomotive::Page do
       expect(page.slug).to eq('convention_valid_ite_dot_html')
     end
 
-    it 'has no cache strategy' do
+    it 'has cache enabled' do
       page = build(:page, site: nil)
-      expect(page.with_cache?).to eq(false)
+      expect(page.cache_enabled?).to eq(true)
     end
 
   end
@@ -427,6 +431,26 @@ describe Locomotive::Page do
 
   end
 
+  it_should_behave_like 'model scoped by a site' do
+
+    let(:model)     { create(:page) }
+    let(:attribute) { :content_version }
+
+    describe 'the raw_template has been modified' do
+
+      let(:date) { Time.zone.local(2015, 4, 1, 12, 0, 0) }
+
+      it 'updates the template_version attribute of the site' do
+        model.raw_template = 'new one'
+        Timecop.freeze(date) do
+          expect { model.save! }.to change { site.template_version }.to date
+        end
+      end
+
+    end
+
+  end
+
   class Foo
   end
 

data/spec/models/locomotive/snippet_spec.rb

@@ -2,18 +2,27 @@ require 'spec_helper'
 
 describe Locomotive::Snippet do
 
+  let(:snippet) { build(:snippet) }
+
   it 'has a valid factory' do
-    expect(FactoryGirl.build(:snippet)).to be_valid
+    expect(snippet).to be_valid
   end
 
   # Validations ##
 
   %w{site name template}.each do |field|
     it "validates presence of #{field}" do
-      template = FactoryGirl.build(:snippet, field.to_sym => nil)
-      expect(template).to_not be_valid
-      expect(template.errors[field.to_sym]).to eq(["can't be blank"])
+      snippet.send(:"#{field}=", nil)
+      expect(snippet).to_not be_valid
+      expect(snippet.errors[field.to_sym].first).to eq("can't be blank")
     end
   end
 
+  it_should_behave_like 'model scoped by a site' do
+
+    let(:model)     { snippet }
+    let(:attribute) { :template_version }
+
+  end
+
 end

data/spec/models/locomotive/theme_asset_spec.rb

@@ -4,9 +4,9 @@ require 'spec_helper'
 
 describe Locomotive::ThemeAsset do
 
-  let(:site) { FactoryGirl.build(:site, domains: %w{www.acme.com}) }
-
-  let(:asset) { FactoryGirl.build(:theme_asset, site: site, updated_at: DateTime.parse('2007/06/29 21:10:00')) }
+  let(:site)    { build(:site, domains: %w{www.acme.com}) }
+  let(:source)  { nil }
+  let(:asset)   { build(:theme_asset, site: site, source: source, updated_at: DateTime.parse('2007/06/29 21:10:00')) }
 
   describe 'attaching a file' do
 
@@ -165,4 +165,11 @@ describe Locomotive::ThemeAsset do
 
   end
 
+  it_should_behave_like 'model scoped by a site' do
+
+    let(:model)     { build(:theme_asset, source: FixturedAsset.open('5k.png')) }
+    let(:attribute) { :template_version }
+
+  end
+
 end

data/spec/models/locomotive/translation_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Locomotive::Translation do
+
+  let(:translation) { build(:translation) }
+
+  it 'has a valid factory' do
+    expect(translation).to be_valid
+  end
+
+  # Validations ##
+
+  %w{site key}.each do |field|
+    it "validates presence of #{field}" do
+      translation.send(:"#{field}=", nil)
+      expect(translation).to_not be_valid
+      expect(translation.errors[field.to_sym].first).to eq("can't be blank")
+    end
+  end
+
+  it_should_behave_like 'model scoped by a site' do
+
+    let(:model)     { translation }
+    let(:attribute) { :content_version }
+
+  end
+
+end

data/spec/requests/locomotive/steam/cache_spec.rb

@@ -0,0 +1,83 @@
+require 'spec_helper'
+
+describe 'Locomotive::Middlewares::Site' do
+
+  let(:site_cache)  { false }
+  let(:page_cache)  { false }
+  let(:site)        { instance_double('CacheSite', _id: '0001', cache_enabled: site_cache, last_modified_at: DateTime.parse('2007/06/29 00:00:00')) }
+  let(:page)        { instance_double('CachedPage', _id: '0042', cache_enabled: page_cache) }
+  let(:app)         { ->(env) { [200, env, 'app'] } }
+  let(:middleware)  { Locomotive::Steam::Middlewares::Cache.new(app) }
+  let(:steam_env)   { { 'REQUEST_METHOD' => 'GET', 'steam.site' => site, 'steam.page' => page, 'steam.live_editing' => false, 'PATH_INFO' => 'foo', 'QUERY_STRING' => 'a=1&c=3' } }
+
+  describe '#call' do
+
+    subject { middleware.call(env_for('foo', steam_env)) }
+
+    it { expect(subject.first).to eq 200 }
+
+    context 'cache enabled' do
+
+      before(:each) { Rails.cache.clear }
+
+      let(:site_cache) { true }
+      let(:page_cache) { true }
+
+      it { expect(subject.first).to eq 200 }
+
+      it 'does not go to the next middleware' do
+        middleware.call(env_for('foo', steam_env)) # warm up the cache
+        expect(middleware.app).not_to receive(:call)
+        expect(subject.first).to eq 200
+      end
+
+    end
+
+  end
+
+  describe '#cache_key' do
+
+    subject { middleware.send(:cache_key, steam_env) }
+
+    it { expect(subject).to eq '559d95fa56a4a72adec091412f5542df' }
+
+  end
+
+  describe '#cacheable?' do
+
+    subject { middleware.send(:cacheable?, steam_env) }
+
+    let(:live_editing) { true }
+    it { expect(subject).to eq false }
+
+    context 'live editing off' do
+
+      let(:live_editing) { false }
+      it { expect(subject).to eq false }
+
+      context 'cache enabled for site' do
+
+        let(:site_cache) { true }
+        it { expect(subject).to eq false }
+
+        context 'cache enabled for page' do
+
+          let(:page_cache) { true }
+          it { expect(subject).to eq true }
+
+          context 'POST method' do
+
+            let(:steam_env) { { 'REQUEST_METHOD' => 'POST', 'steam.site' => site, 'steam.page' => page, 'steam.live_editing' => false, 'PATH_INFO' => 'foo' } }
+            it { expect(subject).to eq false }
+
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/spec/requests/site_spec.rb

@@ -15,6 +15,30 @@ describe 'Locomotive::Middlewares::Site' do
 
   end
 
+  describe 'requesting the back-office assets' do
+
+    before { site }
+    before { allow(middleware).to receive(:default_host).and_return('steve.me') }
+
+    let(:url) { 'http://steve.me/assets/foo.png' }
+    it { is_expected.to eq(nil) }
+
+    context 'localhost' do
+
+      let(:url) { 'http://localhost/assets/foo.png' }
+      it { is_expected.to eq(nil) }
+
+    end
+
+    context '0.0.0.0' do
+
+      let(:url) { 'http://0.0.0.0/assets/foo.png' }
+      it { is_expected.to eq(nil) }
+
+    end
+
+  end
+
   describe 'the requested site is also the default host' do
 
     before { site }

data/spec/support/capybara.rb

@@ -1,25 +1,17 @@
-def ensure_host_resolution(app_host)
-  hosts = Resolv::Hosts.new
-  app_host_name = URI.parse(app_host).host
-  begin
-    hosts.getaddress(app_host_name)
-  rescue Resolv::ResolvError
-    raise "Unable to resolve ip address for #{app_host_name}. Please consider adding an entry to '/etc/hosts' that associates #{app_host_name} with '127.0.0.1'."
-  end
-end
-
 Capybara.configure do |config|
   config.default_selector   = :css
   config.server_port        = 9886
-  config.app_host           = 'http://test.example.com:9886'
-
-  ensure_host_resolution(config.app_host)
+  config.app_host           = 'http://localhost:9886'
 end
 
 Capybara.default_wait_time = 5
 
 Capybara.javascript_driver = :poltergeist
 
+Capybara.register_driver :poltergeist do |app|
+  Capybara::Poltergeist::Driver.new(app, timeout: 60)
+end
+
 # Stop endless errors like
 # ~/.rvm/gems/ruby-1.9.2-p0@global/gems/rack-1.2.1/lib/rack/utils.rb:16:
 # warning: regexp match /.../n against to UTF-8 string