committee 2.0.0.pre2 → 2.0.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c27dbbfbcb3d316bd61c7056fe0a8f7fec175ab6
-  data.tar.gz: c3ad5a80a63987ae2f94988ed12b1285e71ee760
+  metadata.gz: 1e120c18b8e980fa98259dcb4d874b0dd095224b
+  data.tar.gz: de67a03b9afba89cbb0dce7b5654fedfb02a5dc7
 SHA512:
-  metadata.gz: 86f1c3e718e6dee210e3c42ba2d1a5ba0b029137adc1be572d5dac9d6048dc7c84cf4274a652360473b9e263662912f5a7a94fc27b2666daf054530f0b44c40f
-  data.tar.gz: 6dd6d2dc9165ea38e3df05a0d35915809a82447a5708728c192d22ee632692448f6e4996733c165c8f0d6f4895dff7bfa18b952c070b2a8bb1e01d21073ad7c7
+  metadata.gz: 59339f5504e9945a8cdc1248eaf47187d0eafb7cfe90c802a3f1e0b391b40154266d157cc3c16b48992ca39fe783c27ef8b8b3f7eeaeff39961c24d7a6e95052
+  data.tar.gz: d5252e28f9e64e2e8fd2812189ed425a32d01e55e1949588cf94d98ec537ee9fad7a0aa93be8672d8affd0946fc411ad00abe1d36e0c3a4b11db9b32d94cc5ef

data/bin/committee-stub

@@ -12,7 +12,7 @@ options, parser = bin.get_options_parser
 if $0 == __FILE__
   parser.parse!(args)
 
-  unless args.count == 1 || options[:help]
+  unless args.count == 1 || options[:help] || !options[:driver]
     puts parser.to_s
     exit
   end

data/lib/committee/bin/committee_stub.rb

