locomotivecms_steam 0.1.0 → 0.1.1

data/lib/locomotive/steam/services.rb

@@ -0,0 +1 @@
+Dir[File.join(File.dirname(__FILE__), 'services', '*.rb')].each { |lib| require lib }

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

@@ -0,0 +1,49 @@
+module Locomotive
+  module Steam
+    module Services
+      class Dragonfly
+
+        attr_reader :path
+
+        def initialize(path = nil)
+          @path = path
+        end
+
+        def enabled?
+          !!self.enabled
+        end
+
+        def resize_url(source, resize_string)
+          image = (case url_or_path = get_url_or_path(source)
+          when '', nil
+            Locomotive::Common::Logger.error "Unable to resize on the fly: #{source.inspect}"
+            nil
+          when /^http:\/\//
+            app.fetch_url(url_or_path)
+          else
+            app.fetch_file(File.join([self.path, 'public', url_or_path].compact))
+          end)
+
+          # apply the conversion if possible
+          image ? image.thumb(resize_string).url : source
+        end
+
+        def self.app
+          ::Dragonfly.app
+        end
+
+        protected
+
+        def get_url_or_path(source)
+          case source
+          when String   then source.strip
+          when Hash     then source['url'] || source[:url]
+          else
+            source.try(:url)
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/locomotive/steam/{monkey_patches/httparty.rb → services/external_api.rb}

@@ -2,12 +2,12 @@ require 'uri'
 
 module Locomotive
   module Steam
-    module Httparty
-      class Webservice
+    module Services
+      class ExternalAPI
 
         include ::HTTParty
 
-        def self.consume(url, options = {})
+        def consume(url, options = {})
           url = ::HTTParty.normalize_base_uri(url)
 
           uri = URI.parse(url)
@@ -22,9 +22,9 @@ module Locomotive
 
           path ||= '/'
 
-          # Locomotive::Steam::Logger.debug "[WebService] consuming #{path}, #{options.inspect}"
+          # Locomotive::Common::Logger.debug "[WebService] consuming #{path}, #{options.inspect}"
 
-          response = self.get(path, options)
+          response = self.class.get(path, options)
 
           if response.code == 200
             _response = response.parsed_response
@@ -34,7 +34,7 @@ module Locomotive
               _response.collect(&:underscore_keys)
             end
           else
-            Locomotive::Steam::Logger.error "[WebService] consumed #{path}, #{options.inspect}, response = #{response.inspect}"
+            Locomotive::Common::Logger.error "[WebService] consumed #{path}, #{options.inspect}, response = #{response.inspect}"
             nil
           end
 

data/lib/locomotive/steam/services/markdown.rb

@@ -0,0 +1,29 @@
+require 'redcarpet'
+
+module Locomotive
+  module Steam
+    module Services
+      class Markdown
+
+        def render(text)
+          self.class.parser.render(text)
+        end
+
+        def self.parser
+          @@markdown ||= Redcarpet::Markdown.new Redcarpet::Steam::HTML, {
+            autolink:         true,
+            fenced_code:      true,
+            generate_toc:     true,
+            gh_blockcode:     true,
+            hard_wrap:        true,
+            no_intraemphasis: true,
+            strikethrough:    true,
+            tables:           true,
+            xhtml:            true
+          }
+        end
+
+      end
+    end
+  end
+end

data/lib/locomotive/steam/standalone_server.rb

@@ -1,6 +1,6 @@
-$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../..'))
+require 'rubygems'
+require 'bundler/setup'
 
-require_relative 'logger'
 require_relative 'version'
 require_relative 'exceptions'
 require_relative 'server'
@@ -11,22 +11,19 @@ module Locomotive
   module Steam
     class StandaloneServer < Server
 
-      def initialize(path, options={})
-        options.fetch(:logger) do
-          Locomotive::Steam::Logger.setup(path, false)
-        end
+      def initialize(path)
+        Locomotive::Common::Logger.setup(path, false)
 
-        reader = options.fetch(:reader) do
-          _reader = Locomotive::Mounter::Reader::FileSystem.instance
-          Proc.new { |_path| _reader.run!(path: _path) }
-        end
-        reader.call path
+        # get the reader
+        reader = Locomotive::Mounter::Reader::FileSystem.instance
+        reader.run!(path: path)
+        reader
 
         Bundler.require 'monkey_patches'
         Bundler.require 'initializers'
 
         # run the rack app
-        super(reader, disable_listen: true)
+        super(reader, serve_assets: true)
       end
     end
   end

data/lib/locomotive/steam/version.rb

@@ -1,5 +1,5 @@
 module Locomotive
   module Steam
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/lib/steam.rb

@@ -1,4 +1,3 @@
 require_relative 'locomotive/steam/version'
-require_relative 'locomotive/steam/logger'
 require_relative 'locomotive/steam/exceptions'
 

data/locomotivecms_steam.gemspec

@@ -25,18 +25,17 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rack-test'
   spec.add_development_dependency 'i18n-spec'
 
-  spec.add_dependency 'rack-cache',            '~> 1.1'
-  spec.add_dependency 'sprockets',             '~> 2.0'
-  spec.add_dependency 'sprockets-sass',        '~> 1.0'
-  spec.add_dependency 'better_errors',         '~> 1.0'
-  spec.add_dependency 'dragonfly',             '~> 0.9'
-  spec.add_dependency 'activesupport',         '~> 3.2'
-  spec.add_dependency 'listen',                '~> 2.7'
-  spec.add_dependency 'will_paginate',         '~> 3.0'
-  spec.add_dependency 'redcarpet',             '~> 3.1'
+  spec.add_dependency 'rack-cache',             '~> 1.1'
+  spec.add_dependency 'moneta',                 '~> 0.7.20'
+  spec.add_dependency 'sprockets',              '~> 2.0'
+  spec.add_dependency 'sprockets-sass',         '~> 1.0'
+  spec.add_dependency 'dragonfly',              '~> 1.0.3'
+  spec.add_dependency 'will_paginate',          '~> 3.0' # TODO: move to kaminari
+  spec.add_dependency 'redcarpet',              '~> 3.1'
 
   spec.add_dependency 'locomotivecms_mounter'
   spec.add_dependency 'locomotivecms-solid'
+  spec.add_dependency 'locomotivecms_common',   '~> 0.0.1'
 
   spec.required_ruby_version = '~> 2.0'
 end

data/spec/integration/integration_helper.rb

@@ -1,15 +1,4 @@
-# encoding: utf-8
+require_relative '../../lib/locomotive/steam/server'
 
 require File.dirname(__FILE__) + '/../spec_helper'
-# require 'vcr'
-# require 'webmock/rspec'
-require 'active_support/core_ext'
-
-# VCR.configure do |c|
-#   c.ignore_localhost = false
-#   c.cassette_library_dir = File.dirname(__FILE__) + '/cassettes'
-#   c.hook_into :webmock
-#   c.default_cassette_options = { record: :new_episodes }
-#   c.configure_rspec_metadata!
-#   c.allow_http_connections_when_no_cassette = false
-# end
+require 'rack/test'

data/spec/integration/server/basic_spec.rb

@@ -1,8 +1,4 @@
-# encoding: utf-8
-
 require File.dirname(__FILE__) + '/../integration_helper'
-require 'locomotive/steam/server'
-require 'rack/test'
 
 describe Locomotive::Steam::Server do
 
@@ -13,9 +9,7 @@ describe Locomotive::Steam::Server do
   end
 
   it 'shows the index page' do
-
     get '/index'
-
     last_response.body.should =~ /Upcoming events/
   end
 

data/spec/integration/server/contact_form_spec.rb

@@ -1,8 +1,4 @@
-# encoding: utf-8
-
 require File.dirname(__FILE__) + '/../integration_helper'
-require 'locomotive/steam/server'
-require 'rack/test'
 
 describe 'ContactForm' do
 

data/spec/integration/server/liquid_spec.rb

@@ -1,8 +1,4 @@
-# encoding: utf-8
-
 require File.dirname(__FILE__) + '/../integration_helper'
-require 'locomotive/steam/server'
-require 'rack/test'
 
 describe Locomotive::Steam::Server do
 

data/spec/integration/server/with_scope_spec.rb

@@ -1,8 +1,4 @@
-# encoding: utf-8
-
 require File.dirname(__FILE__) + '/../integration_helper'
-require 'locomotive/steam/server'
-require 'rack/test'
 
 describe 'Complex with_scope conditions' do
 

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'bundler/setup'
 
+require 'common'
 require 'i18n-spec'
 require 'coveralls'
 

data/spec/support/helpers.rb

@@ -1,3 +1,6 @@
+require 'common'
+require_relative '../../lib/locomotive/steam/initializers'
+
 module Spec
   module Helpers
 
@@ -10,12 +13,18 @@ module Spec
     end
 
     def run_server
