locomotivecms_steam 1.0.0.pre.beta.2 → 1.0.0.pre.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a200877da9098d215eb31f61067aa85e17cdd031
-  data.tar.gz: 7e4a6550691aa4d42578e19471457148004791d4
+  metadata.gz: afc4338f5582de4d66788ef18ebb8d1d8d3d024d
+  data.tar.gz: 457d04823de496fc46c507f64d3b1e1313c7a6dd
 SHA512:
-  metadata.gz: 35c4e6ef24a93b95c0a302174bac850a28283cb8a2efb231a0e0fa7398009654c5fa2f9bb0bd87a6c12dd59556e6510a860762a02ab3943830b078306035d15d
-  data.tar.gz: a7f438df4b3685f1da9accf8874fcc1fc18a29f141c29367acb1df52dfaae08027f0143a4a9be61ddb9424cd840656a1adbae92a83355ced83b5036938e05d33
+  metadata.gz: 38071d83a98a7e53dd81591d58f7a3b035ac244b563e2077b115ba939cddbb4b55a54ee77e60f361dde5352fe5fd14cf8547229a95116416b43189999cb9619d
+  data.tar.gz: 7378ea6a8eeda23d69bac0991d430dcaa4abed935598aca30294ba5f6a60097058b7e8f0e20a727f18c61814447a47f426278b68c249c0525e20b3c71cb204e1

data/Gemfile

@@ -7,9 +7,15 @@ group :development do
   # gem 'locomotivecms_models', '~> 0.0.1', path: '../models'
   # gem 'locomotivecms_models', '0.0.1.pre.alpha'
   # gem 'locomotivecms-liquid', path: '/Users/didier/Documents/LocomotiveCMS/gems/liquid'
-  gem 'thin'
+  # gem 'thin'
+  gem 'puma'
   # gem 'sprockets-sass',     '~> 1.2.0'
   gem 'yui-compressor',     '~> 0.12.0'
+
+  gem 'rack-mini-profiler'
+  gem 'flamegraph'
+  gem 'stackprof' # ruby 2.1+ only
+  gem 'memory_profiler'
 end
 
 group :test do

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.0.0.pre.beta.2)
+    locomotivecms_steam (1.0.0.pre.beta.3)
       RedCloth (~> 4.2.9)
       chronic (~> 0.10.2)
       coffee-script (~> 2.4.1)
@@ -28,7 +28,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    activesupport (4.2.3)
+    activesupport (4.2.4)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -70,7 +70,6 @@ GEM
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
     crass (1.0.2)
-    daemons (1.2.2)
     diff-lcs (1.2.5)
     docile (1.1.5)
     domain_name (0.5.24)
@@ -79,9 +78,13 @@ GEM
       addressable (~> 2.3)
       multi_json (~> 1.0)
       rack (>= 1.3.0)
-    eventmachine (1.0.7)
-    execjs (2.5.2)
+    execjs (2.6.0)
+    fast_stack (0.1.0)
+      rake
+      rake-compiler
     ffi (1.9.10)
+    flamegraph (0.1.0)
+      fast_stack
     haml (4.0.7)
       tilt
     hike (1.2.3)
@@ -109,11 +112,12 @@ GEM
       activesupport (~> 4.2.1)
       colorize
       stringex (~> 2.5.2)
+    memory_profiler (0.9.4)
     method_source (0.8.2)
     mime-types (2.6.1)
     mimetype-fu (0.1.2)
     mini_portile (0.6.2)
-    minitest (5.7.0)
+    minitest (5.8.0)
     moneta (0.8.0)
     moped (2.0.6)
       bson (~> 3.0)
@@ -136,15 +140,20 @@ GEM
     pry-byebug (3.1.0)
       byebug (~> 4.0)
       pry (~> 0.10)
+    puma (2.12.3)
     rack (1.6.1)
     rack-cache (1.2)
       rack (>= 0.4)
+    rack-mini-profiler (0.9.7)
+      rack (>= 1.1.3)
     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.5)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
@@ -169,7 +178,7 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (= 1.4.1)
-    sass (3.4.16)
+    sass (3.4.18)
     simplecov (0.10.0)
       docile (~> 1.1.0)
       json (~> 1.8)
@@ -187,13 +196,10 @@ GEM
     sprockets-sass (1.3.1)
       sprockets (~> 2.0)
       tilt (~> 1.1)
+    stackprof (0.2.7)
     stringex (2.5.2)
     term-ansicolor (1.3.0)
       tins (~> 1.0)
