sinatra-params 1.0.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7bb20c00551b7a793c77c6aae6eedb00e19cbc9de62af23bd0fadde9216ba6d
-  data.tar.gz: f3afe879522a123c06ea543b73dfadaf07c702f8454099f40093571e3d1d37eb
+  metadata.gz: 391ad5968f903b4753d971effc77666adc10ca5b423f4096cd07ccd76b8c23ad
+  data.tar.gz: c49017b0823b83f03d63fecebf7a137487e2cbc099706dc7058c015aceaa7e43
 SHA512:
-  metadata.gz: 5a5a49dfdb51ebdeb77cc86b04dfcf3c5d61b69dedf36e3ae396b2c8c713373a11493879ed1a357aadbafb994301f7db9331ad961e37c218e90b29fc195d54f1
-  data.tar.gz: fed02db7066bc0cd4de9b9a7ba89b2168348810b28914190ecd383cf2d6c23e32f11203b4c41ec1bd79c7fc6373d551fdac16e891d8fee3a93c11a189240f322
+  metadata.gz: '0699f9646dea7dd0d82e83b1db54b42755df0f19e9b5e47a10145d4e977a4f3b6154e2b9ab21e7f405d2b3601068727ed87b1c8bb0160d8a14abf70eb0434dc7'
+  data.tar.gz: 18ca3601563210e9b071c486f8736889cbdd0c8f00242fc274b5025547ba1f748daf66845ec0a7462d2865a9a8eefa835101957e6e17eb5186233a5613de6109

data/lib/sinatra/params.rb

@@ -1,51 +1,24 @@
-require 'sinatra/params/configuration'
-require 'sinatra/params/error'
-require 'sinatra/params/version'
-
-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 = {})
-      params.define_singleton_method(name.to_sym) { self[name] }
-
-      present = !params[name].nil?
-
-      raise ParameterNotFoundError(name) unless present or args[:optional]
-
-      if params[name].class == type
-        # Do nothing
-      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(name) unless args[:optional]
-      end
-
-      return unless present
-
-      raise ParameterOutOfRangeError(name) if args[:in] and not args[:in].include? params[name]
-      raise ParameterOutOfRangeError(name) if args[:max] and args[:max] < params[name]
-      raise ParameterOutOfRangeError(name) if args[:min] and params[name] < args[:min]
-    end
-  end
-end
+require 'sinatra/params/string'
+require 'sinatra/params/integer'
+require 'sinatra/params/float'
+require 'sinatra/params/date'
+require 'sinatra/params/time'
+require 'sinatra/params/datetime'
+require 'sinatra/params/errors'
+
+module Sinatra
+    module Params
+        def param(name, type, opts = {})
+            params.define_singleton_method(name) { self[name] }
+
+            raise ParameterNotPresentException.new(name) unless opts[:optional?] or not params[name].nil?
+
+            source_type = params[name].class
+            params[name] = params[name].send(source_type.convert_to(type))
+
+            raise ParameterOutOfRangeException.new(name, :min) unless opts[:min].nil? or params[name] >= opts[:min]
+            raise ParameterOutOfRangeException.new(name, :max) unless opts[:max].nil? or params[name] <= opts[:max]
+            raise ParameterOutOfRangeException.new(name, :in) unless opts[:in].nil? or opts[:in].include? params[name]
+        end
+    end
+end

data/lib/sinatra/params/array.rb

@@ -0,0 +1,22 @@
+require 'date'
+
+class Array
+    def self.convert_to(type)
+        table = {
+            Array => :to_a,
+            String => :to_s,
+            Date => :to_date,
+            DateTime => :to_datetime
+        }
+
+        table[type]
+    end
+
+    def to_date
+        Date.parse(self.join('-'))
+    end
+
+    def to_datetime
+        DateTime.parse(self.join('-'))
+    end
+end

data/lib/sinatra/params/date.rb

@@ -0,0 +1,25 @@
+require 'date'
+
+class Date
+    def self.convert_to(type)
+        table = {
+            String => :to_s,
+            Integer => :to_i,
+            Float => :to_f,
+            Array => :to_a,
+            Date => :to_date,
+            DateTime => :to_datetime,
+            Time => :to_time
+        }
+
+        table[type]
+    end
+
+    def to_i
+        self.to_time.to_i
+    end
+
+    def to_f
+        self.to_time.to_f
+    end
+end

data/lib/sinatra/params/datetime.rb

@@ -0,0 +1,25 @@
+require 'date'
+
+class DateTime
+    def self.convert_to(type)
+        table = {
+            String => :to_s,
+            Integer => :to_i,
+            Float => :to_f,
+            Array => :to_a,
+            Date => :to_date,
+            DateTime => :to_datetime,
+            Time => :to_time
+        }
+
+        table[type]
+    end
+
+    def to_i
+        self.to_time.to_i
+    end
+
+    def to_f
+        self.to_time.to_f
+    end
+end

data/lib/sinatra/params/errors.rb

@@ -0,0 +1,22 @@
+class ParameterOutOfRangeException < StandardError
+    attr_reader :message
+
+    def initialize(name, type)
+        case type
+        when :min
+            @message = "Parameter `#{name}` is less than the minimum permitted" 
+        when :max
+            @message = "Parameter `#{name}` is more than the maximum permitted"
+        when :in
+            @message = "Parameter `#{name}` is not in the list of possible values"
+        end
+    end
+end
+
+class ParameterNotPresentException < StandardError
+    attr_reader :message
+
+    def initialize(name)
+        @message = "Parameter `#{name}` is not present"
+    end
+end

data/lib/sinatra/params/float.rb

@@ -0,0 +1,28 @@
+require 'date'
+
+class Float
+    def self.convert_to(type)
+        table = {
+            String => :to_s,
+            Integer => :to_i,
+            Float => :to_f,
+            Time => :to_time,
+            Date => :to_date,
+            DateTime => :to_datetime
+        }
+
+        table[type]
+    end
+
+    def to_time
+        Time.at(self)
+    end
+
+    def to_date
+        Time.at(self).to_date
+    end
+
+    def to_datetime
+        Time.at(self).to_datetime
+    end
+end

data/lib/sinatra/params/integer.rb

@@ -0,0 +1,28 @@
+require 'date'
+
+class Integer
+    def self.convert_to(type)
+        table = {
+            String => :to_s,
+            Integer => :to_i,
+            Float => :to_f,
+            Time => :to_time,
+            Date => :to_date,
+            DateTime => :to_datetime
+        }
+
+        table[type]
+    end
+
+    def to_time
+        Time.at(self)
+    end
+
+    def to_date
+        Time.at(self).to_date
+    end
+
+    def to_datetime
+        Time.at(self).to_datetime
+    end
+end

data/lib/sinatra/params/string.rb

@@ -0,0 +1,29 @@
+require 'date'
+
+class String
+    def self.convert_to(type)
+        table = {
+            String => :to_s,
+            Symbol => :to_sym,
+            Integer => :to_i,
+            Float => :to_f,
+            Date => :to_date,
+            DateTime => :to_datetime,
+            Time => :to_time
+        }
+
+        table[type]
+    end
+
+    def to_date
+        Date.parse(self)
+    end
+
+    def to_time
+        self.to_datetime.to_time
+    end
+
+    def to_datetime
+        DateTime.parse(self)
+    end
+end

data/lib/sinatra/params/time.rb

@@ -0,0 +1,17 @@
+require 'date'
+
+class Time
+    def self.convert_to(type)
+        table = {
+            String => :to_s,
+            Integer => :to_i,
+            Float => :to_f,
+            Array => :to_a,
+            Date => :to_date,
+            DateTime => :to_datetime,
+            Time => :to_time
+        }
+
+        table[type]
+    end
+end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-params
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors:
 - Felipe Cabrera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-30 00:00:00.000000000 Z
+date: 2018-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,39 +39,37 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra-contrib
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
-email:
-- fecabrera@ondasonora.cl
+description: ''
+email: fecabrera0@outlook.com
 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
+- lib/sinatra/params/array.rb
+- lib/sinatra/params/date.rb
+- lib/sinatra/params/datetime.rb
+- lib/sinatra/params/errors.rb
+- lib/sinatra/params/float.rb
+- lib/sinatra/params/integer.rb
+- lib/sinatra/params/string.rb
+- lib/sinatra/params/time.rb
 homepage: https://github.com/fecabrera/sinatra-params
 licenses:
-- MIT
+- BSD-2-Clause
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -89,8 +87,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
-summary: Parameter validation for Sinatra.
+summary: Parameter validation extension for Sinatra
 test_files: []

data/.gitignore

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

data/Gemfile

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

data/LICENSE

@@ -1,21 +0,0 @@
-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,55 +0,0 @@
-# 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 :msg, String
-  
-  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 :msg, String
-    
-    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/configuration.rb

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

data/lib/sinatra/params/error.rb

@@ -1,16 +0,0 @@
-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 +0,0 @@
-module Sinatra
-  module Params
-    VERSION = '1.0.7'
-  end
-end

data/sinatra-params.gemspec

@@ -1,24 +0,0 @@
-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

@@ -1,10 +0,0 @@
-require 'sinatra'
-require 'sinatra/json'
-require 'sinatra/params'
-
-helpers Sinatra::Params
-
-post '/' do
-  param :type, String, :in => ['flex', 'fixed']
-
-end