locomotivecms_wagon 2.1.0.rc3 → 2.1.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 571f69b042f72f8bf9c9ac09260ed1f5f19af3e1
-  data.tar.gz: 199bdd8684cfc28ba142652e6652713ee8e633f8
+  metadata.gz: c992663746d4414b01ab474e5e4169863dbf246e
+  data.tar.gz: 64dcd654ebf23562683183c5313decd1417b0b34
 SHA512:
-  metadata.gz: 13ee04e4560d5a032cd52e10774db4bd1e40e0d288e5bd58aad6b25334a83f4a0047b4c293361caf5f2db6afbbe2dfd23144b7939cbf0a9c26a5caa6f4f3a107
-  data.tar.gz: 40027558ba5aa6b28528be62b6496ea11fcf76d3e77dc158d8b20975c805bc2ba26dd469c88a04914068828cc8c79e54c517788c4c1844f9d574e66888cfa56a
+  metadata.gz: f1c80340c057ba5867d1313553bf9e1c05c1181d57a2e2c3fc31988c5e941c3b64ec0791133df2618798c89a4891676243d1f2b9c984adccc332395112828a2c
+  data.tar.gz: 63dc747d936d59492842b1cf34d0418e8878fbbfa68f2c486c9763d1f3bb1dd7ade520e4a041041eebd105d3455ae08f619630733abf173959b57babd2e5701a

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

data/generators/blank/config/site.yml.tt

@@ -27,6 +27,12 @@ seo_title: <%= @name %>
 meta_keywords: "some meta keywords"
 meta_description: "some meta description"
 
+# You can control the display of the "Properties" section in the back-office
+# metafields_ui:
+#   label: Store settings # use a hash for localized versions
+#   icon: shopping-cart # FontAwesome icons without the leading "fa-" string.
+#   hint: "Lorem ipsum..."
+
 # Each site can have its own set of custom properties organized in namespaces.
 # First, define namespaces and their fields in the config/metafields_schema.yml file.
 # Finally, set default values below as described in the example.

data/generators/bootstrap/config/site.yml.tt

@@ -27,6 +27,12 @@ seo_title: <%= @name %>
 meta_keywords: "some meta keywords"
 meta_description: "some meta description"
 
+# You can control the display of the "Properties" section in the back-office
+# metafields_ui:
+#   label: Store settings # use a hash for localized versions
+#   icon: shopping-cart # FontAwesome icons without the leading "fa-" string.
+#   hint: "Lorem ipsum..."
+
 # Each site can have its own set of custom properties organized in namespaces.
 # First, define namespaces and their fields in the config/metafields_schema.yml file.
 # Finally, set default values below as described in the example.

data/generators/foundation5/config/site.yml.tt

@@ -27,6 +27,12 @@ seo_title: <%= @name %>
 meta_keywords: "some meta keywords"
 meta_description: "some meta description"
 
+# You can control the display of the "Properties" section in the back-office
+# metafields_ui:
+#   label: Store settings # use a hash for localized versions
+#   icon: shopping-cart # FontAwesome icons without the leading "fa-" string.
+#   hint: "Lorem ipsum..."
+
 # Each site can have its own set of custom properties organized in namespaces.
 # First, define namespaces and their fields in the config/metafields_schema.yml file.
 # Finally, set default values below as described in the example.

data/lib/locomotive/wagon/cli.rb

@@ -399,9 +399,13 @@ module Locomotive
         # @param [ Boolean ] verbose Print the full backtrace if true
         #
         def print_exception(exception, verbose)
-          say exception.message, :red
           if verbose
-            say "\t" + exception.backtrace.join("\n\t")
+            say "\n# Error description:", :bold
+            say exception.message, :red
+            say "\n# Backtrace:", :bold
+            say "\n\t" + exception.backtrace.join("\n\t")
+          else
+            say "\n\nError(s) found. Please use the -v option to display the full exception", :red
           end
         end
 

data/lib/locomotive/wagon/commands/concerns/steam_concern.rb

@@ -11,7 +11,7 @@ module Locomotive::Wagon
         config.mode           = :test
         config.adapter        = { name: :filesystem, path: path }
         config.asset_path     = File.expand_path(File.join(path, 'public'))
-        config.minify_assets  = true
+        config.minify_assets  = false
       end
 
       @steam_services = Locomotive::Steam::Services.build_instance.tap do |services|

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')
+      attributes = current_site.attributes.slice('name', 'locales', 'domains', 'timezone', 'seo_title', 'meta_keywords', 'meta_description', 'picture_thumbnail_url', 'metafields', 'metafields_schema', 'metafields_ui')
 
       locales.each_with_index do |locale, index|
         if index == 0

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

@@ -35,6 +35,9 @@ module Locomotive::Wagon
           instrument :persist_with_success
         rescue SkipPersistingException => e
           instrument :skip_persisting
+        rescue Locomotive::Coal::ServerSideError => e
+          instrument :persist_with_error, message: 'Locomotive Back-office error. Contact your administrator or check your application logs.'
+          raise e
         rescue Exception => e
           instrument :persist_with_error, message: e.message
           raise e

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

@@ -86,7 +86,8 @@ module Locomotive::Wagon
     end
 
     def sprockets_env
-      @sprockets_env ||= Locomotive::Steam::SprocketsEnvironment.new(File.join(path, 'public'), minify: true)
+      @sprockets_env ||= Locomotive::Steam::SprocketsEnvironment.new(File.join(path, 'public'),
+        minify: ENV['WAGON_NO_MINIFY_ASSETS'].present? ? false : true)
     end
 
     def skip?(entity)

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

@@ -12,6 +12,10 @@ module Locomotive
         (__getobj__.domains || []) - ['localhost']
       end
 
+      def metafields_ui
+        self[:metafields_ui].try(:to_json)
+      end
+
       def metafields_schema
         self[:metafields_schema].try(:to_json)
       end
@@ -37,7 +41,7 @@ module Locomotive
       end
 
       def __attributes__
-        %i(name handle robots_txt locales timezone seo_title meta_keywords meta_description picture metafields_schema metafields)
+        %i(name handle robots_txt locales timezone seo_title meta_keywords meta_description picture metafields_schema metafields metafields_ui)
       end
 
       def edited?
@@ -49,7 +53,7 @@ module Locomotive
     class UpdateSiteDecorator < SiteDecorator
 
       def __attributes__
-        %i(picture locales metafields_schema metafields)
+        %i(picture locales metafields_schema metafields metafields_ui)
       end
 
     end

data/lib/locomotive/wagon/generators/site_metafields.rb

@@ -21,6 +21,12 @@ module Locomotive
         def add_instructions
           append_to_file 'config/site.yml', <<-EOF
 
+# You can control the display of the "Properties" section in the back-office
+# metafields_ui:
+#   label: Store settings # use a hash for localized versions
+#   icon: shopping-cart # FontAwesome icons without the leading "fa-" string.
+#   hint: "Lorem ipsum..."
+
 # Each site can have its own set of custom properties organized in namespaces.
 # First, define namespaces and their fields in the config/metafields_schema.yml file.
 # Finally, set default values below as described in the example.

data/lib/locomotive/wagon/version.rb

@@ -1,5 +1,5 @@
 module Locomotive
   module Wagon
-    VERSION = '2.1.0.rc3'
+    VERSION = '2.1.0.rc4'
   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.rc1'
+  gem.add_dependency 'locomotivecms_steam',   '~> 1.1.0.rc2'
 
   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.rc3
+  version: 2.1.0.rc4
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -9,7 +9,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: rake
@@ -115,14 +115,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc1
+        version: 1.1.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc1
+        version: 1.1.0.rc2
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement