locomotivecms 3.0.0.rc1 → 3.0.0.rc2

data/spec/lib/locomotive/steam/services/api_entry_submission_service_spec.rb

@@ -38,7 +38,7 @@ describe Locomotive::Steam::APIEntrySubmissionService do
     subject { service.to_json(entry) }
 
     it 'includes _id and fields' do
-      expect(subject).to match('"_id":"42"')
+      expect(subject).to match('"_id":42')
       expect(subject).to match('"name":"John Doe"')
       expect(subject).to match('"message":"Hello"')
     end

data/spec/mailers/locomotive/notifications_spec.rb

@@ -5,7 +5,7 @@ describe Locomotive::Notifications do
   describe 'new_content_entry' do
 
     let(:now)           { Time.use_zone('America/Chicago') { Time.zone.local(1982, 'sep', 16, 14, 0) } }
-    let(:site)          { FactoryGirl.build(:site, domains: %w{www.acme.com}, timezone_name: 'CET') }
+    let(:site)          { FactoryGirl.build(:site, name: 'Acme', domains: %w{www.acme.com}, timezone_name: 'Paris') }
     let(:account)       { FactoryGirl.build(:account, email: 'bart@simpson.net') }
     let(:content_type)  { FactoryGirl.build(:content_type, site: site) }
     let(:content_entry) { FactoryGirl.build(:content_entry, content_type: content_type, site: site) }
@@ -38,6 +38,44 @@ describe Locomotive::Notifications do
       expect(mail.body.encoded).to match('The list of my projects')
     end
 
+    describe 'rendering based on field types' do
+
+      describe 'text type' do
+
+        let(:content_type)  { FactoryGirl.build(:content_type, :with_text_field, site: site) }
+        let(:content_entry) { content_type.entries.build(description: "hello\nworld", site: site) }
+
+        it 'outputs the formatted value of the text field' do
+          expect(mail.body.encoded).to match('hello<br/>world')
+        end
+
+      end
+
+      describe 'date time type' do
+
+        let(:content_type)  { FactoryGirl.build(:content_type, :with_date_time_field, site: site) }
+        let(:content_entry) { content_type.entries.build(time: DateTime.parse('2015/09/26 10:45pm CDT'), site: site) }
+
+        it 'outputs the formatted value of the date time field' do
+          expect(mail.body.encoded).to match('09/27/2015 05:45')
+        end
+
+      end
+
+    end
+
+    context 'custom title' do
+
+      before do
+        content_type.public_submission_title_template = "{{ site.name }} - you have a message"
+      end
+
+      it 'renders the subject' do
+        expect(mail.subject).to eq 'Acme - you have a message'
+      end
+
+    end
+
   end
 
   def set_timezone(&block)

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

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+describe Locomotive::Concerns::Site::UrlRedirections do
+
+  let(:redirections) { {} }
+  let(:site) { build(:site, url_redirections: redirections) }
+
+  describe '#url_redirections=' do
+
+    subject { site.url_redirections }
+
+    describe 'passing nil' do
+
+      let(:redirections) { nil }
+      it { is_expected.to eq([]) }
+
+    end
+
+    describe 'passing an array' do
+
+      let(:redirections) { [['/foo', '/bar'], ['/hello_world', '/hello-world']] }
+      it { is_expected.to eq([['/foo', '/bar'], ['/hello_world', '/hello-world']]) }
+
+    end
+
+    describe 'passing a flatten array' do
+
+      let(:redirections) { ['/foo', '/bar', '/hello_world', '/hello-world'] }
+      it { is_expected.to eq([['/foo', '/bar'], ['/hello_world', '/hello-world']]) }
+
+    end
+
+    describe 'make sure a leading "/" character is present' do
+
+      let(:redirections) { ['hello_world', 'hello-world'] }
+      it { is_expected.to eq([['/hello_world', '/hello-world']]) }
+
+    end
+
+  end
+
+end

data/spec/models/locomotive/theme_asset_spec.rb

@@ -108,6 +108,35 @@ describe Locomotive::ThemeAsset do
 
   end
 
+  describe 'SVG assets' do
+
+    let(:asset) { build(:theme_asset, site: site, folder: folder, source: FixturedAsset.open('ruby_logo.svg'), updated_at: DateTime.parse('2007/06/29 21:10:00')) }
+
+    before { asset.save }
+
+    describe 'uploaded in the fonts folder' do
+
+      let(:folder) { 'fonts' }
+
+      it 'is considered as a font' do
+        expect(asset.content_type).to eq :font
+      end
+
+    end
+
+
+    describe 'uploaded in the images folder' do
+
+      let(:folder) { 'images' }
+
+      it 'is considered as an image' do
+        expect(asset.content_type).to eq :image
+      end
+
+    end
+
+  end
+
   describe 'creating from plain text' do
 
     let(:asset) { FactoryGirl.build(:theme_asset,

data/spec/support/factories.rb

@@ -190,9 +190,11 @@ FactoryGirl.define do
 
     factory 'message content type' do
       name 'Messages'
+      slug 'messages'
       description 'Messages posted from the contact form'
+      public_submission_enabled true
       after(:build) do |content_type, _|
-        content_type.entries_custom_fields.build label: 'Name', name: 'name', type: 'string'
+        content_type.entries_custom_fields.build label: 'Name', name: 'name', type: 'string', required: true
         content_type.entries_custom_fields.build label: 'Message', name: 'message', type: 'text'
       end
     end
@@ -248,6 +250,18 @@ FactoryGirl.define do
       end
     end
 
+    trait :with_text_field do
+      after(:build) do |content_type, evaluator|
+        content_type.entries_custom_fields.build label: 'Description', name: 'description', type: 'text'
+      end
+    end
+
+    trait :with_date_time_field do
+      after(:build) do |content_type, evaluator|
+        content_type.entries_custom_fields.build label: 'Time', name: 'time', type: 'date_time'
+      end
+    end
+
     trait :with_select_field do
       after(:build) do |content_type, evaluator|
         content_type.entries_custom_fields.build(label: 'Category', type: 'select')

data/spec/support/features/site_helpers.rb

@@ -10,7 +10,7 @@ module Features
       @site = Locomotive::Site.where(name: 'Acme').first
 
       # 2. add content types
-      create('message content type', site: @site, public_submission_enabled: true)
+      messages  = create('message content type', site: @site)
       articles  = create('article content type', slug: 'articles', site: @site)
       photos    = create('photo content type', slug: 'photos', site: @site)
 
@@ -20,8 +20,15 @@ module Features
       articles.entries_custom_fields.build(label: 'Photos', name: 'photos', type: 'has_many', class_name: photos.entries_class_name, inverse_of: 'article')
       articles.save!
 
+      # 3. create pages
+      @site.pages.create(parent: @site.pages.root.first, title: 'Contact', slug: 'contact', raw_template: %{<html><body>{% if message.errors %}num errors: {{ message.errors.size }} / {% for error in message.errors %}-{{error[0]}} {{error[1]}}-{% endfor %}{% endif %}{% model_form 'messages', success: '/', error: '/contact' %}<input type="text" name="content[name]" value="{{customer_message.name}}"><input type="text" name="content[message]" value="{{customer_message.message}}"><input type="submit" value="Send">{% endmodel_form %}</body></html>})
+
       click_link 'Dashboard'
     end
 
+    def preview_page(path = '')
+      visit "/locomotive/#{@site.handle}/preview/#{path}"
+    end
+
   end
 end

data/spec/support/shared_contexts/api_site_setup.rb

@@ -1,6 +1,6 @@
 shared_context 'api site setup' do
   include Rack::Test::Methods
-  let!(:site) { create(:site, domains: %w{www.acme.com}) }
+  let!(:site) { create(:site, domains: %w{www.acme.com}, locales: %w(en fr)) }
 
   let!(:account) { create(:account) }
   let(:params) { { locale: :en } }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc1
+  version: 3.0.0.rc2
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -170,28 +170,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0.rc5
+        version: 2.4.0.rc8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0.rc5
+        version: 2.4.0.rc8
 - !ruby/object:Gem::Dependency
   name: locomotivecms_steam
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +262,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: rails-i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.6
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -472,20 +486,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.1
-- !ruby/object:Gem::Dependency
-  name: fog
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.34.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.34.0
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
@@ -887,6 +887,7 @@ files:
 - app/models/locomotive/concerns/content_type/group_by.rb
 - app/models/locomotive/concerns/content_type/label.rb
 - app/models/locomotive/concerns/content_type/order_by.rb
+- app/models/locomotive/concerns/content_type/public_submission_title_template.rb
 - app/models/locomotive/concerns/content_type/sync.rb
 - app/models/locomotive/concerns/page/editable_elements.rb
 - app/models/locomotive/concerns/page/layout.rb
@@ -903,6 +904,7 @@ files:
 - app/models/locomotive/concerns/site/cache.rb
 - app/models/locomotive/concerns/site/locales.rb
 - app/models/locomotive/concerns/site/timezone.rb
+- app/models/locomotive/concerns/site/url_redirections.rb
 - app/models/locomotive/concerns/theme_asset/plain_text.rb
 - app/models/locomotive/content_asset.rb
 - app/models/locomotive/content_entry.rb
@@ -970,6 +972,7 @@ files:
 - app/views/locomotive/current_site/_domain.html.slim
 - app/views/locomotive/current_site/_locale.html.slim
 - app/views/locomotive/current_site/_membership.html.slim
+- app/views/locomotive/current_site/_url_redirection.html.slim
 - app/views/locomotive/current_site/edit.html.slim
 - app/views/locomotive/current_site/form/_access_points.html.slim
 - app/views/locomotive/current_site/form/_advanced.html.slim
@@ -977,6 +980,7 @@ files:
 - app/views/locomotive/current_site/form/_panes.html.slim
 - app/views/locomotive/current_site/form/_seo.html.slim
 - app/views/locomotive/current_site/form/_tabs.html.slim
+- app/views/locomotive/current_site/form/_url_redirections.html.slim
 - app/views/locomotive/custom_fields/select_options/_option.html.slim
 - app/views/locomotive/custom_fields/select_options/edit.html.slim
 - app/views/locomotive/dashboard/_activity.html.slim
@@ -1024,8 +1028,6 @@ files:
 - app/views/locomotive/public_submission_accounts/edit.html.slim
 - app/views/locomotive/registrations/new.html.slim
 - app/views/locomotive/sessions/new.html.slim
-- app/views/locomotive/shared/_footer.html.slim
-- app/views/locomotive/shared/_form_actions.html.slim
 - app/views/locomotive/shared/_head.html.slim
 - app/views/locomotive/shared/_header.html.slim
 - app/views/locomotive/shared/_locale_picker_link.html.slim
@@ -1034,7 +1036,6 @@ files:
 - app/views/locomotive/shared/_main_app_header.html.slim
 - app/views/locomotive/shared/_sidebar.html.slim
 - app/views/locomotive/shared/_sidebar_without_site.html.slim
-- app/views/locomotive/shared/actions/_contents.html.slim
 - app/views/locomotive/shared/header/_account.html.slim
 - app/views/locomotive/shared/header/_account_menu.html.slim
 - app/views/locomotive/shared/header/_brand.html.slim
@@ -1054,105 +1055,114 @@ files:
 - app/views/locomotive/translations/_form.html.slim
 - app/views/locomotive/translations/edit.html.slim
 - app/views/locomotive/translations/index.html.slim
-- config/cucumber.yml
+- config/i18n-tasks.yml
 - config/initializers/csv_renderer.rb
 - config/initializers/deny_phantomjs_ttf.rb
 - config/initializers/devise.rb
 - config/initializers/simple_form.rb
 - config/initializers/slim.rb
 - config/initializers/time_format.rb
-- config/locales/admin_ui.bg.yml
-- config/locales/admin_ui.cs.yml
-- config/locales/admin_ui.de.yml
-- config/locales/admin_ui.en.yml
-- config/locales/admin_ui.es.yml
-- config/locales/admin_ui.et.yml
-- config/locales/admin_ui.fr.yml
-- config/locales/admin_ui.it.yml
-- config/locales/admin_ui.ja.yml
-- config/locales/admin_ui.nb.yml
-- config/locales/admin_ui.nl.yml
-- config/locales/admin_ui.pl.yml
-- config/locales/admin_ui.pt-BR.yml
-- config/locales/admin_ui.pt.yml
-- config/locales/admin_ui.ru.yml
-- config/locales/admin_ui.sk.yml
-- config/locales/admin_ui.sr.yml
-- config/locales/admin_ui.zh-CN.yml
-- config/locales/carrierwave.bg.yml
-- config/locales/carrierwave.cs.yml
-- config/locales/carrierwave.de.yml
 - config/locales/carrierwave.en.yml
-- config/locales/carrierwave.es.yml
-- config/locales/carrierwave.et.yml
 - config/locales/carrierwave.fr.yml
-- config/locales/carrierwave.it.yml
-- config/locales/carrierwave.ja.yml
-- config/locales/carrierwave.nb.yml
-- config/locales/carrierwave.nl.yml
-- config/locales/carrierwave.pl.yml
-- config/locales/carrierwave.pt-BR.yml
-- config/locales/carrierwave.pt.yml
-- config/locales/carrierwave.ru.yml
-- config/locales/carrierwave.sk.yml
-- config/locales/carrierwave.sr.yml
-- config/locales/carrierwave.zh-CN.yml
-- config/locales/default.bg.yml
-- config/locales/default.cs.yml
-- config/locales/default.de.yml
 - config/locales/default.en.yml
-- config/locales/default.es.yml
-- config/locales/default.et.yml
 - config/locales/default.fr.yml
-- config/locales/default.it.yml
-- config/locales/default.ja.yml
-- config/locales/default.nb.yml
-- config/locales/default.nl.yml
-- config/locales/default.pl.yml
-- config/locales/default.pt-BR.yml
-- config/locales/default.pt.yml
-- config/locales/default.ru.yml
-- config/locales/default.sk.yml
-- config/locales/default.sr.yml
-- config/locales/default.zh-CN.yml
-- config/locales/devise.bg.yml
-- config/locales/devise.cs.yml
-- config/locales/devise.de.yml
 - config/locales/devise.en.yml
-- config/locales/devise.es.yml
-- config/locales/devise.et.yml
 - config/locales/devise.fr.yml
-- config/locales/devise.it.yml
-- config/locales/devise.ja.yml
-- config/locales/devise.nb.yml
-- config/locales/devise.nl.yml
-- config/locales/devise.pl.yml
-- config/locales/devise.pt-BR.yml
-- config/locales/devise.pt.yml
-- config/locales/devise.ru.yml
-- config/locales/devise.sk.yml
-- config/locales/devise.sr.yml
-- config/locales/devise.zh-CN.yml
-- config/locales/flash.bg.yml
-- config/locales/flash.cs.yml
-- config/locales/flash.de.yml
+- config/locales/en.yml
 - config/locales/flash.en.yml
-- config/locales/flash.es.yml
-- config/locales/flash.et.yml
 - config/locales/flash.fr.yml
-- config/locales/flash.it.yml
-- config/locales/flash.ja.yml
-- config/locales/flash.nb.yml
-- config/locales/flash.nl.yml
-- config/locales/flash.pl.yml
-- config/locales/flash.pt-BR.yml
-- config/locales/flash.pt.yml
-- config/locales/flash.ru.yml
-- config/locales/flash.sk.yml
-- config/locales/flash.sr.yml
-- config/locales/flash.zh-CN.yml
+- config/locales/fr.yml
 - config/locales/inputs.en.yml
+- config/locales/inputs.fr.yml
+- config/locales/mongoid.en.yml
+- config/locales/mongoid.fr.yml
 - config/locales/simple_form.en.yml
+- config/locales/simple_form.fr.yml
+- config/old-locales/admin_ui.bg.yml
+- config/old-locales/admin_ui.cs.yml
+- config/old-locales/admin_ui.de.yml
+- config/old-locales/admin_ui.es.yml
+- config/old-locales/admin_ui.et.yml
+- config/old-locales/admin_ui.fr.yml
+- config/old-locales/admin_ui.it.yml
+- config/old-locales/admin_ui.ja.yml
+- config/old-locales/admin_ui.nb.yml
+- config/old-locales/admin_ui.nl.yml
+- config/old-locales/admin_ui.pl.yml
+- config/old-locales/admin_ui.pt-BR.yml
+- config/old-locales/admin_ui.pt.yml
+- config/old-locales/admin_ui.ru.yml
+- config/old-locales/admin_ui.sk.yml
+- config/old-locales/admin_ui.sr.yml
+- config/old-locales/admin_ui.zh-CN.yml
+- config/old-locales/carrierwave.bg.yml
+- config/old-locales/carrierwave.cs.yml
+- config/old-locales/carrierwave.de.yml
+- config/old-locales/carrierwave.es.yml
+- config/old-locales/carrierwave.et.yml
+- config/old-locales/carrierwave.fr.yml
+- config/old-locales/carrierwave.it.yml
+- config/old-locales/carrierwave.ja.yml
+- config/old-locales/carrierwave.nb.yml
+- config/old-locales/carrierwave.nl.yml
+- config/old-locales/carrierwave.pl.yml
+- config/old-locales/carrierwave.pt-BR.yml
+- config/old-locales/carrierwave.pt.yml
+- config/old-locales/carrierwave.ru.yml
+- config/old-locales/carrierwave.sk.yml
+- config/old-locales/carrierwave.sr.yml
+- config/old-locales/carrierwave.zh-CN.yml
+- config/old-locales/default.bg.yml
+- config/old-locales/default.cs.yml
+- config/old-locales/default.de.yml
+- config/old-locales/default.es.yml
+- config/old-locales/default.et.yml
+- config/old-locales/default.fr.yml
+- config/old-locales/default.it.yml
+- config/old-locales/default.ja.yml
+- config/old-locales/default.nb.yml
+- config/old-locales/default.nl.yml
+- config/old-locales/default.pl.yml
+- config/old-locales/default.pt-BR.yml
+- config/old-locales/default.pt.yml
+- config/old-locales/default.ru.yml
+- config/old-locales/default.sk.yml
+- config/old-locales/default.sr.yml
+- config/old-locales/default.zh-CN.yml
+- config/old-locales/devise.bg.yml
+- config/old-locales/devise.cs.yml
+- config/old-locales/devise.de.yml
+- config/old-locales/devise.es.yml
+- config/old-locales/devise.et.yml
+- config/old-locales/devise.fr.yml
+- config/old-locales/devise.it.yml
+- config/old-locales/devise.ja.yml
+- config/old-locales/devise.nb.yml
+- config/old-locales/devise.nl.yml
+- config/old-locales/devise.pl.yml
+- config/old-locales/devise.pt-BR.yml
+- config/old-locales/devise.pt.yml
+- config/old-locales/devise.ru.yml
+- config/old-locales/devise.sk.yml
+- config/old-locales/devise.sr.yml
+- config/old-locales/devise.zh-CN.yml
+- config/old-locales/flash.bg.yml
+- config/old-locales/flash.cs.yml
+- config/old-locales/flash.de.yml
+- config/old-locales/flash.es.yml
+- config/old-locales/flash.et.yml
+- config/old-locales/flash.fr.yml
+- config/old-locales/flash.it.yml
+- config/old-locales/flash.ja.yml
+- config/old-locales/flash.nb.yml
+- config/old-locales/flash.nl.yml
+- config/old-locales/flash.pl.yml
+- config/old-locales/flash.pt-BR.yml
+- config/old-locales/flash.pt.yml
+- config/old-locales/flash.ru.yml
+- config/old-locales/flash.sk.yml
+- config/old-locales/flash.sr.yml
+- config/old-locales/flash.zh-CN.yml
 - config/routes.rb
 - features/api/accounts.feature
 - features/api/authentication.feature
@@ -1338,6 +1348,7 @@ files:
 - spec/fixtures/assets/5k_2.png
 - spec/fixtures/assets/application.js
 - spec/fixtures/assets/main.css
+- spec/fixtures/assets/ruby_logo.svg
 - spec/fixtures/assets/specs.pdf
 - spec/fixtures/assets/wrong.txt
 - spec/fixtures/images/logo1.jpg
@@ -1362,6 +1373,7 @@ files:
 - spec/models/locomotive/concerns/site/access_points_spec.rb
 - spec/models/locomotive/concerns/site/cache_spec.rb
 - spec/models/locomotive/concerns/site/locales_spec.rb
+- spec/models/locomotive/concerns/site/url_redirections_spec.rb
 - spec/models/locomotive/content_asset_spec.rb
 - spec/models/locomotive/content_entry_spec.rb
 - spec/models/locomotive/content_type_spec.rb
@@ -1560,6 +1572,7 @@ test_files:
 - spec/fixtures/assets/5k_2.png
 - spec/fixtures/assets/application.js
 - spec/fixtures/assets/main.css
+- spec/fixtures/assets/ruby_logo.svg
 - spec/fixtures/assets/specs.pdf
 - spec/fixtures/assets/wrong.txt
 - spec/fixtures/images/logo1.jpg
@@ -1584,6 +1597,7 @@ test_files:
 - spec/models/locomotive/concerns/site/access_points_spec.rb
 - spec/models/locomotive/concerns/site/cache_spec.rb
 - spec/models/locomotive/concerns/site/locales_spec.rb
+- spec/models/locomotive/concerns/site/url_redirections_spec.rb
 - spec/models/locomotive/content_asset_spec.rb
 - spec/models/locomotive/content_entry_spec.rb
 - spec/models/locomotive/content_type_spec.rb