@@ -25,7 +25,7 @@ module Committee
       # Gets an option parser for command line arguments.
       def get_options_parser
         options = {
-          :driver   => :hyper_schema,
+          :driver   => nil,
           :help     => false,
           :port     => 9292,
           :tolerant => false,
@@ -37,14 +37,15 @@ module Committee
           opts.separator ""
           opts.separator "Options:"
 
-          opts.on_tail("-h", "-?", "--help", "Show this message") {
-            options[:help] = true
-          }
-
+          # required
           opts.on("-d", "--driver NAME", "name of driver [open_api_2|hyper_schema]") { |name|
             options[:driver] = name.to_sym
           }
 
+          opts.on_tail("-h", "-?", "--help", "Show this message") {
+            options[:help] = true
+          }
+
           opts.on("-t", "--tolerant", "don't perform request/response validations") {
             options[:tolerant] = true
           }

data/lib/committee/drivers/hyper_schema.rb

@@ -1,5 +1,10 @@
 module Committee::Drivers
   class HyperSchema < Committee::Drivers::Driver
+    # Whether parameters that were form-encoded will be coerced by default.
+    def default_coerce_form_params
+      false
+    end
+
     # Whether parameters in a request's path will be considered and coerced by
     # default.
     def default_path_params

data/lib/committee/drivers/open_api_2.rb

@@ -1,5 +1,10 @@
 module Committee::Drivers
   class OpenAPI2 < Committee::Drivers::Driver
+    # Whether parameters that were form-encoded will be coerced by default.
+    def default_coerce_form_params
+      true
+    end
+
     # Whether parameters in a request's path will be considered and coerced by
     # default.
     def default_path_params

data/lib/committee/drivers.rb

@@ -15,6 +15,11 @@ module Committee
 
     # Driver is a base class for driver implementations.
     class Driver
+      # Whether parameters that were form-encoded will be coerced by default.
+      def default_coerce_form_params
+        raise "needs implementation"
+      end
+
       # Whether parameters in a request's path will be considered and coerced
       # by default.
       def default_path_params

data/lib/committee/middleware/request_validation.rb

@@ -9,6 +9,8 @@ module Committee::Middleware
       @optimistic_json     = options.fetch(:optimistic_json, false)
       @strict              = options[:strict]
 
+      @coerce_form_params = options.fetch(:coerce_form_params,
+        @schema.driver.default_coerce_form_params)
       @coerce_path_params = options.fetch(:coerce_path_params,
         @schema.driver.default_path_params)
       @coerce_query_params = options.fetch(:coerce_query_params,
@@ -50,7 +52,9 @@ module Committee::Middleware
         request,
         allow_form_params:  @allow_form_params,
         allow_query_params: @allow_query_params,
-        optimistic_json:    @optimistic_json
+        coerce_form_params: @coerce_form_params,
+        optimistic_json:    @optimistic_json,
+        schema:             link ? link.schema : nil
       ).call
 
       request.env[@params_key].merge!(path_params)

data/lib/committee/request_unpacker.rb

@@ -5,7 +5,9 @@ module Committee
 
       @allow_form_params  = options[:allow_form_params]
       @allow_query_params = options[:allow_query_params]
+      @coerce_form_params = options[:coerce_form_params]
       @optimistic_json    = options[:optimistic_json]
+      @schema             = options[:schema]
     end
 
     def call
@@ -26,7 +28,16 @@ module Committee
       elsif @allow_form_params && @request.media_type == "application/x-www-form-urlencoded"
         # Actually, POST means anything in the request body, could be from
         # PUT or PATCH too. Silly Rack.
-        indifferent_params(@request.POST)
+        p = @request.POST
+
+        if @coerce_form_params && @schema
+          p.merge!(Committee::StringParamsCoercer.new(
+            p,
+            @schema
+          ).call)
+        end
+
+        p
       else
         {}
       end

data/test/drivers/hyper_schema_test.rb

@@ -32,6 +32,10 @@ describe Committee::Drivers::HyperSchema do
     end
   end
 
+  it "defaults to not coercing form parameters" do
+    assert_equal false, @driver.default_coerce_form_params
+  end
+
   it "defaults to no path parameters" do
     assert_equal false, @driver.default_path_params
   end

data/test/drivers/open_api_2_test.rb

@@ -111,6 +111,10 @@ describe Committee::Drivers::OpenAPI2 do
     assert_equal "Committee: no definitions section in spec data.", e.message
   end
 
+  it "defaults to coercing form parameters" do
+    assert_equal true, @driver.default_coerce_form_params
+  end
+
   it "defaults to path parameters" do
     assert_equal true, @driver.default_path_params
   end

data/test/drivers_test.rb

@@ -23,11 +23,12 @@ end
 
 describe Committee::Drivers::Driver do
   DRIVER_METHODS = {
-    :default_path_params  => [],
-    :default_query_params => [],
-    :name                 => [],
-    :parse                => [nil],
-    :schema_class         => [],
+    :default_coerce_form_params => [],
+    :default_path_params        => [],
+    :default_query_params       => [],
+    :name                       => [],
+    :parse                      => [nil],
+    :schema_class               => [],
   }
 
   it "has a set of abstract methods" do

data/test/request_unpacker_test.rb

@@ -82,6 +82,25 @@ describe Committee::RequestUnpacker do
     assert_equal({ "x" => "y" }, params)
   end
 
+  it "coerces form params with coerce_form_params and a schema" do
+    schema = JsonSchema::Schema.new
+    schema.properties = { "x" => JsonSchema::Schema.new }
+    schema.properties["x"].type = ["integer"]
+
+    env = {
+      "CONTENT_TYPE" => "application/x-www-form-urlencoded",
+      "rack.input"   => StringIO.new("x=1"),
+    }
+    request = Rack::Request.new(env)
+    params = Committee::RequestUnpacker.new(
+      request,
+      allow_form_params: true,
+      coerce_form_params: true,
+      schema: schema
+    ).call
+    assert_equal({ "x" => 1 }, params)
+  end
+
   it "unpacks form & query params with allow_form_params and allow_query_params" do
     env = {
       "CONTENT_TYPE" => "application/x-www-form-urlencoded",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: committee
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre2
+  version: 2.0.0.pre3
 platform: ruby
 authors:
 - Brandur
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-13 00:00:00.000000000 Z
+date: 2016-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schema
@@ -20,7 +20,7 @@ dependencies:
         version: '0.14'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.14.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '0.14'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.14.3
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement