sinatra-params 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4220d11aae943a4e7b24bf403554d749836423a
-  data.tar.gz: 050a991ab239f00dba247d3a3a577427889e7ac4
+  metadata.gz: 3b739a97d63e9480304313235b59510e05286c05
+  data.tar.gz: 5fbce8cb5d98d1755fd100183db52043651b0221
 SHA512:
-  metadata.gz: d92342df34606dc20f5164395a8a737e24ace64697420ebdf308c0cea357464852fd8313666f7028c16bb0692f98fdeec8d57adae22b7479aca22bc12cf90288
-  data.tar.gz: db4b8ce52284d5ad0b9db24edc622ed5e17ca409553132bb32b4ebe96c63222e1e70ecef3e81d93861d4a0bb193b9bd5890b7b46c9f5e80f61eeab6349a1ece3
+  metadata.gz: 970d2115fc6ddfdbec8783569799739d00e65455cded3f0d8b570022d59ee6edff44e4252f0e02d3391460fb770e197a69a7e540165c15e701265ffd8bedd9f8
+  data.tar.gz: 8d5886e159941cba17bb14d71e6d0c729dff1b98682f318881de86c9a9b74749b7ebae79ecd9e91c96708a64a3ab3fcdde879ddf47fa41976de5293a2f8c6b56

data/Gemfile

@@ -1,3 +1,3 @@
-source 'https://rubygems.org'
-
-gemspec
+source 'https://rubygems.org'
+
+gemspec

data/LICENSE

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2018 Felipe Cabrera
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2018 Felipe Cabrera
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1,57 +1,57 @@
-# Sinatra::Params
-
-
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'sinatra-params'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install sinatra-params
-
-## Usage
-
-```ruby
-require 'sinatra'
-require 'sinatra/params'
-
-helpers Sinatra::Params
-
-get '/' do
-  param :id, Integer
-  param :msg, String
-  
-  "#{params.id}: #{params.msg}"
-end
-```
-
-Or if you are using Sinatra::Base
-
-```ruby
-require 'sinatra/base'
-require 'sinatra/params'
-
-class Application < Sinatra::Base
-  helpers Sinatra::Params
-  
-  get '/' do
-    param :id, Integer
-    param :msg, String
-    
-    "#{params.id}: #{params.msg}"
-  end
-end
-```
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+# Sinatra::Params
+
+
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'sinatra-params'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install sinatra-params
+
+## Usage
+
+```ruby
+require 'sinatra'
+require 'sinatra/params'
+
+helpers Sinatra::Params
+
+get '/' do
+  param :id, Integer
+  param :msg, String
+  
+  "#{params.id}: #{params.msg}"
+end
+```
+
+Or if you are using Sinatra::Base
+
+```ruby
+require 'sinatra/base'
+require 'sinatra/params'
+
+class Application < Sinatra::Base
+  helpers Sinatra::Params
+  
+  get '/' do
+    param :id, Integer
+    param :msg, String
+    
+    "#{params.id}: #{params.msg}"
+  end
+end
+```
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/lib/sinatra/params.rb

@@ -1,41 +1,57 @@
-require 'date'
-
-module Conversion
-  attr_accessor :respond_as, :convert
-  extend self
-end
-
-Conversion.respond_as = {
-    String => :to_s,
-    Integer => :to_i
-}
-
-Conversion.convert = {
-    String => {
-        Array => Proc.new { |input| input.split(%r{,\s*}) },
-        Date => Proc.new { |input| Date.parse(input) },
-        DateTime => Proc.new { |input| DateTime.parse(input) }
-    }
-}
-
-module Sinatra
-  module Params
-    def param (name, type, args = {})
-      raise 'Parameter {name} missing'.sub('{name}', name.to_s) unless params.key? name
-
-      params.define_singleton_method(name.to_sym) { self[name] }
-
-      p Conversion.respond_as
-
-      if params[name].class == type
-        # Do nothing
-      elsif params[name].respond_to? Conversion.respond_as[type]
-        params[name] = params[name].send(Conversion.respond_as[type])
-      elsif Conversion.convert[params[name].class] and Conversion.convert[params[name].class].key? type
-        params[name] = Conversion.convert[params[name].class][type].call(params[name])
-      else
-        raise 'Parameter {name} not found'.sub('{name}', name) unless args[:optional]
-      end
-    end
-  end
-end
+require 'date'
+
+class ParameterNotFoundError < StandardError
+  def initialize
+    super('Parameter not found')
+  end
+end
+
+class ParameterOutOfRangeError < StandardError
+  def initialize
+    super('Parameter out of range')
+  end
+end
+
+module Conversion
+  attr_accessor :respond_as, :convert
+  extend self
+end
+
+Conversion.respond_as = {
+    String => :to_s,
+    Integer => :to_i
+}
+
+Conversion.convert = {
+    String => {
+        Array => Proc.new { |input| input.split(%r{,\s*}) },
+        Date => Proc.new { |input| Date.parse(input) },
+        DateTime => Proc.new { |input| DateTime.parse(input) }
+    }
+}
+
+module Sinatra
+  module Params
+    def param (name, type, args = {})
+      raise ParameterNotFoundError unless params.key? name
+
+      params.define_singleton_method(name.to_sym) { self[name] }
+
+      p Conversion.respond_as
+
+      if params[name].class == type
+        # Do nothing
+      elsif params[name].respond_to? Conversion.respond_as[type]
+        params[name] = params[name].send(Conversion.respond_as[type])
+      elsif Conversion.convert[params[name].class] and Conversion.convert[params[name].class].key? type
+        params[name] = Conversion.convert[params[name].class][type].call(params[name])
+      else
+        raise ParameterNotFoundError unless args[:optional]
+      end
+
+      if args[:in] then raise ParameterOutOfRangeError unless args[:in].include? params[name] end
+      if args[:max] then raise ParameterOutOfRangeError unless args[:max] < params[name] end
+      if args[:min] then raise ParameterOutOfRangeError unless args[:min] > params[name] end
+    end
+  end
+end

data/lib/sinatra/params/version.rb

@@ -1,5 +1,5 @@
-module Sinatra
-  module Params
-    VERSION = '1.0.2'
-  end
-end
+module Sinatra
+  module Params
+    VERSION = '1.0.3'
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-params
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Felipe Cabrera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-07 00:00:00.000000000 Z
+date: 2018-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler