locomotivecms_steam 1.4.0.rc2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c449da4bdd9dbb3aff106e8559b14d668a8ab5bea684e250673d07fef9fc8778
-  data.tar.gz: afb9c2b211dff1c79dcbc44b307e69c86b82ec4b363454bc93bef28a869419a8
+  metadata.gz: 779a3a79f45335e0789fc5e4dcbaf304e4714124685133d3ca091544f7f81ed5
+  data.tar.gz: f65d74a99bdfaafcc518ab31f6286758992658c8bd2bf62b6362aa55299227c5
 SHA512:
-  metadata.gz: 65c84944ce32f47836c455b81b51823a0095dde95eefe4d4f1762a11de79ffacddcfb5149286642136201aa7cb69d50a5050be08d63215e2057477e40a73b9a8
-  data.tar.gz: 1c8ffe885fa13483009f12ee5e415f2ea6d2f5e0129475a1985690a172760e1f531873aeab69535c46703159e2ac5948301cfe7d3c6b95bb9447886319193302
+  metadata.gz: c2cd44c90cad565c44407a9eb2e4d75dfe345041745c44d58dc7fad5ff4c0cb4511c1edac3b010244ac0a50af44d4781fced848f4c33a3ceb89161c73d763dae
+  data.tar.gz: b4320719a670a06715f403ae55fc022d597f428e03647e796ddbd732522f28907c13f1e9d4dbdb329f09cb5a99d5948f3e4714b8ab3aef2e03c9e3e97e93f41d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.4.0.rc2)
+    locomotivecms_steam (1.4.0)
       RedCloth (~> 4.3.2)
       autoprefixer-rails (~> 8.0.0)
       bcrypt (~> 3.1.11)
@@ -42,7 +42,7 @@ GEM
     attr_extras (5.2.0)
     autoprefixer-rails (8.0.0)
       execjs
-    bcrypt (3.1.11)
+    bcrypt (3.1.12)
     bson (4.3.0)
     chronic (0.10.2)
     chunky_png (1.3.10)
@@ -81,7 +81,7 @@ GEM
       rack (>= 1.3)
     duktape (1.6.1.0)
     execjs (2.7.0)
-    ffi (1.9.23)
+    ffi (1.9.25)
     flamegraph (0.9.5)
     haml (5.0.4)
       temple (>= 0.8.0)
@@ -112,9 +112,9 @@ GEM
     memory_profiler (0.9.10)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
+    mime-types-data (3.2018.0812)
     mimetype-fu (0.1.2)
-    mini_mime (1.0.0)
+    mini_mime (1.0.1)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
     moneta (1.0.0)
@@ -123,17 +123,17 @@ GEM
     morphine (0.1.1)
     multi_json (1.13.1)
     multi_xml (0.6.0)
-    nokogiri (1.8.2)
+    nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
     nokogumbo (1.5.0)
       nokogiri
     origin (2.3.1)
     pony (1.12)
       mail (>= 2.0)
-    public_suffix (3.0.2)
+    public_suffix (3.0.3)
     puma (3.11.3)
     rack (2.0.4)
-    rack-cache (1.7.1)
+    rack-cache (1.7.2)
       rack (>= 0.4)
     rack-mini-profiler (0.10.7)
       rack (>= 1.2.0)
@@ -159,7 +159,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
-    sanitize (4.6.4)
+    sanitize (4.6.6)
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4)
@@ -169,7 +169,7 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     stackprof (0.2.11)
@@ -184,7 +184,7 @@ GEM
     tins (1.16.3)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (4.1.10)
+    uglifier (4.1.19)
       execjs (>= 0.3.0, < 3)
 
 PLATFORMS

data/lib/locomotive/steam/adapters/memory/condition.rb

@@ -22,16 +22,17 @@ module Locomotive::Steam
           entry_value = entry_value(entry)
 
           adapt_operator!(entry_value)
+
           case @operator
           when :==        then entry_value == @value
           when :eq        then entry_value == @value
           when :ne        then entry_value != @value
           when :neq       then entry_value != @value
           when :matches   then @value =~ entry_value
