locomotivecms_steam 1.3.0.rc2 → 1.3.0

data/config/locales/en.yml

@@ -12,6 +12,7 @@ en:
       es: Spanish
       ru: Russian
       et: Estonian
+      el: Greek
 
   errors:
     syntax:
@@ -27,7 +28,11 @@ en:
       session_assign: "Syntax Error in 'session_assign' - Valid syntax: session_assign [var] = [source]"
     messages:
       blank: "can't be blank"
-      unique: "must be unique"
+      taken: "must be unique"
+      confirmation: doesn't match %{attribute}
+      too_short:
+        one: is too short (minimum is 1 character)
+        other: is too short (minimum is %{count} characters)
 
   pagination:
     previous: "« Previous"

data/config/locales/es.yml

@@ -12,10 +12,16 @@ es:
       es: Español
       ru: Ruso
       et: Estonio
+      el: Griego
 
   errors:
     messages:
       blank: "no puede estar en blanco"
+      taken: ya está en uso
+      confirmation: no coincide
+      too_short:
+        one: "es demasiado corto (1 carácter mínimo)"
+        other: "es demasiado corto (%{count} caracteres mínimo)"
 
   pagination:
     previous: "« Anterior"
@@ -130,4 +136,4 @@ es:
       skip_last_comma: true
       words_connector: ", "
       two_words_connector: " y "
-      last_word_connector: " y "
+      last_word_connector: " y "

data/config/locales/et.yml

@@ -12,10 +12,14 @@ et:
       es: Hispaania
       ru: Vene
       et: Eesti
+      el: Kreeka
 
   errors:
     messages:
       blank: "tühi"
+      taken: on juba võetud
+      confirmation: ei vasta kinnitusele
+      too_short: on liiga lühike (miinimum on %{count} tähemärki)
 
   pagination:
     previous: "« Eelmine"

data/config/locales/fr.yml

@@ -13,11 +13,16 @@ fr:
       ru: Russe
       et: Estonien
       ja: Japonais
+      el: Grecque
 
   errors:
     messages:
       blank: "doit être rempli(e)"
-      unique: "doit être unique"
+      taken: n'est pas disponible
+      confirmation: "ne concorde pas avec %{attribute}"
+      too_short:
+        one: est trop court (au moins un caractère)
+        other: est trop court (au moins %{count} caractères)
 
   pagination:
     previous: "« Précédent"

data/config/locales/it.yml

@@ -12,10 +12,16 @@ it:
       es: Spagnolo
       ru: Russo
       et: Estone
+      el: Greco
 
   errors:
     messages:
       blank: "non può essere lasciato in bianco"
+      taken: è già presente
+      confirmation: non coincide con %{attribute}
+      too_short:
+        one: è troppo corto (il minimo è 1 carattere)
+        other: è troppo corto (il minimo è %{count} caratteri)
 
   pagination:
     previous: "« Precedente"
@@ -152,4 +158,4 @@ it:
       skip_last_comma: true
       words_connector: ", "
       two_words_connector: " e "
-      last_word_connector: " e "
+      last_word_connector: " e "

data/config/locales/nb.yml

@@ -12,6 +12,7 @@ nb:
       es: Spansk
       ru: Russisk
       et: Estisk
+      el: Gresk
 
   date:
     formats:
@@ -20,6 +21,9 @@ nb:
   errors:
     messages:
       blank: "kan ikke være blank"
+      taken: er allerede i bruk
+      confirmation: er ikke lik %{attribute}
+      too_short: er for kort (minimum %{count} tegn)
 
   pagination:
     previous: "« Previous"
@@ -188,4 +192,4 @@ nb:
 
     percentage:
       format:
-        delimiter: ""
+        delimiter: ""

data/config/locales/nl.yml

@@ -4,16 +4,24 @@ nl:
       en: Engels
       de: Duits
       fr: Frans
+      pl: Pools
       pt-BR: "Braziliaans Portugees"
       it: Italiaans
       nl: Nederlands
       nb: Noors
+      es: Spaans
       ru: Russisch
       et: Estlands
+      el: Grieks
 
   errors:
     messages:
       blank: "mag niet leeg zijn"
+      taken: is al in gebruik
+      confirmation: komt niet overeen met %{attribute}
+      too_short:
+        one: is te kort (minimaal %{count} teken)
+        other: is te kort (minimaal %{count} tekens)
 
   number:
     format:

data/config/locales/pl.yml

@@ -12,10 +12,18 @@ pl:
       es: hiszpański
       ru: rosyjski
       et: estoński
+      el: Grecki
 
   errors:
     messages:
       blank: "nie może być puste"
+      taken: zostało już zajęte
+      confirmation: nie zgadza się z polem %{attribute}
+      too_short:
+        few: jest za krótkie (przynajmniej %{count} znaki)
+        many: jest za krótkie (przynajmniej %{count} znaków)
+        one: jest za krótkie (przynajmniej jeden znak)
+        other: jest za krótkie (przynajmniej %{count} znaków)
 
   date:
     formats:

data/config/locales/pt-BR.yml

@@ -12,10 +12,16 @@ pt-BR:
       es: Espanhol
       ru: Russo
       et: Estoniano
+      el: Grego
 
   errors:
     messages:
       blank: "não pode ficar em branco"
+      taken: já está em uso
+      confirmation: não é igual a %{attribute}
+      too_short:
+        one: 'é muito curto (mínimo: 1 caracter)'
+        other: 'é muito curto (mínimo: %{count} caracteres)'
 
   date:
     formats:

data/config/locales/ru.yml

@@ -12,10 +12,18 @@ ru:
       es: Испанский
       ru: Русский
       et: Эстонский
+      el: Греческий
 
   errors:
     messages:
-      blank: "can not be blank"
+      blank: не может быть пустым
+      taken: уже существует
+      confirmation: не совпадает со значением поля %{attribute}
+      too_short:
+        few: недостаточной длины (не может быть меньше %{count} символов)
+        many: недостаточной длины (не может быть меньше %{count} символов)
+        one: недостаточной длины (не может быть меньше %{count} символа)
+        other: недостаточной длины (не может быть меньше %{count} символа)
 
   pagination:
     previous: "« Предыдущая"

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

@@ -83,7 +83,7 @@ module Locomotive::Steam
           end
 
           def slugify(id, label, dataset, locale = nil)
-            base, index = label.permalink(false), nil
+            base, index = label.to_s.permalink(false), nil
             _slugify = -> (i) { [base, i].compact.join('-') }
 
             while !is_slug_unique?(id, _slugify.call(index), dataset, locale)

data/lib/locomotive/steam/decorators/template_decorator.rb

@@ -36,7 +36,7 @@ module Locomotive
 
         def render_haml(source, template_path)
           begin
-            Haml::Engine.new(source).render
+            Haml::Engine.new(source, escape_attrs: false).render
           rescue Haml::SyntaxError => e
             raise Steam::RenderError.new(e, template_path, source)
           end

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

@@ -64,6 +64,10 @@ module Locomotive::Steam
       self[content_type.label_field_name]
     end
 
+    def _label_of(name)
+      content_type.field_label_of(name)
+    end
+
     def localized_attributes
       @localized_attributes.tap do |hash|
         if hash && hash.has_key?(content_type.label_field_name.to_sym)

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

@@ -52,6 +52,10 @@ module Locomotive::Steam
       (self[:label_field_name] || fields.first.name).to_sym
     end
 
+    def field_label_of(name)
+      fields_by_name[name].label.downcase
+    end
+
     def order_by
       name = self[:order_by] == 'manually' ? '_position' : self[:order_by]
 

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

@@ -18,7 +18,8 @@ module Locomotive::Steam
         private_access:           false,
         password:                 nil,
         metafields_schema:        {},
-        metafields:               nil
+        metafields:               nil,
+        asset_host:               nil
       }.merge(attributes))
     end
 

data/lib/locomotive/steam/liquid/drops/content_entry.rb

@@ -67,7 +67,7 @@ module Locomotive
               @_source.content_type.fields_by_name.each do |name, field|
                 case field.type
                 when :belongs_to
-                  hash[name] = liquify_entry(@_source.send(name))._slug
+                  hash[name] = liquify_entry(@_source.send(name))._slug if hash["#{name}_id"].present?
                 when :many_to_many
                   hash[name] = (@_source.send(name) || []).all.map { |e| liquify_entry(e)._slug }.compact
                 when :file

data/lib/locomotive/steam/liquid/drops/site.rb

@@ -4,7 +4,7 @@ module Locomotive
       module Drops
         class Site < I18nBase
 
-          delegate :name, :domains, :seo_title, :meta_keywords, :meta_description, to: :@_source
+          delegate :name, :domains, :seo_title, :meta_keywords, :meta_description, :asset_host, to: :@_source
 
           def index
             @index ||= repository.root.to_liquid

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

@@ -2,6 +2,7 @@ module Locomotive::Steam
   module Middlewares
 
     # Process all the authentication actions:
+    # - sign up
     # - sign in
     # - new reset password
     # - reset password
@@ -26,10 +27,25 @@ module Locomotive::Steam
 
       private
 
+      def sign_up(options)
+        return if authenticated?
+
+        status, entry = services.auth.sign_up(options, default_liquid_context, request)
+
+        if status == :entry_created
+          store_authenticated(entry)
+          redirect_to options.callback || mounted_on
+        else
+          liquid_assigns['auth_entry'] = entry
+        end
+
+        append_message(status)
+      end
+
       def sign_in(options)
         return if authenticated?
 
-        status, entry = services.auth.sign_in(options)
+        status, entry = services.auth.sign_in(options, request)
 
         if status == :signed_in
           store_authenticated(entry)
@@ -42,6 +58,8 @@ module Locomotive::Steam
       def sign_out(options)
         return unless authenticated?
 
+        services.auth.sign_out(load_authenticated_entry, request)
+
         store_authenticated(nil)
 
         append_message(:signed_out)
@@ -102,7 +120,7 @@ module Locomotive::Steam
 
       class AuthOptions
 
-        ACTIONS = %w(sign_in sign_out forgot_password reset_password)
+        ACTIONS = %w(sign_up sign_in sign_out forgot_password reset_password)
 
         attr_reader :site, :params
 
@@ -131,7 +149,7 @@ module Locomotive::Steam
         end
 
         def id
-          params[:auth_id]
+          params[:auth_entry].try(:[], id_field) || params[:auth_id]
         end
 
         def password
@@ -162,6 +180,14 @@ module Locomotive::Steam
           params[:auth_email_handle]
         end
 
+        def disable_email
+          [1, '1', 'true', true].include?(params[:auth_disable_email])
+        end
+
+        def entry
+          params[:auth_entry]
+        end
+
         def smtp
           name = params[:auth_email_smtp_namespace] || 'smtp'
           namespace = site.metafields.try(:[], name)

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

@@ -36,16 +36,15 @@ module Locomotive
               add(attribute, :blank) if value.blank?
             end
 
-            def add(attribute, message)
-              (@messages[attribute] ||= []) << generate_message(message)
+            def add(attribute, message, options = {})
+              (@messages[attribute] ||= []) << generate_message(message, options)
             end
 
-            def generate_message(message)
-              case message
-              when :blank, :unique then I18n.t(message, scope: 'errors.messages')
-              else
-                message
-              end
+            def generate_message(message, options = {})
+              I18n.t(message, {
+                scope:    'errors.messages',
+                default:  message
+              }.merge(options))
             end
 
           end

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

@@ -40,8 +40,10 @@ module Locomotive::Steam
       end
 
       def blank?
-        @translations.blank? ||
-        @translations.values.all? { |v| v.blank? }
+        @translations.default.blank? && (
+          @translations.blank? ||
+          @translations.values.all? { |v| v.blank? }
+        )
       end
 
       def apply(&block)

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

@@ -137,7 +137,15 @@ module Locomotive
       def prepare_conditions(*conditions)
         _conditions = Conditions.new(conditions.first, self.content_type.fields, simple_clone).prepare
 
-        super({ _visible: true }, _conditions)
+        super(_conditions).tap do |final_conditions|
+          # skip the default visible condition (_visible: true) by just passing nil
+          skip_visible = final_conditions.stringify_keys.fetch('_visible', true).nil?
+
+          # clean it
+          final_conditions.delete(:_visible) || final_conditions.delete('_visible')
+
+          final_conditions[:_visible] = true unless skip_visible
+        end
       end
 
       def simple_clone

data/lib/locomotive/steam/services.rb

@@ -123,7 +123,7 @@ module Locomotive
         end
 
         register :auth do
-          Steam::AuthService.new(content_entry, email)
+          Steam::AuthService.new(current_site, content_entry, email)
         end
 
         register :cache do

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

@@ -3,12 +3,10 @@ module Locomotive
 
     class AssetHostService
 
-      attr_reader :request, :site, :host
+      attr_reader :request, :site
 
-      def initialize(request, site, host)
-        @request, @site = request, site
-
-        @host = build_host(host, request, site)
+      def initialize(request, site, default_host)
+        @request, @site, @default_host = request, site, default_host
       end
 
       def compute(source, timestamp = nil)
@@ -23,6 +21,20 @@ module Locomotive
         add_timestamp_suffix(url, timestamp)
       end
 
+      def host
+        return @host if @host
+
+        @host = if site.try(:asset_host).present?
+          build_host_with_protocol(site.asset_host)
+        elsif @default_host.respond_to?(:call)
+          @default_host.call(request, site)
+        elsif @default_host.present?
+          build_host_with_protocol(@default_host)
+        else
+          nil
+        end
+      end
+
       private
 
       def build_url(host, source)
@@ -30,18 +42,6 @@ module Locomotive
         URI.join(host, clean_source).to_s
       end
 
-      def build_host(host, request, site)
-        if host
-          if host.respond_to?(:call)
-            host.call(request, site)
-          else
-            host =~ Steam::IsHTTP ? host : "https://#{host}"
-          end
-        else
-          nil
-        end
-      end
-
       def add_timestamp_suffix(source, timestamp)
         if timestamp.nil? || timestamp == 0 || source.include?('?')
           source
@@ -50,6 +50,10 @@ module Locomotive
         end
       end
 
+      def build_host_with_protocol(host)
+        host =~ Steam::IsHTTP ? host : "https://#{host}"
+      end
+
     end
 
   end