sinatra-param 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41745f2481953252139149d9cd960c0d0ebfe218
-  data.tar.gz: 690bb03e1469f59231190f46b805a5bed38a0906
+  metadata.gz: 8ffa4f732ac04f03dc48517e868e5a867523eb75
+  data.tar.gz: ab474ce1e1afb21370af3434f3c00fbd24959174
 SHA512:
-  metadata.gz: 383b1b4052465f089c1c8c3d8cb5bd6527fb364e8acec1b7ddeeedd8ac021c598a755273fca0e25f260a757844942a4239b14980db89b6c7fb027b5aeec1b844
-  data.tar.gz: 31afa16492bd2030f635853bea4f698bfa8cc7e283c991a2f3fb5497a9bdb77ed0055e62c9aa04bbd81d0c0a967b894cb837f0fbde8a22af907aeb8c092e9917
+  metadata.gz: d247a854fe31d5e93f1dbb34bdbe645c89206019ee4d5af6f15d89c1455d65867f17a40fd3f7379ad00b2912a66aa1bc8e7a4216295c58f74943e48911e6bb4b
+  data.tar.gz: 0fdca5b6ebd84db55cd933d77826232ba458e560b2caa5e971ba075eeeb00ffff3304c3c3c0c908dca3caf1ae2b137b8bd0a426f1625b650664219d367ed962d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sinatra-param (1.3.0)
+    sinatra-param (1.3.1)
       sinatra (~> 1.3)
 
 GEM

data/Rakefile

@@ -8,3 +8,11 @@ task :build => "#{gemspec.full_name}.gem"
 file "#{gemspec.full_name}.gem" => gemspec.files + ["sinatra-param.gemspec"] do
   system "gem build sinatra-param.gemspec"
 end
+
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+
+  task :default => :spec
+rescue LoadError
+end

data/coverage/index.html

@@ -14,7 +14,7 @@
       <img src="./assets/0.7.1/loading.gif" alt="loading"/>
     </div>
     <div id="wrapper" style="display:none;">
-      <div class="timestamp">Generated <abbr class="timeago" title="2015-01-20T09:50:50-08:00">2015-01-20T09:50:50-08:00</abbr></div>
+      <div class="timestamp">Generated <abbr class="timeago" title="2015-01-22T07:13:54-08:00">2015-01-22T07:13:54-08:00</abbr></div>
       <ul class="group_tabs"></ul>
 
       <div id="content">
@@ -25,7 +25,7 @@
      covered at
      <span class="covered_strength">
        <span class="green">
-         19.8
+         22.3
        </span>
     </span> hits/line)
   </h2>
@@ -57,7 +57,7 @@
         <td>80</td>
         <td>80</td>
         <td>0</td>
-        <td>19.8</td>
+        <td>22.3</td>
       </tr>
       
     </tbody>
@@ -174,8 +174,8 @@
           <code class="ruby">    def param(name, type, options = {})</code>
         </li>
       
-        <li class="covered" data-hits="96" data-linenumber="15">
-          <span class="hits">96</span>
+        <li class="covered" data-hits="123" data-linenumber="15">
+          <span class="hits">123</span>
           
           <code class="ruby">      name = name.to_s</code>
         </li>
@@ -186,8 +186,8 @@
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="96" data-linenumber="17">
-          <span class="hits">96</span>
+        <li class="covered" data-hits="123" data-linenumber="17">
+          <span class="hits">123</span>
           
           <code class="ruby">      return unless params.member?(name) or options[:default] or options[:required]</code>
         </li>
@@ -198,32 +198,32 @@
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="84" data-linenumber="19">
-          <span class="hits">84</span>
+        <li class="covered" data-hits="92" data-linenumber="19">
+          <span class="hits">92</span>
           
           <code class="ruby">      begin</code>
         </li>
       