-          when :gt        then entry_value > @value
-          when :gte       then entry_value >= @value
-          when :lt        then entry_value < @value
-          when :lte       then entry_value <= @value
+          when :gt        then entry_value && entry_value > @value
+          when :gte       then entry_value && entry_value >= @value
+          when :lt        then entry_value && entry_value < @value
+          when :lte       then entry_value && entry_value <= @value
           when :size      then entry_value.size == @value
           when :all       then array_contains?([*@value], entry_value)
           when :in, :nin  then value_is_in_entry_value?(entry_value)

data/lib/locomotive/steam/liquid/drops/site.rb

@@ -4,7 +4,7 @@ module Locomotive
       module Drops
         class Site < I18nBase
 
-          delegate :name, :domains, :seo_title, :meta_keywords, :meta_description, :asset_host, to: :@_source
+          delegate :name, :handle, :domains, :seo_title, :meta_keywords, :meta_description, :asset_host, to: :@_source
 
           def index
             @index ||= repository.root.to_liquid

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

@@ -3,6 +3,74 @@ module Locomotive::Steam
 
     module Helpers
 
+      #= Shortcuts =
+
+      def services
+        @services ||= env.fetch('steam.services')
+      end
+
+      def repositories
+        @repositories ||= services.repositories
+      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 locales
+        site.locales
+      end
+
+      def default_locale
+        site.default_locale
+      end
+
+      def live_editing?
+        !!env['steam.live_editing']
+      end
+
+      def mounted_on
+        env['steam.mounted_on']
+      end
+
+      # if this is a JSON request with a JSON body, try to parse it
+      # if we are unable to parse it, fallback to the original params
+      def params
+        @params = env['steam.params']
+
+        return @params if @params.present?
+
+        if json? && (request.post? || request.put?)
+          @params = JSON.parse(request.body.read) rescue nil
+
+          request.body.rewind # leave the body as it was before we touched it
+        end
+
+        @params = env['steam.params'] = (@params || request.params).with_indifferent_access
+      end
+
+      #= Useful getters =
+
       def html?
         ['text/html', 'application/x-www-form-urlencoded', 'multipart/form-data'].include?(self.request.media_type) &&
         !self.request.xhr? &&
@@ -13,6 +81,8 @@ module Locomotive::Steam
         self.request.content_type == 'application/json' || File.extname(self.request.path) == '.json'
       end
 
+      #= Helper methods
+
       def render_response(content, code = 200, type = nil)
         @next_response = [code, { 'Content-Type' => type || 'text/html' }, [content]]
       end
@@ -45,8 +115,19 @@ module Locomotive::Steam
         location.gsub(Regexp.new('^' + mounted_on), '')
       end
 
-      def mounted_on
-        request.env['steam.mounted_on']
+      def decorate_entry(entry)
+        return nil if entry.nil?
+        Locomotive::Steam::Decorators::I18nDecorator.new(entry, locale, default_locale)
+      end
+
+      def default_liquid_context
+        ::Liquid::Context.new({ 'site' => site.to_liquid }, {}, {
+          request:        request,
+          locale:         locale,
+          site:           site,
+          services:       services,
+          repositories:   services.repositories
+        }, true)
       end
 
       def log(msg, offset = 2)

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

@@ -6,14 +6,10 @@ module Locomotive::Steam::Middlewares
     attr_accessor :env
 
     def call(env)
-      threadsafed = dup
+      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._call
 
       threadsafed.next
     end
@@ -23,71 +19,6 @@ module Locomotive::Steam::Middlewares
       @next_response || (@next_response = app.call(env))
     end
 
