locomotivecms_wagon 2.2.0.rc1 → 2.2.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df455a7f6accfcf8b3b18d115b4736b07b6088fa
-  data.tar.gz: 48208819e4bde10b2e31e1a50982c0addf98d883
+  metadata.gz: 52fd2b1db00c64e0a1378a8ece082374ac3b7f14
+  data.tar.gz: 2c6357e45921c7655bcbec88b4576d295bcae1a4
 SHA512:
-  metadata.gz: 65ad7102456ddcb49a0a5d0ec32109d58164a823fa88b7fe0f894469d7081848eca4fe3bb2d9ea9ceb8f3be0a9a65d9ad27abf2326c97db53f01e121bc6290ed
-  data.tar.gz: daab1c49d271fccffc9ec7462420ef5488780b4148e03af7996d2f668c3629d4a19fc009c35a10600581f47cab6e18e8891baf7e04f777b08db721d34c9becf9
+  metadata.gz: e3ad48fc103305f876cb47e0179f83b2450289504ff59454e8494008396977605327f8bc2979993521d0844b20b5b1958a28a8eb8ee584c1320d6d7d1ce963d7
+  data.tar.gz: 851e04f5cf06181e9b53e12a7d52929dddd8becd6aa00f5073db54d8cbccd1881ca51ae50af2d473a17338150073eb1d0b193e9b119221aebfbd2a0f0d64c1e9

data/lib/locomotive/wagon/commands/pull_sub_commands/pull_pages_command.rb

@@ -21,6 +21,7 @@ module Locomotive::Wagon
 #{yaml_attributes(page, locale)}---
 #{replace_asset_urls(page.template)}
 EOF
+        .gsub(/\n$/, '')
       end
     end
 

data/lib/locomotive/wagon/commands/push_sub_commands/push_pages_command.rb

@@ -49,7 +49,10 @@ module Locomotive::Wagon
     end
 
     def can_update?(local_entity)
-      if local_entity.handle && id = remote_entity_id_from_handle(local_entity)
+      # checking pathes only if the current locale is the default one
+      if  local_entity.__locale__.to_s == default_locale.to_s &&
+          local_entity.handle &&
+          id = remote_entity_id_from_handle(local_entity)
         remote_entity_folder_path(id) == local_entity.folder_path
       else
         true
@@ -79,7 +82,7 @@ module Locomotive::Wagon
 
       @remote_entities = {}.tap do |hash|
         api_client.pages.fullpaths(default_locale).each do |entity|
-          hash[entity.fullpath]       = entity._id
+          hash[entity.fullpath] = entity._id
 
           if entity.respond_to?(:handle) && entity.handle.present?
             # to_sym: trick to not have conflicts with fullpaths

data/lib/locomotive/wagon/decorators/page_decorator.rb

@@ -8,10 +8,10 @@ module Locomotive
 
       attr_accessor :__content_assets_pusher__, :__persist_content__
 
-      def initialize(object, locale = nil, content_assets_pusher, persist_content)
+      def initialize(object, locale, content_assets_pusher, persist_content)
         self.__content_assets_pusher__ = content_assets_pusher
         self.__persist_content__ = persist_content
-        super(object, locale, nil)
+        super(object, locale, nil) # we don't need a fallback to the default locale
       end
 
       def __attributes__

data/lib/locomotive/wagon/version.rb

@@ -1,5 +1,5 @@
 module Locomotive
   module Wagon
-    VERSION = '2.2.0.rc1'
+    VERSION = '2.2.0.rc2'
   end
 end

data/locomotivecms_wagon.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'locomotivecms_common',  '~> 0.2.0'
   gem.add_dependency 'locomotivecms_coal',    '~> 1.3.0.rc1'
-  gem.add_dependency 'locomotivecms_steam',   '~> 1.2.0.rc1'
+  gem.add_dependency 'locomotivecms_steam',   '~> 1.2.0.rc2'
 
   gem.add_dependency 'haml',                  '~> 4.0.7'
   gem.add_dependency 'listen',                '~> 3.0.4'

data/spec/unit/commands/push_sub_commands/push_pages_command_spec.rb

@@ -86,7 +86,8 @@ describe Locomotive::Wagon::PushPagesCommand do
 
     let(:handle)  { nil }
     let(:folder)  { '' }
-    let(:page)    { instance_double('Page', fullpath: 'modified-about-us', folder_path: folder, handle: handle) }
+    let(:locale)  { :en }
+    let(:page)    { instance_double('Page', fullpath: 'modified-about-us', folder_path: folder, handle: handle, __locale__: locale, __default_locale__: :en) }
 
     subject { command.send(:can_update?, page) }
 
@@ -111,6 +112,14 @@ describe Locomotive::Wagon::PushPagesCommand do
 
     end
 
+    context 'another locale' do
+
+      let(:locale) { :fr }
+
+      it { is_expected.to eq true }
+
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_wagon
 version: !ruby/object:Gem::Version
-  version: 2.2.0.rc1
+  version: 2.2.0.rc2
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-11 00:00:00.000000000 Z
+date: 2016-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -115,14 +115,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0.rc1
+        version: 1.2.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0.rc1
+        version: 1.2.0.rc2
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement