locomotivecms_mounter 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bc126f035df0912f914258192ed40e207f0b500
-  data.tar.gz: 83f1f579f8ec9f6e00f9bd934261944ee8538785
+  metadata.gz: 22319511037ee53f5fde01a98595c7e13625bb94
+  data.tar.gz: a7ee27a364ec3a987db9ef5b6b2e2e07f5c10470
 SHA512:
-  metadata.gz: e40834801eb4e0d81f23b476f6be7ad20697c32be1bcbb17a7647d1642bed4ce42af4d507cb3074ca65a13b32c261d71f8de3d5893d242bbd420156f116caf32
-  data.tar.gz: 230ac8773c3a0524ccd3516db6a3fc4f3ac6621b2d1b14d711af67bf4df5cfae54e50e33893e12c68c9591d5c0dba7248c20bca33d8b4aed5ca7728b16123426
+  metadata.gz: 076478319cfcc093fee428b4bb8ce7426ac4764118a2e2b4bf1d6b7735baed1174221fd472105a750ed7fc7f571226aee6831fe8e9525d1096cdd7ac8ef013ca
+  data.tar.gz: e53c360a726731722ffaef69d85b080556651833134ac2f7a69997aea89edeae92eed2a9838c5947cf34b774b17884748554a29fe583a345e6702ab617226747

data/lib/locomotive/mounter/extensions/sprockets.rb

@@ -1,3 +1,5 @@
+require 'yui/compressor'
+
 module Locomotive
   module Mounter
     module Extensions
@@ -17,6 +19,10 @@ module Locomotive
 
           @@path  = site_path
           @@env   = ::Sprockets::Environment.new.tap do |env|
+            # minify javascripts and stylesheets
+            env.js_compressor  = YUI::JavaScriptCompressor.new
+            env.css_compressor = YUI::CssCompressor.new
+
             %w(fonts stylesheets javascripts).each do |name|
               env.append_path File.join(site_path, 'public', name)
             end

data/lib/locomotive/mounter/models/content_entry.rb

@@ -47,6 +47,8 @@ module Locomotive
 
           if field.type == :belongs_to
             value.try(:_label)
+          elsif field.type == :file
+            value['url']
           else
             value
           end

data/lib/locomotive/mounter/models/translation.rb

@@ -19,7 +19,7 @@ module Locomotive
         end
 
         def to_s
-          "Translation {#{self.key}: #{self.values}}"
+          "Translation #{self.key} (#{self.values.keys.join(', ')})"
         end
 
       end

data/lib/locomotive/mounter/reader/api/theme_assets_reader.rb

@@ -19,6 +19,7 @@ module Locomotive
 
             self.items = self.get(:theme_assets).map do |attributes|
               url = attributes.delete('url')
+              url.gsub!(/^\/\//, "https://")
 
               attributes['uri'] = URI(url =~ /^https?:\/\// ? url : "#{self.base_uri_with_scheme}#{url}")
 

data/lib/locomotive/mounter/version.rb

@@ -2,7 +2,7 @@
 module Locomotive
   module Mounter #:nodoc
 
-    VERSION = '1.4.1'
+    VERSION = '1.4.2'
 
   end
 end

data/lib/locomotive/mounter/writer/api/translations_writer.rb

@@ -23,9 +23,9 @@ module Locomotive
             self.translations.each do |key, translation|
               self.output_resource_op translation
 
-              success = translation.persisted? ? self.update_translation(translation) : self.create_translation(translation)
+              status = translation.persisted? ? self.update_translation(translation) : self.create_translation(translation)
 
-              self.output_resource_op_status translation, success ? :success : :error
+              self.output_resource_op_status translation, status
               self.flush_log_buffer
             end
           end
@@ -48,7 +48,7 @@ module Locomotive
 
             translation._id = response['id'] if response
 
-            !response.nil?
+            !response.nil? ? :success : :error
           end
 
           # Update a translation by calling the API.
@@ -60,10 +60,14 @@ module Locomotive
           def update_translation(translation)
             params = self.buffer_log { translation.to_params }
 
-            # make a call to the API for the update
-            response = self.put :translations, translation._id, params
+            if self.data?
+              # make a call to the API for the update
+              response = self.put :translations, translation._id, params
 
-            !response.nil?
+              !response.nil? ? :success : :error
+            else
+              :skipped
+            end
           end
 
           # Shortcut to get all the local translations.

data/lib/locomotive/mounter.rb

@@ -5,7 +5,7 @@ Encoding.default_internal = Encoding.default_external = 'UTF-8'
 
 # Remove I18n warnings
 require 'i18n'
-I18n.config.enforce_available_locales = true
+I18n.config.enforce_available_locales = false
 
 require 'logger'
 require 'colorize'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_mounter
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-26 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.4.1
 - !ruby/object:Gem::Dependency
-  name: sprockets
+  name: sprockets-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
-  name: sprockets-sass
+  name: yui-compressor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.12
+        version: 3.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.12
+        version: 3.4.4
 - !ruby/object:Gem::Dependency
   name: compass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.11
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement