locomotivecms_steam 1.0.0.rc4 → 1.0.0.rc6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a09d7e73bc37c30f64b170c09a38a6761db8788f
-  data.tar.gz: 6611a2cd44128874452e1172ad77a1b38e128134
+  metadata.gz: 73dc9ea0190083dd20c33f5e820da421b36d11b4
+  data.tar.gz: 5e74931081e00c151d857c449f0c14c3219e0f67
 SHA512:
-  metadata.gz: b759d95e386dd121a7936bb4715ec5fe8d308af8854c4408ff16d0a878dfcc31d50e45e0a16d6847a3360a83d528ddfbc479dbd74ca8f606bb63381f20cc8657
-  data.tar.gz: 9e51a4924b1f934f08dbd5dd3fc503ef1c18454e753a742009890bbe2abae6e231f8c60ddd39a75bb253f3a136e69976ad48f4ca7ae1fbda3d0aaa654e5aeb12
+  metadata.gz: b4e2759d7ab8798c17f8a4a40b0779228410c8b0f0fb96b4aad83dd7589a2059e1baae8dae58be3f448ccd07ca2933e1ddd2a8a1e918924f3fb44a730825a4f9
+  data.tar.gz: 7b443e9021b581bd62cee286dd74bb02ee966086064313866f1379055069d23a30f5b198de07aa9da308772eb89003f0e5ae6f6eef07b317c4e2bcbed6d728c8

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 services: mongodb
 before_script: ./script/ci/before_build.sh
 rvm:
-  - 2.2.2
+  - 2.2.3
 env:
   - CODECLIMATE_REPO_TOKEN=3fa74f2ade25037fccd7261090acbdeae232639c3a83aafb80ee428ec16b8cf9
 addons:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.0.0.rc4)
+    locomotivecms_steam (1.0.0.rc6)
       RedCloth (~> 4.2.9)
       chronic (~> 0.10.2)
       coffee-script (~> 2.4.1)
@@ -120,7 +120,7 @@ GEM
     mime-types (2.6.1)
     mimetype-fu (0.1.2)
     mini_portile (0.6.2)
-    minitest (5.8.2)
+    minitest (5.8.3)
     moneta (0.8.0)
     mongo (2.1.2)
       bson (~> 3.0)
@@ -128,7 +128,7 @@ GEM
     multi_json (1.11.1)
     multi_xml (0.5.5)
     netrc (0.10.3)
-    nokogiri (1.6.6.2)
+    nokogiri (1.6.6.4)
       mini_portile (~> 0.6.0)
     nokogumbo (1.4.1)
       nokogiri

data/lib/locomotive/steam/decorators/i18n_decorator.rb

@@ -51,6 +51,14 @@ module Locomotive
           end
         end
 
+        def __with_default_locale__(&block)
+          if self.__default_locale__
+            __with_locale__(self.__default_locale__, &block)
+          else
+            yield
+          end
+        end
+
         def __freeze_locale__
           @__frozen_locale__ = true
         end

data/lib/locomotive/steam/decorators/template_decorator.rb

@@ -11,12 +11,16 @@ module Locomotive
           if respond_to?(:template_path) && template_path
             source_from_template_file
           else
-            self.source
+            self.source.blank? ? source_in_default_locale : self.source
           end
         end
 
         private
 
+        def source_in_default_locale
+          self.__with_default_locale__ { self.source }
+        end
+
         def source_from_template_file
           source = File.read(template_path).force_encoding('utf-8')
 

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

@@ -23,6 +23,8 @@ module Locomotive
       protected
 
       def fetch_file(source)
+        return nil if source.blank?
+
         url_or_path = get_url_or_path(source)
 
         if url_or_path =~ Steam::IsHTTP

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

@@ -13,7 +13,7 @@ module Locomotive
         # build the url of the theme asset based on the persistence layer
         _url = repository.url_for(path)
 
-        # get a timestamp only the source url does not include a query string
+        # get a timestamp only if the source url doesn't include a query string
         timestamp = query_string.blank? ? checksums[path] : nil
 
         # prefix by a asset host if given

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.rc4'
+    VERSION = '1.0.0.rc6'
   end
 end

data/spec/unit/decorators/i18n_decorator_spec.rb

@@ -46,9 +46,40 @@ describe Locomotive::Steam::Decorators::I18nDecorator do
 
   describe 'using the default locale' do
 
-    let(:locale)          { 'de' }
-    let(:default_locale)  { 'en' }
-    it { expect(decorated.title).to eq 'Hello world!' }
+    let(:default_locale) { 'en' }
+
+    context 'unknown locale' do
+
+      let(:locale) { 'de' }
+
+      it { expect(decorated.title).to eq 'Hello world!' }
+
+    end
+
+    context 'existing locale' do
+
+      let(:locale) { 'fr' }
+
+      it 'uses the default locale and get back to the previous one' do
+        decorated.__with_default_locale__ do
+          expect(decorated.title).to eq 'Hello world!'
+        end
+        expect(decorated.__locale__).to eq :fr
+      end
+
+      context 'default_locale is nil' do
+
+        let(:default_locale) { nil }
+
+        it 'yields the block if no default locale' do
+          decorated.__with_default_locale__ do
+            expect(decorated.title).to eq 'Bonjour monde'
+          end
+        end
+
+      end
+
+    end
 
   end
 

data/spec/unit/decorators/template_decorator_spec.rb

@@ -5,7 +5,7 @@ describe Locomotive::Steam::Decorators::TemplateDecorator do
   let(:template_path)   { 'template.liquid' }
   let(:page)            { instance_double('Page', localized_attributes: [], template_path: template_path) }
   let(:locale)          { 'fr' }
-  let(:default_locale)  { nil }
+  let(:default_locale)  { 'en' }
   let(:decorated)       { described_class.new(page, locale, default_locale) }
 
   describe '#liquid_source' do
@@ -18,6 +18,14 @@ describe Locomotive::Steam::Decorators::TemplateDecorator do
 
     it { is_expected.to eq 'Lorem ipsum' }
 
+    context 'Raw template' do
+
+      let(:page) { instance_double('Page', localized_attributes: [:source], source: { en: 'Lorem ipsum [EN]', fr: '' }) }
+
+      it { is_expected.to eq 'Lorem ipsum [EN]' }
+
+    end
+
     context 'HAML file' do
 
       let(:template_path) { 'template.liquid.haml' }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_steam
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc4
+  version: 1.0.0.rc6
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2015-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler