locomotivecms_mounter 1.2.1 → 1.2.2

data/lib/locomotive/mounter/engine_api.rb

@@ -29,6 +29,8 @@ module Locomotive
         if response.code < 400
           self.default_params auth_token: response['token']
           response['token']
+        elsif response.code == 404 # ssl option missing
+          raise WrongCredentials.new("#{uri}/tokens.json does not respond. Perhaps, the ssl option is missing in your config/deploy.yml file")
         else
           raise WrongCredentials.new("#{response['message']} (#{response.code})")
         end

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

@@ -118,7 +118,7 @@ module Locomotive
 
           case field.type
           when :date
-            value.is_a?(String) ? Date.parse(value) : value
+            value.is_a?(String) ? Chronic.parse(value) : value
           when :file
             value.present? ? { 'url' => value } : nil
           when :belongs_to

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

@@ -207,8 +207,11 @@ module Locomotive
 
           attributes.to_a.each do |_attributes|
             if _attributes.is_a?(Array) # attributes is maybe a Hash
-              block, slug = _attributes.first.split('/')
-              block, slug = nil, block if slug.nil?
+              _splashed   = _attributes.first.split('/')
+
+              block, slug = _splashed[0..-2].join('/'), _splashed.last
+              block       = nil if block.blank?
+
               _attributes = { 'block' => block, 'slug' => slug, 'content' => _attributes.last }
             end
 
@@ -320,7 +323,9 @@ module Locomotive
         def to_yaml
           fields = %w(title slug redirect_url redirect_type handle published listed cache_strategy response_type position seo_title meta_description meta_keywords)
 
-          _attributes = self.attributes.delete_if { |k, v| !fields.include?(k.to_s) || v.blank? }.deep_stringify_keys
+          _attributes = self.attributes.delete_if do |k, v|
+            !fields.include?(k.to_s) || (!v.is_a?(FalseClass) && v.blank?)
+          end.deep_stringify_keys
 
           # useless attributes
           _attributes.delete('redirect_type') if self.redirect_url.blank?

data/lib/locomotive/mounter/version.rb

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

data/lib/locomotive/mounter/writer/file_system/theme_assets_writer.rb

@@ -41,7 +41,7 @@ module Locomotive
           #
           def replace_asset_urls(content)
             return if content.blank?
-            content.force_encoding('utf-8').gsub!(/[("']([^)"']*)\/sites\/[0-9a-f]{24}\/theme\/(([^;.]+)\/)*([a-zA-Z_\-0-9]+\.[a-z]{2,3})[)"']/) do |path|
+            content.force_encoding('utf-8').gsub!(/[("']([^)"';]*)\/sites\/[0-9a-f]{24}\/theme\/(([^;.]+)\/)*([a-zA-Z_\-0-9]+\.[a-z]{2,3})[)"']/) do |path|
               "#{path.first}/#{$2 + $4}#{path.last}"
             end
           end

data/lib/locomotive/mounter.rb

@@ -11,6 +11,7 @@ require 'active_support/core_ext'
 require 'stringex'
 require 'tempfile'
 require 'digest/sha1'
+require 'chronic'
 
 require 'tilt'
 require 'haml'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_mounter
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-20 00:00:00.000000000 Z
+date: 2013-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -32,17 +32,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0.rc.2
+        version: 4.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0.rc.2
+        version: 4.0.3
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +123,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.2.3
+- !ruby/object:Gem::Dependency
+  name: chronic
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -504,7 +520,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2843107645801968148
+      hash: 1068346951777047981
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: