locomotivecms_wagon 2.1.0.rc5 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbfa30794e5fef44d286be75267b65d52ed3bcaf
-  data.tar.gz: 25dd384d0decd405edc613af02956ee6d6065494
+  metadata.gz: 39b72c35430dbc4c08cac9452401fd3e366a71c5
+  data.tar.gz: f0c9234b8cbb49a67ff9824a5a1a95f0d4f6b365
 SHA512:
-  metadata.gz: d4b3d642b06e9b59c7a469baf8d55dc76a2699504975d605425a310b6843a7b9da590518998b93e92136c3efd64e2f75bad42e79f87efe2407f774a133a3f1d3
-  data.tar.gz: 7e3399257bdf768c364bb85387c65efd92de04d5c8705f11f46a7eb52fa2e2378a099e737d6d53bad1c408472b72de62569f59d030a5d9fa348e0ce45f5b1975
+  metadata.gz: 5ae92dd65c7b3e95ca4060358421bd0715621e72a8f5232dfe2711ad1afda2ad2ed0fca2036000c174a401d8afb1a256756e88883559ae94e2a3157079525b42
+  data.tar.gz: 2f995dd430b629a66d12657d68debde142a23d9c0e64227bd10cf9c7bd2ae0aa21fee30b9c3fd5a95537b3e842dd7ccb65732bdc8e588ac15e3bbe651397a1f0

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: 'a3054f1', require: false
+# gem 'locomotivecms_steam',  github: 'locomotivecms/steam',  ref: 'fe7403c', require: false
 
 # Local development
 # gem 'locomotivecms_coal', path: '../gems/coal', require: false

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.%]+)\.([A-Za-z]{2,})(\?\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>

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

@@ -46,6 +46,11 @@ module Locomotive::Wagon
           ordered_options.each do |option|
             locales.each { |locale| (_options[locale] ||= []) << option['name'][locale.to_s] }
           end
+
+          # if all the values of a locale are nil, then no need to keep that locale
+          locales.each do |locale|
+            _options.delete(locale) if _options[locale].all? { |v| v.blank? }
+          end
         end
       else
         ordered_options.map { |option| option['name'][default_locale] }

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

@@ -14,6 +14,7 @@ module Locomotive::Wagon
       end if locales.size > 1
 
       decode_metafields(attributes)
+      decode_metafields_ui(attributes)
 
       write_metafields_schema(attributes.delete('metafields_schema'))
 
@@ -60,14 +61,13 @@ module Locomotive::Wagon
     end
 
     def decode_metafields(attributes)
-      metafields = attributes['metafields']
-
-      return if metafields.blank?
-
-      # metafields come under a JSON string format.
-      metafields = JSON.parse(metafields)
+      decode_json_attribute(attributes, 'metafields') do |metafields|
+        replace_asset_urls_in_hash(metafields)
+      end
+    end
 
-      attributes['metafields'] = replace_asset_urls_in_hash(metafields)
+    def decode_metafields_ui(attributes)
+      decode_json_attribute(attributes, 'metafields_ui')
     end
 
     def array_of_hash_to_hash(array, name, &block)
@@ -80,6 +80,17 @@ module Locomotive::Wagon
       end
     end
 
+    def decode_json_attribute(attributes, name, &block)
+      value = attributes.delete(name)
+
+      return if value.blank?
+
+      # JSON string -> Hash
+      _value = JSON.parse(value)
+
+      attributes[name] = block_given? ? yield(_value) : _value
+    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_content_entries_command.rb

@@ -7,7 +7,7 @@ module Locomotive::Wagon
     alias_method :default_push, :_push
 
     def _push
-      (%i(without_relationships only_relationships) + other_locales).each do |step|
+      ([:without_relationships] + other_locales + [:only_relationships]).each do |step|
         @step = step
         default_push
       end

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

@@ -117,7 +117,11 @@ module Locomotive::Wagon
     def skip?(entity)
       return false if @only_entities.blank?
 
-      _path = entity.template_path[default_locale].gsub('./app/views/pages/', '')
+      template_path = entity.template_path[default_locale]
+
+      return true if template_path == false
+
+      _path = template_path.gsub('./app/views/pages/', '')
 
       !@only_entities.any? { |regexp| regexp.match(_path) }
     end

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

@@ -40,7 +40,7 @@ module Locomotive::Wagon
       return unless entity.stylesheet_or_javascript?
 
       Tempfile.new(entity.realname).tap do |file|
-        content = sprockets_env[entity.short_relative_url].to_s
+        content = compress_and_minify(entity)
 
         # replace paths to images or fonts by the absolute URL used in the Engine
         replace_assets!(content)
@@ -85,6 +85,16 @@ module Locomotive::Wagon
       @remote_urls[resource.local_path] = "#{resource.url}?#{resource.checksum}"
     end
 
+    def compress_and_minify(entity)
+      begin
+        sprockets_env[entity.short_relative_url].to_s
+      rescue Locomotive::Steam::YUICompressorRuntimeError => e
+        instrument :warning, message: "Unable to compress and minify it, number of errors (#{e.errors.size})\n#{e.errors.join("\n")}"
+        # use the original file instead
+        File.read(File.join(path, entity.source))
+      end
+    end
+
     def sprockets_env
       @sprockets_env ||= Locomotive::Steam::SprocketsEnvironment.new(File.join(path, 'public'),
         minify: ENV['WAGON_NO_MINIFY_ASSETS'].present? ? false : true)

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

@@ -1,5 +1,7 @@
 module Locomotive::Wagon
 
+  SiteFinder = Struct.new(:repository, :request) { def find; repository.first; end; }
+
   class ServeCommand < Struct.new(:path, :options, :shell)
 
     def initialize(path, options, shell)
@@ -82,6 +84,14 @@ module Locomotive::Wagon
         end
 
         config.middleware.insert_before Rack::Lint, Locomotive::Wagon::Middlewares::ErrorPage
+
+        config.services_hook = -> (services) {
+          if services.request
+            services.defer(:site_finder) do
+              SiteFinder.new(services.repositories.site, services.request)
+            end
+          end
+        }
       end
     end
 

data/lib/locomotive/wagon/version.rb

@@ -1,5 +1,5 @@
 module Locomotive
   module Wagon
-    VERSION = '2.1.0.rc5'
+    VERSION = '2.1.0'
   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.rc3'
+  gem.add_dependency 'locomotivecms_steam',   '~> 1.1.0'
 
   gem.add_dependency 'listen',                '~> 3.0.4'
   gem.add_dependency 'rack-livereload',       '~> 0.3.16'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_wagon
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc5
+  version: 2.1.0
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -115,14 +115,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc3
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc3
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -653,9 +653,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5.1