locomotivecms_steam 1.2.0.rc3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eec023af794726f45fcdf70d6cb85b9874a8b56e
-  data.tar.gz: 67d5c5968b4597655ead417285dfa9163204d819
+  metadata.gz: 55dc6e31d1bf0a7b9713eec9c4e60a825afe2803
+  data.tar.gz: c541108e250a7c1b9d4d052bc852d5cac4c9d8f4
 SHA512:
-  metadata.gz: e6e0cab759ddd568f92f50dd88a4e1116b09f2ac959908dcf0067da5c4e2d90236fa75d3beabb7c8070fdaee9a8d7015d677b74d29aeb84c00beec500a7ff125
-  data.tar.gz: 86e838bd1b3db3ff5cd16465c1a0fb2d2ded0000368cbaca310409fc8fd93a93b90bb42e3252dd94313336f27fa7a3e5d3253dc6fd6af1499280ee652a89485e
+  metadata.gz: ad6e4a7821c20f1c4029f5dcbcb234fda822d0f65f2f8e2d68c49510a7603933643730224854b35ea9d955c760526a25ed1c3ab5f70524cc2a38d2a889fb8d69
+  data.tar.gz: 604e238795bcba4e957f6b662c4aec28a9d6b4c325e0070f2da3bf1a862795b9ff92a1578dbf504ef7fc1293166d54ad51e05d56b423b70561f2edfca3ee0782

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.2.0.rc3)
+    locomotivecms_steam (1.2.0)
       RedCloth (~> 4.3.2)
       autoprefixer-rails (~> 6.3.3.1)
       chronic (~> 0.10.2)
@@ -36,7 +36,8 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.4.0)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
     attr_extras (4.4.0)
     autoprefixer-rails (6.3.3.1)
       execjs
@@ -121,7 +122,7 @@ GEM
     multi_xml (0.5.5)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-    nokogumbo (1.4.9)
+    nokogumbo (1.4.10)
       nokogiri
     origin (2.2.0)
     pony (1.11)
@@ -133,6 +134,7 @@ GEM
     pry-byebug (3.3.0)
       byebug (~> 8.0)
       pry (~> 0.10)
+    public_suffix (2.0.4)
     puma (3.6.0)
     rack (2.0.1)
     rack-cache (1.6.1)
@@ -145,7 +147,7 @@ GEM
     rack_csrf (2.5.0)
       rack (>= 1.1.0)
     rake (10.4.2)
-    rb-fsevent (0.9.7)
+    rb-fsevent (0.9.8)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
     rspec (3.4.0)

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

@@ -33,7 +33,9 @@ module Locomotive::Steam
       # - the type of response asked by the browser (html or json)
       #
       def navigation_behavior(entry)
-        if entry.errors.empty?
+        if entry.nil?
+          raise 'TODO'
+        elsif entry.errors.empty?
           navigation_success(entry)
         else
           navigation_error(entry)
@@ -74,7 +76,7 @@ module Locomotive::Steam
 
       def entry_to_query_string(entry)
         service_params = [
-          services.csrf_protection.field,
+          csrf_field,
           CONTENT_TYPE_PARAM,
           SUBMITTED_TYPE_PARAM,
           SUBMITTED_PARAM,
@@ -139,7 +141,7 @@ module Locomotive::Steam
       #
       #
       def create_entry(slug)
-        if entry = services.entry_submission.submit(slug, entry_attributes)
+        if entry = entry_submission.submit(slug, entry_attributes)
           entry
         else
           raise %{Unknown content type "#{slug}" or public_submission_enabled property not true}
@@ -150,7 +152,7 @@ module Locomotive::Steam
       #
       def fetch_entry
         if (type_slug = params[SUBMITTED_TYPE_PARAM]) && (slug = params[SUBMITTED_PARAM])
-          if entry = services.entry_submission.find(type_slug, slug)
+          if entry = entry_submission.find(type_slug, slug)
             store_in_liquid(entry)
           end
         end
@@ -163,7 +165,7 @@ module Locomotive::Steam
       # @return [ Array ] The rack response depending on the validation status and the requested format
       #
       def json_response(entry, status = 200)
-        json = services.entry_submission.to_json(entry)
+        json = entry_submission.to_json(entry)
         render_response(json, status, 'application/json')
       end
 
@@ -171,6 +173,14 @@ module Locomotive::Steam
         HashConverter.to_sym(params[:entry] || params[:content] || {})
       end
 
+      def entry_submission
+        services.entry_submission
+      end
+
+      def csrf_field
+        services.csrf_protection.field
+      end
+
     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.2.0.rc3'
+    VERSION = '1.2.0'
   end
 end

data/spec/unit/middlewares/entry_submission_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+require_relative '../../../lib/locomotive/steam/middlewares/thread_safe'
+require_relative '../../../lib/locomotive/steam/middlewares/helpers'
+require_relative '../../../lib/locomotive/steam/middlewares/entry_submission'
+
+describe Locomotive::Steam::Middlewares::EntrySubmission do
+
+  let(:app)         { ->(env) { [200, env, ['app']] } }
+  let(:site)        { instance_double('Site', default_locale: 'en', locales: ['en']) }
+  let(:middleware)  { described_class.new(app) }
+  let(:service)     { instance_double('EntrySubmission') }
+  let(:services)    { instance_double('Services', entry_submission: service, :locale= => 'en') }
+  let(:session)     { {} }
+  let(:method)      { 'POST' }
+
+  before do
+    allow_any_instance_of(described_class).to receive(:csrf_field).and_return('csrf_field')
+  end
+
+  describe '#call' do
+
+    let(:rack_env) { build_env }
+
+    before do
+      expect(service).to receive(:submit).with('contacts', { email: 'john@doe.net' }).and_return(entry)
+    end
+
+    subject { middleware.call(rack_env) }
+
+    context 'the creation of a content entry returns nil' do
+
+      let(:form)  { { content_type_slug: 'contacts', content: { email: 'john@doe.net' } } }
+      let(:entry) { nil }
+
+      it 'raises an exception' do
+        expect { subject }.to raise_exception('Unknown content type "contacts" or public_submission_enabled property not true')
+      end
+
+    end
+
+  end
+
+  def build_env
+    env_for('http://example.com/contact-us', params: form, method: method).tap do |env|
+      env['steam.request']    = Rack::Request.new(env)
+      env['steam.site']       = site
+      env['steam.services']   = services
+      env['rack.session']     = session
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_steam
 version: !ruby/object:Gem::Version
-  version: 1.2.0.rc3
+  version: 1.2.0
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2016-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -794,6 +794,7 @@ files:
 - spec/unit/liquid/tags/snippet_spec.rb
 - spec/unit/liquid/tags/with_scope_spec.rb
 - spec/unit/middlewares/dynamic_assets_spec.rb
+- spec/unit/middlewares/entry_submission_spec.rb
 - spec/unit/middlewares/helpers_spec.rb
 - spec/unit/middlewares/locale_redirection_spec.rb
 - spec/unit/middlewares/page_spec.rb
@@ -845,9 +846,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
@@ -1055,6 +1056,7 @@ test_files:
 - spec/unit/liquid/tags/snippet_spec.rb
 - spec/unit/liquid/tags/with_scope_spec.rb
 - spec/unit/middlewares/dynamic_assets_spec.rb
+- spec/unit/middlewares/entry_submission_spec.rb
 - spec/unit/middlewares/helpers_spec.rb
 - spec/unit/middlewares/locale_redirection_spec.rb
 - spec/unit/middlewares/page_spec.rb