locomotivecms_steam 1.1.0.rc2 → 1.1.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c17c4a04bf43a0773bfe7862cc8a0b8b6f4cc1df
-  data.tar.gz: 5f42f142c5e32e216aaaddb71e664297b1946d25
+  metadata.gz: 42c767e4b89256e979cc9e73a2851227052b8478
+  data.tar.gz: 45d39c6d1b6ee403c4797f2793eeecbe03e56d2f
 SHA512:
-  metadata.gz: 839e0df868a0fe863513d9b9d772810825a632b1a8abdaca54c3a803b8c08261e1c85b2b696a6ccc0b856b4682581c62e94d2922fc7449fa96b1777d81f94652
-  data.tar.gz: 8ebed488b272103bc81bddd06e387663ddb44fb93a62b35b62cc1caecb7851c4a2ffa25d60532caaf9f11228207d8d5e679b2c37ff5e09045a3bd060af7648a8
+  metadata.gz: cf631f30710f478aa18d766fb9b302fbea3a671ca4cc8b0c02ade4d6e3df11ffe162d779d06a0fac40df2348be9313fca2ef0d258dece9ad4e2666673415f782
+  data.tar.gz: aa70b068ba7218dbd9f29fe765860fb03b3eb3c72ef96956c48c9cb6596d0aaa896b700c1b111950cdb6dfa5ab1d4f1432b734e48aee3215693c00ede75231e9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.1.0.rc2)
+    locomotivecms_steam (1.1.0.rc3)
       RedCloth (~> 4.2.9)
       autoprefixer-rails (~> 6.3.3.1)
       chronic (~> 0.10.2)

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

@@ -40,7 +40,7 @@ module Locomotive
 
           def before_method(meth)
             if (meth.to_s =~ /^group_by_(.+)$/) == 0
-              repository.group_by_select_option(@content_type, $1)
+              repository.group_by_select_option($1)
             elsif (meth.to_s =~ /^(.+)_options$/) == 0
               select_options($1)
             else

data/lib/locomotive/steam/liquid/tags/model_form.rb

@@ -65,19 +65,34 @@ module Locomotive
           end
 
           def prepare_form_attributes(options)
-            action      = options[:action]
+            url         = action_url(options)
             attributes  = options.slice(:id, :class, :name, :novalidate)
 
-            if action.blank? && options[:json]
-              action = current_context['path']
-              action = (action.blank? ? 'index' : action) + '.json'
+            { method: 'POST', enctype: 'multipart/form-data' }.merge(attributes).tap do |_attributes|
+              _attributes[:action] = url if url
             end
+          end
 
-            { method: 'POST', enctype: 'multipart/form-data' }.merge(attributes).tap do |_attributes|
-              _attributes[:action] = action if action
+          def action_url(options)
+            url = options[:action]
+
+            if url.blank?
+              if options[:json]
+                url = current_context['path'].blank? ? '/' : current_context['path']
+                url + 'index.json'
+              else
+                nil
+              end
+            else
+              url = '/' + url unless url.starts_with?('/')
+              url_builder.prefix(url)
             end
           end
 
+          def url_builder
+            current_context.registers[:services].url_builder
+          end
+
         end
 
       end

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

@@ -102,7 +102,7 @@ module Locomotive
         groups_to_array(name, _groups).tap do |groups|
           # entries with a not existing select_option value?
           unless _groups.blank?
-            groups << { name: nil, entries: _groups.values.flatten }
+            groups << { name: nil, entries: _groups.values.flatten }.with_indifferent_access
           end
         end
       end
@@ -179,7 +179,7 @@ module Locomotive
       def groups_to_array(name, groups)
         content_type_repository.select_options(content_type, name).map do |option|
           option_name = i18n_value_of(option, :name)
-          { name: option_name, entries: groups.delete(option_name) || [] }
+          { 'name' => option_name, 'entries' => groups.delete(option_name) || [] }.with_indifferent_access
         end
       end
 

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

@@ -30,12 +30,12 @@ module Locomotive
         "/entry_submissions/#{content_type.slug}"
       end
 
-      private
-
       def prefix(url)
         mounted_on ? "#{mounted_on}#{url}" : url
       end
 
+      private
+
       def mounted_on
         return if request.nil?
         request.env['steam.mounted_on']

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.1.0.rc2'
+    VERSION = '1.1.0.rc3'
   end
 end

data/spec/integration/server/contact_form_spec.rb

@@ -96,7 +96,9 @@ describe 'ContactForm' do
 
       context 'when valid' do
 
-        let(:response) { post_contact_form(url, params, false, true) }
+        let(:env)             { {} }
+        let(:follow_redirect) { true }
+        let(:response)        { post_contact_form(url, params, false, follow_redirect, env) }
 
         it 'returns a success status' do
           expect(response.status).to eq 200
@@ -106,6 +108,17 @@ describe 'ContactForm' do
           expect(response.body.to_s).to include 'Thank you John'
         end
 
+        context 'mounted on a different path than /' do
+
+          let(:env)             { { 'steam.mounted_on' => '/foo/bar/' } }
+          let(:follow_redirect) { false }
+
+          it 'redirects to the location prefixed by the mounted_on path' do
+            expect(response.location).to match(/\A\/foo\/bar\/\/events\?submitted_type_slug=messages\&submitted_entry_slug=john/)
+          end
+
+        end
+
       end
 
     end
@@ -162,13 +175,13 @@ describe 'ContactForm' do
 
   end
 
-  def post_contact_form(url, params, json = false, follow_redirect = false)
+  def post_contact_form(url, params, json = false, follow_redirect = false, env = {})
     if json
       url += '.json'
       params = params.symbolize_keys
     end
 
-    post url, params
+    post url, params, env
 
     follow_redirect! if follow_redirect
 

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

@@ -88,7 +88,7 @@ describe Locomotive::Steam::Liquid::Drops::ContentEntryCollection do
   describe 'group entries by a select/belongs_to field' do
 
     before do
-      expect(services.repositories.content_entry).to receive(:group_by_select_option).with(content_type, 'category').and_return([['a', [1, 2]]])
+      expect(services.repositories.content_entry).to receive(:group_by_select_option).with('category').and_return([['a', [1, 2]]])
     end
 
     it { expect(drop.before_method(:group_by_category)).to eq [['a', [1, 2]]] }

data/spec/unit/liquid/tags/model_form_spec.rb

@@ -8,10 +8,12 @@ describe Locomotive::Steam::Liquid::Tags::ModelForm do
     allow(Rack::Csrf).to receive(:token).and_return(42)
   end
 
-  let(:request)   { instance_double('Request', env: {}) }
+  let(:path)      { '' }
+  let(:env)       { {} }
+  let(:request)   { instance_double('Request', env: env) }
   let(:source)    { "{% model_form 'newsletter_addresses' %}Newsletter Form{% endmodel_form %}" }
   let(:services)  { Locomotive::Steam::Services.build_instance(request) }
-  let(:context)   { ::Liquid::Context.new({ path: '' }, {}, { services: services }) }
+  let(:context)   { ::Liquid::Context.new({ 'path' => path }, {}, { services: services }) }
 
   subject { render_template(source, context) }
 
@@ -35,7 +37,29 @@ describe Locomotive::Steam::Liquid::Tags::ModelForm do
   describe 'json enabled' do
 
     let(:source) { "{% model_form 'newsletter_addresses', json: true %}Newsletter Form{% endmodel_form %}" }
-    it { is_expected.to eq %(<form method="POST" enctype="multipart/form-data" action="index.json"><input type="hidden" name="content_type_slug" value="newsletter_addresses" /><input type="hidden" name="token" value="42" />Newsletter Form</form>) }
+    it { is_expected.to eq %(<form method="POST" enctype="multipart/form-data" action="/index.json"><input type="hidden" name="content_type_slug" value="newsletter_addresses" /><input type="hidden" name="token" value="42" />Newsletter Form</form>) }
+
+    context 'rendered at /_app/foo/preview' do
+
+      let(:path)  { '/_app/foo/preview/' }
+      let(:env)   { { 'steam.mounted_on' => '/_app/foo/preview/' } }
+      it { is_expected.to eq %(<form method="POST" enctype="multipart/form-data" action="/_app/foo/preview/index.json"><input type="hidden" name="content_type_slug" value="newsletter_addresses" /><input type="hidden" name="token" value="42" />Newsletter Form</form>) }
+
+    end
+
+  end
+
+  describe 'specifying an action' do
+
+    let(:source) { "{% model_form 'newsletter_addresses', action: 'foo/bar' %}Newsletter Form{% endmodel_form %}" }
+    it { is_expected.to eq %(<form method="POST" enctype="multipart/form-data" action="/foo/bar"><input type="hidden" name="content_type_slug" value="newsletter_addresses" /><input type="hidden" name="token" value="42" />Newsletter Form</form>) }
+
+    context 'mounted_on is not empty' do
+
+      let(:env) { { 'steam.mounted_on' => '/_app/foo/preview' } }
+      it { is_expected.to eq %(<form method="POST" enctype="multipart/form-data" action="/_app/foo/preview/foo/bar"><input type="hidden" name="content_type_slug" value="newsletter_addresses" /><input type="hidden" name="token" value="42" />Newsletter Form</form>) }
+
+    end
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_steam
 version: !ruby/object:Gem::Version
-  version: 1.1.0.rc2
+  version: 1.1.0.rc3
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler