locomotivecms_steam 1.1.0.rc1 → 1.1.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 400e04e9a4062cfc7e0102c922c2fe95cca51ce1
-  data.tar.gz: 2336e61a9aa71e12270250a0b5c9fe9954ed979f
+  metadata.gz: c17c4a04bf43a0773bfe7862cc8a0b8b6f4cc1df
+  data.tar.gz: 5f42f142c5e32e216aaaddb71e664297b1946d25
 SHA512:
-  metadata.gz: 93d703f38bc555e0eb23ff1aa5d212a5c26bd15d6e6c849a4f7a585093a3c952c45eafc11bb925e75548ebe0c3c0ad079c517391cb5adc9cc97b861910e8921a
-  data.tar.gz: 2cde9a62ba99ffcf7d731354af3faffbe01eaa2a76bb0f39a209f019df5cccf63b3ee08848a39ed9d70a96b8ab1ac3488997a5908355e17105acaf2aa66acbae
+  metadata.gz: 839e0df868a0fe863513d9b9d772810825a632b1a8abdaca54c3a803b8c08261e1c85b2b696a6ccc0b856b4682581c62e94d2922fc7449fa96b1777d81f94652
+  data.tar.gz: 8ebed488b272103bc81bddd06e387663ddb44fb93a62b35b62cc1caecb7851c4a2ffa25d60532caaf9f11228207d8d5e679b2c37ff5e09045a3bd060af7648a8

data/Gemfile.lock

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

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

@@ -42,7 +42,7 @@ module Locomotive
             if (meth.to_s =~ /^group_by_(.+)$/) == 0
               repository.group_by_select_option(@content_type, $1)
             elsif (meth.to_s =~ /^(.+)_options$/) == 0
-              content_type_repository.select_options(@content_type, $1)
+              select_options($1)
             else
               Locomotive::Common::Logger.warn "[Liquid template] trying to call #{meth} on a content_type object"
               nil
@@ -76,6 +76,16 @@ module Locomotive
             @repository || services.repositories.content_entry.with(@content_type)
           end
 
+          def select_options(name)
+            locale          = @context.registers[:locale]
+            default_locale  = @context.registers[:site].try(:default_locale)
+
+            (content_type_repository.select_options(@content_type, name) || []).map do |option|
+              _option = Locomotive::Steam::Decorators::I18nDecorator.new(option, locale, default_locale)
+              _option.name
+            end
+          end
+
         end
 
       end

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

@@ -22,7 +22,7 @@ module Locomotive
 
           def find_value(name)
             if field = fields[name]
-              t(values[name], field['localized'])
+              safe_value(t(values[name], field['localized']))
             else
               Locomotive::Common::Logger.warn "[Liquid template] unknown site metafield \"#{name}\" under #{@namespace['name']}"
               nil
@@ -45,7 +45,7 @@ module Locomotive
               {
                 'name'  => field['name'],
                 'label' => t(field['label']) || field['name'].humanize,
-                'value' => t(value, localized)
+                'value' => safe_value(t(value, localized))
               }
             end
           end
@@ -66,6 +66,10 @@ module Locomotive
             value[key]
           end
 
+          def safe_value(value)
+            value.blank? ? nil : value
+          end
+
         end
 
         class Metafields < Base

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

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

@@ -5,7 +5,7 @@ describe Locomotive::Steam::Liquid::Drops::ContentEntryCollection do
   let(:assigns)       { {} }
   let(:content_type)  { instance_double('ContentType', slug: 'articles') }
   let(:services)      { Locomotive::Steam::Services.build_instance }
-  let(:context)       { ::Liquid::Context.new(assigns, {}, { services: services }) }
+  let(:context)       { ::Liquid::Context.new(assigns, {}, { services: services, locale: :en }) }
   let(:drop)          { described_class.new(content_type).tap { |d| d.context = context } }
 
   before { allow(services).to receive(:current_site).and_return(nil) }
@@ -74,8 +74,11 @@ describe Locomotive::Steam::Liquid::Drops::ContentEntryCollection do
 
   describe 'get options of a select field' do
 
+    let(:option_a) { build_select_option(en: 'a') }
+    let(:option_b) { build_select_option('b') }
+
     before do
-      expect(services.repositories.content_type).to receive(:select_options).with(content_type, 'category').and_return(['a', 'b'])
+      expect(services.repositories.content_type).to receive(:select_options).with(content_type, 'category').and_return([option_a, option_b])
     end
 
     it { expect(drop.before_method(:category_options)).to eq ['a', 'b'] }
@@ -98,4 +101,11 @@ describe Locomotive::Steam::Liquid::Drops::ContentEntryCollection do
 
   end
 
+  def build_select_option(name)
+    _name = Locomotive::Steam::Models::I18nField.new('name', name)
+    Locomotive::Steam::ContentTypeField::SelectOption.new(name: _name).tap do |option|
+      option.localized_attributes = [:name]
+    end
+  end
+
 end

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

@@ -54,8 +54,17 @@ describe Locomotive::Steam::Liquid::Drops::Metafields do
 
           it { is_expected.to eq '42' }
 
+          context 'the value exists but is an empty string' do
+
+            let(:metafields)  { { 'my_namespace' => { 'analytics_id' => { 'default' => '' }, 'street' => { 'en' => '7 Albert Camus Alley', 'fr' => '7 allée Albert Camus' } } } }
+            it { is_expected.to eq nil }
+
+          end
+
         end
 
+
+
         context "the value doesn't exist" do
 
           subject { namespace.before_method(:country) }

metadata

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