locomotive_cms 2.5.6.rc2 → 2.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b39721a2c18764375ea4711a4d204b26c3f3389c
-  data.tar.gz: 71c5f61a9a06e22dbc9f0820628358fd3a26a173
+  metadata.gz: 5dfbff0cc38b5176c19758fbfc3f62445f568dd7
+  data.tar.gz: a3cbab7b3f997330faa9d3be3cd19102b4f4594e
 SHA512:
-  metadata.gz: 19ea3bdd811ca435f4a873b4db1f705f263586323ff8af846cb4c6a2fa949667069d4f1f0ed60b3b946d1dfaabe6cef144fcd2d0b0bc4d17af81c6bec6398163
-  data.tar.gz: 56d022b27bc92ce5326944d2175e13be7bfe12210c75d8646a562b8ba4361fca8f933ddeebce873cf7070c5bad6f5bf81a79eb58763a192b6c7c33ca2696b789
+  metadata.gz: 027015441876276ed84f1a4bd441f92e8c2f4b8e6ccae09321eeecf1bf762ec0e6f61cfeb3d0bf8a8a1d205dd3fed985dbdd3e0c4895efb4ead37afc0ab33438
+  data.tar.gz: fb8250bc13cb6e7e174967e11d91fc5061484f5cd1632f215a8612c2b6db114516fd9aa2fb593876d4e6eceb7d3e284f7bab3a4112a40d1761280ee79094343a

data/lib/locomotive/action_controller/public_responder.rb

@@ -12,6 +12,10 @@ module Locomotive
         end
       end
 
+      def api_location
+        success_location
+      end
+
       def navigation_error_behavior
         if error_location =~ %r(^http://)
           # simple redirection for outside urls

data/lib/locomotive/action_controller/url_helpers.rb

@@ -31,7 +31,7 @@ module Locomotive
         fullpath  = current_site.localized_page_fullpath(page, locale)
 
         if content = options.delete(:content)
-          fullpath = File.join(fullpath.gsub('content_type_template', ''), content._slug)
+          fullpath = fullpath.gsub('content_type_template', content._slug)
         end
 
         File.join(current_site_public_url, fullpath)

data/lib/locomotive/liquid/filters/misc.rb

@@ -17,6 +17,12 @@ module Locomotive
           input.blank? ? value : input
         end
 
+        # FIXME: to be removed once we use liquid > 2.6
+        # https://github.com/Shopify/liquid/blob/master/lib/liquid/standardfilters.rb#L81
+        def split(input, pattern)
+          input.to_s.split(pattern)
+        end
+
         # Render the navigation for a paginated collection
         def default_pagination(paginate, *args)
           return '' if paginate['parts'].empty?

data/lib/locomotive/version.rb

@@ -1,3 +1,3 @@
 module Locomotive #:nodoc
-  VERSION = '2.5.6.rc2'
+  VERSION = '2.5.6'
 end

data/spec/lib/locomotive/liquid/filters/misc_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe Locomotive::Liquid::Filters::Misc do
 
+  include Liquid::StandardFilters
   include Locomotive::Liquid::Filters::Base
   include Locomotive::Liquid::Filters::Misc
 
@@ -20,6 +21,23 @@ describe Locomotive::Liquid::Filters::Misc do
     default(nil, 42).should == 42
   end
 
+  describe 'split' do
+
+    let(:string) { nil }
+    subject { split(string, ',') }
+
+    it { should eq [] }
+
+    context 'a not nil value' do
+
+      let(:string) { 'foo,bar'}
+
+      it { should eq %w(foo bar) }
+
+    end
+
+  end
+
   describe 'random' do
 
     context 'from an integer' do

data/spec/requests/locale_redirection_spec.rb

@@ -9,12 +9,12 @@ describe 'Locomotive::Middlewares::LocaleRedirection' do
   let(:middleware)  { Locomotive::Middlewares::LocaleRedirection.new(app) }
   let(:locale)      { 'de' }
 
-  subject do 
+  subject do
     code, env = middleware.call(env_for(url, 'locomotive.site' => site, 'locomotive.locale' => locale))
     [code, env['Location']]
   end
 
-  describe 'not prefixed by locale' do 
+  describe 'not prefixed by locale' do
 
     describe 'strip default locale from root path' do
       let(:url) { 'http://models.example.com/de' }
@@ -50,10 +50,7 @@ describe 'Locomotive::Middlewares::LocaleRedirection' do
 
   end
 
-
-
-
-  describe 'prefixed by locale' do 
+  describe 'prefixed by locale' do
 
     let(:prefixed)    { true }
 
@@ -89,7 +86,7 @@ describe 'Locomotive::Middlewares::LocaleRedirection' do
     end
 
     describe 'with locale' do
-      
+
      describe 'dont add default locale if already present' do
         let(:locale) { 'de' }
         let(:url)    { 'http://models.example.com/de/hello/world' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locomotive_cms
 version: !ruby/object:Gem::Version
-  version: 2.5.6.rc2
+  version: 2.5.6
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-20 00:00:00.000000000 Z
+date: 2014-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -1457,9 +1457,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '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.2.2