locomotivecms 3.1.2 → 3.2.0.rc1

data/config/locales/zh-CN.yml

@@ -13,6 +13,7 @@ zh-CN:
       es: 西班牙
       ru: 俄语
       et: 爱沙尼亚
+      lt: 立陶宛人
       ja: 日语
       zh-CN: 中文
       cs: 捷克
@@ -35,6 +36,7 @@ zh-CN:
       sidebar:
         dashboard: 控制台
         assets: 资源
+        pages: 页面
         settings: 通用设置
         metafields: 属性
         developers: 开发者
@@ -94,9 +96,11 @@ zh-CN:
         sorted: '%{content_type} 排序'
       content_asset:
         created_bulk: '更新 %{count} 个资源'
-        destroyed: '删除 %{name} 个资源'
+        destroyed: '删除 %{count} 个资源'
       membership:
         created: '添加 %{name} 到站点'
+      site_metafields:
+        updated: '已更新 %{label}'
     pagination:
       first: "«"
       last: "»"

data/lib/generators/locomotive/install/templates/locomotive.rb

@@ -14,14 +14,14 @@ Locomotive.configure do |config|
     per_page: 10
   }
 
-  # default locale (for now, only en, de, fr, pl, pt, pt-BR, it, nl, nb, ja, cs, bg, sk and sv are supported)
+  # default locale (for now, only en, de, fr, pl, pt, pt-BR, it, nl, nb, ja, cs, bg, sk, sv and uk are supported)
   config.default_locale = :en
 
   # locales allowed for the back-office UI
   config.locales = [:en, :fr, :de, :"zh-CN", :cs, :el, :lt, :"pt-BR", :nl, :ru]
 
   # available locales suggested to "localize" a site. You will have to pick up at least one among that list.
-  # config.site_locales = %w{en de fr pl pt pt-BR it nl nb es ru ja cs bg sk}
+  # config.site_locales = %w{en de fr pl pt pt-BR it nl nb es ru ja cs bg sk uk}
 
   # tell if logs are enabled. Useful for debug purpose.
   config.enable_logs = true

data/lib/locomotive/middlewares/site.rb

@@ -68,14 +68,15 @@ module Locomotive
       #
       # FIXME: move that in a different middleware
       def fetch_from_handle(handle, request)
-        mounted_on = "#{Locomotive.mounted_on}/#{handle}/preview"
+        mounted_on  = "#{Locomotive.mounted_on}/#{handle}/preview"
+        logged_in   = request.env['warden'].try(:user).present?
 
         request.env['locomotive.mounted_on']  = request.env['steam.mounted_on'] = mounted_on
         request.env['locomotive.path']        = request.path_info.gsub(mounted_on, '')
 
-        request.env['steam.live_editing']     = true
+        request.env['steam.live_editing']     = logged_in
 
-        request.env['steam.private_access_disabled'] = request.env['warden'].try(:user).present?
+        request.env['steam.private_access_disabled'] = logged_in
 
         Locomotive::Site.where(handle: handle).first
       end

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

@@ -11,6 +11,8 @@ module Locomotive
         end
 
         def call(env)
+          disable_live_editing_if_not_html(env)
+
           status, headers, response = @app.call(env)
 
           site, mounted_on, page, locale, live_editing = env['steam.site'], env['steam.mounted_on'], env['steam.page'], env['steam.locale'].to_s, env['steam.live_editing']
@@ -51,6 +53,14 @@ module Locomotive
 
         protected
 
+        def disable_live_editing_if_not_html(env)
+          page = env['steam.page']
+
+          if page && page.response_type != 'text/html'
+            env['steam.live_editing'] = false
+          end
+        end
+
         def editable?(page, response, live_editing)
           live_editing && page && !page.redirect && page.response_type == 'text/html' && response.first
         end

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