-    #= Shortcuts =
-
-    def services
-      @services ||= env.fetch('steam.services')
-    end
-
-    def repositories
-      @repositories ||= services.repositories
-    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 locales
-      site.locales
-    end
-
-    def default_locale
-      site.default_locale
-    end
-
-    def params
-      @params ||= self.request.params.with_indifferent_access
-    end
-
-    def live_editing?
-      !!env['steam.live_editing']
-    end
-
-    def decorate_entry(entry)
-      return nil if entry.nil?
-      Locomotive::Steam::Decorators::I18nDecorator.new(entry, locale, default_locale)
-    end
-
-    def default_liquid_context
-      ::Liquid::Context.new({ 'site' => site.to_liquid }, {}, {
-        request:        request,
-        locale:         locale,
-        site:           site,
-        services:       services,
-        repositories:   services.repositories
-      }, true)
-    end
-
   end
 
 end

data/lib/locomotive/steam/repositories/content_entry_repository.rb

@@ -287,7 +287,7 @@ module Locomotive
           else
             value
           end
-          type == :date ? _value.to_date : _value.to_datetime
+          type == :date ? _value&.to_date : _value&.to_datetime
         end
 
       end

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.4.0.rc2'
+    VERSION = '1.4.0'
   end
 end

data/spec/unit/liquid/drops/site_spec.rb

@@ -4,13 +4,14 @@ describe Locomotive::Steam::Liquid::Drops::Site do
 
   let(:services)  { Locomotive::Steam::Services.build_instance }
   let(:context)   { ::Liquid::Context.new({}, {}, { services: services }) }
-  let(:site)      { instance_double('Site', name: 'Locomotive', domains: ['acme.org'], seo_title: 'seo title', meta_keywords: 'keywords', meta_description: 'description', localized_attributes: {}, asset_host: 'http://asset.dev') }
+  let(:site)      { instance_double('Site', handle: 'locomotive', name: 'Locomotive', domains: ['acme.org'], seo_title: 'seo title', meta_keywords: 'keywords', meta_description: 'description', localized_attributes: {}, asset_host: 'http://asset.dev') }
   let(:drop)      { described_class.new(site).tap { |d| d.context = context } }
 
   subject { drop }
 
   it 'gives access to general attributes' do
     expect(subject.name).to eq 'Locomotive'
+    expect(subject.handle).to eq 'locomotive'
     expect(subject.seo_title).to eq 'seo title'
     expect(subject.meta_keywords).to eq 'keywords'
     expect(subject.meta_description).to eq 'description'

data/spec/unit/middlewares/helpers_spec.rb

@@ -58,4 +58,65 @@ describe Locomotive::Steam::Middlewares::Helpers do
 
   end
 
+  describe '#params' do
+
+    let(:url)             { 'http://models.example.com' }
+    let(:app)             { ->(env) { [200, env, 'app'] } }
+    let(:options)         { {} }
+
+    before do
+      env = env_for(url, options)
+      env['steam.request'] = Rack::Request.new(env)
+      allow(instance).to receive(:app).and_return(app)
+      allow(instance).to receive(:env).and_return(env)
+    end
+
+    subject { instance.params }
+
+    context 'from a GET' do
+
+      let(:url) { 'http://models.example.com?foo=bar' }
+
+      it { is_expected.to eq('foo' => 'bar') }
+
+    end
+
+    context 'from a GET (JSON)' do
+
+      let(:url) { 'http://models.example.com/api.json?foo=bar' }
+
+      it { is_expected.to eq('foo' => 'bar') }
+
+    end
+
+    context 'from the body of JSON POST request' do
+
+      let(:input) { '{"foo": { "bar": 42 } }' }
+
+      let(:options) { {
+        method: 'POST',
+        input:  input,
+        'CONTENT_TYPE' => 'application/json'
+      } }
+
+      it { is_expected.to eq('foo' => { 'bar' => 42 }) }
+
+      it 'builds a hash with indifferent access' do
+        expect(subject[:foo][:bar]).to eq 42
+      end
+
+      context 'the JSON is invalid' do
+
+        let(:input) { '{ a: 2 }' }
+
+        it 'returns an empty hash' do
+          is_expected.to eq({})
+        end
+
+      end
+
+    end
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_steam
 version: !ruby/object:Gem::Version
-  version: 1.4.0.rc2
+  version: 1.4.0
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-30 00:00:00.000000000 Z
+date: 2018-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -895,9 +895,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.7.3