-      path = 'spec/fixtures/default'
-      Locomotive::Steam::Logger.setup(path, false)
+      Locomotive::Common.reset
+      Locomotive::Common.configure do |config|
+        path = File.join(File.expand_path('../../spec/fixtures/default/log/locomotivecms.log'))
+        config.notifier = Locomotive::Common::Logger.setup(path)
+      end
+
+      Locomotive::Common::Logger.info 'Server started...'
+
       reader = Locomotive::Mounter::Reader::FileSystem.instance
-      reader.run!(path: path)
+      reader.run!(path: 'spec/fixtures/default')
 
-      Locomotive::Steam::Server.new(reader, disable_listen: true)
+      Locomotive::Steam::Server.new(reader)
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_steam
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-01 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,35 +140,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: sprockets
+  name: moneta
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.7.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.7.20
 - !ruby/object:Gem::Dependency
-  name: sprockets-sass
+  name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: better_errors
+  name: sprockets-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -187,42 +187,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: listen
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
@@ -279,6 +251,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: locomotivecms_common
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 description: The LocomotiveCMS steam is a front end server LocomotiveCMS libraries
 email:
 - did@locomotivecms.com
@@ -310,6 +296,7 @@ files:
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
 - config/locales/ru.yml
+- example/server.rb
 - lib/locomotive/steam/core_ext.rb
 - lib/locomotive/steam/core_ext/array.rb
 - lib/locomotive/steam/core_ext/boolean/false.rb
@@ -318,9 +305,9 @@ files:
 - lib/locomotive/steam/core_ext/string.rb
 - lib/locomotive/steam/exceptions.rb
 - lib/locomotive/steam/initializers.rb
+- lib/locomotive/steam/initializers/dragonfly.rb
 - lib/locomotive/steam/initializers/i18n.rb
-- lib/locomotive/steam/initializers/markdown.rb
-- lib/locomotive/steam/initializers/will_paginate.rb
+- lib/locomotive/steam/initializers/sprockets.rb
 - lib/locomotive/steam/liquid.rb
 - lib/locomotive/steam/liquid/drops/base.rb
 - lib/locomotive/steam/liquid/drops/content_entry.rb
@@ -360,26 +347,29 @@ files:
 - lib/locomotive/steam/liquid/tags/session_assign.rb
 - lib/locomotive/steam/liquid/tags/snippet.rb
 - lib/locomotive/steam/liquid/tags/with_scope.rb
-- lib/locomotive/steam/listen.rb
-- lib/locomotive/steam/logger.rb
+- lib/locomotive/steam/middlewares.rb
+- lib/locomotive/steam/middlewares/base.rb
+- lib/locomotive/steam/middlewares/dynamic_assets.rb
+- lib/locomotive/steam/middlewares/entry_submission.rb
+- lib/locomotive/steam/middlewares/favicon.rb
+- lib/locomotive/steam/middlewares/locale.rb
+- lib/locomotive/steam/middlewares/logging.rb
+- lib/locomotive/steam/middlewares/page.rb
+- lib/locomotive/steam/middlewares/path.rb
+- lib/locomotive/steam/middlewares/renderer.rb
+- lib/locomotive/steam/middlewares/stack.rb
+- lib/locomotive/steam/middlewares/static_assets.rb
+- lib/locomotive/steam/middlewares/templatized_page.rb
+- lib/locomotive/steam/middlewares/timezone.rb
+- lib/locomotive/steam/misc.rb
 - lib/locomotive/steam/monkey_patches.rb
-- lib/locomotive/steam/monkey_patches/better_errors.rb
-- lib/locomotive/steam/monkey_patches/dragonfly.rb
 - lib/locomotive/steam/monkey_patches/haml.rb
-- lib/locomotive/steam/monkey_patches/httparty.rb
 - lib/locomotive/steam/monkey_patches/mounter.rb
 - lib/locomotive/steam/server.rb
-- lib/locomotive/steam/server/dynamic_assets.rb
-- lib/locomotive/steam/server/entry_submission.rb
-- lib/locomotive/steam/server/favicon.rb
-- lib/locomotive/steam/server/locale.rb
-- lib/locomotive/steam/server/logging.rb
-- lib/locomotive/steam/server/middleware.rb
-- lib/locomotive/steam/server/page.rb
-- lib/locomotive/steam/server/path.rb
-- lib/locomotive/steam/server/renderer.rb
-- lib/locomotive/steam/server/templatized_page.rb
-- lib/locomotive/steam/server/timezone.rb
+- lib/locomotive/steam/services.rb
+- lib/locomotive/steam/services/dragonfly.rb
+- lib/locomotive/steam/services/external_api.rb
+- lib/locomotive/steam/services/markdown.rb
 - lib/locomotive/steam/standalone_server.rb
 - lib/locomotive/steam/version.rb
 - lib/steam.rb