locomotivecms_steam 1.4.1 → 1.5.0.beta1

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

@@ -3,7 +3,7 @@ module Locomotive::Steam
 
     class TemplatizedPage < ThreadSafe
 
-      include Helpers
+      include Concerns::Helpers
 
       def _call
         if page && page.templatized?

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

@@ -6,10 +6,14 @@ module Locomotive::Steam::Middlewares
     attr_accessor :env
 
     def call(env)
-      threadsafed     = dup
+      threadsafed = dup
       threadsafed.env = env
 
-      threadsafed._call
+      # time = Benchmark.realtime do
+      threadsafed._call # thread-safe purpose
+      # end
+
+      # puts "[Benchmark][#{self.class.name}] Time elapsed #{time*1000} milliseconds"
 
       threadsafed.next
     end
@@ -19,6 +23,85 @@ module Locomotive::Steam::Middlewares
       @next_response || (@next_response = app.call(env))
     end
 
+    #= Shortcuts =
+
+    def services
+      @services ||= env.fetch('steam.services')
+    end
+
+    def repositories
+      @repositories ||= services.repositories
+    end
+
+    def request
+      @request ||= env.fetch('steam.request')
+    end
+
+    def site
+      @site ||= env.fetch('steam.site')
+    end
+
+    def page
+      @page ||= env.fetch('steam.page')
+    end
+
+    def path
+      @path ||= env.fetch('steam.path')
+    end
+
+    def locale
+      @locale ||= env.fetch('steam.locale')
+    end
+
+    def liquid_assigns
+      @liquid_assigns ||= env.fetch('steam.liquid_assigns')
+    end
+
+    def locales
+      site.locales
+    end
+
+    def default_locale
+      site.default_locale
+    end
+
+    def params
+      @params ||= if request.content_type == 'application/json' && (request.post? || request.put?)
+        request.body.rewind
+        JSON.parse(request.body.read).with_indifferent_access
+      else
+        request.params.with_indifferent_access
+      end
+    end
+
+    def merge_with_params(values)
+      values.each { |name, value| self.request.params[name] = value }
+      @params = nil
+    end
+
+    def session
+      env['rack.session']
+    end
+
+    def live_editing?
+      !!env['steam.live_editing']
+    end
+
+    def decorate_entry(entry)
+      return nil if entry.nil?
+      Locomotive::Steam::Decorators::I18nDecorator.new(entry, locale, default_locale)
+    end
+
+    def default_liquid_context
+      ::Liquid::Context.new({ 'site' => site.to_liquid }, {}, {
+        request:        request,
+        locale:         locale,
+        site:           site,
+        services:       services,
+        repositories:   services.repositories
+      }, true)
+    end
+
   end
 
 end

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

@@ -5,7 +5,7 @@ module Locomotive::Steam
     #
     class Timezone < ThreadSafe
 
-      include Helpers
+      include Concerns::Helpers
 
       def _call
         timezone = site.try(:timezone)

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

@@ -9,7 +9,7 @@ module Locomotive::Steam
     #
     class UrlRedirection < ThreadSafe
 
-      include Helpers
+      include Concerns::Helpers
 
       def _call
         if url = redirect_url

data/lib/locomotive/steam/models/entity.rb

@@ -1,6 +1,5 @@
 module Locomotive::Steam
   module Models
-
     module Entity
 
       include Locomotive::Steam::Models::Concerns::Validation
@@ -47,7 +46,6 @@ module Locomotive::Steam
       def serialize
         attributes.dup
       end
-
     end
   end
 end

data/lib/locomotive/steam/models/mapper.rb

@@ -92,7 +92,7 @@ module Locomotive::Steam
 
       def i18n_value_of(entity, name, locale)
         value = entity.send(name.to_sym)
-        value.respond_to?(:translations) ? value[locale] : value
+        (value.respond_to?(:translations) ? value[locale] : value)
       end
 
       def reset_entity_map
@@ -141,9 +141,11 @@ module Locomotive::Steam
       end
 
       def cache_entity(entity_klass, attributes, &block)
-        return yield if attributes['_id'].blank?
+        entity_id = attributes['_id'] || attributes[:_id] # FIXME: in Wagon, we deal with symbols
 
-        key = "#{entity_klass.to_s}-#{attributes['_id']}"
+        return yield if entity_id.blank?
+
+        key = "#{entity_klass.to_s}-#{entity_id}"
 
         if (entity = @entity_map[key]).nil?
           entity = @entity_map[key] = yield

data/lib/locomotive/steam/models/scope.rb

@@ -17,6 +17,14 @@ module Locomotive::Steam
         site.try(:locales)
       end
 
+      def with_locale(locale, &block)
+        @previous_locale = @locale
+        @locale = locale
+        yield.tap do
+          @locale = @previous_locale
+        end
+      end
+
       def apply(attributes)
         attributes['site_id'] = @site._id
       end

data/lib/locomotive/steam/repositories.rb

