locomotivecms_wagon 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80736e3b3140592d940de1d47d1fb160828e092d
-  data.tar.gz: 26830e5eee2ea0d15313736446ed500d8bf68f77
+  metadata.gz: d29d1ebdfcc402538d09a6a719a998f4006ff29e
+  data.tar.gz: e7a85f25d6d7a193c0cb385becd4b28e47a84352
 SHA512:
-  metadata.gz: 5f70206ceba29668a34974a65e7f126fc45293b388d3540cea5ef6a3fb93b27f12d1e2d373bbecb8e5a35a20a019bfdfc695b7c298a22f1aa3ce25d2762f6a10
-  data.tar.gz: 4491ea679b74f560d3875f9d32aa02dcc7eb18a5494868c1e09380a3c43cc027ed4256923b12b3615a7953fb0a2a69d5b4f2734dedc3a937f259281f5c3db9c1
+  metadata.gz: dd72ab98df4fda5497cabcb1ea6161db0489c8cb0fc11745628642551e4b235040e23bb953fb9bb80847da453c60422094e7566133a7a2edbb6ebeb9467683ac
+  data.tar.gz: 2dfadf5cc1297a0842962cebb34ce6d3391f5a9b1fb5dda04302ac99bd36f353c979d5b12872b0c90d81c166f40cd540fd9be6e382ce274c186a2749160b3de2

data/lib/locomotive/wagon/liquid/drops/base.rb

@@ -12,7 +12,10 @@ module Locomotive
           end
 
           def id
-            (@_source.respond_to?(:id) ? @_source.id : nil) || 'new'
+            (@_source.respond_to?(:id) ? @_source.id : nil) ||
+            (@_source.respond_to?(:slug) ? @_source.slug : nil) ||
+            (@_source.respond_to?(:_slug) ? @_source._slug : nil) ||
+            'new'
           end
 
           # converts an array of records to an array of liquid drops
@@ -43,4 +46,4 @@ module Locomotive
       end
     end
   end
-end
+end

data/lib/locomotive/wagon/misc/httparty.rb

@@ -8,12 +8,21 @@ module Locomotive
         include ::HTTParty
 
         def self.consume(url, options = {})
+          method = options.delete(:method).try(:to_sym) || :get
+
           url = ::HTTParty.normalize_base_uri(url)
 
           uri = URI.parse(url)
-          options[:base_uri] = "#{uri.scheme}://#{uri.host}"
-          options[:base_uri] += ":#{uri.port}" if uri.port != 80
-          path = uri.request_uri
+          path = uri.path.blank? ? '/' : uri.path
+
+          if uri.query
+            params = Rack::Utils.parse_nested_query(uri.query)
+            key = method == :post ? :body : :query
+            options[key] = params unless params.blank?
+          end
+
+          uri.query = nil; uri.path = ''
+          options[:base_uri] = uri.to_s
 
           options.delete(:format) if options[:format] == 'default'
           options[:format]  = options[:format].gsub(/[\'\"]/, '').to_sym if options.has_key?(:format)
@@ -22,11 +31,9 @@ module Locomotive
           username, password = options.delete(:username), options.delete(:password)
           options[:basic_auth] = { username: username, password: password } if username
 
-          path ||= '/'
-
-          # Locomotive::Wagon::Logger.debug "[WebService] consuming #{path}, #{options.inspect}"
+          Locomotive::Wagon::Logger.debug "[WebService] consuming #{path}, #{options.inspect}"
 
-          response = self.get(path, options)
+          response = self.send(method, path, options)
 
           if response.code == 200
             _response = response.parsed_response
@@ -45,4 +52,4 @@ module Locomotive
       end
     end
   end
-end
+end

data/lib/locomotive/wagon/version.rb

@@ -1,5 +1,5 @@
 module Locomotive
   module Wagon
-    VERSION = '1.5.4'
+    VERSION = '1.5.5'
   end
 end

data/locomotivecms_wagon.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'httmultiparty',         '0.3.10'
   gem.add_dependency 'will_paginate',         '~> 3.0.3'
-  gem.add_dependency 'locomotivecms_mounter', '~> 1.5.3'
+  gem.add_dependency 'locomotivecms_mounter', '~> 1.5.4'
 
   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.5.4
+  version: 1.5.5
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -227,14 +227,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 1.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 1.5.4
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -869,7 +869,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: The LocomotiveCMS wagon is a site generator for the LocomotiveCMS engine