locomotivecms_steam 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 286924b9da97684b0d41b2f7665c1bf10d8e7a3c
-  data.tar.gz: 995313de3bb43273c996c3bed12154fb03e6ac0d
+  metadata.gz: 8893681c8f5eb7eb8d2679fd660ae4aed7e731f5
+  data.tar.gz: 9ee2f1cacf9d807e2194f139cabd844743cf3dc7
 SHA512:
-  metadata.gz: d54ce2aac8f838cc950fae949838fa61cb1b223bd43c9cb37abfff14abc41d34feae2674fb45efeec822a924b833834ed2f3d66a32a0de44cff2ae2321888941
-  data.tar.gz: aabe22de1742646c3ee9281b87845ac1cf87b5eb1a26ba3f93b83133103724b318f62dbd534727cf32723519e563fa6c0493e159426605931955bf67e2b54e90
+  metadata.gz: 9090a78846cc972558e88da4dba21c6aa44b30585608467ca09e666e18022f85572f3de3861be7e7c95a13433a37410270417edf9a71095c69ad181bb08c5089
+  data.tar.gz: 0ef2642d9cf8fe0d28cf30621f48eabf294ce02d396e37096031455d8f3062b809f88bae38270587b09233d316d8f2580a124e04ce4e0619656b68fd9d6d757d

data/.gitignore

@@ -19,3 +19,7 @@ doc/
 
 .rspec
 spec/fixtures/default/log/*
+
+.ruby-*
+
+log

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### VERSION 0.1.1
+
+* refactoring
+  * remove logger from core
+
 ### VERSION 0.0.1
 
 * bug fix

data/Gemfile

@@ -2,7 +2,14 @@ source 'https://rubygems.org'
 
 gemspec
 
+group :development do
+  gem 'locomotivecms_common', '~> 0.0.1', require: 'common' # path: '../common'
+  gem 'thin'
+end
+
 group :test do
   gem 'pry'
   gem 'coveralls', require: false
 end
+
+gem 'thin'

data/Gemfile.lock

@@ -1,13 +1,12 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (0.1.0)
-      activesupport (~> 3.2)
-      better_errors (~> 1.0)
-      dragonfly (~> 0.9)
-      listen (~> 2.7)
+    locomotivecms_steam (0.1.1)
+      dragonfly (~> 1.0.3)
       locomotivecms-solid
+      locomotivecms_common (~> 0.0.1)
       locomotivecms_mounter
+      moneta (~> 0.7.20)
       rack-cache (~> 1.1)
       redcarpet (~> 3.1)
       sprockets (~> 2.0)
@@ -22,14 +21,6 @@ GEM
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     addressable (2.3.6)
-    better_errors (1.1.0)
-      coderay (>= 1.0.0)
-      erubis (>= 2.6.6)
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
-    celluloid-io (0.15.0)
-      celluloid (>= 0.15.0)
-      nio4r (>= 0.5.0)
     chronic (0.10.2)
     chunky_png (1.3.0)
     coderay (1.1.0)
@@ -39,10 +30,10 @@ GEM
     coffee-script-source (1.7.0)
     colorize (0.5.8)
     commonjs (0.2.7)
-    compass (0.12.4)
+    compass (0.12.5)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
-      sass (~> 3.2.17)
+      sass (~> 3.2.19)
     coveralls (0.7.0)
       multi_json (~> 1.3)
       rest-client
@@ -51,14 +42,14 @@ GEM
       thor
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
+    daemons (1.1.9)
     diff-lcs (1.2.5)
     docile (1.1.3)
-    dragonfly (0.9.15)
+    dragonfly (1.0.4)
       multi_json (~> 1.0)
       rack
-    erubis (2.7.0)
+    eventmachine (1.0.3)
     execjs (2.0.2)
-    ffi (1.9.3)
     fssm (0.2.10)
     haml (4.0.5)
       tilt
@@ -66,7 +57,7 @@ GEM
     httmultiparty (0.3.10)
       httparty (>= 0.7.3)
       multipart-post
-    httparty (0.13.0)
+    httparty (0.13.1)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
     i18n (0.6.9)
@@ -79,14 +70,10 @@ GEM
       addressable (~> 2.3)
     less (2.2.2)
       commonjs (~> 0.2.6)
-    listen (2.7.1)
-      celluloid (>= 0.15.2)
-      celluloid-io (>= 0.15.0)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
     locomotivecms-liquid (2.6.0)
     locomotivecms-solid (0.2.2.1)
       locomotivecms-liquid (~> 2.6.0)
+    locomotivecms_common (0.0.1)
     locomotivecms_mounter (1.4.0)
       RedCloth (~> 4.2.3)
       activesupport (~> 3.2.15)
@@ -112,10 +99,10 @@ GEM
     logger (1.2.8)
     method_source (0.8.2)
     mime-types (1.25.1)
+    moneta (0.7.20)
     multi_json (1.7.9)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    nio4r (1.0.0)
     pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
@@ -126,9 +113,6 @@ GEM
     rack-test (0.6.2)
       rack (>= 1.0)
     rake (10.2.2)
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.3)
-      ffi (>= 0.5.0)
     redcarpet (3.1.1)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -141,7 +125,7 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
     safe_yaml (1.0.1)
-    sass (3.2.18)
+    sass (3.2.19)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json
@@ -159,9 +143,12 @@ GEM
     stringex (2.0.11)
     term-ansicolor (1.3.0)
       tins (~> 1.0)
+    thin (1.6.2)
+      daemons (>= 1.0.9)
+      eventmachine (>= 1.0.0)
+      rack (>= 1.0.0)
     thor (0.18.1)
     tilt (1.4.1)
-    timers (1.1.0)
     tins (1.0.0)
     tzinfo (0.3.39)
     vcr (2.9.0)
@@ -179,10 +166,12 @@ DEPENDENCIES
   coveralls
   i18n-spec
   launchy
+  locomotivecms_common (~> 0.0.1)
   locomotivecms_steam!
   pry
   rack-test
   rake (~> 10.1)
   rspec (~> 2.14)
+  thin
   vcr
   webmock

data/bin/publish

@@ -6,8 +6,8 @@ require_relative '../lib/steam'
 
 class Publish
 
-  def start version, rvm=false
-    system "rvm use #{rvm}"
+  def start # version, rvm=false
+    # system "rvm use #{rvm}"
 
     system "bundle && bundle exec rspec"
     system "gem build locomotivecms_steam.gemspec"
@@ -19,10 +19,10 @@ class Publish
 
 end
 
-if ARGV.length != 1 # or !ARGV[0].match(/\d{1,3}.\d{1,3}.\d{1,3}/)
-  puts 'HELP: '
-  puts '$ bin/publish [ruby-2.1.1@steam]'
-  exit 0
-end
+# if ARGV.length != 1 # or !ARGV[0].match(/\d{1,3}.\d{1,3}.\d{1,3}/)
+#   puts 'HELP: '
+#   puts '$ bin/publish [ruby-2.1.1@steam]'
+#   exit 0
+# end
 
-Publish.new.start ARGV[0]
+Publish.new.start # ARGV[0]

data/example/server.rb

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'bundler/setup'
+
+Bundler.require
+
+require 'thin'
+require 'common'
+
+require_relative '../lib/steam'
+require_relative '../lib/locomotive/steam/server'
+require_relative '../lib/locomotive/steam/initializers'
+
+path = ENV['SITE_PATH'] || File.join(File.expand_path(File.dirname(__FILE__)), '../spec/fixtures/default')
+reader = Locomotive::Mounter::Reader::FileSystem.instance
+reader.run!(path: path)
+
+app = Locomotive::Steam::Server.new(reader, {
+  serve_assets: true
+})
+
+server  = Thin::Server.new('localhost', '3333', app)
+server.threaded = true
+
+Locomotive::Common::Logger.info 'Server started...'
+server.start

data/lib/locomotive/steam/exceptions.rb

@@ -15,7 +15,7 @@ module Locomotive
         full_error_message = "#{parent_exception.message}\n\t"
         full_error_message += parent_exception.backtrace.join("\n\t")
         full_error_message += "\n\n"
-        Locomotive::Steam::Logger.fatal full_error_message
+        Locomotive::Common::Logger.fatal full_error_message
       end
 
     end
@@ -40,7 +40,7 @@ module Locomotive
 
         message = "#{self.template.filepath}:#{line}:in `#{self.name}'"
 
-        Locomotive::Steam::Logger.fatal "[ERROR] #{exception.message} - #{message}\n".red
+        Locomotive::Common::Logger.fatal "[ERROR] #{exception.message} - #{message}\n".red
 
         exception.backtrace.unshift message
       end

data/lib/locomotive/steam/initializers.rb

@@ -1,5 +1,7 @@
-require_relative 'core_ext.rb'
-
+require_relative 'initializers/sprockets.rb'
 require_relative 'initializers/i18n.rb'
-require_relative 'initializers/markdown.rb'
-require_relative 'initializers/will_paginate.rb'
+require_relative 'initializers/dragonfly.rb'
+
+Locomotive::Common.configure do |config|
+  config.notifier = Locomotive::Common::Logger.setup
+end

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

@@ -0,0 +1,19 @@
+require 'dragonfly'
+require 'common'
+
+# Configure
+Dragonfly.app(:steam).configure do
+  plugin :imagemagick,
+    convert_command:  `which convert`.strip.presence || '/usr/local/bin/convert',
+    identify_command: `which identify`.strip.presence || '/usr/local/bin/identify'
+
+  protect_from_dos_attacks true
+
+  url_format '/images/dynamic/:job/:basename.:ext'
+
+  fetch_file_whitelist /public/
+
+  fetch_url_whitelist /.+/
+end
+
+Dragonfly.logger = Locomotive::Common::Logger.instance

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

@@ -0,0 +1 @@
+Sprockets::Sass.add_sass_functions = false

data/lib/locomotive/steam/liquid.rb

@@ -6,7 +6,7 @@ require_relative 'liquid/drops/base'
 require_relative 'liquid/tags/hybrid'
 require_relative 'liquid/tags/path_helper'
 
-%w{. drops tags filters }.each do |dir|
+%w{. drops tags filters}.each do |dir|
   Dir[File.join(File.dirname(__FILE__), 'liquid', dir, '*.rb')].each { |lib| require lib }
 end
 

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

@@ -5,7 +5,8 @@ module Locomotive
         module Resize
 
           def resize(input, resize_string)
-            Locomotive::Steam::Dragonfly.instance.resize_url(input, resize_string)
+            dragonfly = @context.registers[:services][:dragonfly]
+            dragonfly.resize_url(input, resize_string)
           end
 
         end

data/lib/locomotive/steam/liquid/scopeable.rb

@@ -13,7 +13,7 @@ module Locomotive
             # build the chains of conditions
             conditions = _conditions.map { |name, value| Condition.new(name, value) }
 
-            Locomotive::Steam::Logger.info "[with_scope] conditions: #{conditions.map(&:to_s).join(', ')}"
+            Locomotive::Common::Logger.info "[with_scope] conditions: #{conditions.map(&:to_s).join(', ')}"
 
             # get only the entries matching ALL the conditions
             _entries = entries.find_all do |content|
@@ -38,7 +38,7 @@ module Locomotive
 
           name, direction = order_by.split.map(&:to_sym)
 
-          Locomotive::Steam::Logger.info "[with_scope] order_by #{name} #{direction || 'asc'}"
+          Locomotive::Common::Logger.info "[with_scope] order_by #{name} #{direction || 'asc'}"
 
           if direction == :asc || direction.nil?
             entries.sort { |a, b| a.send(name) <=> b.send(name) }

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

@@ -72,7 +72,8 @@ module Locomotive
           def render_all_without_cache(context)
             context.stack do
               begin
-                context.scopes.last[@target.to_s] = Locomotive::Steam::Httparty::Webservice.consume(@url, @options.symbolize_keys)
+                context.scopes.last[@target.to_s] = external_api_service(context).consume(@url, @options.symbolize_keys)
+
                 self.cached_response = context.scopes.last[@target.to_s]
               rescue Timeout::Error
                 context.scopes.last[@target.to_s] = self.cached_response
@@ -88,6 +89,10 @@ module Locomotive
             end
           end
 
+          def external_api_service(context)
+            context.registers[:services][:external_api]
+          end
+
         end
 
         ::Liquid::Template.register_tag('consume', Consume)

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

@@ -6,7 +6,7 @@ module Locomotive
           class ShortText < Base
 
             def render(context)
-              Locomotive::Steam::Logger.warn "  [#{self.current_block_name(context)}/#{@slug}] The editable_{short|long}_text tags are deprecated. Use editable_text instead.".colorize(:orange)
+              Locomotive::Common::Logger.warn "  [#{self.current_block_name(context)}/#{@slug}] The editable_{short|long}_text tags are deprecated. Use editable_text instead.".colorize(:orange)
               super(context)
             end
 

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

@@ -30,7 +30,7 @@ module Locomotive
                 partial.render(context)
               end)
 
-              Locomotive::Steam::Logger.info "  Steamed snippet #{name}"
+              Locomotive::Common::Logger.info "  Steamed snippet #{name}"
 
               output
             end

data/lib/locomotive/steam/middlewares.rb

@@ -0,0 +1,15 @@
+require_relative 'middlewares/base'
+
+require_relative 'middlewares/favicon'
+require_relative 'middlewares/static_assets'
+require_relative 'middlewares/dynamic_assets'
+require_relative 'middlewares/logging'
+require_relative 'middlewares/entry_submission'
+require_relative 'middlewares/path'
+require_relative 'middlewares/locale'
+require_relative 'middlewares/page'
+require_relative 'middlewares/timezone'
+require_relative 'middlewares/templatized_page'
+require_relative 'middlewares/renderer'
+
+require_relative 'middlewares/stack'

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

@@ -1,10 +1,10 @@
 module Locomotive::Steam
-  class Server
+  module Middlewares
 
-    class Middleware
-
-      attr_accessor :app, :request, :path, :liquid_assigns
+    class Base
 
+      attr_accessor :app, :request, :path
+      attr_accessor :liquid_assigns, :services
       attr_accessor :mounting_point, :page, :content_entry
 
       def initialize(app = nil)
@@ -12,17 +12,19 @@ module Locomotive::Steam
       end
 
       def call(env)
-        app.call(env)
+        dup._call(env) # thread-safe purpose
+      end
+
+      def _call(env)
+        self.set_accessors(env)
       end
 
       protected
 
       def set_accessors(env)
-        self.path           = env['steam.path']
-        self.request        = Rack::Request.new(env)
-        self.mounting_point = env['steam.mounting_point']
-        self.page           = env['steam.page']
-        self.content_entry  = env['steam.content_entry']
+        %w(path request mounting_point page content_entry services).each do |name|
+          self.send(:"#{name}=", env["steam.#{name}"])
+        end
 
         env['steam.liquid_assigns'] ||= {}
         self.liquid_assigns = env['steam.liquid_assigns']
@@ -52,7 +54,7 @@ module Locomotive::Steam
       end
 
       def log(msg)
-        Locomotive::Steam::Logger.info msg
+        Locomotive::Common::Logger.info msg
       end
 
     end