locomotivecms_steam 1.1.2 → 1.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f9df68e43afc27c2b1791937e36cc3755b31516
-  data.tar.gz: bfea5634abf89f91ebd523b01dd58f51ce6a7d65
+  metadata.gz: 2a2b0e0615f8c591f1c412fe1c9f7f4c6a112287
+  data.tar.gz: c032bbb2a96e67b56a3ad1941889329ad86d644a
 SHA512:
-  metadata.gz: b7fd99e9a39fd88391391d55345cff0e13537cb8b504dd6af0b4c7c8b043ffc6a47c30d9491b18f4e5aee4b78ea8d8ccfabd1cf596356ee727d053d381b361da
-  data.tar.gz: e62db05b922358598d8841a86a76910e32a2dc7fc3879e034246e2c0aaf1bdbe4bd3a4984e5165c5e0a43a0bc8317d8e373da2da0a495cca1ddca8003c33a7e9
+  metadata.gz: 9d458caf6b4e974c00ea5c046cec40273aae8845964478e8c762b6147d177b9119247a73d0d34682f8df427bcdcdac10a9f8eeb1c0b397d4e50b4e44c5be945f
+  data.tar.gz: 346b31f343f138e208b95b77edab81f772855ebd499fd4dd98a70c2b5637982d1ef6a02a821584204e71c3d9e2c89110342d8176836fcd89075177d5ed343f4b

data/Gemfile

@@ -29,8 +29,8 @@ group :test do
 
   gem 'rack-test',          '~> 0.6.3'
 
-  gem 'codeclimate-test-reporter',  '~> 0.4.7',   require: false
-  gem 'coveralls',                  '~> 0.8.1',   require: false
+  gem 'codeclimate-test-reporter',  '~> 0.4.7',  require: false
+  gem 'coveralls',                  '~> 0.8.1', require: false
 end
 
 platform :ruby do

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.1.2)
+    locomotivecms_steam (1.2.0.beta1)
       RedCloth (~> 4.2.9)
       autoprefixer-rails (~> 6.3.3.1)
       chronic (~> 0.10.2)
       coffee-script (~> 2.4.1)
       compass (~> 1.0.3)
       dragonfly (~> 1.0.12)
+      duktape (~> 1.3.0.6)
       haml (~> 4.0.6)
       httparty (~> 0.13.6)
       kramdown (~> 1.10.0)
@@ -18,6 +19,7 @@ PATH
       moneta (~> 0.8.0)
       morphine (~> 0.1.1)
       nokogiri (~> 1.6.7.2)
+      pony (~> 1.11)
       rack-cache (~> 1.6.1)
       rack-rewrite (~> 1.5.1)
       rack_csrf (~> 2.5.0)
@@ -29,28 +31,28 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    activesupport (4.2.8)
+    activesupport (4.2.6)
       i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.0)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.4.0)
     attr_extras (4.4.0)
     autoprefixer-rails (6.3.3.1)
       execjs
-    bson (4.0.2)
-    byebug (8.2.1)
+    bson (4.1.1)
+    byebug (8.2.5)
     chronic (0.10.2)
-    chunky_png (1.3.8)
+    chunky_png (1.3.5)
     codeclimate-test-reporter (0.4.8)
       simplecov (>= 0.7.1, < 1.0.0)
-    coderay (1.1.0)
+    coderay (1.1.1)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.12.2)
-    colorize (0.8.1)
+    coffee-script-source (1.10.0)
+    colorize (0.7.7)
     compass (1.0.3)
       chunky_png (~> 1.2)
       compass-core (~> 1.0.2)
@@ -63,10 +65,9 @@ GEM
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
-    concurrent-ruby (1.0.5)
-    coveralls (0.8.10)
+    concurrent-ruby (1.0.2)
+    coveralls (0.8.13)
       json (~> 1.8)
-      rest-client (>= 1.6.8, < 2)
       simplecov (~> 0.11.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
@@ -74,23 +75,18 @@ GEM
     crass (1.0.2)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    domain_name (0.5.25)
-      unf (>= 0.0.5, < 1.0.0)
     dragonfly (1.0.12)
       addressable (~> 2.3)
       multi_json (~> 1.0)
       rack (>= 1.3.0)
+    duktape (1.3.0.6)
     execjs (2.7.0)
-    fast_stack (0.1.0)
-      rake
-      rake-compiler
-    ffi (1.9.18)
+    fast_stack (0.2.0)
+    ffi (1.9.10)
     flamegraph (0.1.0)
       fast_stack
     haml (4.0.7)
       tilt
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
     httparty (0.13.7)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
@@ -112,24 +108,27 @@ GEM
       attr_extras (~> 4.4.0)
       colorize
       stringex (~> 2.6.0)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
     memory_profiler (0.9.6)
     method_source (0.8.2)
     mime-types (2.6.2)
     mimetype-fu (0.1.2)
     mini_portile2 (2.0.0)
-    minitest (5.10.1)
-    moneta (0.8.1)
-    mongo (2.2.3)
+    minitest (5.9.0)
+    moneta (0.8.0)
+    mongo (2.2.5)
       bson (~> 4.0)
     morphine (0.1.1)
-    multi_json (1.11.2)
-    multi_xml (0.6.0)
-    netrc (0.11.0)
+    multi_json (1.12.0)
+    multi_xml (0.5.5)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
-    nokogumbo (1.4.10)
+    nokogumbo (1.4.7)
       nokogiri
     origin (2.1.1)
+    pony (1.11)
+      mail (>= 2.0)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -137,38 +136,31 @@ GEM
     pry-byebug (3.3.0)
       byebug (~> 8.0)
       pry (~> 0.10)
-    public_suffix (2.0.5)
-    puma (2.15.3)
+    puma (3.4.0)
     rack (1.6.4)
     rack-cache (1.6.1)
       rack (>= 0.4)
-    rack-mini-profiler (0.9.8)
-      rack (>= 1.1.3)
+    rack-mini-profiler (0.9.9.2)
+      rack (>= 1.2.0)
     rack-rewrite (1.5.1)
     rack-test (0.6.3)
       rack (>= 1.0)
     rack_csrf (2.5.0)
       rack (>= 1.1.0)
     rake (10.4.2)
-    rake-compiler (0.9.5)
-      rake
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.8)
+    rb-fsevent (0.9.7)
+    rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
       rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.1)
+    rspec-core (3.4.4)
       rspec-support (~> 3.4.0)
     rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.0)
+    rspec-mocks (3.4.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
@@ -176,8 +168,8 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4.1)
-    sass (3.4.23)
-    simplecov (0.11.1)
+    sass (3.4.22)
+    simplecov (0.11.2)
       docile (~> 1.1.0)
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
@@ -186,20 +178,17 @@ GEM
     sprockets (3.5.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    stackprof (0.2.7)
-    stringex (2.6.1)
+    stackprof (0.2.9)
+    stringex (2.6.0)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
     thor (0.19.1)
-    thread_safe (0.3.6)
-    tilt (2.0.6)
-    timecop (0.8.0)
+    thread_safe (0.3.5)
+    tilt (2.0.4)
+    timecop (0.8.1)
     tins (1.6.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.1)
     yui-compressor (0.12.0)
 
 PLATFORMS

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

@@ -9,9 +9,8 @@ module Locomotive::Steam
 
           def setup(scope)
             super.tap do
-              @ids, @parent_ids = {}, {}
-              @content_types    = {}
-              @localized = locales.inject({}) { |m, l| m[l] = {}; m }
+              @ids, @parent_ids, @templatized_ids = {}, {}, {}
+              @localized      = locales.inject({}) { |m, l| m[l] = {}; m }
             end
           end
 
@@ -22,27 +21,31 @@ module Locomotive::Steam
 
             locales.each do |locale|
               set_default_redirect_type(entity, locale)
-              modify_if_templatized(entity, locale)
             end
+
+            check_and_mark_as_templatized(entity)
           end
 
           def apply_to_dataset(dataset)
             sorted_collection(dataset.records.values).each do |page|
               locales.each do |locale|
+                set_parent_id(page)
+
+                modify_if_parent_templatized(page, locale)
+
                 # the following method needs to be called first
                 set_fullpath_for(page, locale)
 
-                set_parent_id(page)
                 use_default_locale_template_path(page, locale)
               end
-
-              modify_if_nested_templatized(page)
             end
           end
 
           # when this is called, the @ids hash has been populated completely
           def set_parent_id(page)
-            return if page.not_found?
+            page._fullpath ||= page.attributes.delete(:_fullpath)
+
+            return if page._fullpath == '404'
 
             parent_key = parent_fullpath(page)
 
@@ -69,17 +72,7 @@ module Locomotive::Steam
             end
           end
 
-          def modify_if_nested_templatized(page)
-            if content_type = fetch_content_type(parent_fullpath(page))
-              # not a templatized page but it becomes one because
-              # its parent is one of them
-              _modify_if_templatized(page, content_type)
-            end
-          end
-
           def set_fullpath_for(page, locale)
-            page._fullpath ||= page.attributes.delete(:_fullpath)
-
             slug = fullpath = page.slug[locale].try(:to_s)
 
             return if slug.blank?
@@ -98,7 +91,7 @@ module Locomotive::Steam
 
             page.depth = page[:_fullpath].split('/').size
 
-            if page.depth == 1 && system_pages?(page)
+            if system_pages?(page)
               page.depth = 0
             end
 
@@ -106,6 +99,7 @@ module Locomotive::Steam
           end
 
           def system_pages?(page)
+            page.depth == 1 &&
             %w(index 404).include?(page.slug.values.compact.first)
           end
 
@@ -114,19 +108,11 @@ module Locomotive::Steam
           end
 
           def parent_fullpath(page)
-            return nil if page._fullpath == 'index'
+            return nil if page._fullpath == 'index' || page._fullpath == '404'
             path = page._fullpath.split('/')[0..-2].join('/')
             path.blank? ? 'index' : path
           end
 
-          def fetch_content_type(fullpath)
-            @content_types[fullpath]
-          end
-
-          def set_content_type(fullpath, value)
-            @content_types[fullpath] = value
-          end
-
           def fetch_localized_fullpath(fullpath, locale)
             @localized[locale][fullpath]
           end
@@ -139,17 +125,26 @@ module Locomotive::Steam
             @ids[entity[:_fullpath]] = entity._id
           end
 
-          def modify_if_templatized(page, locale)
+          def check_and_mark_as_templatized(page)
             if content_type = page[:content_type]
-              _modify_if_templatized(page, content_type)
-              page[:slug][locale] = Locomotive::Steam::WILDCARD
-              set_content_type(page[:_fullpath], content_type)
+              mark_as_templatized(page, content_type)
             end
           end
 
-          def _modify_if_templatized(page, content_type)
-            page[:templatized]        = true
-            page[:target_klass_name]  = "Locomotive::ContentEntry#{content_type}"
+          def mark_as_templatized(page, content_type)
+            @templatized_ids[page._id]  = content_type
+            page[:templatized]          = true
+            page[:target_klass_name]    = "Locomotive::ContentEntry#{content_type}"
+          end
+
+          def modify_if_parent_templatized(page, locale)
+            parent_templatized = @templatized_ids[page.parent_id]
+
+            if page[:templatized]
+              page[:slug][locale] = Locomotive::Steam::WILDCARD unless parent_templatized
+            elsif parent_templatized
+              mark_as_templatized(page, parent_templatized)
+            end
           end
 
         end

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

@@ -45,6 +45,10 @@ module Locomotive::Steam
       entity
     end
 
+    def update(mapper, scope, entity)
+      entity
+    end
+
     def inc(mapper, entity, attribute, amount = 1)
       entity.tap do
         entity[attribute] ||= 0
@@ -64,6 +68,10 @@ module Locomotive::Steam
       ''
     end
 
+    def make_id(value)
+      value
+    end
+
     def count(mapper, scope, &block)
       query(mapper, scope, &block).count
     end

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

@@ -20,6 +20,13 @@ module Locomotive::Steam
           entity
         end
 
+        def update(entity)
+          entity.tap do
+            serialized_entity = @mapper.serialize(entity)
+            @collection.find(_id: entity._id).update_one(serialized_entity)
+          end
+        end
+
         def inc(entity, attribute, amount = 1)
           entity.tap do
             @collection.find(_id: entity._id).update_one('$inc' => { attribute => amount })
@@ -29,7 +36,7 @@ module Locomotive::Steam
         end
 
         def delete(entity)
-          @collection.find(_id: entity._id).delete_one if entity._id
+          @collection.find(_id: entity._id).delete_one
         end
 
       end

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

@@ -27,13 +27,18 @@ module Locomotive::Steam
     end
 
     def find(mapper, scope, id)
-      query(mapper, scope) { where(_id: BSON::ObjectId.from_string(id)) }.first
+      _id = make_id(id)
+      query(mapper, scope) { where(_id: _id) }.first
     end
 
     def create(mapper, scope, entity)
       command(mapper).insert(entity)
     end
 
+    def update(mapper, scope, entity)
+      command(mapper).update(entity)
+    end
+
     def inc(mapper, entity, attribute, amount = 1)
       command(mapper).inc(entity, attribute, amount)
     end
@@ -46,6 +51,10 @@ module Locomotive::Steam
       name.to_sym.__send__(operator.to_sym)
     end
 
+    def make_id(id)
+      BSON::ObjectId.from_string(id)
+    end
+
     def base_url(mapper, scope, entity = nil)
       return nil if scope.site.nil?
 

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

@@ -76,19 +76,22 @@ module Locomotive::Steam
     end
 
     def to_hash
+      hash = {}
+
       # default attributes
       _attributes = %i(_id _slug _label _visible _position content_type_slug created_at updated_at)
 
       # dynamic attributes
       _attributes += content_type.persisted_field_names
 
-      _attributes.inject({}) do |hash, name|
-        hash[name.to_s] = send(name)
-        hash
-      end.tap do |hash|
-        # errors?
-        hash['errors'] = self.errors.to_hash.stringify_keys unless self.errors.empty?
+      _attributes.each do |name|
+        hash[name.to_s] = send(name) rescue nil
       end
+
+      # errors?
+      hash['errors'] = self.errors.to_hash.stringify_keys unless self.errors.empty?
+
+      hash
     end
 
     def to_liquid
@@ -184,6 +187,10 @@ module Locomotive::Steam
         base.blank? ? filename : "#{base}/#{filename}"
       end
 
+      def to_hash
+        { 'url' => url, 'filename' => filename, 'size' => size, 'updated_at' => updated_at }
+      end
+
       def to_json
         url
       end

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

@@ -48,6 +48,10 @@ module Locomotive::Steam
       attributes[:fullpath].values.first == '404'
     end
 
+    def layout?
+      (attributes[:fullpath].values.first =~ Locomotive::Steam::IsLAYOUT) == 0
+    end
+
     def source
       self[:raw_template]
     end

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

@@ -13,6 +13,7 @@ module Locomotive::Steam
         template_version:         nil,
         domains:                  [],
         redirect_to_first_domain: false,
+        redirect_to_https:        false,
         url_redirections:         [],
         private_access:           false,
         password:                 nil,

data/lib/locomotive/steam/errors.rb

@@ -3,6 +3,9 @@ module Locomotive::Steam
   class NoSiteException < ::Exception
   end
 
+  class ActionException < ::Exception
+  end
+
   class RenderError < ::StandardError
 
     LINES_RANGE = 10

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

@@ -26,14 +26,12 @@ module Locomotive
             fetch_url_whitelist /.+/
           end
 
-          if ::Dragonfly.logger.nil?
-            ::Dragonfly.logger = Locomotive::Common::Logger.instance
-          end
+          ::Dragonfly.logger = Locomotive::Common::Logger
         end
 
         def find_imagemagick_commands
-          convert   = `which convert`.strip.presence || '/usr/local/bin/convert'
-          identify  = `which identify`.strip.presence || '/usr/local/bin/identify'
+          convert   = ENV['IMAGE_MAGICK_CONVERT'] || `which convert`.strip.presence || '/usr/local/bin/convert'
+          identify  = ENV['IMAGE_MAGICK_IDENTIFY'] || `which identify`.strip.presence || '/usr/local/bin/identify'
 
           if File.exists?(convert)
             { convert_command: convert, identify_command: identify }

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

@@ -5,6 +5,8 @@ require 'compass'
 require 'autoprefixer-rails'
 require 'open3'
 
+require 'execjs'
+
 module Locomotive::Steam
 
   class YUICompressorRuntimeError < RuntimeError
@@ -65,6 +67,8 @@ module Locomotive::Steam
 
   class SprocketsEnvironment < ::Sprockets::Environment
 
+    attr_reader :steam_path
+
     def initialize(root, options = {})
       super(root)
 
@@ -75,6 +79,12 @@ module Locomotive::Steam
       install_yui_compressor(options)
 
       install_autoprefixer
+
+      context_class.class_eval do
+        def asset_path(path, options = {})
+          path
+        end
+      end
     end
 
     private

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

@@ -62,6 +62,10 @@ 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
+                when :many_to_many
+                  hash[name] = (@_source.send(name) || []).all.map { |e| liquify_entry(e)._slug }.compact
                 when :file
                   hash[name] = hash["#{name}_url"] = file_field_to_url(hash[name.to_s]) if hash[name.to_s].present?
                 when :select
@@ -77,6 +81,10 @@ module Locomotive
 
           protected
 
+          def liquify_entry(entry)
+            self.class.new(entry).tap { |drop| drop.context = @context }
+          end
+
           def file_field_to_url(field)
             field.to_liquid.tap { |drop| drop.context = @context }.url
           end

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

@@ -5,7 +5,7 @@ module Locomotive
 
         class ContentEntryCollection < ::Liquid::Drop
 
-          delegate :first, :last, :each, :each_with_index, :empty?, :any?, to: :collection
+          delegate :first, :last, :each, :each_with_index, :empty?, :any?, :map, to: :collection
 
           def initialize(content_type, repository = nil)
             @content_type = content_type

data/lib/locomotive/steam/liquid/tags/action.rb

@@ -0,0 +1,59 @@
+module Locomotive
+  module Steam
+    module Liquid
+      module Tags
+
+        # Execute javascript code server side.
+        # The API allows you to:
+        # - access the current liquid context
+        # - modify the session
+        # - send emails
+        # - find / create / update content entries
+        #
+        # Usage:
+        #
+        # {% action "My javascript action" %}
+        #   var lastPost = allEntries('posts', { 'posted_at.lte': getProp('today'), published: true, order_by: 'posted_at desc' })[0];
+        #   var views = lastPost.views + 1;
+        #
+        #   updateEntry('posts', lastPost._id, { views: views });
+        #
+        #   setProp('views', views);
+        # {% endaction %}
+        #
+        # <p>Number of views for the last published post: {{ views }}</p>
+        #
+        class Action < ::Liquid::Block
+
+          Syntax = /(#{::Liquid::QuotedString}+)/o
+
+          def initialize(tag_name, markup, options)
+            if markup =~ Syntax
+              @description = $1.to_s
+            else
+              raise ::Liquid::SyntaxError.new("Syntax Error in 'action' - Valid syntax: action \"<description>\"")
+            end
+            super
+          end
+
+          def render(context)
+            Locomotive::Common::Logger.info "[action] executing #{@description}"
+            service(context).run(super, context['params'], context)
+            ''
+          end
+
+          private
+
+          def service(context)
+            context.registers[:services].action
+          end
+
+        end
+
+        ::Liquid::Template.register_tag('action'.freeze, Action)
+
+      end
+    end
+  end
+end
+

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

@@ -59,7 +59,7 @@ module Locomotive::Steam
         if error_location =~ HTTP_REGEXP
           redirect_to error_location
         else
-          env['PATH_INFO'] = error_location
+          env['PATH_INFO'] = make_local_path(error_location)
           store_in_liquid(entry)
           self.next
         end