locomotivecms_wagon 2.1.0.rc4 → 2.1.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c992663746d4414b01ab474e5e4169863dbf246e
-  data.tar.gz: 64dcd654ebf23562683183c5313decd1417b0b34
+  metadata.gz: fbfa30794e5fef44d286be75267b65d52ed3bcaf
+  data.tar.gz: 25dd384d0decd405edc613af02956ee6d6065494
 SHA512:
-  metadata.gz: f1c80340c057ba5867d1313553bf9e1c05c1181d57a2e2c3fc31988c5e941c3b64ec0791133df2618798c89a4891676243d1f2b9c984adccc332395112828a2c
-  data.tar.gz: 63dc747d936d59492842b1cf34d0418e8878fbbfa68f2c486c9763d1f3bb1dd7ade520e4a041041eebd105d3455ae08f619630733abf173959b57babd2e5701a
+  metadata.gz: d4b3d642b06e9b59c7a469baf8d55dc76a2699504975d605425a310b6843a7b9da590518998b93e92136c3efd64e2f75bad42e79f87efe2407f774a133a3f1d3
+  data.tar.gz: 7e3399257bdf768c364bb85387c65efd92de04d5c8705f11f46a7eb52fa2e2378a099e737d6d53bad1c408472b72de62569f59d030a5d9fa348e0ce45f5b1975

data/Gemfile

@@ -8,7 +8,7 @@ gem 'rb-fsevent', '~> 0.9.1'
 # Development
 # gem 'locomotivecms_common', github: 'locomotivecms/common', ref: '257047b', require: false
 # gem 'locomotivecms_coal',   github: 'locomotivecms/coal',   ref: 'f4ff435', require: false
-# gem 'locomotivecms_steam',  github: 'locomotivecms/steam',  ref: 'c44f003', require: false
+# gem 'locomotivecms_steam',  github: 'locomotivecms/steam',  ref: 'a3054f1', require: false
 
 # Local development
 # gem 'locomotivecms_coal', path: '../gems/coal', require: false

data/generators/blank/config/metafields_schema.yml

@@ -2,7 +2,7 @@
 #
 # Syntax:
 #
-# - <namespace_1>: # no empty spaces, only digits and underscores
+# <namespace_1>: # no empty spaces, only digits and underscores
 #   label: <my label> # used as the label of a tab in the back-office
 #   # label: # if you want to provide the label in another language (back-office)
 #   #   en: <your label in English if the local of the current user is English>
@@ -22,7 +22,7 @@
 #     # <name_2>:
 #     #   ...
 #
-# - <namespace_2>:
+# <namespace_2>:
 #   # ...
 #
 #

data/generators/bootstrap/config/metafields_schema.yml

@@ -2,7 +2,7 @@
 #
 # Syntax:
 #
-# - <namespace_1>: # no empty spaces, only digits and underscores
+# <namespace_1>: # no empty spaces, only digits and underscores
 #   label: <my label> # used as the label of a tab in the back-office
 #   # label: # if you want to provide the label in another language (back-office)
 #   #   en: <your label in English if the local of the current user is English>
@@ -22,7 +22,7 @@
 #     # <name_2>:
 #     #   ...
 #
-# - <namespace_2>:
+# <namespace_2>:
 #   # ...
 #
 #

data/generators/foundation5/config/metafields_schema.yml

@@ -2,7 +2,7 @@
 #
 # Syntax:
 #
-# - <namespace_1>: # no empty spaces, only digits and underscores
+# <namespace_1>: # no empty spaces, only digits and underscores
 #   label: <my label> # used as the label of a tab in the back-office
 #   # label: # if you want to provide the label in another language (back-office)
 #   #   en: <your label in English if the local of the current user is English>
@@ -22,7 +22,7 @@
 #     # <name_2>:
 #     #   ...
 #
-# - <namespace_2>:
+# <namespace_2>:
 #   # ...
 #
 #

data/generators/site_metafields/schema.yml.tt

@@ -2,7 +2,7 @@
 #
 # Syntax:
 #
-# - <namespace_1>: # no empty spaces, only digits and underscores
+# <namespace_1>: # no empty spaces, only digits and underscores
 #   label: <my label> # used as the label of a tab in the back-office
 #   # label: # if you want to provide the label in another language (back-office)
 #   #   en: <your label in English if the local of the current user is English>
@@ -22,7 +22,7 @@
 #     # <name_2>:
 #     #   ...
 #
-# - <namespace_2>:
+# <namespace_2>:
 #   # ...
 #
 #

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

@@ -39,11 +39,23 @@ module Locomotive::Wagon
       end
     end
 
-    def write_metafields_schema(schema)
-      return if schema.blank?
+    def decode_metafields_schema(schema)
+      if schema.is_a?(Array)
+        schema = array_of_hash_to_hash(schema, 'name') do |namespace|
+          namespace['fields'] = array_of_hash_to_hash(namespace.delete('fields'), 'name')
+        end
+      end
+
+      schema
+    end
+
+    def write_metafields_schema(json)
+      return if json.blank?
+
+      schema = decode_metafields_schema(JSON.parse(json))
 
       File.open(File.join(path, 'config', 'metafields_schema.yml'), 'wb') do |file|
-        file.write JSON.parse(schema).to_yaml
+        file.write schema.to_yaml
       end
     end
 
@@ -58,6 +70,16 @@ module Locomotive::Wagon
       attributes['metafields'] = replace_asset_urls_in_hash(metafields)
     end
 
+    def array_of_hash_to_hash(array, name, &block)
+      {}.tap do |hash|
+        (array || []).each do |element|
+          key = element.delete(name)
+          hash[key] = element
+          yield element if block_given?
+        end
+      end
+    end
+
     def localized_attributes(&block)
       %w(seo_title meta_keywords meta_description).each do |name|
         yield(name)

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

@@ -18,13 +18,15 @@ module Locomotive::Wagon
     end
 
     def persist(decorated_entity)
-      decorated_entity._id = remote_id = remote_entity_id(decorated_entity.fullpath)
+      decorated_entity._id = remote_id = remote_entity_id(decorated_entity)
 
       translated_in(decorated_entity) do |locale|
         if remote_id.nil?
           remote_id = api_client.pages.create(decorated_entity.to_hash)._id
-        else
+        elsif can_update?(decorated_entity)
           api_client.pages.update(remote_id, decorated_entity.to_hash, locale)
+        else
+          raise "The local and the remote (#{remote_entity_fullpath_from_handle(decorated_entity)}) versions of that page have the same handle but they are not in the same folder."
         end
       end
     end
@@ -46,20 +48,62 @@ module Locomotive::Wagon
       PageDecorator.new(entity, default_locale, content_assets_pusher, persist_content)
     end
 
-    def remote_entity_id(fullpath)
+    def can_update?(local_entity)
+      if local_entity.handle && id = remote_entity_id_from_handle(local_entity)
+        remote_entity_folder_path(id) == local_entity.folder_path
+      else
+        true
+      end
+    end
+
+    def remote_entity_id(local_entity)
+      remote_entity_id_from_fullpath(local_entity) || remote_entity_id_from_handle(local_entity)
+    end
+
+    def remote_entity_id_from_fullpath(local_entity)
+      fullpath = local_entity.fullpath
       remote_entities[fullpath] || remote_entities[fullpath.dasherize]
     end
 
+    def remote_entity_id_from_handle(local_entity)
+      remote_entities[local_entity.handle.try(:to_sym)]
+    end
+
+    def remote_entity_fullpath_from_handle(local_entity)
+      id = remote_entity_id_from_handle(local_entity)
+      remote_entities_by_id[id]
+    end
+
     def remote_entities
       return @remote_entities if @remote_entities
 
       @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
+            hash[entity.handle.to_sym]  = entity._id
+          end
         end
       end
     end
 
+    def remote_entity_folder_path(id)
+      if path = remote_entities_by_id[id]
+        *segments, slug = path.split('/')
+        segments.join('/')
+      else
+        nil
+      end
+    end
+
+    def remote_entities_by_id
+      @remote_entities_by_id ||= remote_entities.each_with_object({}) do |(key, value), out|
+        out[value] = key if key.is_a?(String)
+      end
+    end
+
     def translated_in(decorated_entity, &block)
       locales.find_all do |locale|
         decorated_entity.__with_locale__(locale) do

data/lib/locomotive/wagon/commands/serve_command.rb

@@ -151,7 +151,11 @@ module Locomotive::Wagon
 
         filepath = File.join(File.expand_path(path), 'app', 'views', 'pages', fullpath + (locale != default_locale ? ".#{locale}" : '') + '.liquid')
 
-        message = "[Tip]".light_white + " add a new page in your Wagon site at this location: " + filepath.light_white
+        message = if File.exists?(filepath)
+          "[Warning]".red + ' by default and unless you overide the slug in the YAML header of your page, Wagon will replace underscores by dashes in your page slug. Try this instead: ' + fullpath.dasherize.light_white
+        else
+          "[Tip]".light_white + " add a new page in your Wagon site at this location: " + filepath.light_white
+        end
 
         Locomotive::Common::Logger.info (' ' * 2) + message
       end

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

@@ -30,6 +30,11 @@ module Locomotive
           _attributes -= %i(title published listed position seo_title meta_keywords meta_description editable_elements)
         end
 
+        # no need to update the slug if this is for an update
+        # in case of a localized site, if this is a new page, the _id will remain empty
+        # for the other locales.
+        _attributes -= %i(slug) if persisted?
+
         _attributes
       end
 
@@ -77,6 +82,11 @@ module Locomotive
         replace_with_content_assets!(self.liquid_source)
       end
 
+      def folder_path
+        *segments, slug = fullpath.split('/')
+        segments.join('/')
+      end
+
       private
 
       def persisted?

data/lib/locomotive/wagon/version.rb

@@ -1,5 +1,5 @@
 module Locomotive
   module Wagon
-    VERSION = '2.1.0.rc4'
+    VERSION = '2.1.0.rc5'
   end
 end

data/locomotivecms_wagon.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'locomotivecms_common',  '~> 0.1.0'
   gem.add_dependency 'locomotivecms_coal',    '~> 1.1.0'
-  gem.add_dependency 'locomotivecms_steam',   '~> 1.1.0.rc2'
+  gem.add_dependency 'locomotivecms_steam',   '~> 1.1.0.rc3'
 
   gem.add_dependency 'listen',                '~> 3.0.4'
   gem.add_dependency 'rack-livereload',       '~> 0.3.16'

data/spec/fixtures/cassettes/authenticate.yml

@@ -7,14 +7,16 @@ http_interactions:
       encoding: UTF-8
       string: email=john%40doe.net&password=asimplepassword
     headers:
+      User-Agent:
+      - HTTPClient/1.0 (2.7.1, ruby 2.2.3 (2015-08-18))
       Accept:
       - application/json
+      Accept-Encoding:
+      - gzip,deflate
+      Date:
+      - Mon, 21 Mar 2016 17:36:40 GMT
       Content-Type:
       - application/x-www-form-urlencoded
-      Accept-Encoding:
-      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-      User-Agent:
-      - Ruby
   response:
     status:
       code: 401
@@ -27,16 +29,16 @@ http_interactions:
       Cache-Control:
       - no-cache
       X-Request-Id:
-      - 4c1dde74-5ab5-47e1-878b-6bafaa3ae31d
+      - f97c50d2-f8ae-4fd8-bce0-3b623afae5f3
       X-Runtime:
-      - '0.491453'
+      - '0.448075'
       Content-Length:
       - '40'
     body:
       encoding: UTF-8
       string: '{"message":"Invalid email or password."}'
     http_version: 
-  recorded_at: Wed, 17 Feb 2016 20:59:45 GMT
+  recorded_at: Mon, 21 Mar 2016 17:36:41 GMT
 - request:
     method: post
     uri: http://localhost:3000/locomotive/api/v3/my_account.json
@@ -44,14 +46,16 @@ http_interactions:
       encoding: UTF-8
       string: account%5Bemail%5D=john%40doe.net&account%5Bname%5D=John&account%5Bpassword%5D=asimplepassword
     headers:
+      User-Agent:
+      - HTTPClient/1.0 (2.7.1, ruby 2.2.3 (2015-08-18))
       Accept:
       - application/json
+      Accept-Encoding:
+      - gzip,deflate
+      Date:
+      - Mon, 21 Mar 2016 17:36:41 GMT
       Content-Type:
       - application/x-www-form-urlencoded
-      Accept-Encoding:
-      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-      User-Agent:
-      - Ruby
   response:
     status:
       code: 201
@@ -60,20 +64,20 @@ http_interactions:
       Content-Type:
       - application/json
       Etag:
-      - W/"ecd8bcbc56ad219c12f928c0c7642228"
+      - W/"13d961357bc8b2ce65f4f13ee8adba85"
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - 163cedb0-c315-4318-905a-2ca2184c2865
+      - a3c557e9-41e9-44dc-ae1d-91af5ddd3b96
       X-Runtime:
-      - '0.086436'
+      - '0.098826'
       Content-Length:
       - '250'
     body:
       encoding: UTF-8
-      string: '{"_id":"56c4df41c3651180309c60d3","created_at":"2016-02-17T20:59:45Z","updated_at":"2016-02-17T20:59:45Z","name":"John","email":"john@doe.net","locale":"en","api_key":"3f7bb7a02a1ad6c3e285beda89e6e8a3f75d9154","super_admin":false,"local_admin":false}'
+      string: '{"_id":"56f03129c36511207342cbcb","created_at":"2016-03-21T17:36:41Z","updated_at":"2016-03-21T17:36:41Z","name":"John","email":"john@doe.net","locale":"en","api_key":"901baf472a28a8e3a6a871255c90b232de964686","super_admin":false,"local_admin":false}'
     http_version: 
-  recorded_at: Wed, 17 Feb 2016 20:59:45 GMT
+  recorded_at: Mon, 21 Mar 2016 17:36:41 GMT
 - request:
     method: post
     uri: http://localhost:3000/locomotive/api/v3/tokens.json
@@ -81,14 +85,16 @@ http_interactions:
       encoding: UTF-8
       string: email=admin%40locomotivecms.com&password=locomotive
     headers:
+      User-Agent:
+      - HTTPClient/1.0 (2.7.1, ruby 2.2.3 (2015-08-18))
       Accept:
       - application/json
+      Accept-Encoding:
+      - gzip,deflate
+      Date:
+      - Mon, 21 Mar 2016 17:36:41 GMT
       Content-Type:
       - application/x-www-form-urlencoded
-      Accept-Encoding:
-      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-      User-Agent:
-      - Ruby
   response:
     status:
       code: 201
@@ -97,37 +103,39 @@ http_interactions:
       Content-Type:
       - application/json
       Etag:
-      - W/"9f0203483ba848323bbda0b85ed7725e"
+      - W/"3cfd61d41b23cdfb3d8833133c136131"
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - 4aed7a00-f72d-4367-890b-d827b3cff156
+      - 805ec3c4-ce19-4edb-bd06-6b499447f2a1
       X-Runtime:
-      - '0.015710'
+      - '0.016118'
       Content-Length:
       - '32'
     body:
       encoding: UTF-8
-      string: '{"token":"e1QSfNaw8zQM7rWX5CPf"}'
+      string: '{"token":"V8VMCfCsp7XzQLvAd1AY"}'
     http_version: 
-  recorded_at: Wed, 17 Feb 2016 20:59:45 GMT
+  recorded_at: Mon, 21 Mar 2016 17:36:41 GMT
 - request:
     method: get
-    uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=e1QSfNaw8zQM7rWX5CPf
+    uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=V8VMCfCsp7XzQLvAd1AY
     body:
-      encoding: US-ASCII
+      encoding: UTF-8
       string: ''
     headers:
+      User-Agent:
+      - HTTPClient/1.0 (2.7.1, ruby 2.2.3 (2015-08-18))
       Accept:
       - application/json
+      Accept-Encoding:
+      - gzip,deflate
+      Date:
+      - Mon, 21 Mar 2016 17:36:41 GMT
       X-Locomotive-Account-Email:
       - admin@locomotivecms.com
       X-Locomotive-Account-Token:
-      - e1QSfNaw8zQM7rWX5CPf
-      Accept-Encoding:
-      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-      User-Agent:
-      - Ruby
+      - V8VMCfCsp7XzQLvAd1AY
   response:
     status:
       code: 200
@@ -136,37 +144,39 @@ http_interactions:
       Content-Type:
       - application/json
       Etag:
-      - W/"7d8f03d047be776ab17daf20e33dc4ad"
+      - W/"2ce6a3f4e073d2d83a53613d0139477e"
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - 18bee298-4a65-4938-9e2f-f80f0c82f53e
+      - e4ca46c9-4c89-42db-9bdb-ca21e8adb1a9
       X-Runtime:
-      - '0.027460'
+      - '0.029466'
       Content-Length:
       - '261'
     body:
       encoding: UTF-8
-      string: '{"_id":"56c4df17c36511800c8b9037","created_at":"2016-02-17T20:59:03Z","updated_at":"2016-02-17T20:59:03Z","name":"Admin","email":"admin@locomotivecms.com","locale":"en","api_key":"d49cd50f6f0d2b163f48fc73cb249f0244c37074","super_admin":false,"local_admin":true}'
+      string: '{"_id":"56f03072c365112052cab389","created_at":"2016-03-21T17:33:38Z","updated_at":"2016-03-21T17:33:38Z","name":"Admin","email":"admin@locomotivecms.com","locale":"en","api_key":"d49cd50f6f0d2b163f48fc73cb249f0244c37074","super_admin":false,"local_admin":true}'
     http_version: 
-  recorded_at: Wed, 17 Feb 2016 20:59:45 GMT
+  recorded_at: Mon, 21 Mar 2016 17:36:41 GMT
 - request:
     method: get
-    uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=e1QSfNaw8zQM7rWX5CPf
+    uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=V8VMCfCsp7XzQLvAd1AY
     body:
-      encoding: US-ASCII
+      encoding: UTF-8
       string: ''
     headers:
+      User-Agent:
+      - HTTPClient/1.0 (2.7.1, ruby 2.2.3 (2015-08-18))
       Accept:
       - application/json
+      Accept-Encoding:
+      - gzip,deflate
+      Date:
+      - Mon, 21 Mar 2016 17:36:41 GMT
       X-Locomotive-Account-Email:
       - admin@locomotivecms.com
       X-Locomotive-Account-Token:
-      - e1QSfNaw8zQM7rWX5CPf
-      Accept-Encoding:
-      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-      User-Agent:
-      - Ruby
+      - V8VMCfCsp7XzQLvAd1AY
   response:
     status:
       code: 200
@@ -175,18 +185,18 @@ http_interactions:
       Content-Type:
       - application/json
       Etag:
-      - W/"7d8f03d047be776ab17daf20e33dc4ad"
+      - W/"2ce6a3f4e073d2d83a53613d0139477e"
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - 58ee0cc3-0a25-43f6-ab83-ec81d9ed63ff
+      - 059e56ad-ec66-4fa7-98a4-85f7eb38746c
       X-Runtime:
-      - '0.015876'
+      - '0.019939'
       Content-Length:
       - '261'
     body:
       encoding: UTF-8
-      string: '{"_id":"56c4df17c36511800c8b9037","created_at":"2016-02-17T20:59:03Z","updated_at":"2016-02-17T20:59:03Z","name":"Admin","email":"admin@locomotivecms.com","locale":"en","api_key":"d49cd50f6f0d2b163f48fc73cb249f0244c37074","super_admin":false,"local_admin":true}'
+      string: '{"_id":"56f03072c365112052cab389","created_at":"2016-03-21T17:33:38Z","updated_at":"2016-03-21T17:33:38Z","name":"Admin","email":"admin@locomotivecms.com","locale":"en","api_key":"d49cd50f6f0d2b163f48fc73cb249f0244c37074","super_admin":false,"local_admin":true}'
     http_version: 
-  recorded_at: Wed, 17 Feb 2016 20:59:45 GMT
+  recorded_at: Mon, 21 Mar 2016 17:36:41 GMT
 recorded_with: VCR 3.0.0