sinatra-params 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35ad664f95e8b6e7ac423d8a29363dafb883b9c0
-  data.tar.gz: 46fb75c85452c2c193f7d13dd2c87a11c248ff73
+  metadata.gz: a4220d11aae943a4e7b24bf403554d749836423a
+  data.tar.gz: 050a991ab239f00dba247d3a3a577427889e7ac4
 SHA512:
-  metadata.gz: bccc1e0db604f62b092b37548d3bb01207a2495499075a2dc3080bc54d121c1e71040d5c7768e9d18557d9ef51aaff1014bef3ce0cf32d082f227084dfd1563a
-  data.tar.gz: b4cf461ae61aa3672dc6a248ab4705acf480aae5f17d1cc448137c72994d3914ad29cf3a0c337d4306a9ac3c440d79492bb2fd18ed35190d40c17f5b8963087a
+  metadata.gz: d92342df34606dc20f5164395a8a737e24ace64697420ebdf308c0cea357464852fd8313666f7028c16bb0692f98fdeec8d57adae22b7479aca22bc12cf90288
+  data.tar.gz: db4b8ce52284d5ad0b9db24edc622ed5e17ca409553132bb32b4ebe96c63222e1e70ecef3e81d93861d4a0bb193b9bd5890b7b46c9f5e80f61eeab6349a1ece3

data/lib/sinatra/params.rb

@@ -1,33 +1,38 @@
 require 'date'
 
-module Sinatra
-  module Params
-    attr_reader :respond_as, :convert
+module Conversion
+  attr_accessor :respond_as, :convert
+  extend self
+end
 
-    @respond_as = {
-        String => :to_s,
-        Integer => :to_i
-    }
+Conversion.respond_as = {
+    String => :to_s,
+    Integer => :to_i
+}
 
-    @convert = {
-        String => {
-            Array => Proc.new { |input| input.split(%r{,\s*}) },
-            Date => Proc.new { |input| Date.parse(input) },
-            DateTime => Proc.new { |input| DateTime.parse(input) }
-        }
+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) unless params.key? name
+      raise 'Parameter {name} missing'.sub('{name}', name.to_s) unless params.key? name
+
+      params.define_singleton_method(name.to_sym) { self[name] }
 
-      params.define_singleton_method(name) { self[name] }
+      p Conversion.respond_as
 
       if params[name].class == type
         # Do nothing
-      elsif params[name].respond_to? respond_as[type]
-        params[name] = params[name].send(respond_as[type])
-      elsif convert[params[name].class] and convert[params[name].class].key? type
-        params[name] = convert[params[name].class][type].call(params[name])
+      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

data/lib/sinatra/params/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-params
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Felipe Cabrera