locomotivecms_steam 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3624519a192d3e6bd9d76a79309374786f790e16
-  data.tar.gz: 24ab1580d146b35e87a7d0208a8143b18ddb3f5e
+  metadata.gz: 40ab1d48128f72e386a5703b9d7b8714e518a601
+  data.tar.gz: 9831bdde9c497e76449501f7311f0aec76d15da6
 SHA512:
-  metadata.gz: 1da4b24d96279eaa2db5e4812af1aed83ddfa12df58dec74c903deea1f098e39cd09e8d6561ae9078e5b199b704d2ebb714a61ff0546a1eb45835a8e8d35da1d
-  data.tar.gz: cb5c389a0355ba13f70b8f3491f706c5999935f0548ec7c912e2a4fc4f07db28ad4a374ee27d37ffc1cc2aa1e879ec4c3794ff0a39c92694450a18b49c93bd8c
+  metadata.gz: 011f9a7993651c5d525bc6ee9485007aa271d1c5a7742e2fa9f12f090d617d3fe64f75159d35293e7e1412eabf69e95b3223d5e60ecb8a62b2848b290c8fba64
+  data.tar.gz: e18402953d1bbad33d9325a2eb1ed9afbcc2dce76f32116bbc6d3761fefeffa12aa8f98d99b2166dd8e75c821ff5ce531139ff07ef5bdf282f89f97e44a6f530

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.0.0)
+    locomotivecms_steam (1.0.1)
       RedCloth (~> 4.2.9)
       autoprefixer-rails (~> 6.2.3)
       chronic (~> 0.10.2)
@@ -17,7 +17,7 @@ PATH
       mimetype-fu (~> 0.1.2)
       moneta (~> 0.8.0)
       morphine (~> 0.1.1)
-      nokogiri (~> 1.6.7.1)
+      nokogiri (~> 1.6.7.2)
       rack-cache (~> 1.2)
       rack-rewrite (~> 1.5.1)
       rack_csrf (~> 2.5.0)
@@ -29,7 +29,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    activesupport (4.2.5)
+    activesupport (4.2.5.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -118,7 +118,7 @@ GEM
     mime-types (2.6.2)
     mimetype-fu (0.1.2)
     mini_portile2 (2.0.0)
-    minitest (5.8.3)
+    minitest (5.8.4)
     moneta (0.8.0)
     mongo (2.2.1)
       bson (~> 4.0)
@@ -126,7 +126,7 @@ GEM
     multi_json (1.11.2)
     multi_xml (0.5.5)
     netrc (0.11.0)
-    nokogiri (1.6.7.1)
+    nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
     nokogumbo (1.4.7)
       nokogiri
@@ -140,7 +140,7 @@ GEM
       pry (~> 0.10)
     puma (2.15.3)
     rack (1.6.4)
-    rack-cache (1.5.1)
+    rack-cache (1.6.1)
       rack (>= 0.4)
     rack-mini-profiler (0.9.8)
       rack (>= 1.1.3)
@@ -153,7 +153,7 @@ GEM
     rake-compiler (0.9.5)
       rake
     rb-fsevent (0.9.7)
-    rb-inotify (0.9.5)
+    rb-inotify (0.9.7)
       ffi (>= 0.5.0)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)

data/bin/steam.rb

@@ -82,7 +82,7 @@ Locomotive::Common.configure do |config|
   config.notifier = Locomotive::Common::Logger.setup(options[:log_file])
 end
 
-app = Locomotive::Steam::Server.to_app
+app = Locomotive::Steam.to_app
 
 # Thin rack handler
 # Note: alt thin settings (Threaded)

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

@@ -45,6 +45,13 @@ module Locomotive::Steam
       entity
     end
 
+    def inc(mapper, entity, attribute, amount = 1)
+      entity.tap do
+        entity[attribute] ||= 0
+        entity[attribute] += amount
+      end
+    end
+
     def delete(mapper, scope, entity)
       # TODO: to be implemented
     end
@@ -109,7 +116,7 @@ module Locomotive::Steam
 
     def build_sanitizers
       hash = Hash.new { build_klass('Sanitizers', :simple).new }
-      %i(pages content_types content_entries snippets).inject(hash) do |memo, name|
+      %i(sites pages content_types content_entries snippets).inject(hash) do |memo, name|
         memo[name] = build_klass('Sanitizers', name).new
         memo
       end

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

@@ -16,13 +16,14 @@ module Locomotive::Steam
             dataset.all.each do |entity|
               _apply_to_dataset(entity, dataset)
             end
+            clean
           end
 
           def apply_to_entity_with_dataset(entity, dataset)
             # Note: this statement attaches the site to the entity
             apply_to_entity(entity)
 
-            # make sure it gets an unique slug and an _id
+            # make sure it gets an unique slug and an _id + set default values
             _apply_to_dataset(entity, dataset)
           end
 
@@ -31,6 +32,7 @@ module Locomotive::Steam
           def _apply_to_dataset(entity, dataset)
             set_slug(entity, dataset)
             set_id(entity)
