grape-batch 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bbe03da7123e206a98f1665477f2903ccff61aa
-  data.tar.gz: 814d658a2f6300f0b99d966be482bf49adf02f41
+  metadata.gz: a41ffb8fd6505834517b904ba91f5af4ea891327
+  data.tar.gz: d1a99a6c05a9b2c4dc6291366d5469c5e05ceae1
 SHA512:
-  metadata.gz: 991c0e72406404557650cda1dbd0303fc0f0b85f701b0570ed8019960223fe64b306af997ce6cb21479932a42d54744bb148433708f458d1326ffa638fb94830
-  data.tar.gz: 0822eda7abe6aaa04bdcb6ee6797549d4a8f8e745a6cb097abdfe5d81059a3da70f92cb74c9d911d4e81032e1a751758edde913585b8d0d3107ad377abf4bef8
+  metadata.gz: 6b9b9cb1822facd4f090cda89d973a91ba7ae4f9ead8427dd6efadeaa0d2912c36ed272b2fb57860a6230bbf269d21a105be90b13e8c69cd78a8135307288271
+  data.tar.gz: f50b49ed2fd3cf5589ba7c2f7803285c9b3fc349531baf730597d155a84267c0c9b18946d5a0fc4db3d86b7b343f5da723b79ecc398db3f412401774f52ca65b

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+# 1.1.3 (25th June 2014)
+* Fixed nested hash to url_encoded
+
+# 1.1.2 (17th February 2014)
+* Added logs
+
+# 1.1.1 (31st December 2014)
+* First stable version

data/lib/grape/batch.rb

@@ -4,6 +4,7 @@ require 'grape/batch/log_subscriber'
 require 'grape/batch/version'
 require 'grape/batch/errors'
 require 'grape/batch/configuration'
+require 'grape/batch/hash_converter'
 require 'grape/batch/parser'
 require 'grape/batch/response'
 require 'multi_json'
@@ -75,7 +76,7 @@ module Grape
 
           if method == 'GET'
             env['rack.input'] = StringIO.new('{}')
-            env['QUERY_STRING'] = URI.encode_www_form(body.to_a)
+            env['QUERY_STRING'] = URI.encode_www_form(HashConverter.encode(body).to_a)
           else
             env['rack.input'] = StringIO.new(MultiJson.encode(body))
           end

data/lib/grape/batch/hash_converter.rb

@@ -0,0 +1,26 @@
+module Grape
+  module Batch
+    class HashConverter
+      def self.encode(value, key = nil, out_hash = {})
+        case value
+          when Hash  then
+            value.each { |k,v| encode(v, append_key(key,k), out_hash) }
+            out_hash
+          when Array then
+            value.each { |v| encode(v, "#{key}[]", out_hash) }
+            out_hash
+          when nil   then ''
+          else
+            out_hash[key] = value
+            out_hash
+        end
+      end
+
+      private
+
+      def self.append_key(root_key, key)
+        root_key.nil? ? :"#{key}" : :"#{root_key}[#{key.to_s}]"
+      end
+    end
+  end
+end

data/lib/grape/batch/version.rb

@@ -1,5 +1,5 @@
 module Grape
   module Batch
-    VERSION = '1.1.2'
+    VERSION = '1.1.3'
   end
 end

data/spec/api.rb

@@ -32,6 +32,15 @@ module Twitter
       end
     end
 
+    resource :complex do
+      params do
+        requires :a, type: Hash
+      end
+      get do
+        "hash #{params[:a][:b][:c]}"
+      end
+    end
+
     resource :status do
       params do
         requires :id, type: Integer, desc: "User id."

data/spec/requests_spec.rb

@@ -135,6 +135,17 @@ RSpec.describe Grape::Batch::Base do
         it { expect(response.body).to eq(encode([{ success: 'status 856' }])) }
       end
 
+      context 'with a body and nested hash' do
+        let(:complex) do
+          { a: { b: { c: 1 } } }
+        end
+        let(:request_body) do
+          encode({ requests: [{ method: 'GET', path: '/api/v1/complex', body: complex}] })
+        end
+        it { expect(response.status).to eq(200) }
+        it { expect(response.body).to eq(encode([{ success: "hash 1" }])) }
+      end
+
       describe '404 errors' do
         let(:request_body) { encode({ requests: [{ method: 'GET', path: '/api/v1/unknown' }] }) }
         it { expect(response.status).to eq(200) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape-batch
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Lionel Oto
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -138,6 +138,7 @@ files:
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -146,6 +147,7 @@ files:
 - lib/grape/batch.rb
 - lib/grape/batch/configuration.rb
 - lib/grape/batch/errors.rb
+- lib/grape/batch/hash_converter.rb
 - lib/grape/batch/log_subscriber.rb
 - lib/grape/batch/parser.rb
 - lib/grape/batch/response.rb