-        <li class="covered" data-hits="84" data-linenumber="20">
-          <span class="hits">84</span>
+        <li class="covered" data-hits="92" data-linenumber="20">
+          <span class="hits">92</span>
           
           <code class="ruby">        params[name] = coerce(params[name], type, options)</code>
         </li>
       
-        <li class="covered" data-hits="79" data-linenumber="21">
-          <span class="hits">79</span>
+        <li class="covered" data-hits="87" data-linenumber="21">
+          <span class="hits">87</span>
           
           <code class="ruby">        params[name] = (options[:default].call if options[:default].respond_to?(:call)) || options[:default] if params[name].nil? and options[:default]</code>
         </li>
       
-        <li class="covered" data-hits="79" data-linenumber="22">
-          <span class="hits">79</span>
+        <li class="covered" data-hits="87" data-linenumber="22">
+          <span class="hits">87</span>
           
           <code class="ruby">        params[name] = options[:transform].to_proc.call(params[name]) if params[name] and options[:transform]</code>
         </li>
       
-        <li class="covered" data-hits="79" data-linenumber="23">
-          <span class="hits">79</span>
+        <li class="covered" data-hits="87" data-linenumber="23">
+          <span class="hits">87</span>
           
           <code class="ruby">        validate!(params[name], options)</code>
         </li>
@@ -324,14 +324,14 @@
           <code class="ruby">    def one_of(*args)</code>
         </li>
       
-        <li class="covered" data-hits="8" data-linenumber="40">
-          <span class="hits">8</span>
+        <li class="covered" data-hits="17" data-linenumber="40">
+          <span class="hits">17</span>
           
           <code class="ruby">      options = args.last.is_a?(Hash) ? args.pop : {}</code>
         </li>
       
-        <li class="covered" data-hits="8" data-linenumber="41">
-          <span class="hits">8</span>
+        <li class="covered" data-hits="17" data-linenumber="41">
+          <span class="hits">17</span>
           
           <code class="ruby">      names = args.collect(&amp;:to_s)</code>
         </li>
@@ -342,10 +342,10 @@
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="8" data-linenumber="43">
-          <span class="hits">8</span>
+        <li class="covered" data-hits="17" data-linenumber="43">
+          <span class="hits">17</span>
           
-          <code class="ruby">      return unless names.length &gt; 2</code>
+          <code class="ruby">      return unless names.length &gt;= 2</code>
         </li>
       
         <li class="never" data-hits="" data-linenumber="44">
@@ -354,26 +354,26 @@
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="8" data-linenumber="45">
-          <span class="hits">8</span>
+        <li class="covered" data-hits="13" data-linenumber="45">
+          <span class="hits">13</span>
           
           <code class="ruby">      begin</code>
         </li>
       
-        <li class="covered" data-hits="8" data-linenumber="46">
-          <span class="hits">8</span>
+        <li class="covered" data-hits="13" data-linenumber="46">
+          <span class="hits">13</span>
           
           <code class="ruby">        validate_one_of!(params, names, options)</code>
         </li>
       
-        <li class="covered" data-hits="4" data-linenumber="47">
-          <span class="hits">4</span>
+        <li class="covered" data-hits="5" data-linenumber="47">
+          <span class="hits">5</span>
           
           <code class="ruby">      rescue InvalidParameterError =&gt; exception</code>
         </li>
       
-        <li class="covered" data-hits="4" data-linenumber="48">
-          <span class="hits">4</span>
+        <li class="covered" data-hits="5" data-linenumber="48">
+          <span class="hits">5</span>
           
           <code class="ruby">        if options[:raise] or (settings.raise_sinatra_param_exceptions rescue false)</code>
         </li>
@@ -402,20 +402,20 @@
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="3" data-linenumber="53">
-          <span class="hits">3</span>
+        <li class="covered" data-hits="4" data-linenumber="53">
+          <span class="hits">4</span>
           
           <code class="ruby">        error = &quot;Parameters #{names.join(&#39;, &#39;)} are mutually exclusive&quot;</code>
         </li>
       
-        <li class="covered" data-hits="3" data-linenumber="54">
-          <span class="hits">3</span>
+        <li class="covered" data-hits="4" data-linenumber="54">
+          <span class="hits">4</span>
           
           <code class="ruby">        if content_type and content_type.match(mime_type(:json))</code>
         </li>
       
-        <li class="covered" data-hits="3" data-linenumber="55">
-          <span class="hits">3</span>
+        <li class="covered" data-hits="4" data-linenumber="55">
+          <span class="hits">4</span>
           
           <code class="ruby">          error = {message: error, errors: {names =&gt; exception.message}}.to_json</code>
         </li>
@@ -432,8 +432,8 @@
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="3" data-linenumber="58">
-          <span class="hits">3</span>
+        <li class="covered" data-hits="4" data-linenumber="58">
+          <span class="hits">4</span>
           
           <code class="ruby">        halt 400, error</code>
         </li>
@@ -474,20 +474,20 @@
           <code class="ruby">    def coerce(param, type, options = {})</code>
         </li>
       
-        <li class="covered" data-hits="84" data-linenumber="65">
-          <span class="hits">84</span>
+        <li class="covered" data-hits="92" data-linenumber="65">
+          <span class="hits">92</span>
           
           <code class="ruby">      begin</code>
         </li>
       
-        <li class="covered" data-hits="84" data-linenumber="66">
-          <span class="hits">84</span>
+        <li class="covered" data-hits="92" data-linenumber="66">
+          <span class="hits">92</span>
           
           <code class="ruby">        return nil if param.nil?</code>
         </li>
       
-        <li class="covered" data-hits="77" data-linenumber="67">
-          <span class="hits">77</span>
+        <li class="covered" data-hits="85" data-linenumber="67">
+          <span class="hits">85</span>
           
           <code class="ruby">        return param if (param.is_a?(type) rescue false)</code>
         </li>
@@ -588,8 +588,8 @@
           <code class="ruby">    def validate!(param, options)</code>
         </li>
       
-        <li class="covered" data-hits="79" data-linenumber="84">
-          <span class="hits">79</span>
+        <li class="covered" data-hits="87" data-linenumber="84">
+          <span class="hits">87</span>
           
           <code class="ruby">      options.each do |key, value|</code>
         </li>
@@ -816,8 +816,8 @@
           <code class="ruby">    def validate_one_of!(params, names, options)</code>
         </li>
       
-        <li class="covered" data-hits="32" data-linenumber="122">
-          <span class="hits">32</span>
+        <li class="covered" data-hits="47" data-linenumber="122">
+          <span class="hits">47</span>
           
           <code class="ruby">      raise InvalidParameterError, &quot;Parameters #{names.join(&#39;, &#39;)} are mutually exclusive&quot; if names.count{|name| present?(params[name])} &gt; 1</code>
         </li>
@@ -846,8 +846,8 @@
           <code class="ruby">    def present?(object)</code>
         </li>
       
-        <li class="covered" data-hits="24" data-linenumber="127">
-          <span class="hits">24</span>
+        <li class="covered" data-hits="34" data-linenumber="127">
+          <span class="hits">34</span>
           
           <code class="ruby">      !blank?(object)</code>
         </li>
@@ -870,8 +870,8 @@
           <code class="ruby">    def blank?(object)</code>
         </li>
       
-        <li class="covered" data-hits="24" data-linenumber="131">
-          <span class="hits">24</span>
+        <li class="covered" data-hits="34" data-linenumber="131">
+          <span class="hits">34</span>
           
           <code class="ruby">      object.respond_to?(:empty?) ? object.empty? : !object</code>
         </li>

data/lib/sinatra/param.rb

@@ -40,7 +40,7 @@ module Sinatra
       options = args.last.is_a?(Hash) ? args.pop : {}
       names = args.collect(&:to_s)
 
