locomotivecms_wagon 2.2.0.rc2 → 2.2.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52fd2b1db00c64e0a1378a8ece082374ac3b7f14
-  data.tar.gz: 2c6357e45921c7655bcbec88b4576d295bcae1a4
+  metadata.gz: 6975244fe7a2d1cdf8c2e261440f6a809b48f048
+  data.tar.gz: 27f4950a89ec9a5857eecb31c34d7a0ab6c87b9b
 SHA512:
-  metadata.gz: e3ad48fc103305f876cb47e0179f83b2450289504ff59454e8494008396977605327f8bc2979993521d0844b20b5b1958a28a8eb8ee584c1320d6d7d1ce963d7
-  data.tar.gz: 851e04f5cf06181e9b53e12a7d52929dddd8becd6aa00f5073db54d8cbccd1881ca51ae50af2d473a17338150073eb1d0b193e9b119221aebfbd2a0f0d64c1e9
+  metadata.gz: 3af332b6afa4227b7755315e8079ffb82973d8c7daa768eba466ebb1d76165201859a6d3ea56f1360dbc8ef3632131224b3d52c3ef38c0025f75a8678eab4af5
+  data.tar.gz: 627f9e406a83ce2824c495907c4e8e71ae01c2f4b445521a476c0737e8132cf87c3f54eef8ac49eeac2d0ee6d942d28b9c16ff89e8e019fd4294beace933ec37

data/lib/locomotive/wagon/commands/pull_sub_commands/concerns/assets_concern.rb

@@ -6,7 +6,7 @@ module Locomotive::Wagon
 
   module AssetsConcern
 
-    REGEX = /(https?:\/\/\S+)?\/sites\/[0-9a-f]{24}\/(assets|pages|theme|content_entry[0-9a-f]{24})\/(([^;.]+)\/)*([a-zA-Z_\-0-9.%]+)\.([A-Za-z]{2,})(\?\w+)?/
+    REGEX = /(https?:\/\/\S+)?\/sites\/[0-9a-f]{24}\/(assets|pages|theme|content_entry[0-9a-f]{24})\/(([^;.]+)\/)*([a-zA-Z_\-0-9.%]+)(\?\w+)?/
 
     # The content assets on the remote engine follows the format: /sites/<id>/assets/<type>/<file>
     # This method replaces these urls by their local representation. <type>/<file>
@@ -17,7 +17,7 @@ module Locomotive::Wagon
       return '' if content.blank?
 
       content.force_encoding('utf-8').gsub(REGEX) do |url|
-        filename = "#{$5}.#{$6}"
+        filename = $5
         folder = case $2
         when 'assets', 'pages'  then File.join('samples', $2)
         when 'theme'            then $4

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

@@ -27,7 +27,6 @@ module Locomotive::Wagon
     def yaml_attributes(content_type, entry)
       fields            = %w(_slug) + content_type.fields.map { |f| f['name'] } + %w(seo_title meta_description meta_keywords)
       localized_fields  = (content_type.attributes['localized_names'] || []) + %w(_slug seo_title meta_description meta_keywords)
-      fields_with_urls  = content_type.attributes['urls_names']
 
       attributes = {}
 
@@ -41,6 +40,8 @@ module Locomotive::Wagon
         end
       end
 
+      attributes['_visible'] = false unless entry[default_locale].attributes['_visible'] == true
+
       { entry[default_locale].attributes[content_type.label_field_name].to_s => clean_attributes(attributes) }
     end
 

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

@@ -28,7 +28,11 @@ EOF
     private
 
     def yaml_attributes(page, locale)
-      attributes = page.attributes.slice('title', 'slug', 'handle', 'position', 'listed', 'published', 'redirect_url', 'is_layout', 'content_type', 'seo_title', 'meta_description', 'meta_keywords')
+      keys = ['title', 'slug', 'handle', 'position', 'listed', 'published', 'redirect_url', 'is_layout', 'content_type', 'seo_title', 'meta_description', 'meta_keywords']
+
+      keys << 'response_type' if page.attributes['response_type'] != 'text/html'
+
+      attributes = page.attributes.slice(*keys)
 
       if locale != default_locale
         attributes.delete_if { |k, _| %w(handle position listed published is_layout content_type).include?(k) }

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

@@ -3,7 +3,7 @@ module Locomotive::Wagon
   class PullSiteCommand < PullBaseCommand
 
     def _pull
-      attributes = current_site.attributes.slice('name', 'locales', 'domains', 'timezone', 'seo_title', 'meta_keywords', 'meta_description', 'picture_thumbnail_url', 'metafields', 'metafields_schema', 'metafields_ui')
+      attributes = current_site.attributes.slice('name', 'locales', 'domains', 'timezone', 'seo_title', 'meta_keywords', 'meta_description', 'picture_thumbnail_url', 'metafields', 'metafields_schema', 'metafields_ui', 'robots_txt')
 
       locales.each_with_index do |locale, index|
         if index == 0

data/lib/locomotive/wagon/commands/sync_sub_commands/sync_pages_command.rb

@@ -32,7 +32,7 @@ module Locomotive::Wagon
     end
 
     def replace_editable_elements(filepath, replacement)
-      content   = File.read(File.join(path, filepath))
+      content   = File.read(File.join(path, filepath), encoding: 'utf-8')
       existing  = content =~ /\A.*?editable_elements:.*?\n---/m
 
       content.gsub /\A---(.*?)\n---/m do |s|

data/lib/locomotive/wagon/version.rb

@@ -1,5 +1,5 @@
 module Locomotive
   module Wagon
-    VERSION = '2.2.0.rc2'
+    VERSION = '2.2.0.rc3'
   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.rc2'
+  gem.add_dependency 'locomotivecms_steam',   '~> 1.2.0.rc3'
 
   gem.add_dependency 'haml',                  '~> 4.0.7'
   gem.add_dependency 'listen',                '~> 3.0.4'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_wagon
 version: !ruby/object:Gem::Version
-  version: 2.2.0.rc2
+  version: 2.2.0.rc3
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-15 00:00:00.000000000 Z
+date: 2016-10-26 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.rc2
+        version: 1.2.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0.rc2
+        version: 1.2.0.rc3
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement