sinatra-params 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b739a97d63e9480304313235b59510e05286c05
-  data.tar.gz: 5fbce8cb5d98d1755fd100183db52043651b0221
+  metadata.gz: bda631e901b268d9cba511c671088dc909f06d69
+  data.tar.gz: 12d04e02ba4eb00bf0a263b300414d7efedd462e
 SHA512:
-  metadata.gz: 970d2115fc6ddfdbec8783569799739d00e65455cded3f0d8b570022d59ee6edff44e4252f0e02d3391460fb770e197a69a7e540165c15e701265ffd8bedd9f8
-  data.tar.gz: 8d5886e159941cba17bb14d71e6d0c729dff1b98682f318881de86c9a9b74749b7ebae79ecd9e91c96708a64a3ab3fcdde879ddf47fa41976de5293a2f8c6b56
+  metadata.gz: c3385f06b2b369f652073fcf806b607ab65ee6a05333260c500359ebf4e5c3ff938c228cb2cbc518ec3ff6a2153fd06d4902ea1d908433e4278a781a821a5f31
+  data.tar.gz: '07848feccca292e83e2ed724693adf9b39f9dd1317ef2178cfc2ad89f90c50f42cf3656e4dadea529efdec03cd5fe2dc26637949c1fcb7a2691e1c477bbe8ee4'

data/.gitignore

@@ -0,0 +1,3 @@
+.idea/
+Gemfile.lock
+*.gem

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

@@ -27,10 +27,9 @@ require 'sinatra/params'
 helpers Sinatra::Params
 
 get '/' do
-  param :id, Integer
   param :msg, String
   
-  "#{params.id}: #{params.msg}"
+  params.msg
 end
 ```
 
@@ -44,10 +43,9 @@ class Application < Sinatra::Base
   helpers Sinatra::Params
   
   get '/' do
-    param :id, Integer
     param :msg, String
     
-    "#{params.id}: #{params.msg}"
+    params.msg
   end
 end
 ```

data/lib/sinatra/params.rb

@@ -1,16 +1,8 @@
-require 'date'
-
-class ParameterNotFoundError < StandardError
-  def initialize
-    super('Parameter not found')
-  end
-end
+require 'sinatra/params/configuration'
+require 'sinatra/params/error'
+require 'sinatra/params/version'
 
-class ParameterOutOfRangeError < StandardError
-  def initialize
-    super('Parameter out of range')
-  end
-end
+require 'date'
 
 module Conversion
   attr_accessor :respond_as, :convert
@@ -33,25 +25,23 @@ Conversion.convert = {
 module Sinatra
   module Params
     def param (name, type, args = {})
-      raise ParameterNotFoundError unless params.key? name
+      raise ParameterNotFoundError(name) 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]
+      elsif Conversion.respond_as[type] and 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]
+        raise ParameterNotFoundError(name) 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
+      raise ParameterOutOfRangeError(name) if args[:in] and args[:in].include? params[name]
+      raise ParameterOutOfRangeError(name) if args[:max] and args[:max] < params[name]
+      raise ParameterOutOfRangeError(name) if args[:min] and args[:min] > params[name]
     end
   end
 end

data/lib/sinatra/params/configuration.rb

@@ -0,0 +1,8 @@
+module Sinatra
+  module Params
+    module Configuration
+      attr_accessor :lang
+      extend self
+    end
+  end
+end

data/lib/sinatra/params/error.rb

@@ -0,0 +1,16 @@
+class ParameterValidationError < StandardError
+  attr_reader :param, :message
+
+  def initialize(msg, param)
+    @param = param
+    @message = msg.sub('{param}', param)
+  end
+end
+
+def ParameterNotFoundError(param)
+  ParameterValidationError.new 'Parameter \'{param}\' not found', param.to_s
+end
+
+def ParameterOutOfRangeError(param)
+  ParameterValidationError.new 'Parameter \'{param}\' out of range', param.to_s
+end

data/lib/sinatra/params/version.rb

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

data/sinatra-params.gemspec

@@ -0,0 +1,24 @@
+require 'find'
+
+lib = File.expand_path('lib')
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+require 'sinatra/params/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = 'sinatra-params'
+  spec.version       = Sinatra::Params::VERSION
+  spec.authors       = ['Felipe Cabrera']
+  spec.email         = ['fecabrera@ondasonora.cl']
+
+  spec.summary       = %q{Parameter validation for Sinatra.}
+  #spec.description   = %q{TODO: Write a longer description or delete this line.}
+  spec.homepage      = 'https://github.com/fecabrera/sinatra-params'
+  spec.license       = 'MIT'
+
+  spec.files         = `git ls-files`.split($/)
+
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'sinatra'
+  spec.add_development_dependency 'sinatra-contrib'
+end

data/test/server_test.rb

@@ -0,0 +1,12 @@
+require 'sinatra'
+require 'sinatra/json'
+require 'sinatra/params'
+
+helpers Sinatra::Params
+
+post '/' do
+  param :content, String
+  param :birthday, Date, :max => Date.today.prev_year(18)
+
+  json :content => params.content
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-params
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Felipe Cabrera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-12 00:00:00.000000000 Z
+date: 2018-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,11 +59,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
 - lib/sinatra/params.rb
+- lib/sinatra/params/configuration.rb
+- lib/sinatra/params/error.rb
 - lib/sinatra/params/version.rb
+- sinatra-params.gemspec
+- test/server_test.rb
 homepage: https://github.com/fecabrera/sinatra-params
 licenses:
 - MIT