@@ -0,0 +1,58 @@
+module Locomotive
+  module Steam
+
+    class APIContentEntryService < ContentEntryService
+
+      include Locomotive::Steam::Services::Concerns::Decorator
+
+      attr_accessor_initialize :content_type_repository, :repository, :locale, :request
+
+      def create(type_slug, attributes, as_json = false)
+        with_form(type_slug, attributes, as_json) do |_attributes|
+          @content_type.entries.create(_attributes)
+        end
+      end
+
+      def update(type_slug, id_or_slug, attributes, as_json = false)
+        with_form(type_slug, attributes, as_json) do |_attributes|
+          entry = @content_type.entries.by_id_or_slug(id_or_slug).first
+
+          entry.update_attributes(_attributes)
+
+          entry
+        end
+      end
+
+      private
+
+      def with_form(type_slug, attributes, as_json, &block)
+        load_content_type(type_slug)
+
+        ::Mongoid::Fields::I18n.with_locale(self.locale) do
+          form  = Locomotive::API::Forms::ContentEntryForm.new(@content_type, attributes)
+
+          entry = yield(form.serializable_hash)
+
+          make_entity(entry, as_json)
+        end
+      end
+
+      def make_entity(entry, as_json)
+        entity = entry.to_steam(@content_type)
+        decorated_entity = Locomotive::Steam::Decorators::I18nDecorator.new(entity, locale)
+        _json_decorate(decorated_entity, as_json)
+      end
+
+      def load_content_type(slug)
+        @content_type = site.content_types.where(slug: slug).first
+      end
+
+      def site
+        request.env['locomotive.site']
+      end
+
+    end
+
+  end
+end
+

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

@@ -1,26 +1,18 @@
 module Locomotive
   module Steam
 
-    class APIEntrySubmissionService < Struct.new(:site, :locale, :ip_address)
+    class APIEntrySubmissionService < EntrySubmissionService
 
-      def submit(slug, attributes = {})
-        if load_content_type(slug)
+      attr_accessor_initialize :service, :request
+
+      def submit(type_slug, attributes = {})
+        if load_content_type(type_slug)
           create_entry(attributes)
         else
           nil
         end
       end
 
-      def find(type_slug, slug)
-        if entry = load_content_type(type_slug).entries.where(_slug: slug).first
-          make_entity(entry)
-        end
-      end
-
-      def to_json(entry)
-        make_entity(entry).to_json
-      end
-
       private
 
       def load_content_type(slug)
@@ -29,16 +21,26 @@ module Locomotive
 
       def create_entry(attributes)
         ::Mongoid::Fields::I18n.with_locale(locale) do
-          service.public_create(attributes, { ip_address: ip_address })
+          entry = engine_service.public_create(attributes, { ip_address: ip_address })
+
+          entity = entry.to_steam(@content_type)
+          Locomotive::Steam::Decorators::I18nDecorator.new(entity, locale)
         end
       end
 
-      def make_entity(entry)
-        entity = entry.to_steam(@content_type)
-        Locomotive::Steam::Decorators::I18nDecorator.new(entity, locale)
+      def site
+        self.request.env['locomotive.site']
+      end
+
+      def ip_address
+        self.request.ip
+      end
+
+      def locale
+        self.service.locale
       end
 
-      def service
+      def engine_service
         Locomotive::ContentEntryService.new(@content_type, nil)
       end
 

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

@@ -0,0 +1,36 @@
+module Locomotive
+  module Steam
+
+    class AsyncEmailService < EmailService
+
+      def send_email!(options)
+        _options = prepare_options_for_async(options)
+
+        SendPonyEmailJob.perform_later(_options)
+      end
+
+      protected
+
+      def prepare_options_for_async(options)
+        _options = options.deep_stringify_keys
+
+        # convert symbol values to string
+        _options['via'] = _options['via'].to_s if _options['via']
+
+        if _options['via_options'] && (value = _options['via_options']['authentication'])
+          _options['via_options']['authentication'] = value.to_s
+        end
+
+        # if attachments, encode them in base64 to avoid encoding
+        # errors when persisting them in Redis.
+        (_options['attachments'] || {}).each do |name, content|
+          _options['attachments'][name] = Base64.encode64(content)
+        end
+
+        _options
+      end
+
+    end
+
+  end
+end

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

@@ -30,6 +30,7 @@ module Locomotive
           Rails.cache.write(cache_key(page), marshal(template))
         rescue Exception => e
           Rails.logger.warn "Could not marshal #{cache_key(page)}, error: #{e.message}"
+          Rails.logger.debug e.backtrace.join("\n")
         end
 
         template
@@ -58,6 +59,8 @@ module Locomotive
             clean_template!(_node)
           end
         end
+
+        # [Debug](used to find the node element whic can't be marshaled): Marshal.dump(node)
       end
 
       def remove_unmarshalable_options(node)
@@ -65,9 +68,22 @@ module Locomotive
 
         return if options.blank?
 
+        unless options[:inherited_blocks].blank?
+          remove_unmarshalable_options_from_inherited_blocks(options)
+        end
+
         options.delete_if { |name, _| UNMARSHALABLE_OPTIONS.include?(name) }
       end
 
+      def remove_unmarshalable_options_from_inherited_blocks(options)
+        options[:inherited_blocks].values.each do |blocks|
+          (blocks.respond_to?(:has_key?) ? blocks.values : blocks).each do |block|
+            _options = block.instance_variable_get(:@options)
+            _options.delete_if { |name, _| UNMARSHALABLE_OPTIONS.include?(name) }
+          end
+        end
+      end
+
     end
 
   end

data/lib/locomotive/steam_adaptor.rb

@@ -34,18 +34,22 @@ Locomotive::Steam.configure do |config|
     config.middleware.insert_after Locomotive::Steam::Middlewares::Page, Locomotive::Steam::Middlewares.const_get(name.camelize)
   end
 
-  require_relative 'steam/services/api_entry_submission_service'
-  require_relative 'steam/services/liquid_parser_with_cache_service'
+  %w(api_content_entry api_entry_submission liquid_parser_with_cache async_email).each do |name|
+    require_relative "steam/services/#{name}_service"
+  end
 
   # let the Rails engine handle the "no site" error
   config.render_404_if_no_site = false
 
   config.services_hook = -> (services) {
-    services.cache = Rails.cache
+    services.cache  = Rails.cache
+    repositories    = services.repositories
 
     if services.request
-      services.entry_submission = Locomotive::Steam::APIEntrySubmissionService.new(services.request.env['locomotive.site'], services.locale, services.request.ip)
+      services.defer(:content_entry) { Locomotive::Steam::APIContentEntryService.new(repositories.content_type, repositories.content_entry, services.locale, services.request) }
+      services.defer(:entry_submission) { Locomotive::Steam::APIEntrySubmissionService.new(services.content_entry, services.request) }
       services.defer(:liquid_parser) { Locomotive::Steam::LiquidParserWithCacheService.new(services.current_site, services.parent_finder, services.snippet_finder, services.locale) }
+      services.defer(:email) { Locomotive::Steam::AsyncEmailService.new(services.page_finder, services.liquid_parser, services.asset_host, services.configuration.mode == :test) }
     end
   }
 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.1.2'
+  VERSION = '3.2.0.rc1'
 end

data/lib/tasks/locomotive.rake

@@ -58,6 +58,11 @@ namespace :locomotive do
               target_ids_name = "#{field.inverse_of.singularize}_ids"
               target_ids      = target_entry.attributes[target_ids_name]
 
+              if target_ids.nil?
+                puts "[ERROR][#{content_type.site.name}] wrong many-to-many inverse_of key for #{content_type.name}"
+                next
+              end
+
               valid = target_ids.include?(entry._id)
 
               unless valid

data/spec/dummy/config/initializers/locomotive.rb

@@ -12,7 +12,7 @@ Locomotive.configure do |config|
   config.default_locale = :en
 
   # locales allowed for the back-office UI
-  config.locales = [:en, :nl, :el, :'pt-BR']
+  config.locales = [:en, :de, :es, :nl, :el, :'pt-BR', :'zh-CN', :sv, :uk, :cs, :lt]
 
   # available locales suggested to "localize" a site. You will have to pick up at least one among that list.
   # config.site_locales = %w{en de fr pl pt pt-BR it nl nb es ru ja cs bg sk sv}

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

@@ -3,14 +3,17 @@ require 'spec_helper'
 describe Locomotive::Steam::APIEntrySubmissionService do
 
   let(:site)          { create(:site) }
-  let(:locale)        { :en }
+  let(:steam_service) { instance_double('SteamContentEntryService', locale: 'en') }
+  let(:request_env)   { instance_double('RequestEnv') }
+  let(:request)       { instance_double('Request', ip: '127.0.0.1', env: request_env) }
   let(:enabled)       { true }
-  let(:ip_address)    { '127.0.0.1' }
   let!(:content_type) { create('message content type', site: site, public_submission_enabled: enabled).reload }
-  let(:service)       { described_class.new(site, locale, ip_address) }
+  let(:service)       { described_class.new(steam_service, request) }
 
   describe '#submit' do
 
+    before { expect(request_env).to receive(:[]).with('locomotive.site').and_return(site) }
+
     let(:attributes) { { 'name' => 'John Doe', 'message' => 'Hello' } }
 
     subject { service.submit(content_type.slug, attributes) }

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

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe Locomotive::Steam::AsyncEmailService do
+
+  let(:page_finder)   { instance_double('PageFinder') }
+  let(:liquid_parser) { instance_double('LiquidParser') }
+  let(:asset_host)    { instance_double('AssetHost') }
+  let(:simulation)    { false }
+  let(:service)       { described_class.new(page_finder, liquid_parser, asset_host, simulation) }
+
+  describe '#send_email!' do
+
+    let(:options) { { to: 'john@doe.net', attachments: { 'foo.png' => 'Hello world' }, via: :smtp, via_options: { address: 'smtp.mydomain.org', authentication: :plain } } }
+
+    subject { service.send_email!(options) }
+
+    it 'creates a new job' do
+      expect(Locomotive::SendPonyEmailJob).to receive(:perform_later).with({
+        'to'  => 'john@doe.net',
+        'attachments' => { 'foo.png' => "SGVsbG8gd29ybGQ=\n" },
+        'via' => 'smtp',
+        'via_options' => {
+          'address' => 'smtp.mydomain.org',
+          'authentication' => 'plain'
+        }
+      })
+      subject
+    end
+
+    context 'no via options' do
+
+      let(:options) { { to: 'john@doe.net' } }
+
+      it 'creates a new job' do
+        expect(Locomotive::SendPonyEmailJob).to receive(:perform_later).with({
+          'to'  => 'john@doe.net'
+        })
+        subject
+      end
+
+    end
+
+  end
+
+end

data/spec/models/locomotive/concerns/page/layout_spec.rb

@@ -8,6 +8,32 @@ describe Locomotive::Concerns::Page::Layout do
   let(:layout)        { Locomotive::Page.new(_id: 42, is_layout: true, fullpath: 'awesome-layout') }
   let(:page)          { Locomotive::Page.new(layout: layout, allow_layout: allow_layout, site: site, raw_template: template) }
 
+  describe '#use_layout?' do
+
+    let(:template) { 'Hello world!' }
+
+    subject { page.use_layout? }
+
+    it { is_expected.to eq false }
+
+    context 'page inheriting from its parent page' do
+
+      let(:template) { '{% extends parent %}' }
+
+      it { is_expected.to eq true }
+
+    end
+
+    context 'page inheriting from another page' do
+
+      let(:template) { '{% extends layouts/default %}' }
+
+      it { is_expected.to eq true }
+
+    end
+
+  end
+
   describe '#find_layout' do
 
     subject { page.find_layout; page.layout_id }