locomotivecms_steam 0.1.0 → 0.1.1

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

@@ -0,0 +1,40 @@
+require 'coffee_script'
+
+module Locomotive::Steam
+  module Middlewares
+
+    class DynamicAssets < Base
+
+      attr_reader :app, :regexp
+
+      def initialize(app)
+        super(app)
+
+        @regexp = /^\/(javascripts|stylesheets)\/(.*)$/
+      end
+
+      def call(env)
+        dup._call(env) # thread-safe purpose
+      end
+
+      def _call(env)
+        if env['PATH_INFO'] =~ self.regexp
+          env['PATH_INFO'] = $2
+
+          base_path = env['steam.mounting_point'].path
+
+          begin
+            sprockets = Locomotive::Mounter::Extensions::Sprockets.environment(base_path)
+            sprockets.call(env)
+          rescue Exception => e
+            raise Locomotive::Steam::DefaultException.new "Unable to serve a dynamic asset. Please check the logs.", e
+          end
+        else
+          app.call(env)
+        end
+      end
+
+    end
+
+  end
+end

data/lib/locomotive/steam/{server → middlewares}/entry_submission.rb

@@ -1,12 +1,12 @@
 module Locomotive::Steam
-  class Server
+  module Middlewares
 
     # Mimic the submission of a content entry
     #
-    class EntrySubmission < Middleware
+    class EntrySubmission < Base
 
-      def call(env)
-        self.set_accessors(env)
+      def _call(env)
+        super
 
         if self.request.post? && env['PATH_INFO'] =~ /^\/entry_submissions\/(.*)/
           self.process_form($1)

data/lib/locomotive/steam/{server → middlewares}/favicon.rb

@@ -1,10 +1,9 @@
 module Locomotive::Steam
-  class Server
+  module Middlewares
 
-    class Favicon < Middleware
+    class Favicon < Base
 
       def call(env)
-        
         if env['PATH_INFO'] == '/favicon.ico'
           [200, { 'Content-Type' => 'image/vnd.microsoft.icon' }, ['']]
         else

data/lib/locomotive/steam/{server → middlewares}/locale.rb

@@ -1,5 +1,5 @@
 module Locomotive::Steam
-  class Server
+  module Middlewares
 
     # Set the locale from the path if possible or use the default one
     # Examples:
@@ -7,10 +7,10 @@ module Locomotive::Steam
     #   /fr/        => locale = :fr
     #   /index      => locale = :en (default one)
     #
-    class Locale < Middleware
+    class Locale < Base
 
-      def call(env)
-        self.set_accessors(env)
+      def _call(env)
+        super
 
         self.set_locale!(env)
 

data/lib/locomotive/steam/{server → middlewares}/logging.rb

@@ -1,9 +1,9 @@
 module Locomotive::Steam
-  class Server
+  module Middlewares
 
     # Track the request into the current logger
     #
-    class Logging < Middleware
+    class Logging < Base
 
       def call(env)
         now = Time.now

data/lib/locomotive/steam/{server → middlewares}/page.rb

@@ -1,13 +1,13 @@
 module Locomotive::Steam
-  class Server
+  module Middlewares
 
     # Sanitize the path from the previous middleware in order
     # to make it work for the renderer.
     #
-    class Page < Middleware
+    class Page < Base
 
-      def call(env)
-        self.set_accessors(env)
+      def _call(env)
+        super
 
         self.set_page!(env)
 
@@ -27,8 +27,6 @@ module Locomotive::Steam
       end
 
       def fetch_page
-        
-
         matchers = self.path_combinations(self.path)
 
         pages = self.mounting_point.pages.values.find_all do |_page|

data/lib/locomotive/steam/{server → middlewares}/path.rb

@@ -1,13 +1,13 @@
 module Locomotive::Steam
-  class Server
+  module Middlewares
 
     # Sanitize the path from the previous middleware in order
     # to make it work for the renderer.
     #
-    class Path < Middleware
+    class Path < Base
 
-      def call(env)
-        self.set_accessors(env)
+      def _call(env)
+        super
 
         self.set_path!(env)
 

data/lib/locomotive/steam/{server → middlewares}/renderer.rb

@@ -1,10 +1,10 @@
 module Locomotive::Steam
-  class Server
+  module Middlewares
 
-    class Renderer < Middleware
+    class Renderer < Base
 
-      def call(env)
-        self.set_accessors(env)
+      def _call(env)
+        super
 
         if self.page
           if self.page.redirect?
@@ -107,8 +107,9 @@ module Locomotive::Steam
           site:           self.site,
           page:           self.page,
           mounting_point: self.mounting_point,
+          services:       self.services,
           inline_editor:  false,
-          logger:         Locomotive::Steam::Logger
+          logger:         Locomotive::Common::Logger
         }
       end
 

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

@@ -0,0 +1,66 @@
+require 'rack/session/moneta'
+require 'rack/builder'
+require 'rack/lint'
+require 'dragonfly/middleware'
+
+module Locomotive
+  module Steam
+    module Middlewares
+
+      class Stack
+
+        def initialize(options)
+          @options = prepare_options(options)
+        end
+
+        def create
+          options = @options
+
+          Rack::Builder.new do
+            use Rack::Lint
+
+            use Middlewares::Favicon
+
+            if options[:serve_assets]
+              use Middlewares::StaticAssets, {
+                urls: ['/images', '/fonts', '/samples', '/media']
+              }
+
+              use Middlewares::DynamicAssets
+            end
+
+            use ::Dragonfly::Middleware, :steam
+
+            use Rack::Session::Moneta, options[:moneta]
+
+            use Middlewares::Logging
+
+            use Middlewares::EntrySubmission
+
+            use Middlewares::Path
+            use Middlewares::Locale
+            use Middlewares::Timezone
+
+            use Middlewares::Page
+            use Middlewares::TemplatizedPage
+
+            run Middlewares::Renderer.new
+          end
+        end
+
+        protected
+
+        def prepare_options(options)
+          {
+            serve_assets: false,
+            moneta: {
+              store: Moneta.new(:Memory, :expires => true)
+            }
+          }.merge(options)
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+require 'rack/static'
+
+module Locomotive::Steam
+  module Middlewares
+
+    class StaticAssets < ::Rack::Static
+
+      alias_method :call_without_threadsafety, :call
+
+      def call(env)
+        dup._call(env) # thread-safe purpose
+      end
+
+      def _call(env)
+        mounting_point = env['steam.mounting_point']
+
+        @file_server = Rack::File.new(mounting_point.assets_path)
+
+        call_without_threadsafety(env)
+      end
+
+    end
+
+  end
+end

data/lib/locomotive/steam/{server → middlewares}/templatized_page.rb

@@ -1,10 +1,10 @@
 module Locomotive::Steam
-  class Server
+  module Middlewares
 
-    class TemplatizedPage < Middleware
+    class TemplatizedPage < Base
 
-      def call(env)
-        self.set_accessors(env)
+      def _call(env)
+        super
 
         if self.page && self.page.templatized?
           self.set_content_entry!(env)

data/lib/locomotive/steam/{server → middlewares}/timezone.rb

@@ -1,12 +1,12 @@
 module Locomotive::Steam
-  class Server
+  module Middlewares
 
     # Set the timezone according to the settings of the site
     #
-    class Timezone < Middleware
+    class Timezone < Base
 
-      def call(env)
-        self.set_accessors(env)
+      def _call(env)
+        super
 
         Time.use_zone(site.try(:timezone) || 'UTC') do
           app.call(env)

data/lib/locomotive/steam/misc.rb

@@ -0,0 +1,10 @@
+require_relative 'core_ext.rb'
+
+require_relative 'initializers/i18n.rb'
+require_relative 'initializers/markdown.rb'
+require_relative 'initializers/will_paginate.rb'
+
+require_relative 'monkey_patches/httparty.rb'
+require_relative 'monkey_patches/dragonfly.rb'
+require_relative 'monkey_patches/mounter.rb'
+require_relative 'monkey_patches/haml.rb'

data/lib/locomotive/steam/monkey_patches.rb

@@ -1,5 +1,4 @@
-require_relative 'monkey_patches/httparty.rb'
-require_relative 'monkey_patches/dragonfly.rb'
+# require_relative 'monkey_patches/httparty.rb'
+# require_relative 'monkey_patches/dragonfly.rb'
 require_relative 'monkey_patches/mounter.rb'
-require_relative 'monkey_patches/haml.rb'
-require_relative 'monkey_patches/better_errors.rb'
+require_relative 'monkey_patches/haml.rb'

data/lib/locomotive/steam/monkey_patches/haml.rb

@@ -1,3 +1,5 @@
+require 'haml'
+
 module Haml::Filters
 
   remove_filter("Markdown") #remove the existing Markdown filter
@@ -7,7 +9,7 @@ module Haml::Filters
     include Haml::Filters::Base
 
     def render text
-      Locomotive::Steam::Markdown.steam text
+      Locomotive::Steam::Markdown.new.render text
     end
 
   end

data/lib/locomotive/steam/monkey_patches/mounter.rb

@@ -1,3 +1,5 @@
+require 'locomotive/mounter'
+
 module Locomotive
   module Mounter
     module Models
@@ -28,5 +30,25 @@ module Locomotive
 
       end
     end
+
+    module Reader
+      module FileSystem
+        class Runner
+
+          def new_mounting_point(host)
+            self.mounting_point
+          end
+
+        end
+      end
+    end
+
+    class MountingPoint
+
+      def assets_path
+        File.join(self.path, 'public')
+      end
+
+    end
   end
 end

data/lib/locomotive/steam/server.rb

@@ -1,80 +1,55 @@
-require 'better_errors'
-require 'coffee_script'
-
-require_relative 'listen'
-require_relative 'server/middleware'
-require_relative 'server/favicon'
-require_relative 'server/dynamic_assets'
-require_relative 'server/logging'
-require_relative 'server/entry_submission'
-require_relative 'server/path'
-require_relative 'server/locale'
-require_relative 'server/page'
-require_relative 'server/timezone'
-require_relative 'server/templatized_page'
-require_relative 'server/renderer'
-
-require_relative 'liquid'
-require_relative 'initializers'
+require_relative 'core_ext'
 require_relative 'monkey_patches'
+require_relative 'liquid'
+require_relative 'services'
+require_relative 'middlewares'
 
 module Locomotive::Steam
   class Server
 
-    def initialize(reader, options = {})
-      Locomotive::Steam::Dragonfly.setup!(reader.mounting_point.path)
-
-      Sprockets::Sass.add_sass_functions = false
+    attr_reader :reader, :app, :options
 
-      @reader = reader
-      @app    = self.create_rack_app(@reader)
+    def initialize(reader, options = {})
+      @reader   = reader
+      @options  = options
 
-      BetterErrors.application_root = reader.mounting_point.path
+      stack     = Middlewares::Stack.new(options)
+      @app      = stack.create
     end
 
     def call(env)
-      env['steam.mounting_point'] = @reader.mounting_point
-      @app.call(env)
+      dup._call(env) # thread-safe purpose
     end
 
-    protected
-
-    def create_rack_app(reader)
-      Rack::Builder.new do
-        use Rack::Lint
-
-        use BetterErrors::MiddlewareWrapper
-
-        use Rack::Session::Cookie, {
-          key:          'steam.session',
-          path:         '/',
-          expire_after: 2592000,
-          secret:       'uselessinlocal'
-        }
+    def _call(env)
+      set_request(env)
 
-        use ::Dragonfly::Middleware, :images
+      set_mounting_point(env)
 
-        use Rack::Static, {
-          urls: ['/images', '/fonts', '/samples', '/media'],
-          root: File.join(reader.mounting_point.path, 'public')
-        }
+      set_services(env)
 
-        use Favicon
-        use DynamicAssets, reader.mounting_point.path
-
-        use Logging
+      @app.call(env)
+    end
 
-        use EntrySubmission
+    protected
 
-        use Path
-        use Locale
-        use Timezone
+    def set_request(env)
+      @request = Rack::Request.new(env)
+      env['steam.request'] = @request
+    end
 
-        use Page
-        use TemplatizedPage
+    def set_mounting_point(env)
+      # one single mounting point per site
+      @mounting_point = @reader.new_mounting_point(@request.host)
+      env['steam.mounting_point'] = @reader.mounting_point
+    end
 
-        run Renderer.new
-      end
+    def set_services(env)
+      env['steam.services'] = {
+        dragonfly:      Locomotive::Steam::Services::Dragonfly.new(@mounting_point.path),
+        markdown:       Locomotive::Steam::Services::Markdown.new,
+        external_api:   Locomotive::Steam::Services::ExternalAPI.new
+      }
     end
 
   end