sinatra-rest-base 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75d50b09e35bd0c09b5384a9f6c053e8b8b7c22d
-  data.tar.gz: 76e0bcb886023c0e11e1bb0a362d13cc5862f566
+  metadata.gz: 24af1cf8be8da4b7423bf9e76473d2848e365f65
+  data.tar.gz: aba24043540d4645d0af30268dda2b57df333af9
 SHA512:
-  metadata.gz: 12e058363080135672533f3bfe0d74034d67adca7993bba787c45d8201cdabf8983d0e8ab85e784071803a865df1f93463059e581ae0e4109971229828b92b0e
-  data.tar.gz: 74f257be8746f15e4b43105c87def2243afc46f056055c3d984c3964fd37211d9c079801a639d97e4d48142c444ef0416b9b95358400b986ebe4fde1c229da31
+  metadata.gz: 23e50403fb3aceec1bac42a754e9c7a313634c5c81ced7ce9c7d4a1cdbebc47dbb55b58da2221a47bbfea91ebb4e573a30d3399bd9b38fa4bfd02eea72018b2f
+  data.tar.gz: 2bd4bb2135d2deaa0ba284529235d3e7e330b833bd27e7c01f52d361b9e5cffcbb4dde9bd8f3e9cccd5a7db586a3cf577e8adf2200a646e610127e0a9a429c95

data/lib/rest_base/application_helper.rb

@@ -26,14 +26,18 @@ module RestBase
     def set_request_body
       read_body = request.body.read
 
-      if read_body.empty?
-        @request_body = {}
-      elsif request.media_type.downcase == 'text/xml'
-        @request_body = Hash.from_xml(read_body)
-        @request_body = Hash[@request_body.map{ |k, v| [k.to_sym, v] }]
-        @request_body = @request_body[:request]
-      else
-        @request_body = JSON.parse(read_body, :symbolize_names => true)
+      begin
+        if read_body.empty?
+          @request_body = {}
+        elsif request.media_type.downcase == 'text/xml'
+          @request_body = Hash.from_xml(read_body)
+          @request_body = Hash[@request_body.map{ |k, v| [k.to_sym, v] }]
+          @request_body = @request_body[:request]
+        else
+          @request_body = JSON.parse(read_body, :symbolize_names => true)
+        end
+      rescue
+        raise StandardError.new("Invalid Request Body")
       end
     end
     

data/lib/rest_base/version.rb

@@ -1,3 +1,3 @@
 module RestBase
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/spec/fixtures/test_errors_end_points.rb

@@ -13,6 +13,10 @@ module RestBase
       get '/unauthorized', :version => 1 do
         error 401
       end
+      
+      get '/notfound', :version => 1 do
+        error 404
+      end
 
       get '/internal_error', :version => 1 do
         error 500

data/spec/lib/rest_base/application_spec.rb

@@ -181,6 +181,16 @@ describe RestBase::Application do
       
       expect(last_response.body).to eq(@expected_hash.to_json)
     end
+  
+    it "should fail with bad json" do
+      post '/', "}", @headers
+      
+      @expected_hash.delete(:result)
+      @expected_hash[:errors] = ["Invalid Request Body"]
+      
+      expect(last_response.status).to eq(500)
+      expect(last_response.body).to eq(@expected_hash.to_json)
+    end
   end
   
   describe :xml do
@@ -222,5 +232,18 @@ describe RestBase::Application do
       
       expect(last_response.body).to eq(@expected_hash.to_xml(:root => :response))
     end
+    
+    it "should fail on bad xml" do
+      @headers['CONTENT_TYPE'] = 'text/xml'
+      @headers['HTTP_ACCEPT'] = 'text/xml'
+      
+      @expected_hash.delete(:result)
+      @expected_hash[:errors] = ["Invalid Request Body"]
+      
+      post '/', "<BadXML>", @headers
+      
+      expect(last_response.status).to eq(500)
+      expect(last_response.body).to eq(@expected_hash.to_xml(:root => :response))
+    end
   end
 end

data/spec/lib/rest_base/error_status_handeling_spec.rb

@@ -33,7 +33,16 @@ describe RestBase::Application do
     it "should provide endpoint not found error" do
       @expected_body[:errors] << "Endpoint not found"
       
-      get '/not_found', {}, @headers
+      get '/idontexist', {}, @headers
+      
+      expect(last_response.status).to eq(404)
+      expect(last_response.body).to eq(@expected_body.to_json)
+    end
+    
+    it "should provide error 404" do
+      @expected_body[:errors] << "Endpoint not found"
+      
+      get '/notfound', {}, @headers
       
       expect(last_response.status).to eq(404)
       expect(last_response.body).to eq(@expected_body.to_json)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-rest-base
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - bmills
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json