-    thin (1.6.3)
-      daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0)
-      rack (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (1.4.1)
@@ -213,15 +219,19 @@ DEPENDENCIES
   bundler (~> 1.7)
   codeclimate-test-reporter (~> 0.4.7)
   coveralls (~> 0.8.1)
+  flamegraph
   i18n-spec (~> 0.6.0)
   json_spec (~> 1.1.4)
   locomotivecms_steam!
+  memory_profiler
   moped (~> 2.0.6)
   origin (~> 2.1.1)
   pry-byebug (~> 3.1.0)
+  puma
+  rack-mini-profiler
   rack-test (~> 0.6.3)
   rake (~> 10.4.2)
   rspec (~> 3.3.0)
-  thin
+  stackprof
   timecop (~> 0.7.4)
   yui-compressor (~> 0.12.0)

data/bin/steam.rb

@@ -5,10 +5,9 @@ require 'bundler/setup'
 
 Bundler.require
 
-require 'thin'
 require 'optparse'
 
-server_options = { address: 'localhost', port: 8080 }
+server_options = { address: '0.0.0.0', port: 8080 }
 
 options = {
   adapter:  {
@@ -85,13 +84,28 @@ end
 
 app = Locomotive::Steam::Server.to_app
 
+# Thin rack handler
 # Note: alt thin settings (Threaded)
-server = Thin::Server.new(server_options[:address], server_options[:port], app)
-server.threaded = true
-server.start
+# require 'thin'
+# server = Thin::Server.new(server_options[:address], server_options[:port], app)
+# server.threaded = true
+# server.start
+# Locomotive::Common::Logger.info 'Server started...'
 # FIXME: Rack::Handler::Thin.run app (not threaded)
 
 # WEBRick rack handler
 # Rack::Handler::WEBrick.run app
-
-Locomotive::Common::Logger.info 'Server started...'
+# Locomotive::Common::Logger.info 'Server started...'
+
+# Puma rack handler
+require 'puma'
+server   = ::Puma::Server.new(app)
+server.add_tcp_listener server_options[:address], server_options[:port]
+server.min_threads = 4
+server.max_threads = 16
+begin
+  Locomotive::Common::Logger.info 'Server started...'
+  server.run.join
+rescue Interrupt
+  server.stop(true)
+end

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

@@ -80,7 +80,7 @@ module Locomotive::Steam
     end
 
     def session
-      if uri
+      Thread.current[:moped_session] ||= if uri
         Moped::Session.connect(uri)
       else
         Moped::Session.new([*hosts]).tap do |session|

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

@@ -59,6 +59,12 @@ module Locomotive::Steam
           build_origin_query.only(@fields).where(@criteria).order_by(*@sort)
         end
 
+        def key(name, operator)
+          :"#{name}".send(operator.to_sym)
+        end
+
+        alias :k :key
+
         private
 
         def build_origin_query

data/lib/locomotive/steam/configuration.rb

@@ -93,6 +93,15 @@ module Locomotive
       attr_accessor :moneta
       def moneta; @moneta.nil? ? { store: Moneta.new(:Memory, expires: true) } : @moneta; end
 
+      # Render a 404 page if no site has been found.
+      # If Steam is embedded in another app, it's better to let the app handle
+      # the no site case.
+      #
+      # default: true
+      #
+      attr_accessor :render_404_if_no_site
+      def render_404_if_no_site; @render_404_if_no_site.nil? ? true : @render_404_if_no_site; end
+
       # Lambda called once a Services instance has been built.
       # It is used when we want to change one of the services
       #

data/lib/locomotive/steam/errors.rb

@@ -1,5 +1,8 @@
 module Locomotive::Steam
 
+  class NoSiteException < ::Exception
+  end
+
   class RenderError < ::StandardError
 
     LINES_RANGE = 10

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

@@ -5,9 +5,27 @@ module Locomotive
         class ContentTypes < ::Liquid::Drop
 
           def before_method(meth)
-            repository = @context.registers[:services].repositories.content_type
+            fetch_content_type(meth.to_s)
+          end
+
+          private
+
+          def repository
+            @context.registers[:services].repositories.content_type
+          end
+
+          def fetch_content_type(slug)
+            @content_type_map ||= {}
+
+            if !@content_type_map.include?(slug)
+              @content_type_map[slug] = _fetch_content_type(slug)
+            end
+
+            @content_type_map[slug]
+          end
 
-            if content_type = repository.by_slug(meth.to_s)
+          def _fetch_content_type(slug)
+            if content_type = repository.by_slug(slug)
               ContentEntryCollection.new(content_type)
             else
               nil

data/lib/locomotive/steam/liquid/filters/json.rb

@@ -0,0 +1,42 @@
+module Locomotive
+  module Steam
+    module Liquid
+      module Filters
+        module Json
+
+          def json(input, fields = nil)
+            if fields && fields.is_a?(String)
+              fields = fields.split(',').map(&:strip)
+            end
+
+            if fields.blank?
+              input.to_json
+            elsif input.respond_to?(:each)
+              if fields.size == 1
+                input.map { |object| object[fields.first].to_json }.join(',')
+              else
+                input.map { |object| "{" + object_to_json(object, fields) + "}" }.join(',')
+              end
+            else
+              object_to_json(input, fields)
+            end
+          end
+
+          protected
+
+          def object_to_json(input, fields)
+            [].tap do |output|
+              fields.each do |field|
+                output << %("#{field}":#{input[field].to_json})
+              end
+            end.join(',')
+          end
+
+        end
+
+        ::Liquid::Template.register_filter(Json)
+
+      end
+    end
+  end
+end

data/lib/locomotive/steam/liquid/filters/misc.rb

@@ -40,6 +40,10 @@ module Locomotive
 
           end
 
+          def hexdigest(input, key, digest = nil)
+            OpenSSL::HMAC.hexdigest(digest || 'sha1', key, input)
+          end
+
         end
 
         ::Liquid::Template.register_filter(Misc)

data/lib/locomotive/steam/liquid/filters/number.rb

@@ -0,0 +1,51 @@
+module Locomotive
+  module Steam
+    module Liquid
+      module Filters
+        module Number
+
+          def money(input, *options)
+            NumberProxyHelper.new(:currency, @context).invoke(input, options)
+          end
+
+          def percentage(input, *options)
+            NumberProxyHelper.new(:percentage, @context).invoke(input, options)
+          end
+
+          def mod(input, modulus)
+            input.to_i % modulus.to_i
+          end
+
+          class NumberProxyHelper
+
+            include ActiveSupport::NumberHelper
+
+            def initialize(name, context)
+              @name     = name
+              @context  = context
+            end
+
+            def invoke(input, options)
+              _options = parse_and_interpolate_options(options)
+              send :"number_to_#{@name}", input, _options
+            end
+
+            def parse_and_interpolate_options(string_or_array)
+              return {} if string_or_array.empty?
+
+              string = [*string_or_array].flatten.join(', ')
+              arguments = Solid::Arguments.parse(string)
+
+              (arguments.interpolate(@context).first || {})
+            end
+
+          end
+
+          ::Liquid::Template.register_filter(Number)
+
+        end
+
+      end
+    end
+  end
+end

data/lib/locomotive/steam/liquid/tags/concerns/i18n_page.rb

@@ -18,15 +18,6 @@ module Locomotive
               end
             end
 
-            # def build_fullpath(page)
-            #   services.url_builder.url_for(page, locale).tap do |fullpath|
-            #     if page.templatized?
-            #       entry = page.send(:_source).content_entry
-            #       fullpath.gsub!('content_type_template', entry._slug)
-            #     end
-            #   end
-            # end
-
           end
 
         end

data/lib/locomotive/steam/liquid/tags/concerns/path.rb

@@ -66,7 +66,7 @@ module Locomotive
             end
 
             def _retrieve_page_drop_from(handle)
-              if page = repository.by_handle(handle)
+              if page = services.page_finder.by_handle(handle)
                 page.to_liquid.tap { |d| d.context = @context }
               end
             end

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

@@ -2,3 +2,4 @@ require_relative 'editable/base'
 require_relative 'editable/text'
 require_relative 'editable/file'
 require_relative 'editable/control'
+require_relative 'editable/model'

data/lib/locomotive/steam/liquid/tags/editable/base.rb

@@ -27,10 +27,12 @@ module Locomotive
               end
             end
 
+            alias :default_render :render
+
             def render(context)
               service   = context.registers[:services].editable_element
               page      = context.registers[:page]
-              block     = context['block'].try(:name)
+              block     = @element_options[:block] || context['block'].try(:name)
 
               if element = service.find(page, block, @slug)
                 render_element(context, element)

data/lib/locomotive/steam/liquid/tags/editable/model.rb

@@ -0,0 +1,19 @@
+module Locomotive
+  module Steam
+    module Liquid
+      module Tags
+        module Editable
+          class Model < Base
+
+            def render(context)
+              default_render(context)
+            end
+
+          end
+
+          ::Liquid::Template.register_tag('editable_model'.freeze, Model)
+        end
+      end
+    end
+  end
+end