+            set_default_values(entity)
           end
 
           def add_label(entity)
@@ -52,6 +54,21 @@ module Locomotive::Steam
             end
           end
 
+          def set_default_values(entity)
+            each_field_with_default(entity) do |field|
+              name  = field.type == 'select' ? "#{field.name}_id" : field.name
+              value = field.localized? ? entity[name][default_locale] : entity[name]
+
+              return unless value.nil?
+
+              if field.localized?
+                entity[name].translations = field.default
+              else
+                entity[name] = field.default
+              end
+            end
+          end
+
           def set_slug(entity, dataset)
             if entity._label.respond_to?(:translations) # localized?
               entity._label.each do |locale, label|
@@ -78,6 +95,15 @@ module Locomotive::Steam
             dataset.query(locale) { where(_slug: slug, k(:_id, :ne) => id) }.first.nil?
           end
 
+          def each_field_with_default(entity, &block)
+            @fields_with_default ||= entity.content_type.fields_with_default
+            @fields_with_default.each(&block)
+          end
+
+          def clean
+            @fields_with_default = nil
+          end
+
         end
 
       end

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

@@ -0,0 +1,51 @@
+module Locomotive::Steam
+  module Adapters
+    module Filesystem
+      module Sanitizers
+
+        class Site
+
+          include Adapters::Filesystem::Sanitizer
+
+          def apply_to_entity(entity)
+            entity.metafields_schema = clean_metafields_schema(entity.metafields_schema)
+          end
+
+          private
+
+          def clean_metafields_schema(schema)
+            return nil unless schema
+
+            schema.each_with_index.map do |(namespace, definitions), position|
+              {
+                name:     namespace.to_s,
+                label:    localized_label(definitions.delete(:label), namespace.to_s), # { default: namespace.to_s }.merge(definitions.delete(:label) || {}),
+                fields:   parse_metafields(definitions.delete(:fields)),
+                position: definitions.delete(:position) || position
+              }.merge(definitions)
+            end.as_json
+          end
+
+          def parse_metafields(fields)
+            fields.each_with_index.map do |(name, attributes), position|
+              if attributes # Hash
+                attributes[:label]  = { default: attributes[:label] } if attributes[:label].is_a?(String)
+                attributes[:hint]   = { default: attributes[:hint] } if attributes[:hint].is_a?(String)
+              end
+              { name: name.to_s, position: position }.merge(attributes || {})
+            end
+          end
+
+          def localized_label(label, default)
+            case label
+            when Hash   then label
+            when String then { default: label }
+            else { default: default}
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -15,9 +15,17 @@ module Locomotive
 
               attributes[:picture] = File.expand_path(File.join(site_path, 'icon.png'))
 
+              attributes[:metafields_schema] = load_metafields_schema
+
               [attributes]
             end
 
+            private
+
+            def load_metafields_schema
+              schema = _load(File.join(site_path, 'config', 'metafields_schema.yml'))
+            end
+
           end
 
         end

data/lib/locomotive/steam/adapters/mongodb.rb

@@ -34,6 +34,10 @@ module Locomotive::Steam
       command(mapper).insert(entity)
     end
 
+    def inc(mapper, entity, attribute, amount = 1)
+      command(mapper).inc(entity, attribute, amount)
+    end
+
     def delete(mapper, scope, entity)
       command(mapper).delete(entity)
     end
@@ -55,6 +59,21 @@ module Locomotive::Steam
       end
     end
 
+    class << self
+
+      attr_reader :session
+
+      def build_session(uri_or_hosts, client_options)
+        @session ||= Mongo::Client.new(uri_or_hosts, client_options)
+      end
+
+      def disconnect_session
+        @session.try(:close)
+        @session = nil
+      end
+
+    end
+
     private
 
     def query_klass
@@ -82,7 +101,7 @@ module Locomotive::Steam
     end
 
     def session
-      Thread.current[:mongo_session] ||= Mongo::Client.new(uri_or_hosts, client_options)
+      self.class.build_session(uri_or_hosts, client_options)
     end
 
     def uri_or_hosts

data/lib/locomotive/steam/adapters/mongodb/command.rb

@@ -20,6 +20,14 @@ module Locomotive::Steam
           entity
         end
 
+        def inc(entity, attribute, amount = 1)
+          entity.tap do
+            @collection.find(_id: entity._id).update_one('$inc' => { attribute => amount })
+            entity[attribute] ||= 0
+            entity[attribute] += amount
+          end
+        end
+
         def delete(entity)
           @collection.find(_id: entity._id).delete_one if entity._id
         end

data/lib/locomotive/steam/adapters/mongodb/query.rb

@@ -25,7 +25,7 @@ module Locomotive::Steam
 
         def order_by(*args)
           self.tap do
-            @sort = [*args]
+            @sort = decode_order_by(*args)
           end
         end
 
@@ -100,6 +100,25 @@ module Locomotive::Steam
           end
         end
 
+        def decode_order_by(*spec)
+          [*spec].compact.map do |arg|
+            _decode_order_by(arg)
+          end
+        end
+
+        def _decode_order_by(arg)
+          case arg
+          when String
+            if arg.include?(',')
+              _decode_order_by(arg.split(','))
+            else
+              arg.strip.split(/[\s|.]/)
+            end
+          when Array  then arg.map { |_arg| _decode_order_by(_arg) }
+          else arg
+          end
+        end
+
       end
 
     end

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

@@ -7,6 +7,7 @@ module Locomotive::Steam
 
     def_delegator :fields, :associations, :association_fields
     def_delegator :fields, :selects, :select_fields
+    def_delegator :fields, :default, :fields_with_default
 
     def initialize(attributes = {})
       super({

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

@@ -11,7 +11,8 @@ module Locomotive::Steam
         type:       :string,
         localized:  false,
         required:   false,
-        unique:     false
+        unique:     false,
+        default:    nil
       }.merge(attributes))
     end
 

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

@@ -15,7 +15,9 @@ module Locomotive::Steam
         redirect_to_first_domain: false,
         url_redirections:         [],
         private_access:           false,
-        password:                 nil
+        password:                 nil,
+        metafields_schema:        {},
+        metafields:               nil
       }.merge(attributes))
     end
 

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

@@ -47,10 +47,20 @@ module Locomotive::Steam
     end
 
     def install_autoprefixer
-      file   = File.join(root, '..', 'config', 'autoprefixer.yml')
-      params = (File.exist?(file) ? ::YAML.load_file(file) : {}).symbolize_keys
+      file = File.join(root, '..', 'config', 'autoprefixer.yml')
 
-      AutoprefixerRails.install(self, params)
+      if File.exists?(file)
+        params = (::YAML.load_file(file) || {}).symbolize_keys
+        AutoprefixerRails.install(self, params)
+
+        Locomotive::Common::Logger.info "[Autoprefixer] detected and installed".light_white
+
+        if ENV['EXECJS_RUNTIME'].blank?
+          Locomotive::Common::Logger.warn "[Autoprefixer]".light_white + " [Warning] if you notice bad performance, install NodeJS and run \"export EXECJS_RUNTIME=Node\" in your shell"
+        end
+
+        Locomotive::Common::Logger.info "\n"
+      end
     end
 
     def is_java_installed?

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

@@ -4,7 +4,7 @@ module Locomotive
       module Drops
         class ContentEntry < I18nBase
 
-          delegate :_slug, :_translated, :seo_title, :meta_keywords, :meta_description, to: :@_source
+          delegate :_slug, :_translated, :seo_title, :meta_keywords, :meta_description, :created_at, :updated_at, to: :@_source
 
           alias :_permalink :_slug
 

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

@@ -0,0 +1,97 @@
+module Locomotive
+  module Steam
+    module Liquid
+      module Drops
+
+        class MetafieldsNamespace < Base
+
+          delegate :first, :last, :each, :each_with_index, :empty?, :any?, :size, to: :labels_and_values
+
+          alias :count    :size
+          alias :length   :size
+
+          def before_method(meth)
+            find_value(meth.to_s)
+          end
+
+          def namespace=(namespace)
+            @namespace = namespace
+          end
+
+          protected
+
+          def find_value(name)
+            if field = fields[name]
+              t(values[name], field['localized'])
+            else
+              Locomotive::Common::Logger.warn "[Liquid template] unknown site metafield \"#{name}\" under #{@namespace['name']}"
+              nil
+            end
+          end
+
+          def values
+            @_source.metafields[@namespace['name']] || {}
+          end
+
+          def labels_and_values
+            return [] if @namespace['fields'].blank?
+
+            return @labels_and_values if @labels_and_values
+
+            ordered_fields = @namespace['fields'].sort { |f| f['position'] }
+
+            @labels_and_values = ordered_fields.map do |field|
+              value, localized = values[field['name']], field['localized']
+              {
+                'name'  => field['name'],
+                'label' => t(field['label']) || field['name'].humanize,
+                'value' => t(value, localized)
+              }
+            end
+          end
+
+          def fields
+            return @fields if @fields
+
+            (@fields = {}).tap do
+              (@namespace['fields'] || []).each do |field|
+                @fields[field['name']] = field
+              end
+            end
+          end
+
+          def t(value, localized = true)
+            key   = localized ? @context.registers[:locale] : 'default'
+            value = { 'default' => value } unless value.is_a?(Hash)
+            value[key]
+          end
+
+        end
+
+        class Metafields < Base
+
+          def before_method(meth)
+            find_namespace(meth.to_s)
+          end
+
+          private
+
+          def find_namespace(name)
+            if namespace = _find_namespace(name)
+              MetafieldsNamespace.new(@_source).tap { |d| d.namespace = namespace }
+            else
+              Locomotive::Common::Logger.warn "[Liquid template] unknown site metafield namespace \"#{name}\""
+              nil
+            end
+          end
+
+          def _find_namespace(name)
+            @_source.metafields_schema.find { |s| s['name'] == name }
+          end
+
+        end
+
+      end
+    end
+  end
+end