committee 0.4.13 → 0.4.14

data/lib/committee/errors.rb

@@ -1,22 +1,25 @@
 module Committee
-  class BadRequest < StandardError
+  class Error < StandardError
   end
 
-  class InvalidPattern < StandardError
+  class BadRequest < Error
   end
 
-  class InvalidFormat < StandardError
+  class InvalidPattern < Error
   end
 
-  class InvalidType < StandardError
+  class InvalidFormat < Error
   end
 
-  class InvalidParams < StandardError
+  class InvalidType < Error
   end
 
-  class InvalidResponse < StandardError
+  class InvalidParams < Error
   end
 
-  class ReferenceNotFound < StandardError
+  class InvalidResponse < Error
+  end
+
+  class ReferenceNotFound < Error
   end
 end

data/lib/committee/middleware/base.rb

@@ -13,7 +13,7 @@ module Committee::Middleware
 
     def render_error(status, id, message)
       [status, { "Content-Type" => "application/json" },
-        [MultiJson.encode(id: id, error: message)]]
+        [MultiJson.encode({ id: id, error: message }, pretty: true)]]
     end
   end
 end

data/lib/committee/middleware/request_validation.rb

@@ -21,7 +21,7 @@ module Committee::Middleware
       @app.call(env)
     rescue Committee::BadRequest
       render_error(400, :bad_request, $!.message)
-    rescue Committee::InvalidParams
+    rescue Committee::Error
       render_error(422, :invalid_params, $!.message)
     rescue MultiJson::LoadError
       render_error(400, :invalid_params, "Request body wasn't valid JSON.")

data/lib/committee/schema.rb

@@ -9,12 +9,12 @@ module Committee
     end
 
     def [](type)
-      @schema["definitions"][type]
+      find(@schema["properties"][type]['$ref'])
     end
 
     def each
-      @schema["definitions"].each do |type, type_schema|
-        yield(type, type_schema)
+      @schema["properties"].each do |type, ref|
+        yield(type, find(ref['$ref']))
       end
     end
 

data/lib/committee/validation.rb

@@ -77,7 +77,7 @@ module Committee
     end
 
     def check_pattern(pattern, value, identifier)
-      !pattern || value =~ pattern
+      !pattern || value =~ Regexp.new(pattern)
     end
   end
 end

data/test/performance/request_validation.rb

@@ -0,0 +1,55 @@
+require "benchmark"
+require_relative "../test_helper"
+
+describe Committee::Middleware::RequestValidation do
+  include Rack::Test::Methods
+
+  def app
+    @app
+  end
+
+  N = 50000
+
+  it "is reasonably quick" do
+    params = MultiJson.encode({
+      "app" => "heroku-api",
+      "recipient" => "owner@heroku.com",
+    })
+
+    Benchmark.benchmark(Benchmark::CAPTION, 7, Benchmark::FORMAT, ">overhead:") do |x|
+      raw = x.report("raw") do
+        N.times do
+          @app = new_rack_app(raw: true)
+          header "Content-Type", "application/json"
+          post "/account/app-transfers", params
+        end
+      end
+
+      rich = x.report("rich") do
+        N.times do
+          @app = new_rack_app
+          header "Content-Type", "application/json"
+          post "/account/app-transfers", params
+        end
+      end
+
+      puts "average overhead = #{(rich.real - raw.real) / N}"
+    end
+  end
+
+  private
+
+  def new_rack_app(options = {})
+    Rack::Builder.new {
+      unless options.delete(:raw)
+        options = {
+          schema: File.read("./test/data/schema.json")
+        }.merge(options)
+        use Committee::Middleware::RequestValidation, options
+      end
+      run lambda { |_|
+        [200, {}, []]
+      }
+    }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: committee
 version: !ruby/object:Gem::Version
-  version: 0.4.13
+  version: 0.4.14
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -44,6 +44,22 @@ dependencies:
     - - ! '>'
       - !ruby/object:Gem::Version
         version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -60,6 +76,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - brandur@mutelight.org
@@ -87,6 +119,7 @@ files:
 - test/middleware/response_validation_test.rb
 - test/middleware/stub_test.rb
 - test/param_validator_test.rb
+- test/performance/request_validation.rb
 - test/request_unpacker_test.rb
 - test/response_generator_test.rb
 - test/response_validator_test.rb