RubyGems - rack_respond_to_malformed_formats - Versions diffs - 0.0.2 → 0.0.3 - Mend

rack_respond_to_malformed_formats 0.0.2 → 0.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

data/lib/rack/respond_to_malformed_formats.rb +5 -8
data/rack_respond_to_malformed_formats.gemspec +1 -1
data/spec/respond_to_malformed_formats_spec.rb +43 -23
metadata +4 -16

data/lib/rack/respond_to_malformed_formats.rb CHANGED Viewed

@@ -11,10 +11,11 @@ module Rack
       @app = app
     end
-      def call(env)
+    def call(env)
       if malformed_response = respond_to_malformed_parameters(env)
         input = env["rack.input"]
         input.rewind
+        logger = env["rack.logger"]
         logger.error "Error occurred while parsing request.\nInput:\n\n#{input.read}" if logger
         malformed_response
       else
@@ -29,11 +30,11 @@ module Rack
       case (env["HTTP_X_POST_DATA_FORMAT"] || request.content_type).to_s.downcase
       when /xml/
-        parse_xml(request.body.read)
+        parse_xml(request.body.read).tap { request.body.rewind }
       when /yaml/
-        parse_yaml(request.body.read)
+        parse_yaml(request.body.read).tap { request.body.rewind }
       when /json/
-        parse_json(request.body.read)
+        parse_json(request.body.read).tap { request.body.rewind }
       else
         false
       end
@@ -63,9 +64,5 @@ module Rack
     rescue ArgumentError => e
       [400, {"Content-Type"=> "application/x-yaml"}, [e.to_s]]
     end
-    def logger
-      defined?(Rails.logger) ? Rails.logger : nil
-    end
   end
 end

data/rack_respond_to_malformed_formats.gemspec CHANGED Viewed

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 Gem::Specification.new do |s|
   s.name        = "rack_respond_to_malformed_formats"
-  s.version     = "0.0.2"
+  s.version     = "0.0.3"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Case Commons, LLC"]
   s.email       = ["casecommons-dev@googlegroups.com"]

data/spec/respond_to_malformed_formats_spec.rb CHANGED Viewed

@@ -1,14 +1,35 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
 describe Rack::RespondToMalformedFormats do
+  def wrapped_app(app)
+    Rack::Builder.new do
+      use Rack::Lint
+      use Rack::RespondToMalformedFormats
+      use Rack::Lint
+      run app
+    end
+  end
+  def response_for_env(env)
+    StringIO.new("Got: #{env['rack.input'].read}")
+  end
+  def read(body)
+    "".tap do |body_string|
+      body.each do |body_part|
+        body_string << body_part
+      end
+    end
+  end
   context "when the format is HTML" do
     it "should do nothing" do
       test_input = '<html></html>'
-      app = lambda { |env| [200, {"CONTEN_TYPE" => "text/html"}, test_input] }
-      request = Rack::MockRequest.env_for("/", :params => "", "CONTENT_TYPE" => "test/html", :input => test_input)
-      body = Rack::RespondToMalformedFormats.new(app).call(request).last
+      app = lambda { |env| [200, {"Content-Type" => "text/html"}, response_for_env(env)] }
+      request = Rack::MockRequest.env_for("/", :params => "", "CONTENT_TYPE" => "text/html", :input => test_input)
+      body = wrapped_app(app).call(request).last
-      body.should == test_input
+      read(body).should == 'Got: <html></html>'
     end
   end
@@ -16,24 +37,24 @@ describe Rack::RespondToMalformedFormats do
     context "and it is valid" do
       it "should do nothing" do
         test_input = '{"foo":"bar"}'
-        app = lambda { |env| [200, {"CONTENT_TYPE" => "application/json"}, test_input] }
+        app = lambda { |env| [200, {"Content-Type" => "application/json"}, response_for_env(env)] }
         request = Rack::MockRequest.env_for("/", :params => "", "CONTENT_TYPE" => "application/json", :input => test_input)
-        body = Rack::RespondToMalformedFormats.new(app).call(request).last
+        body = wrapped_app(app).call(request).last
-        body.should == test_input
+        read(body).should == 'Got: {"foo":"bar"}'
       end
     end
     context "and it is invalid" do
       it "should return a 400 with a message" do
         test_input = '{"foo":'
-        app = lambda { |env| [200, {"CONTENT_TYPE" => "application/json"}, test_input] }
+        app = lambda { |env| [200, {"Content-Type" => "application/json"}, response_for_env(env)] }
         request = Rack::MockRequest.env_for("/", :params => "", "CONTENT_TYPE" => "application/json", :input => test_input)
-        response = Rack::RespondToMalformedFormats.new(app).call(request)
+        response = wrapped_app(app).call(request)
         response[0].should == 400
         response[1]["Content-Type"].should == "application/json"
-        response[2].first.should =~ /.*error.*unexpected token.*/
+        read(response.last).should =~ /.*error.*unexpected token.*/
       end
     end
   end
@@ -42,24 +63,24 @@ describe Rack::RespondToMalformedFormats do
     context "and it is valid" do
       it "should do nothing" do
         test_input = '<?xml version="1.0"?><foo>bar</foo>'
-        app = lambda { |env| [200, {"CONTENT_TYPE" => "application/xml"}, test_input] }
+        app = lambda { |env| [200, {"Content-Type" => "application/xml"}, response_for_env(env)] }
         request = Rack::MockRequest.env_for("/", :params => "", "CONTENT_TYPE" => "application/xml", :input => test_input)
-        body = Rack::RespondToMalformedFormats.new(app).call(request).last
+        body = wrapped_app(app).call(request).last
-        body.should == test_input
+        read(body).should == 'Got: <?xml version="1.0"?><foo>bar</foo>'
       end
     end
     context "and it is invalid" do
       it "should return a 400 with a message" do
         test_input = '<ml><foo>bar'
-        app = lambda { |env| [200, {"CONTENT_TYPE" => "application/xml"}, test_input] }
+        app = lambda { |env| [200, {"Content-Type" => "application/xml"}, response_for_env(env)] }
         request = Rack::MockRequest.env_for("/", :params => "", "CONTENT_TYPE" => "application/xml", :input => test_input)
-        response = Rack::RespondToMalformedFormats.new(app).call(request)
+        response = wrapped_app(app).call(request)
         response[0].should == 400
         response[1]["Content-Type"].should == "application/xml"
-        response[2].first.should =~ /.*<error>Premature.*<\/error>.*/
+        read(response.last).should =~ /.*<error>Premature.*<\/error>.*/
       end
     end
   end
@@ -68,26 +89,25 @@ describe Rack::RespondToMalformedFormats do
     context "and it is valid" do
       it "should do nothing" do
         test_input = "--- \nfoo: bar\n"
-        app = lambda { |env| [200, {"CONTENT_TYPE" => "application/x-yaml"}, test_input] }
+        app = lambda { |env| [200, {"Content-Type" => "application/x-yaml"}, response_for_env(env)] }
         request = Rack::MockRequest.env_for("/", :params => "", "CONTENT_TYPE" => "application/x-yaml", :input => test_input)
-        body = Rack::RespondToMalformedFormats.new(app).call(request).last
+        body = wrapped_app(app).call(request).last
-        body.should == test_input
+        read(body).should == "Got: --- \nfoo: bar\n"
       end
     end
     context "and it is invalid" do
       it "should return a 400 with a message" do
         test_input = "--- what:\nawagasd"
-        app = lambda { |env| [200, {"CONTENT_TYPE" => "application/x-yaml"}, test_input] }
+        app = lambda { |env| [200, {"Content-Type" => "application/x-yaml"}, response_for_env(env)] }
         request = Rack::MockRequest.env_for("/", :params => "", "CONTENT_TYPE" => "application/x-yaml", :input => test_input)
-        response = Rack::RespondToMalformedFormats.new(app).call(request)
+        response = wrapped_app(app).call(request)
         response[0].should == 400
         response[1]["Content-Type"].should == "application/x-yaml"
-        response[2].first.should =~ /.*syntax error.*/
+        read(response.last).should =~ /.*syntax error.*/
       end
     end
   end
 end

metadata CHANGED Viewed

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: rack_respond_to_malformed_formats
 version: !ruby/object:Gem::Version
-  prerelease: false
-  segments:
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
+  prerelease:
+  version: 0.0.3
 platform: ruby
 authors:
 - Case Commons, LLC
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-03-18 00:00:00 -04:00
+date: 2011-04-01 00:00:00 -04:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -25,10 +21,6 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        segments:
-        - 1
-        - 4
-        - 4
         version: 1.4.4
   type: :runtime
   version_requirements: *id001
@@ -66,21 +58,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      segments:
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      segments:
-      - 0
       version: "0"
 requirements: []
 rubyforge_project:
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key:
 specification_version: 3
 summary: Intercept malformed XML and JSON requests and return XML and JSON 400 responses not HTML 500