locomotivecms 3.2.0.rc2 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ab195895e4193a300a633c0496606156308bdbe
-  data.tar.gz: fc17f2fdaade351feb1c66e9aa67addea6ef3428
+  metadata.gz: 4bade9679c107681f6331eded20d257d26b15984
+  data.tar.gz: b1b3f52495e62d5875a3df43caec5fdfaa811a88
 SHA512:
-  metadata.gz: a0d9827a76d2171a730e6273dd5769ee962652e4383bbd37e9a6a308e25098323db3f5bce4fdac884c300728c81003231109d74f4a83f7a68e234816748697ee
-  data.tar.gz: 84ffc9549c927e87337f33a5c78b00d0423435e3a663cb9965557c68884c6e67d6a4b9bc2ee9f30de8a6d7465cbb24e37f3731f22c140718cdf121a43875695f
+  metadata.gz: b3acfde3cf399e738e0b5f138133302c7c8b67d116fc54c8a9fbe21180a7b3f051877faa32244326a8daa6a82c5017668d053301a53206c3402a55cb72df7d01
+  data.tar.gz: 976d3e537b9ff47402f5f70b700457f0f0de010ea6ab87fa8020b3c87bd010884df54fc435dc3cc47cdd56c780572e3a3af48570055dc943dc0222453bc444a4

data/Gemfile

@@ -25,7 +25,7 @@ group :development do
   # gem 'locomotivecms_common', github: 'locomotivecms/common', ref: '257047b', require: false
 
   # gem 'locomotivecms_steam', path: '../gems/steam', require: false
-  # gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: 'c17802c', require: false
+  # gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: 'a2cba33', require: false
 
   # gem 'locomotive_liquid', path: '../gems/liquid' # for Developers
   # gem 'locomotivecms_solid', path: '../gems/solid' # for Developers

data/app/controllers/locomotive/current_site_controller.rb

@@ -10,6 +10,7 @@ module Locomotive
     helper Locomotive::SitesHelper
 
     before_filter :ensure_domains_list, only: :update
+    before_filter :ensure_url_redirections, only: :update
 
     def edit
       authorize @site
@@ -70,5 +71,9 @@ module Locomotive
       params[:site][:domains] = [] unless params[:site][:domains]
     end
 
+    def ensure_url_redirections
+      params[:site][:url_redirections] = [] unless params[:site][:url_redirections]
+    end
+
   end
 end

data/app/controllers/locomotive/errors_controller.rb

@@ -12,7 +12,9 @@ module Locomotive
     end
 
     def no_site
-      render 'no_site', status: :not_found
+      respond_to do |format|
+        format.html { render 'no_site', status: :not_found }
+      end
     end
 
   end

data/app/models/locomotive/editable_control.rb

@@ -2,7 +2,7 @@ module Locomotive
   class EditableControl < EditableElement
 
     ## fields ##
-    field :content
+    field :content, localize: true
     field :default_content, type: Boolean, default: true
     field :options, type: Array, default: []
 

data/app/views/locomotive/editable_elements/index_without_preview.html.slim

@@ -17,7 +17,7 @@
 
       .row
 
-        - if @editable_elements.empty?
+        - if @editable_elements.blank?
           - if @content_entry.nil?
             .col-md-12
               br

data/app/views/locomotive/notifications/new_content_entry.html.slim

@@ -10,6 +10,7 @@ hr
 ul
   - @type.ordered_entries_custom_fields.each do |field|
     - value = @entry.send(field.name)
+    - next if value.nil?
     li
       strong= field.label
       |  - 

data/app/views/locomotive/shared/sidebar/_page.html.slim

@@ -18,12 +18,13 @@ li id="node-#{page._id}" class=page.class_names
       = render partial: 'locomotive/shared/sidebar/page', collection: page.nodes
 
       - if page.templatized_children? && !page.templatized?