-      return unless names.length > 2
+      return unless names.length >= 2
 
       begin
         validate_one_of!(params, names, options)

data/lib/sinatra/param/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module Param
-    VERSION = '1.3.0'
+    VERSION = '1.3.1'
   end
 end

data/sinatra-param.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.summary     = "Parameter Validation & Type Coercion for Sinatra."
   s.description = "sinatra-param allows you to declare, validate, and transform endpoint parameters as you would in frameworks like ActiveModel or DataMapper."
 
-  s.add_dependency "sinatra",   "~> 1.3"
+  s.add_dependency "sinatra", "~> 1.3"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"

data/spec/dummy/app.rb

@@ -185,7 +185,31 @@ class App < Sinatra::Base
     params.to_json
   end
 
-  get '/choice' do
+  get '/choice/1' do
+    param :a, String
+    param :b, String
+    param :c, String
+
+    one_of :a
+
+    {
+      message: 'OK'
+    }.to_json
+  end
+
+  get '/choice/2' do
+    param :a, String
+    param :b, String
+    param :c, String
+
+    one_of :a, :b
+
+    {
+      message: 'OK'
+    }.to_json
+  end
+
+  get '/choice/3' do
     param :a, String
     param :b, String
     param :c, String
@@ -202,7 +226,7 @@ class App < Sinatra::Base
     params.to_json
   end
 
-  get '/raise/choice' do
+  get '/raise/choice/3' do
     param :a, String
     param :b, String
     param :c, String

data/spec/parameter_exclusivity_spec.rb

@@ -10,13 +10,22 @@ describe 'Parameter Sets' do
       ]
 
       params.each do |param|
-        get('/choice', param) do |response|
+        get('/choice/3', param) do |response|
           expect(response.status).to eql 400
           expect(JSON.parse(response.body)['message']).to match(/mutually exclusive/)
         end
       end
     end
 
+    it 'returns 400 on requests that contain more than one mutually exclusive parameter' do
+      params = {a: 1, b: 2}
+
+      get('/choice/2', params) do |response|
+        expect(response.status).to eql 400
+        expect(JSON.parse(response.body)['message']).to match(/mutually exclusive/)
+      end
+    end
+
     it 'returns successfully for requests that have one parameter' do
       params = [
         {a: 1},
@@ -24,18 +33,22 @@ describe 'Parameter Sets' do
         {c: 3}
       ]
 
-      params.each do |param|
-        get('/choice', param) do |response|
-          expect(response.status).to eql 200
-          expect(JSON.parse(response.body)['message']).to match(/OK/)
+      (1..3).each do |n|
+        params.each do |param|
+          get("/choice/#{n}", param) do |response|
+            expect(response.status).to eql 200
+            expect(JSON.parse(response.body)['message']).to match(/OK/)
+          end
         end
       end
     end
 
     it 'returns successfully for requests that have no parameter' do
-      get('/choice') do |response|
-        expect(response.status).to eql 200
-        expect(JSON.parse(response.body)['message']).to match(/OK/)
+      (1..3).each do |n|
+        get("/choice/#{n}") do |response|
+          expect(response.status).to eql 200
+          expect(JSON.parse(response.body)['message']).to match(/OK/)
+        end
       end
     end
   end

data/spec/parameter_raise_spec.rb

@@ -12,7 +12,7 @@ describe 'Exception' do
   it 'should raise error when more than one parameter is specified' do
     params = {a: 1, b: 2, c: 3}
     expect {
-      get('/raise/choice', params)
+      get('/raise/choice/3', params)
     }.to raise_error
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-param
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Mattt Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-20 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -140,6 +140,7 @@ files:
 - ./LICENSE
 - ./Rakefile
 - ./README.md
+- ./sinatra-param-1.3.0.gem
 - ./sinatra-param.gemspec
 - spec/dummy/app.rb
 - spec/parameter_exclusivity_spec.rb