grape-batch 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72ecca1274e9f2e1f1d2a896d85a75dc538b5b89
-  data.tar.gz: 6892ba66a0aa07eb03434d9f385208135bde27c2
+  metadata.gz: bbbf72e7d25fcf89c630726e596e076196efe570
+  data.tar.gz: afdfe942d8894569147cec3e7665c1f7ef03811e
 SHA512:
-  metadata.gz: 7a8e2550213099227213f61f904636d13145eb295b4f2069fd16042f7ad4e10612587a204cab4c603f6ca7231e18ba37ae4a724bfd4b82a9de96d985f51f4400
-  data.tar.gz: 168dc3ca5de9a49c36d2f7b87659f3ad15127ee65d47bc4f2b8cc5c95c138219f6ffb4fa198d8cc6143c979936d8e1a6849c92ddc8addc807cd79361465be0fc
+  metadata.gz: 792bfb7fa1ad3361706e79035093e3b4ec9b26764f3d1810584345e72ee37f2365a1d404a958ce96de6790bb8179cbf21dafd4bfd335e336a54a03798c1d7774
+  data.tar.gz: 49ca34252acda3520aac0c20eb8efc597422ac2a1e1e3764bb828e71d8705cedc1d9fe50198823d86d34ef21d39a0717f48220695f3fe617b64ff44f9d589a1a

data/CHANGELOG.md

@@ -1,6 +1,10 @@
+# 2.0.1 (30th September 2015)
+* Removed obsolete gem dependencies
+* Now ensures the response is properly formatted and not empty, or returns an error
+
 # 2.0.0 (26rd August 2015)
 * Removed session_header from configuration options
-# Now passes the whole env to the session Proc
+* Now passes the whole env to the session Proc
 
 # 1.2.1 (24rd July 2015)
 * Using env['HTTP_X_REQUEST_ID'] or env['rack-timeout.info'][:id] or generate unique hex to identify request batch

data/grape-batch.gemspec

@@ -17,10 +17,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'rack', '>= 1.5'
   spec.add_runtime_dependency 'grape', '>= 0.7.0'
   spec.add_runtime_dependency 'multi_json', '>= 1.0'
-  spec.add_runtime_dependency 'activesupport', '>= 4.1.0'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake', '~> 10.3.2'

data/lib/grape/batch.rb

@@ -57,7 +57,7 @@ module Grape
           status, headers, response = @app.call(tmp_env)
 
           # format response
-          @response_klass::format(status, headers, response)
+          @response_klass::format(status, headers, response, tmp_env)
         end
       end
 

data/lib/grape/batch/hash_converter.rb

@@ -23,4 +23,4 @@ module Grape
       end
     end
   end
-end
+end

data/lib/grape/batch/response.rb

@@ -1,10 +1,22 @@
 class Grape::Batch::Response
-  def self.format(status, headers, response)
+  def self.format(status, headers, response, env)
     if response
       body = response.respond_to?(:body) ? response.body.join : response.join
-      result = MultiJson.decode(body)
+      parsing_failed = true
+
+      begin
+        result = MultiJson.decode(body)
+        parsing_failed = false
+      rescue MultiJson::ParseError
+        # Captain planet to the rescue
+      end
+    end
+
+    if parsing_failed || result.empty?
+      status = 404
+      result = { 'error' => "#{env['PATH_INFO']} not found" }
     end
 
-    (200..299).include?(status) ? {success: result} : {code: status, error: result['error']}
+    (200..299).include?(status) ? { success: result } : { code: status, error: result['error'] }
   end
 end

data/lib/grape/batch/version.rb

@@ -1,5 +1,5 @@
 module Grape
   module Batch
-    VERSION = '2.0.0'
+    VERSION = '2.0.1'
   end
 end

data/spec/requests_spec.rb

@@ -134,6 +134,12 @@ RSpec.describe Grape::Batch::Base do
         it { expect(response.body).to eq(encode([{ success: 'status 856' }])) }
       end
 
+      context 'with an unknown version' do
+        let(:request_body) { encode({ requests: [{ method: 'GET', path: '/api/v2/status', body: { id: 856 } }] }) }
+        it { expect(response.status).to eq(200) }
+        it { expect(response.body).to eq(encode([{ code: 404, error: '/api/v2/status not found' }])) }
+      end
+
       context 'with a body and nested hash' do
         let(:complex) do
           { a: { b: { c: 1 } } }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape-batch
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Lionel Oto
@@ -10,22 +10,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2015-09-30 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
@@ -54,20 +40,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement