locomotivecms_wagon 1.2.0 → 1.2.1

data/generators/foundation/app/views/pages/index.liquid.haml

@@ -98,36 +98,35 @@ published: true
 
     {{ 'foundation.min.js' | javascript_tag }}
 
+    / {{ 'foundation/foundation.js' | javascript_tag }}
 
-      / {{ 'foundation/foundation.js' | javascript_tag }}
+    / {{ 'foundation/foundation.alerts.js' | javascript_tag }}
 
-      / {{ 'foundation/foundation.alerts.js' | javascript_tag }}
+    / {{ 'foundation/foundation.clearing.js' | javascript_tag }}
 
-      / {{ 'foundation/foundation.clearing.js' | javascript_tag }}
+    / {{ 'foundation/foundation.cookie.js' | javascript_tag }}
 
-      / {{ 'foundation/foundation.cookie.js' | javascript_tag }}
+    / {{ 'foundation/foundation.dropdown.js' | javascript_tag }}
 
-      / {{ 'foundation/foundation.dropdown.js' | javascript_tag }}
+    / {{ 'foundation/foundation.forms.js' | javascript_tag }}
 
-      / {{ 'foundation/foundation.forms.js' | javascript_tag }}
+    / {{ 'foundation/foundation.joyride.js' | javascript_tag }}
 
-      / {{ 'foundation/foundation.joyride.js' | javascript_tag }}
+    / {{ 'foundation/foundation.magellan.js' | javascript_tag }}
 
-      / {{ 'foundation/foundation.magellan.js' | javascript_tag }}
+    / {{ 'foundation/foundation.orbit.js' | javascript_tag }}
 
-      / {{ 'foundation/foundation.orbit.js' | javascript_tag }}
+    / {{ 'foundation/foundation.placeholder.js' | javascript_tag }}
 
-      / {{ 'foundation/foundation.placeholder.js' | javascript_tag }}
+    / {{ 'foundation/foundation.reveal.js' | javascript_tag }}
 
-      / {{ 'foundation/foundation.reveal.js' | javascript_tag }}
+    / {{ 'foundation/foundation.section.js' | javascript_tag }}
 
-      / {{ 'foundation/foundation.section.js' | javascript_tag }}
+    / {{ 'foundation/foundation.tooltips.js' | javascript_tag }}
 
-      / {{ 'foundation/foundation.tooltips.js' | javascript_tag }}
+    / {{ 'foundation/foundation.topbar.js' | javascript_tag }}
 
-      / {{ 'foundation/foundation.topbar.js' | javascript_tag }}
-
-      / {{ 'foundation/foundation.interchange.js' | javascript_tag }}
+    / {{ 'foundation/foundation.interchange.js' | javascript_tag }}
 
     :javascript
       $(document).foundation();

data/lib/locomotive/wagon.rb

@@ -57,9 +57,9 @@ module Locomotive
     #
     def self.push(path, connection_info, options = {})
       if reader = self.require_mounter(path, true)
-        
-        reader.mounting_point.site.domains   = connection_info["domains"]   if connection_info["domains"]
-        reader.mounting_point.site.subdomain = connection_info["subdomain"] if connection_info["subdomain"]
+
+        reader.mounting_point.site.domains   = connection_info['domains']   if connection_info["domains"]
+        reader.mounting_point.site.subdomain = connection_info['subdomain'] if connection_info["subdomain"]
         require 'bundler'
         Bundler.require 'misc'
 
@@ -89,7 +89,7 @@ module Locomotive
 
       connection_info[:uri] = "#{connection_info.delete(:host)}/locomotive/api"
 
-      _options = { console: true }.merge(options)
+      _options = { console: true }.merge(options).symbolize_keys
       _options[:only] = _options.delete(:resources)
 
       reader = Locomotive::Mounter::Reader::Api.instance
@@ -97,7 +97,7 @@ module Locomotive
       reader.run!(_options.merge(connection_info))
 
       writer = Locomotive::Mounter::Writer::FileSystem.instance
-      writer.run!(mounting_point: reader.mounting_point, target_path: path)
+      writer.run!(_options.merge(mounting_point: reader.mounting_point, target_path: path))
     end
 
     # Clone a site from a remote LocomotiveCMS engine.

data/lib/locomotive/wagon/cli.rb

@@ -265,6 +265,10 @@ module Locomotive
             path_to_deploy_file = File.join(path, 'config', 'deploy.yml')
             connection_info = YAML::load(File.open(path_to_deploy_file).read)[env.to_s].with_indifferent_access
 
+            if connection_info[:ssl] && !connection_info[:host].start_with?('https')
+              connection_info[:host] = 'https://' + connection_info[:host]
+            end
+
             if connection_info.nil?
               raise "No #{env.to_s} environment found in the config/deploy.yml file"
             end

data/lib/locomotive/wagon/liquid/tags/link_to.rb

@@ -97,7 +97,7 @@ module Locomotive
             fullpath = "#{::I18n.locale}/#{fullpath}" if ::I18n.locale.to_s != mounting_point.default_locale.to_s
 
             if page.templatized?
-              fullpath.gsub!(/(content_type_template|template)/, page.content_entry._slug)
+              fullpath.gsub!(/(content[_-]type[_-]template|template)/, page.content_entry._slug)
             end
 
             File.join('/', fullpath)

data/lib/locomotive/wagon/liquid/tags/nav.rb

@@ -165,7 +165,7 @@ module Locomotive
           #
           def entry_css(page, css = '')
             _css = 'link'
-            _css = "#{page}#{@options[:active_class]}" if self.page_selected?(page)
+            _css += " #{page} #{@options[:active_class]}" if self.page_selected?(page)
 
             (_css + " #{css}").strip
           end

data/lib/locomotive/wagon/version.rb

@@ -1,5 +1,5 @@
 module Locomotive
   module Wagon
-    VERSION = '1.2.0'
+    VERSION = '1.2.1'
   end
 end

data/locomotivecms_wagon.gemspec

@@ -31,9 +31,9 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'listen',                '~> 0.7.0'
 
-  gem.add_dependency 'httmultiparty',         '0.3.8'
+  gem.add_dependency 'httmultiparty',         '0.3.10'
   gem.add_dependency 'will_paginate',         '~> 3.0.3'
-  gem.add_dependency 'locomotivecms_mounter', '~> 1.2.0'
+  gem.add_dependency 'locomotivecms_mounter', '~> 1.2.1'
 
   gem.add_dependency 'faker',                 '~> 0.9.5'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_wagon
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-07 00:00:00.000000000 Z
+date: 2013-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -195,7 +195,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: 0.3.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -203,7 +203,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: 0.3.10
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
@@ -227,7 +227,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -235,7 +235,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -629,7 +629,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3158717839100797524
+      hash: 1589277993808003914
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -638,7 +638,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3158717839100797524
+      hash: 1589277993808003914
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23