locomotivecms_steam 1.0.0.rc1 → 1.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c15327d7b834e6a45dc9c631bf3f7aca7320d2e0
-  data.tar.gz: 7480937c0e40dee146c4b10684671f0da1bb638c
+  metadata.gz: 7867012e1ff99777a991748f000e8984ce4d9b14
+  data.tar.gz: d03ab3751750b477ad705af2735e886bab54f9b4
 SHA512:
-  metadata.gz: cf0538f565ffd72f18d96ae008189df3256639ba5124c260a76cdf24e5654968525acfeee2cb57c190a80b6edd3abb99b3a58928b5de9231e1f7b695958b1d57
-  data.tar.gz: d60744e27708a5af594454722bcbe13da873de4fd3c2f61624259529620710c830ae16449eb70a5f4b5c5fba7974531fb490bb3d2d17ee03fb309e38a3668f7b
+  metadata.gz: 008f097e630b8f223df81f751cc75060ae8722649fe393ff0f5f33682737f2886f91b704a8ca4e9d50f4c3bb896e9de82cd86ae4a59b91a3d904b9c9de59e79b
+  data.tar.gz: 9f564651bddec6e4d96db8e5220509c24fcbddf4f2f2037f87b831e36c1064b7a6c701a3cb6081b4b0c2d618f190b8f4409f3c7cde0225f221e1ba52bb590166

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.0.0.rc1)
+    locomotivecms_steam (1.0.0.rc2)
       RedCloth (~> 4.2.9)
       chronic (~> 0.10.2)
       coffee-script (~> 2.4.1)

data/config/locales/en.yml

@@ -26,7 +26,7 @@ en:
       paginate: "Syntax Error in 'paginate' - Valid syntax: paginate <collection> by <number>"
       session_assign: "Syntax Error in 'session_assign' - Valid syntax: session_assign [var] = [source]"
     messages:
-      blank: "can't not be blank"
+      blank: "can't be blank"
       unique: "must be unique"
 
   pagination:

data/lib/locomotive/steam/adapters/filesystem/sanitizers/page.rb

@@ -80,7 +80,7 @@ module Locomotive::Steam
           def set_fullpath_for(page, locale)
             page._fullpath ||= page.attributes.delete(:_fullpath)
 
-            slug = fullpath = page.slug[locale].try(page.templatized? ? :to_s : :dasherize)
+            slug = fullpath = page.slug[locale].try(:to_s)
 
             return if slug.blank?
 

data/lib/locomotive/steam/adapters/filesystem/yaml_loaders/content_entry.rb

@@ -60,7 +60,11 @@ module Locomotive
             def each(slug, &block)
               position = 0
               _load(File.join(path, "#{slug}.yml")).each do |element|
-                label, attributes = element.keys.first, element.values.first
+                label, attributes = if element.respond_to?(:keys)
+                  [element.keys.first, element.values.first]
+                else
+                  [element, {}]
+                end
                 yield(label, attributes, position)
                 position += 1
               end

data/lib/locomotive/steam/entities/content_entry.rb

@@ -85,6 +85,9 @@ module Locomotive::Steam
       _attributes.inject({}) do |hash, name|
         hash[name.to_s] = send(name)
         hash
+      end.tap do |hash|
+        # errors?
+        hash['errors'] = self.errors.to_hash.stringify_keys unless self.errors.empty?
       end
     end
 

data/lib/locomotive/steam/entities/site.rb

@@ -6,11 +6,14 @@ module Locomotive::Steam
 
     def initialize(attributes = {})
       super({
-        cache_enabled:          false,
-        prefix_default_locale:  false,
-        updated_at:             nil,
-        content_version:        nil,
-        template_version:       nil
+        cache_enabled:            false,
+        prefix_default_locale:    false,
+        updated_at:               nil,
+        content_version:          nil,
+        template_version:         nil,
+        domains:                  [],
+        redirect_to_first_domain: false,
+        url_redirections:         []
       }.merge(attributes))
     end
 

data/lib/locomotive/steam/initializers/dragonfly.rb

@@ -19,7 +19,7 @@ module Locomotive
 
             secret Locomotive::Steam.configuration.image_resizer_secret
 
-            url_format '/images/dynamic/:job/:basename.:ext'
+            url_format '/steam/dynamic/:job/:sha/:basename.:ext'
 
             fetch_file_whitelist /public/
 

data/lib/locomotive/steam/middlewares/helpers.rb

@@ -4,7 +4,7 @@ module Locomotive::Steam
     module Helpers
 
       def html?
-        ['text/html', 'application/x-www-form-urlencoded'].include?(self.request.media_type) &&
+        ['text/html', 'application/x-www-form-urlencoded', 'multipart/form-data'].include?(self.request.media_type) &&
         !self.request.xhr? &&
         !self.json?
       end

data/lib/locomotive/steam/middlewares/site.rb

@@ -15,6 +15,8 @@ module Locomotive::Steam
 
         # log anyway
         log_site(site)
+
+        redirect_to_first_domain_if_enabled(site)
       end
 
       private
@@ -38,6 +40,25 @@ module Locomotive::Steam
         end
       end
 
+      def redirect_to_first_domain_if_enabled(site)
+        if redirect_to_first_domain?(site)
+          klass = request.scheme == 'https' ? URI::HTTPS : URI::HTTP
+          redirect_to klass.build(
+            host:   site.domains.first,
+            port:   [80, 443].include?(request.port) ? nil : request.port,
+            path:   request.path,
+            query:  request.query_string.present? ? request.query_string : nil).to_s
+        end
+      end
+
+      def redirect_to_first_domain?(site)
+        # the site parameter can be an instance of Locomotive::Steam::Services::Defer and
+        # so comparing just site may not be reliable.
+        !env['steam.is_default_host'] &&
+        site.try(:redirect_to_first_domain) &&
+        site.domains.first != request.host
+      end
+
       def log_site(site)
         if site.nil?
           msg = "Unable to find a site, url asked: #{request.url} ".colorize(color: :light_white, background: :red)

data/lib/locomotive/steam/middlewares/url_redirection.rb

@@ -0,0 +1,31 @@
+module Locomotive::Steam
+  module Middlewares
+
+    # If an old URL has been found among the site url_redirections hash,
+    # perform a 310 redirection to the new URL.
+    # It is highly useful when the site existed before but was ran by another system.
+    #
+    # See the specs (spec/unit/middlewares/url_redirection_spec.rb) for more details.
+    #
+    class UrlRedirection < ThreadSafe
+
+      include Helpers
+
+      def _call
+        if url = redirect_url
+          redirect_to url
+        end
+      end
+
+      protected
+
+      def redirect_url
+        return false if site.url_redirections.nil? || site.url_redirections.size == 0
+
+        site.url_redirections.to_h[request.env['locomotive.path'] || request.fullpath]
+      end
+
+    end
+  end
+
+end

data/lib/locomotive/steam/models/concerns/validation.rb

@@ -22,7 +22,7 @@ module Locomotive
 
             attr_accessor :messages
 
-            def_delegators :@messages, :[], :clear, :empty?, :each, :size
+            def_delegators :@messages, :[], :clear, :empty?, :each, :size, :to_hash
 
             alias_method :blank?, :empty?
 

data/lib/locomotive/steam/server.rb

@@ -40,6 +40,8 @@ module Locomotive::Steam
             }
           end
 
+          use Dragonfly::Middleware, :steam
+
           use Rack::Lint
           use Rack::Session::Moneta, configuration.moneta
 
@@ -54,6 +56,7 @@ module Locomotive::Steam
           Middlewares::DefaultEnv,
           Middlewares::Site,
           Middlewares::Logging,
+          Middlewares::UrlRedirection,
           Middlewares::Robots,
           Middlewares::Timezone,
           Middlewares::EntrySubmission,

data/lib/locomotive/steam/services/entry_submission_service.rb

@@ -34,20 +34,7 @@ module Locomotive
       def to_json(entry)
         return nil if entry.nil?
 
-        # default values
-        hash = { _slug: entry._slug, content_type_slug: entry.content_type_slug }
-
-        # dynamic attributes
-        entry.content_type.fields.all.each do |field|
-          next if %w(belongs_to has_many many_to_many).include?(field.type.to_s)
-
-          hash[field.name] = entry.send(field.name)
-        end
-
-        # errors
-        hash[:errors] = entry.errors.messages unless entry.errors.empty?
-
-        hash.to_json
+        entry.to_json
       end
 
       private

data/lib/locomotive/steam/services/image_resizer_service.rb

@@ -29,7 +29,7 @@ module Locomotive
           resizer.fetch_url(url_or_path)
         else
           path = url_or_path.sub(/(\?.*)$/, '')
-          resizer.fetch_file(File.join(asset_path || '', 'public', path))
+          resizer.fetch_file(File.join(asset_path || '', path))
         end
       end
 

data/lib/locomotive/steam/version.rb

@@ -3,6 +3,6 @@
 # 1.0.0-alpha < 1.0.0-alpha.1 < 1.0.0-alpha.beta < 1.0.0-beta < 1.0.0-beta.2 < 1.0.0-beta.11 < 1.0.0-rc.1 < 1.0.0
 module Locomotive
   module Steam
-    VERSION = '1.0.0.rc1'
+    VERSION = '1.0.0.rc2'
   end
 end

data/spec/integration/server/contact_form_spec.rb

@@ -49,9 +49,9 @@ describe 'ContactForm' do
           subject { entry['errors'] }
 
           it 'lists all the errors' do
-            expect(subject['name']).to eq ["can't not be blank"]
-            expect(subject['email']).to eq ["can't not be blank"]
-            expect(subject['email']).to eq ["can't not be blank"]
+            expect(subject['name']).to eq ["can't be blank"]
+            expect(subject['email']).to eq ["can't be blank"]
+            expect(subject['email']).to eq ["can't be blank"]
           end
 
         end
@@ -79,7 +79,7 @@ describe 'ContactForm' do
         end
 
         it 'displays errors' do
-          expect(response.body.to_s).to include "can't not be blank"
+          expect(response.body.to_s).to include "can't be blank"
         end
 
         context 'redirects outside the site' do
@@ -130,7 +130,7 @@ describe 'ContactForm' do
       end
 
       it 'displays errors' do
-        expect(response.body.to_s).to include "can't not be blank"
+        expect(response.body.to_s).to include "can't be blank"
       end
 
     end

data/spec/unit/entities/content_entry_spec.rb

@@ -26,7 +26,7 @@ describe Locomotive::Steam::ContentEntry do
 
       let(:attributes) { {} }
       it { is_expected.to eq false }
-      it { subject; expect(content_entry.errors[:title]).to eq(["can't not be blank"]) }
+      it { subject; expect(content_entry.errors[:title]).to eq(["can't be blank"]) }
       it { subject; expect(content_entry.errors.empty?).to eq false }
 
     end

data/spec/unit/liquid/filters/resize_spec.rb

@@ -27,7 +27,7 @@ describe Locomotive::Steam::Liquid::Filters::Resize do
 
       let(:geometry) { '30x40#' }
 
-      it { is_expected.to match /images\/dynamic\/.*\/240px-Metropolitan_railway_steam_locomotive_2781022036.png/ }
+      it { is_expected.to match /\/steam\/dynamic\/.*\/240px-Metropolitan_railway_steam_locomotive_2781022036.png/ }
 
     end
 

data/spec/unit/middlewares/site_spec.rb

@@ -12,10 +12,12 @@ describe Locomotive::Steam::Middlewares::Site do
   let(:url)             { 'http://models.example.com' }
   let(:app)             { ->(env) { [200, env, 'app'] } }
   let(:middleware)      { Locomotive::Steam::Middlewares::Site.new(app) }
+  let(:is_default_host) { nil }
 
   subject do
     env = env_for(url, 'steam.services' => services)
-    env['steam.request'] = Rack::Request.new(env)
+    env['steam.request']          = Rack::Request.new(env)
+    env['steam.is_default_host']  = is_default_host
     code, env = middleware.call(env)
     [code, env['Location']]
   end
@@ -40,4 +42,38 @@ describe Locomotive::Steam::Middlewares::Site do
 
   end
 
+  describe 'redirection to the first domain' do
+
+    let(:redirect_to_first_domain) { false }
+    let(:url)  { 'http://acme.com' }
+    let(:site) { instance_double('SiteWithDomains', name: 'Acme', domains: ['www.acme.com', 'acme.com'], redirect_to_first_domain: redirect_to_first_domain) }
+
+    before { expect(services).to receive(:current_site).and_return(site) }
+
+    it { is_expected.to eq [200, nil] }
+
+    describe 'option enabled' do
+
+      let(:redirect_to_first_domain) { true }
+
+      it { is_expected.to eq [301, 'http://www.acme.com/'] }
+
+      context 'first domain requested' do
+
+        let(:url) { 'http://www.acme.com' }
+        it { is_expected.to eq [200, nil] }
+
+      end
+
+      context 'requesting the default host' do
+
+        let(:is_default_host) { true }
+        it { is_expected.to eq [200, nil] }
+
+      end
+
+    end
+
+  end
+
 end

data/spec/unit/middlewares/url_redirection_spec.rb

@@ -0,0 +1,76 @@
+require 'spec_helper'
+
+require_relative '../../../lib/locomotive/steam/middlewares/thread_safe'
+require_relative '../../../lib/locomotive/steam/middlewares/helpers'
+require_relative '../../../lib/locomotive/steam/middlewares/url_redirection'
+
+describe Locomotive::Steam::Middlewares::UrlRedirection do
+
+  let(:redirections)    { [] }
+  let(:site)            { instance_double('Site', url_redirections: redirections) }
+  let(:url)             { 'http://models.example.com' }
+  let(:locomotive_path) { nil }
+  let(:app)             { ->(env) { [200, env, 'app'] } }
+  let(:middleware)      { described_class.new(app) }
+
+  subject do
+    env = env_for(url, 'steam.site' => site)
+    env['steam.request']    = Rack::Request.new(env)
+    env['locomotive.path']  = locomotive_path
+    code, env = middleware.call(env)
+    [code, env['Location']]
+  end
+
+  describe 'no redirections' do
+
+    it { is_expected.to eq [200, nil] }
+
+  end
+
+  describe 'redirections' do
+
+    let(:redirections) { [['/foo.php', '/bar']] }
+
+    it { is_expected.to eq [200, nil] }
+
+    describe 'use first the locomotive.path env variable' do
+
+      let(:locomotive_path) { '/foo.php' }
+      it { is_expected.to eq [301, '/bar'] }
+
+    end
+
+    describe 'requesting the old url' do
+
+      let(:url) { 'http://models.example.com/foo.php' }
+      it { is_expected.to eq [301, '/bar'] }
+
+      describe 'url with a lot of dots' do
+
+        let(:redirections) { [['/content.HOME.HOME.WELCOME.DEU.GER.html', '/bar'], ['/hello', '/world']] }
+        let(:url) { 'http://models.example.com/content.HOME.HOME.WELCOME.DEU.GER.html' }
+
+        it { is_expected.to eq [301, '/bar'] }
+
+      end
+
+      describe 'url with a query string' do
+
+        let(:url) { 'http://models.example.com/foo.php?a=1' }
+
+        it { is_expected.to eq [200, nil] }
+
+        describe 'exact matching' do
+
+          let(:redirections) { { '/foo.php?a=1' => '/bar' } }
+          it { is_expected.to eq [301, '/bar'] }
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/spec/unit/services/entry_submission_service_spec.rb

@@ -48,19 +48,20 @@ describe Locomotive::Steam::EntrySubmissionService do
 
     context 'existing content entry' do
 
-      let(:errors)  { {} }
-      let(:fields)  { [instance_double('TitleField', name: :title, type: :string)] }
-      let(:type)    { instance_double('Articles') }
-      let(:entry)   { instance_double('DecoratedEntry', _slug: 'hello-world', title: 'Hello world', content_type: type, content_type_slug: :articles, errors: errors) }
+      let(:field)   { instance_double('TitleField', name: :title, type: :string) }
+      let(:fields)  { [field] }
+      let(:type)    { instance_double('Articles', slug: 'articles', label_field_name: :title, fields_by_name: { title: field }, persisted_field_names: [:title]) }
+      let(:entry)   { Locomotive::Steam::ContentEntry.new(_slug: 'hello-world', title: 'Hello world', content_type: type) }
 
       before { allow(type).to receive(:fields).and_return(instance_double('FieldRepository', all: fields)) }
 
-      it { is_expected.to eq '{"_slug":"hello-world","content_type_slug":"articles","title":"Hello world"}' }
+      it { is_expected.to match %r{{"_id":null,"_slug":"hello-world","_label":"Hello world","_visible":true,"_position":0,"content_type_slug":"articles","created_at":"[^\"]+","updated_at":"[^\"]+","title":"Hello world"}} }
 
       context 'with errors' do
 
-        let(:errors) { instance_double('Errors', empty?: false, messages: { title: ["can't be blank"] }) }
-        it { is_expected.to eq '{"_slug":"hello-world","content_type_slug":"articles","title":"Hello world","errors":{"title":["can\'t be blank"]}}' }
+        before { entry.errors.add(:title, "can't be blank") }
+
+        it { is_expected.to match %r{,\"errors\":\{\"title\":\[\"can't be blank\"\]\}} }
 
       end
 

data/spec/unit/services/image_resizer_service_spec.rb

@@ -31,33 +31,33 @@ describe Locomotive::Steam::ImageResizerService do
         it { is_expected.to eq nil }
       end
 
-      it { is_expected.to match /images\/dynamic\/.*\/240px-Metropolitan_railway_steam_locomotive_2781022036.png/ }
+      it { is_expected.to match /\/steam\/dynamic\/.*\/240px-Metropolitan_railway_steam_locomotive_2781022036.png/ }
 
       describe 'a local asset' do
 
         let(:input)  { '/sites/42/theme/images/banner.png' }
-        it { is_expected.to match /images\/dynamic\/.*\/banner.png/ }
+        it { is_expected.to match /\/steam\/dynamic\/.*\/banner.png/ }
 
       end
 
       describe 'a hash' do
 
         let(:input) { { 'url' => '/sites/42/theme/images/banner.png' } }
-        it { is_expected.to match /images\/dynamic\/.*\/banner.png/ }
+        it { is_expected.to match /\/steam\/dynamic\/.*\/banner.png/ }
 
       end
 
       describe 'an object responding to the url method (Carrierwave uploaded file)' do
 
         let(:input)  { instance_double('UploadedFile', url: '/sites/42/theme/acme.png') }
-        it { is_expected.to match /images\/dynamic\/.*\/acme.png/ }
+        it { is_expected.to match /\/steam\/dynamic\/.*\/acme.png/ }
 
       end
 
       describe 'an url with a timestamp' do
 
         let(:input)  { '/sites/42/theme/images/banner.png?24e29997bcb00e97d8252cdd29d14e2d' }
-        it { is_expected.to match /images\/dynamic\/.*\/banner.png\?sha=[a-z0-9]+/ }
+        it { is_expected.to match /\/steam\/dynamic\/.*\/[a-z0-9]+\/banner.png/ }
 
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_steam
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,7 +11,7 @@ authors:
 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: bundler
@@ -508,6 +508,7 @@ files:
 - lib/locomotive/steam/middlewares/templatized_page.rb
 - lib/locomotive/steam/middlewares/thread_safe.rb
 - lib/locomotive/steam/middlewares/timezone.rb
+- lib/locomotive/steam/middlewares/url_redirection.rb
 - lib/locomotive/steam/models.rb
 - lib/locomotive/steam/models/associations/belongs_to.rb
 - lib/locomotive/steam/models/associations/embedded.rb
@@ -745,6 +746,7 @@ files:
 - spec/unit/middlewares/renderer_spec.rb
 - spec/unit/middlewares/site_spec.rb
 - spec/unit/middlewares/stack_proxy_spec.rb
+- spec/unit/middlewares/url_redirection_spec.rb
 - spec/unit/models/concerns/to_json_spec.rb
 - spec/unit/models/i18n_field_spec.rb
 - spec/unit/models/mapper_spec.rb
@@ -983,6 +985,7 @@ test_files:
 - spec/unit/middlewares/renderer_spec.rb
 - spec/unit/middlewares/site_spec.rb
 - spec/unit/middlewares/stack_proxy_spec.rb
+- spec/unit/middlewares/url_redirection_spec.rb
 - spec/unit/models/concerns/to_json_spec.rb
 - spec/unit/models/i18n_field_spec.rb
 - spec/unit/models/mapper_spec.rb