-        li.list-entries
-          = link_to content_entries_path(current_site, page.templatized_page.content_type.slug) do
-              i.fa.fa-list-ul.icon
-              span.text style="#{page.deeper_text_inline_style}"= t(:list_content_entries, name: page.content_type.name.pluralize, scope: 'locomotive.pages.index')
+        - if content_type = page.templatized_page.content_type
+          li.list-entries
+            = link_to content_entries_path(current_site, content_type.slug) do
+                i.fa.fa-list-ul.icon
+                span.text style="#{page.deeper_text_inline_style}"= t(:list_content_entries, name: content_type.name.pluralize, scope: 'locomotive.pages.index')
 
-        li.new-entry.sidebar-list-add
-          = link_to new_content_entry_path(current_site, page.templatized_page.content_type.slug) do
-            i.fa.fa-plus.icon
-            span.text style="#{page.deeper_text_inline_style}"= t(:new_content_entry, name: page.content_type.name.singularize, scope: 'locomotive.pages.index')
+          li.new-entry.sidebar-list-add
+            = link_to new_content_entry_path(current_site, content_type.slug) do
+              i.fa.fa-plus.icon
+              span.text style="#{page.deeper_text_inline_style}"= t(:new_content_entry, name: content_type.name.singularize, scope: 'locomotive.pages.index')

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

@@ -28,6 +28,8 @@ module Locomotive
       def with_form(type_slug, attributes, as_json, &block)
         load_content_type(type_slug)
 
+        useTempfiles(attributes)
+
         ::Mongoid::Fields::I18n.with_locale(self.locale) do
           form  = Locomotive::API::Forms::ContentEntryForm.new(@content_type, attributes)
 
@@ -37,6 +39,15 @@ module Locomotive
         end
       end
 
+      def useTempfiles(attributes)
+        # kind of marshal/unmarshal mechanism :-)
+        attributes.each do |key, value|
+          if value.is_a?(Hash) && value['tempfile'].present? && value['tempfile'].is_a?(String) && value['filename'].present?
+            attributes[key]['tempfile'] = File.open(attributes[key]['tempfile'])
+          end
+        end
+      end
+
       def make_entity(entry, as_json)
         entity = entry.to_steam(@content_type)
         decorated_entity = Locomotive::Steam::Decorators::I18nDecorator.new(entity, locale)

data/lib/locomotive/steam_adaptor.rb

@@ -29,7 +29,10 @@ Locomotive::Steam.configure do |config|
   config.middleware.delete Rack::Lint
   config.middleware.delete Rack::Session::Moneta
 
-  %w(cache catch_error page_editing missing_translations wysihtml_css).each do |name|
+  require_relative 'steam/middlewares/catch_error'
+  config.middleware.insert_after Locomotive::Steam::Middlewares::Site, Locomotive::Steam::Middlewares::CatchError
+
+  %w(cache page_editing missing_translations wysihtml_css).each do |name|
     require_relative "steam/middlewares/#{name}"
     config.middleware.insert_after Locomotive::Steam::Middlewares::Page, Locomotive::Steam::Middlewares.const_get(name.camelize)
   end

data/lib/locomotive/version.rb

@@ -2,5 +2,5 @@
 # MAJOR.MINOR.PATCH format.
 # 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 #:nodoc
-  VERSION = '3.2.0.rc2'
+  VERSION = '3.2.0'
 end

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

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe Locomotive::Steam::APIContentEntryService do
+
+  let(:site)          { create(:site) }
+  let(:request_env)   { instance_double('RequestEnv') }
+  let(:request)       { instance_double('Request', ip: '127.0.0.1', env: request_env) }
+  let!(:content_type) { create('article content type', site: site).reload }
+  let(:service)       { described_class.new(nil, nil, :en, request) }
+
+  before { expect(request_env).to receive(:[]).with('locomotive.site').and_return(site) }
+
+  describe '#create' do
+
+    let(:file)        { Rack::Multipart::UploadedFile.new(FixturedAsset.path('5k.png'), 'image/png') }
+    let(:attributes)  { { title: 'Hello world', body: 'Lorem ipsum...', picture: file } }
+
+    subject { service.create(content_type.slug, attributes, true) }
+
+    it 'persists the content entry' do
+      expect { subject }.to change(Locomotive::ContentEntry, :count).by(1)
+      expect(subject['picture']['url']).to eq '5k.png'
+    end
+
+    context 'marshalled picture' do
+
+      let(:file) {
+        {
+          'content_type' => 'image/png',
+          'original_filename' => '5k.png',
+          'filename' => '5k.png',
+          'tempfile' => FixturedAsset.path('5k.png')
+        }
+      }
+
+      it 'persists the content entry' do
+        expect(subject['picture']['url']).to eq '5k.png'
+      end
+
+    end
+
+  end
+
+end

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

@@ -39,7 +39,7 @@ describe Locomotive::Steam::Middlewares::Cache do
 
     subject { middleware.send(:cache_key, steam_env) }
 
-    it { expect(subject).to eq 'fd87f5b55149276bc20fcc26465d27c9' }
+    it { expect(subject).to eq 'e5bc074a017ba05e140a16185e3e38f7' }
 
   end
 

data/vendor/assets/javascripts/locomotive/wysihtml5/parser_rules/advanced.js

@@ -113,6 +113,10 @@ var wysihtml5ParserRules = {
         "tr": {
             "add_class": {
                 "align": "align_text"
+            },
+            "check_attributes": {
+                "id": "any",
+                "class": "any"
             }
         },
         "strike": {},
@@ -131,6 +135,10 @@ var wysihtml5ParserRules = {
             "rename_tag": "div"
         },
         "h4": {
+            "check_attributes": {
+                "id": "any",
+                "class": "any"
+            },
             "add_class": {
                 "align": "align_text"
             }
@@ -165,7 +173,12 @@ var wysihtml5ParserRules = {
         "command": {
             "remove": 1
         },
-        "ul": {},
+        "ul": {
+            "check_attributes": {
+                "id": "any",
+                "class": "any"
+            }
+        },
         "progress": {
             "rename_tag": "span"
         },
@@ -174,6 +187,7 @@ var wysihtml5ParserRules = {
         },
         "iframe": {
             "check_attributes": {
+                "id": "any",
                 "class": "any",
                 "width": "any",
                 "height": "any",
@@ -187,17 +201,19 @@ var wysihtml5ParserRules = {
         },
         "a": {
             "check_attributes": {
+                "id": "any",
                 "target": "any",
                 "href": "any", // if you compiled master manually then change this from 'url' to 'href'
                 "title": "any",
                 "class": "any",
-                "data-*": "any"
-            },
-            "set_attributes": {
+                "data-*": "any",
+                "rel": "any"
             }
         },
         "img": {
             "check_attributes": {
+                "id": "any",
+                "class": "any",
                 "width": "numbers",
                 "title": "any",
                 "alt": "any",
@@ -236,6 +252,10 @@ var wysihtml5ParserRules = {
             "rename_tag": "div"
         },
         "h1": {
+            "check_attributes": {
+                "id": "any",
+                "class": "any"
+            },
             "add_class": {
                 "align": "align_text"
             }
@@ -244,6 +264,10 @@ var wysihtml5ParserRules = {
             "remove": 1
         },
         "tbody": {
+            "check_attributes": {
+                "id": "any",
+                "class": "any"
+            },
             "add_class": {
                 "align": "align_text"
             }
@@ -254,9 +278,16 @@ var wysihtml5ParserRules = {
         "s": {
             "rename_tag": "span"
         },
-        "li": {},
+        "li": {
+            "check_attributes": {
+                "id": "any",
+                "class": "any"
+            },
+        },
         "td": {
             "check_attributes": {
+                "id": "any",
+                "class": "any",
                 "rowspan": "numbers",
                 "colspan": "numbers"
             },
@@ -269,6 +300,7 @@ var wysihtml5ParserRules = {
         },
         "div": {
             "check_attributes": {
+                "id": "any",
                 "class": "any",
                 "data-*": "any"
             },
@@ -309,6 +341,10 @@ var wysihtml5ParserRules = {
             "remove": 1
         },
         "h5": {
+            "check_attributes": {
+                "id": "any",
+                "class": "any"
+            },
             "add_class": {
                 "align": "align_text"
             }
@@ -331,6 +367,10 @@ var wysihtml5ParserRules = {
             }
         },
         "tfoot": {
+            "check_attributes": {
+                "id": "any",
+                "class": "any"
+            },
             "add_class": {
                 "align": "align_text"
             }
@@ -358,6 +398,7 @@ var wysihtml5ParserRules = {
         },
         "span": {
             "check_attributes": {
+                "id": "any",
                 "class": "any",
                 "data-*": "any"
             }
@@ -383,7 +424,12 @@ var wysihtml5ParserRules = {
         "body": {
             "rename_tag": "div"
         },
-        "ol": {},
+        "ol": {
+            "check_attributes": {
+                "id": "any",
+                "class": "any"
+            }
+        },
         "nobr": {
             "rename_tag": "span"
         },
@@ -401,6 +447,8 @@ var wysihtml5ParserRules = {
         // },
         "blockquote": {
             "check_attributes": {
+                "id": "any",
+                "class": "any",
                 "cite": "url"
             }
         },
@@ -414,6 +462,10 @@ var wysihtml5ParserRules = {
             "rename_tag": "span"
         },
         "h3": {
+            "check_attributes": {
+                "id": "any",
+                "class": "any"
+            },
             "add_class": {
                 "align": "align_text"
             }
@@ -438,6 +490,10 @@ var wysihtml5ParserRules = {
             "remove": 1
         },
         "thead": {
+            "check_attributes": {
+                "id": "any",
+                "class": "any"
+            },
             "add_class": {
                 "align": "align_text"
             }
@@ -452,6 +508,10 @@ var wysihtml5ParserRules = {
             "remove": 1
         },
         "h6": {
+            "check_attributes": {
+                "id": "any",
+                "class": "any"
+            },
             "add_class": {
                 "align": "align_text"
             }
@@ -461,6 +521,8 @@ var wysihtml5ParserRules = {
         },
         "th": {
             "check_attributes": {
+                "id": "any",
+                "class": "any",
                 "rowspan": "numbers",
                 "colspan": "numbers"
             },
@@ -510,7 +572,12 @@ var wysihtml5ParserRules = {
         "article": {
             "rename_tag": "div"
         },
-        "cite": {},
+        "cite": {
+            "check_attributes": {
+                "id": "any",
+                "class": "any"
+            }
+        },
         "link": {
             "remove": 1
         },
@@ -530,6 +597,10 @@ var wysihtml5ParserRules = {
             "rename_tag": "span"
         },
         "h2": {
+            "check_attributes": {
+                "id": "any",
+                "class": "any"
+            },
             "add_class": {
                 "align": "align_text"
             }
@@ -538,6 +609,10 @@ var wysihtml5ParserRules = {
             "rename_tag": "span"
         },
         "p": {
+            "check_attributes": {
+                "id": "any",
+                "class": "any"
+            },
             "add_class": {
                 "align": "align_text"
             }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms
 version: !ruby/object:Gem::Version
-  version: 3.2.0.rc2
+  version: 3.2.0
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-15 00:00:00.000000000 Z
+date: 2016-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -156,28 +156,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0.rc1
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0.rc1
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: locomotivecms_steam
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0.rc2
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0.rc2
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -1243,6 +1243,7 @@ files:
 - spec/lib/action_view_spec.rb
 - spec/lib/core_ext_spec.rb
 - spec/lib/locomotive/configuration_spec.rb
+- spec/lib/locomotive/steam/services/api_content_entry_service_spec.rb
 - spec/lib/locomotive/steam/services/api_entry_submission_service_spec.rb
 - spec/lib/locomotive/steam/services/async_email_service_spec.rb
 - spec/lib/locomotive/steam/services/liquid_parser_with_cache_service_spec.rb
@@ -1365,9 +1366,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5.1
@@ -1390,6 +1391,7 @@ test_files:
 - spec/lib/action_view_spec.rb
 - spec/lib/core_ext_spec.rb
 - spec/lib/locomotive/configuration_spec.rb
+- spec/lib/locomotive/steam/services/api_content_entry_service_spec.rb
 - spec/lib/locomotive/steam/services/api_entry_submission_service_spec.rb
 - spec/lib/locomotive/steam/services/async_email_service_spec.rb
 - spec/lib/locomotive/steam/services/liquid_parser_with_cache_service_spec.rb