GitBlixt
teagles/steam

attempt to fix locomotivecms/wagon#255 and locomotivecms/wagon#254. Ruby seems picky about ruby filenames

did committed Sep 15, 2015
commit a7b7c6fbb6eb946d955bfdba051ab1b6981bf9e1
Showing 8 changed files with 73 additions and 70 deletions
Gemfile +1 -1
@@ @@ -34,5 +34,5 @@ group :test do
end
platform :ruby do
- ruby '2.2.0'
+ ruby '2.2.2'
end
locomotive/steam/adapters/memory.rb b/lib/locomotive/steam/adapters/memory.rb +3 -0
@@ @@ -6,6 +6,9 @@ require_relative 'memory/dataset'
module Locomotive::Steam
+ module Memory
+ end
+
class MemoryAdapter < Struct.new(:collection)
include Locomotive::Steam::Adapters::Concerns::Key
locomotive/steam/middlewares.rb b/lib/locomotive/steam/middlewares.rb +1 -1
@@ @@ -1,4 +1,4 @@
- require_relative 'middlewares/threadsafe'
+ require_relative 'middlewares/thread_safe'
require_relative 'middlewares/helpers'
require_relative_all 'middlewares'
locomotive/steam/middlewares/thread_safe.rb b/lib/locomotive/steam/middlewares/thread_safe.rb +65 -0
@@ @@ -0,0 +1,65 @@
+ module Locomotive::Steam::Middlewares
+
+ class ThreadSafe < Struct.new(:app)
+
+ attr_accessor :env
+
+ def call(env)
+ threadsafed = dup
+ threadsafed.env = env
+
+ # time = Benchmark.realtime do
+ threadsafed._call # thread-safe purpose
+ # end
+
+ # puts "[Benchmark][#{self.class.name}] Time elapsed #{time*1000} milliseconds"
+
+ threadsafed.next
+ end
+
+ def next
+ # avoid to be called twice
+ @next_response || (@next_response = app.call(env))
+ end
+
+ #= Shortcuts =
+
+ def services
+ @services ||= env.fetch('steam.services')
+ end
+
+ def request
+ @request ||= env.fetch('steam.request')
+ end
+
+ def site
+ @site ||= env.fetch('steam.site')
+ end
+
+ def page
+ @page ||= env.fetch('steam.page')
+ end
+
+ def path
+ @path ||= env.fetch('steam.path')
+ end
+
+ def locale
+ @locale ||= env.fetch('steam.locale')
+ end
+
+ def liquid_assigns
+ @liquid_assigns ||= env.fetch('steam.liquid_assigns')
+ end
+
+ def default_locale
+ site.default_locale
+ end
+
+ def params
+ @params ||= self.request.params.with_indifferent_access
+ end
+
+ end
+
+ end
locomotive/steam/middlewares/threadsafe.rb b/lib/locomotive/steam/middlewares/threadsafe.rb +0 -65
@@ @@ -1,65 +0,0 @@
- module Locomotive::Steam::Middlewares
-
- class ThreadSafe < Struct.new(:app)
-
- attr_accessor :env
-
- def call(env)
- threadsafed = dup
- threadsafed.env = env
-
- # time = Benchmark.realtime do
- threadsafed._call # thread-safe purpose
- # end
-
- # puts "[Benchmark][#{self.class.name}] Time elapsed #{time*1000} milliseconds"
-
- threadsafed.next
- end
-
- def next
- # avoid to be called twice
- @next_response || (@next_response = app.call(env))
- end
-
- #= Shortcuts =
-
- def services
- @services ||= env.fetch('steam.services')
- end
-
- def request
- @request ||= env.fetch('steam.request')
- end
-
- def site
- @site ||= env.fetch('steam.site')
- end
-
- def page
- @page ||= env.fetch('steam.page')
- end
-
- def path
- @path ||= env.fetch('steam.path')
- end
-
- def locale
- @locale ||= env.fetch('steam.locale')
- end
-
- def liquid_assigns
- @liquid_assigns ||= env.fetch('steam.liquid_assigns')
- end
-
- def default_locale
- site.default_locale
- end
-
- def params
- @params ||= self.request.params.with_indifferent_access
- end
-
- end
-
- end
spec/unit/middlewares/locale_redirection_spec.rb +1 -1
@@ @@ -1,6 +1,6 @@
require 'spec_helper'
- require_relative '../../../lib/locomotive/steam/middlewares/threadsafe'
+ require_relative '../../../lib/locomotive/steam/middlewares/thread_safe'
require_relative '../../../lib/locomotive/steam/middlewares/helpers'
require_relative '../../../lib/locomotive/steam/middlewares/locale_redirection'
spec/unit/middlewares/renderer_spec.rb +1 -1
@@ @@ -1,6 +1,6 @@
require 'spec_helper'
- require_relative '../../../lib/locomotive/steam/middlewares/threadsafe'
+ require_relative '../../../lib/locomotive/steam/middlewares/thread_safe'
require_relative '../../../lib/locomotive/steam/middlewares/helpers'
require_relative '../../../lib/locomotive/steam/middlewares/renderer'
spec/unit/middlewares/site_spec.rb +1 -1
@@ @@ -1,6 +1,6 @@
require 'spec_helper'
- require_relative '../../../lib/locomotive/steam/middlewares/threadsafe'
+ require_relative '../../../lib/locomotive/steam/middlewares/thread_safe'
require_relative '../../../lib/locomotive/steam/middlewares/helpers'
require_relative '../../../lib/locomotive/steam/middlewares/site'