@@ -25,6 +25,10 @@ module Locomotive
         SnippetRepository.new(adapter, current_site, locale)
       end
 
+      register :section do
+        SectionRepository.new(adapter, current_site, locale)
+      end
+
       register :content_type do
         ContentTypeRepository.new(adapter, current_site, locale)
       end

data/lib/locomotive/steam/repositories/content_entry_repository.rb

@@ -104,7 +104,7 @@ module Locomotive
         _groups = all.group_by { |entry| i18n_value_of(entry, name) }
 
         groups_to_array(name, _groups).tap do |groups|
-          # entries with a not existing select_option value?
+          # entries with a non existing select_option value?
           unless _groups.blank?
             groups << { name: nil, entries: _groups.values.flatten }.with_indifferent_access
           end
@@ -205,6 +205,7 @@ module Locomotive
           @conditions = conditions.try(:with_indifferent_access) || {}
           @fields, @operators = fields, {}
           @target_repository = target_repository
+          @locale = target_repository.locale
 
           @conditions.each do |name, value|
             _name, operator = name.to_s.split('.')
@@ -213,8 +214,11 @@ module Locomotive
         end
 
         def prepare
-          # selects
           _prepare(@fields.selects) do |field, value|
+            # FIXME: [only in Wagon], if the user changes the locale, since all content is stored in memory,
+            # we have to change the locale in the repository used to fetch the select options.
+            field.select_options.locale = @locale
+
             field.select_options.by_name(value).try(:_id)
           end
 

data/lib/locomotive/steam/repositories/page_repository.rb

@@ -7,7 +7,10 @@ module Locomotive
 
       # Entity mapping
       mapping :pages, entity: Page do
-        localized_attributes :title, :slug, :permalink, :source, :raw_template, :template_path, :redirect_url, :fullpath, :seo_title, :meta_description, :meta_keywords
+        localized_attributes :title, :slug, :permalink,
+          :source, :raw_template, :template_path, :redirect_url, :fullpath,
+          :sections_content, :sections_dropzone_content,
+          :seo_title, :meta_description, :meta_keywords
 
         embedded_association :editable_elements, EditableElementRepository
       end

data/lib/locomotive/steam/repositories/section_repository.rb

@@ -0,0 +1,14 @@
+module Locomotive
+  module Steam
+    class SectionRepository
+
+      include Models::Repository
+
+      mapping :sections, entity: Section
+
+      def by_slug(slug)
+        first { where(slug: slug) }
+      end
+    end
+  end
+end

data/lib/locomotive/steam/repositories/site_repository.rb

@@ -7,7 +7,7 @@ module Locomotive
 
       # Entity mapping
       mapping :sites, entity: Site do
-        localized_attributes :seo_title, :meta_description, :meta_keywords
+        localized_attributes :seo_title, :meta_description, :meta_keywords, :sections_content
       end
 
       def by_domain(domain)

data/lib/locomotive/steam/repositories/snippet_repository.rb

@@ -1,11 +1,9 @@
 module Locomotive
   module Steam
-
     class SnippetRepository
 
       include Models::Repository
 
-      # Entity mapping
       mapping :snippets, entity: Snippet do
         localized_attributes :template_path, :template, :source
       end
@@ -13,7 +11,6 @@ module Locomotive
       def by_slug(slug)
         first { where(slug: slug) }
       end
-
     end
   end
 end

data/lib/locomotive/steam/server.rb

@@ -31,7 +31,7 @@ module Locomotive::Steam
           if configuration.serve_assets
             use ::Rack::Static, {
               root: configuration.asset_path,
-              urls: ['/images', '/fonts', '/samples', '/sites']
+              urls: ['/images', '/fonts', '/samples', '/sites', '/misc', '/others', '/pdfs', '/media']
             }
             use Middlewares::DynamicAssets, {
               root:   configuration.asset_path,
@@ -55,6 +55,7 @@ module Locomotive::Steam
           Middlewares::DefaultEnv,
           Middlewares::Site,
           Middlewares::Logging,
+          Middlewares::EncodedLinkRedirection,
           Middlewares::UrlRedirection,
           Middlewares::Robots,
           Middlewares::Timezone,
@@ -66,6 +67,7 @@ module Locomotive::Steam
           Middlewares::PrivateAccess,
           Middlewares::Path,
           Middlewares::Page,
+          Middlewares::Section,
           Middlewares::Sitemap,
           Middlewares::TemplatizedPage
         ]

data/lib/locomotive/steam/services.rb

@@ -15,6 +15,14 @@ module Locomotive
         end
       end
 
+      # Used to get an easy access to some of the services (url_builder)
+      # without passing a request
+      def self.build_simple_instance(site)
+        Instance.new(nil).tap do |instance|
+          instance.current_site = site
+        end
+      end
+
       class Defer < SimpleDelegator
         def initialize(&block)
           @constructor = block
@@ -62,6 +70,10 @@ module Locomotive
           Steam::SnippetFinderService.new(repositories.snippet)
         end
 
+        register :section_finder do
+          Steam::SectionFinderService.new(repositories.section)
+        end
+
         register :action do
           Steam::ActionService.new(current_site, email, content_entry: content_entry, api: external_api, redirection: page_redirection)
         end
@@ -79,7 +91,11 @@ module Locomotive
         end
 
         register :url_builder do
-          Steam::UrlBuilderService.new(current_site, locale, request)
+          Steam::UrlBuilderService.new(current_site, locale, request&.env&.fetch('steam.mounted_on', nil))
+        end
+
+        register :url_finder do
+          Steam::UrlFinderService.new(url_builder, page_finder, content_entry)
         end
 
         register :page_redirection do

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

@@ -18,6 +18,8 @@ module Locomotive
         setProp
         getSessionProp
         setSessionProp
+        getCookiesProp
+        setCookiesProp
         sendEmail
         allEntries
         findEntry
@@ -81,6 +83,14 @@ module Locomotive
         -> (name, value) { liquid_context.registers[:session][name.to_sym] = value }
       end
 
+      def get_cookies_prop_lambda(liquid_context)
+        -> (name) { liquid_context.registers[:cookies][name.to_s].as_json }
+      end
+
+      def set_cookies_prop_lambda(liquid_context)
+        -> (name, value) { liquid_context.registers[:cookies][name.to_s] = value.to_s }
+      end
+
       def all_entries_lambda(liquid_context)
         -> (type, conditions) { content_entry_service.all(type, conditions, true) }
       end

data/lib/locomotive/steam/services/concerns/decorator.rb

@@ -26,9 +26,7 @@ module Locomotive
           def default_locale
             repository.site.default_locale
           end
-
         end
-
       end
     end
   end

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

@@ -42,7 +42,7 @@ module Locomotive
         elsif source.respond_to?(:url)
           source.url
         else
-          source
+          source&.to_s
         end
         value.strip if value
       end

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

@@ -25,6 +25,12 @@ module Locomotive
         end
       end
 
+      def find_by_id(id)
+        decorate do
+          repository.find(id)
+        end
+      end
+
       private
 
       def decorate(&block)

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

@@ -0,0 +1,17 @@
+module Locomotive
+  module Steam
+    class SectionFinderService
+
+      include Locomotive::Steam::Services::Concerns::Decorator
+
+      attr_accessor_initialize :repository
+
+      def find(slug)
+        decorate do
+          repository.by_slug(slug)
+        end
+      end
+    end
+  end
+end
+

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

@@ -3,25 +3,44 @@ module Locomotive
 
     class UrlBuilderService
 
-      attr_accessor_initialize :site, :current_locale, :request
+      attr_accessor_initialize :site, :current_locale, :mounted_on
 
-      def url_for(page, locale = nil)
-        prefix(_url_for(page, locale))
+      def url_for(page, locale = nil, prefix_default_locale = nil)
+        prefix(_url_for(page, locale, prefix_default_locale))
       end
 
-      def _url_for(page, locale = nil)
-        [''].tap do |segments|
-          locale ||= current_locale
-          same_locale = locale.to_sym == site.default_locale.to_sym
+      def _url_for(page, locale = nil, prefix_default_locale = nil)
+        locale          = locale&.to_sym
+        _locale         = (locale || current_locale).to_sym
+        default_locale  = site.default_locale.to_sym
+        same_locale     = _locale == default_locale
+
+        # the prefix_default_locale can override the site.prefix_default_locale attribute
+        prefix_default_locale = prefix_default_locale.nil? ? site.prefix_default_locale : prefix_default_locale
 
-          # if the prefix_default_locale is enabled, we need to
-          # add the locale no matter if the locale is the same as the default one
-          if site.prefix_default_locale || !same_locale
+        fullpath = sanitized_fullpath(page, same_locale)
+
+        [''].tap do |segments|
+          # To insert the locale in the path, 2 cases:
+          #
+          # 1.  if the prefix_default_locale is enabled, we need to
+          #     add the locale no matter if the locale is the same as the default one.
+          #
+          # 2.  since we also store the locale in session, calling the index page ("/")
+          #     will always return the page in the locale stored in session.
+          #     In order to see the index page in the default locale, we need to allow
+          #     "/<default locale>" instead of just "/".
+          #
+          if prefix_default_locale || !same_locale
+            segments << _locale
+          elsif fullpath.blank? && locale == default_locale && current_locale != locale
             segments << locale
           end
 
-          # fullpath
-          segments << sanitized_fullpath(page, same_locale)
+          # we don't want a trailing slash for the home page if a locale is set
+          fullpath = nil if segments.size == 2 && fullpath.blank?
+
+          segments << fullpath
         end.compact.join('/')
       end
 
@@ -39,11 +58,6 @@ module Locomotive
 
       private
 
-      def mounted_on
-        return if request.nil?
-        request.env['steam.mounted_on']
-      end
-
       def sanitized_fullpath(page, same_locale)
         path = page.fullpath