locomotivecms_steam 1.0.0.rc10 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08118e0a2969d025bcffcd655e906bc397f8a2f1
-  data.tar.gz: 80fad7857d84473f15b614900b7a6350bc132732
+  metadata.gz: 3624519a192d3e6bd9d76a79309374786f790e16
+  data.tar.gz: 24ab1580d146b35e87a7d0208a8143b18ddb3f5e
 SHA512:
-  metadata.gz: 297db1a5512db9cbc9b34c1646b09f1445cf6a07942b93298ea5386bfaafaa85a26e8d12512ff4097131e619c348d6950cb6cc679c5c5d83c546ef07716f42ec
-  data.tar.gz: 179a3cc3ba5eea81689127242d9e53e53efe389314ac3ab2cbf9d6e0c786bb42aadcc1e25f1108ac5ef9a6b4097c927411202540b204d9382c0f6a0f35ccbbd0
+  metadata.gz: 1da4b24d96279eaa2db5e4812af1aed83ddfa12df58dec74c903deea1f098e39cd09e8d6561ae9078e5b199b704d2ebb714a61ff0546a1eb45835a8e8d35da1d
+  data.tar.gz: cb5c389a0355ba13f70b8f3491f706c5999935f0548ec7c912e2a4fc4f07db28ad4a374ee27d37ffc1cc2aa1e879ec4c3794ff0a39c92694450a18b49c93bd8c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.0.0.rc10)
+    locomotivecms_steam (1.0.0)
       RedCloth (~> 4.2.9)
       autoprefixer-rails (~> 6.2.3)
       chronic (~> 0.10.2)
@@ -11,23 +11,19 @@ PATH
       haml (~> 4.0.6)
       httparty (~> 0.13.6)
       kramdown (~> 1.9.0)
-      less (~> 2.6.0)
       locomotivecms-solid (~> 4.0.1)
       locomotivecms_common (~> 0.0.5)
       mime-types (~> 2.6.1)
       mimetype-fu (~> 0.1.2)
       moneta (~> 0.8.0)
-      mongo (~> 2.2.1)
       morphine (~> 0.1.1)
       nokogiri (~> 1.6.7.1)
-      origin (~> 2.1.1)
       rack-cache (~> 1.2)
       rack-rewrite (~> 1.5.1)
       rack_csrf (~> 2.5.0)
       sanitize (~> 4.0.1)
-      sass (~> 3.4.20)
+      sass (~> 3.4.21)
       sprockets (~> 3.5.2)
-      therubyracer (~> 0.12.2)
 
 GEM
   remote: https://rubygems.org/
@@ -56,7 +52,6 @@ GEM
       execjs
     coffee-script-source (1.10.0)
     colorize (0.7.7)
-    commonjs (0.2.7)
     compass (1.0.3)
       chunky_png (~> 1.2)
       compass-core (~> 1.0.2)
@@ -110,9 +105,6 @@ GEM
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
     kramdown (1.9.0)
-    less (2.6.0)
-      commonjs (~> 0.2.7)
-    libv8 (3.16.14.13)
     locomotivecms-liquid (4.0.0)
     locomotivecms-solid (4.0.1)
       locomotivecms-liquid (~> 4.0.0)
@@ -163,7 +155,6 @@ GEM
     rb-fsevent (0.9.7)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    ref (2.0.0)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
@@ -185,7 +176,7 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4.1)
-    sass (3.4.20)
+    sass (3.4.21)
     simplecov (0.11.1)
       docile (~> 1.1.0)
       json (~> 1.8)
@@ -199,12 +190,9 @@ GEM
     stringex (2.5.2)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
-    therubyracer (0.12.2)
-      libv8 (~> 3.16.14.0)
-      ref
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (2.0.1)
+    tilt (2.0.2)
     timecop (0.8.0)
     tins (1.6.0)
     tzinfo (1.2.2)
@@ -226,6 +214,8 @@ DEPENDENCIES
   json_spec (~> 1.1.4)
   locomotivecms_steam!
   memory_profiler
+  mongo (~> 2.2.1)
+  origin (~> 2.1.1)
   pry-byebug (~> 3.3.0)
   puma
   rack-mini-profiler
@@ -237,4 +227,4 @@ DEPENDENCIES
   yui-compressor (~> 0.12.0)
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

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

@@ -82,33 +82,15 @@ module Locomotive::Steam
     end
 
     def session
-      Thread.current[:mongo_session] ||= if uri
-        Mongo::Client.new(uri)
-      else
-        client = Mongo::Client.new([*hosts], database: database)
-        client = client.with(user: username, password: password) if username && password
-        client
-      end
-    end
-
-    def uri
-      options[:uri]
-    end
-
-    def database
-      options[:database]
-    end
-
-    def hosts
-      options[:hosts]
+      Thread.current[:mongo_session] ||= Mongo::Client.new(uri_or_hosts, client_options)
     end
 
-    def username
-      options[:username]
+    def uri_or_hosts
+      options[:uri] || [*options[:hosts]]
     end
 
-    def password
-      options[:password]
+    def client_options
+      options.slice(*Mongo::Client::VALID_OPTIONS)
     end
 
   end

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

@@ -1,6 +1,5 @@
 require 'sprockets'
 require 'sass'
-require 'less'
 require 'coffee_script'
 require 'compass'
 require 'autoprefixer-rails'

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

@@ -26,7 +26,7 @@ module Locomotive::Steam
       end
 
       def modify_path(path = nil, &block)
-        path ||= request.path
+        path ||= env['steam.path']
 
         segments = path.split('/')
         yield(segments)

data/lib/locomotive/steam/version.rb

@@ -3,6 +3,6 @@
 # 1.0.0-alpha < 1.0.0-alpha.1 < 1.0.0-alpha.beta < 1.0.0-beta < 1.0.0-beta.2 < 1.0.0-beta.11 < 1.0.0-rc.1 < 1.0.0
 module Locomotive
   module Steam
-    VERSION = '1.0.0.rc10'
+    VERSION = '1.0.0'
   end
 end

data/lib/locomotive/steam.rb

@@ -22,7 +22,8 @@ module Locomotive
     IsHTTP = /\Ahttps?:\/\//o
 
     class << self
-      attr_writer :configuration
+      attr_writer   :configuration
+      attr_accessor :extension_configurations
     end
 
     def self.configuration
@@ -39,8 +40,16 @@ module Locomotive
       require_relative 'steam/initializers'
     end
 
+    def self.configure_extension(&block)
+      (@extension_configurations ||= []) << block
+    end
+
     # Shortcut to build the Rack stack
     def self.to_app
+      (@extension_configurations || []).each do |block|
+        block.call(@configuration)
+      end
+
       require_relative 'steam/server'
       Server.to_app
     end

data/locomotivecms_steam.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler',    '~> 1.7'
   spec.add_development_dependency 'rake',       '~> 10.4.2'
 
-  spec.add_dependency 'mongo',                  '~> 2.2.1'
-  spec.add_dependency 'origin',                 '~> 2.1.1'
+  spec.add_development_dependency 'mongo',      '~> 2.2.1'
+  spec.add_development_dependency 'origin',     '~> 2.1.1'
 
   spec.add_dependency 'nokogiri',               '~> 1.6.7.1'
   spec.add_dependency 'sanitize',               '~> 4.0.1'
@@ -34,9 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rack_csrf',              '~> 2.5.0'
 
   spec.add_dependency 'sprockets',              '~> 3.5.2'
-  spec.add_dependency 'sass',                   '~> 3.4.20'
-  spec.add_dependency 'less',                   '~> 2.6.0'
-  spec.add_dependency 'therubyracer',           '~> 0.12.2'
+  spec.add_dependency 'sass',                   '~> 3.4.21'
   spec.add_dependency 'coffee-script',          '~> 2.4.1'
   spec.add_dependency 'compass',                '~> 1.0.3'
   spec.add_dependency 'autoprefixer-rails',     '~> 6.2.3'

data/spec/unit/middlewares/locale_redirection_spec.rb

@@ -13,10 +13,13 @@ describe Locomotive::Steam::Middlewares::LocaleRedirection do
   let(:middleware)      { Locomotive::Steam::Middlewares::LocaleRedirection.new(app) }
   let(:locale)          { 'de' }
   let(:locale_in_path)  { true }
+  let(:mounted_on)      { nil }
 
   subject do
     env = env_for(url, 'steam.site' => site, 'steam.locale' => locale, 'steam.locale_in_path' => locale_in_path)
-    env['steam.request'] = Rack::Request.new(env)
+    env['steam.mounted_on'] = mounted_on
+    env['steam.request']    = Rack::Request.new(env)
+    env['steam.path']       = env['steam.request'].path_info.gsub(/\A#{mounted_on}/, '')
     code, env = middleware.call(env)
     [code, env['Location']]
   end
@@ -81,6 +84,12 @@ describe Locomotive::Steam::Middlewares::LocaleRedirection do
         it { is_expected.to eq [301, '/de/hello/world?this=is_me'] }
       end
 
+      describe 'mounted_on is present' do
+        let(:mounted_on) { '/mounted-on/somewhere' }
+        let(:url) { 'http://models.example.com/mounted-on/somewhere/hello/world' }
+        it { is_expected.to eq [301, '/mounted-on/somewhere/de/hello/world'] }
+      end
+
     end
 
     describe 'with locale' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_steam
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc10
+  version: 1.0.0
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -48,7 +48,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.1
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -62,7 +62,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.1
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -229,42 +229,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.20
+        version: 3.4.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.20
-- !ruby/object:Gem::Dependency
-  name: less
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.6.0
-- !ruby/object:Gem::Dependency
-  name: therubyracer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.12.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 3.4.21
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
@@ -836,9 +808,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5.1