sinatra-my-params 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2c387628a7d4582e28e5fe2bdc905abc284cdcf81c76fc8bd2f0c3e23f254e1
-  data.tar.gz: e86107885442e79700caf8f293b591814798296275b5588dbe2120d80df63898
+  metadata.gz: 747bacbce6ab90027f92e29c45475964414cda4f62ad362339f1fd515323fcf3
+  data.tar.gz: 2c0d6582d40e18230e5d97e29ddff20484d86163366bc23e7aa24e67c255d9a6
 SHA512:
-  metadata.gz: 8c544a84df83f1e507dced93487e175f0d3b4044141f47774f59fdd8f12592070f98134a472b524983ddde905af04444da6acf359cbf8a34c14fe5e0d1eb65b5
-  data.tar.gz: b03d81b690692988673bdf9fbf944ca533fa770ff3e4b21f358e371579b6c0ebc6c5688d5729adc243c4e1f522737b256941cee23ee71df6964917b87c6c3a3e
+  metadata.gz: b2b7b1e994250fce4fbabe3cf9571b62dc6432c7965d81897b54889a1be64198fb0dff9ba1ab83e91462985ee7644a5a3b00188b600b1d7fa4431d72e0ee99d6
+  data.tar.gz: e502b5deafbeb12839eb772b3be83720160ac8f1c99950fa527dcdef9da2e04df7aa55ffee1a32c6e037fa9931e3ec3f28e2e3470e545781e9855245b5db3d5d

data/lib/permit_params.rb

@@ -6,18 +6,22 @@ module PermitParams
   def permitted_params(params, permitted = {}, strong_validation = false)
     return params if permitted.empty?
   
-    params.select do |k,v| 
-      permitted.keys.map(&:to_s).include?(k.to_s) && 
-        !v.nil? && 
-        !coerce(v, permitted[k.to_sym], strong_validation).nil?
+    coerced_params = Hash.new({})
+
+    params.each do |key, value|
+      if permitted.keys.map(&:to_s).include?(key.to_s) && !value.nil?
+        coerced = coerce(value, permitted[key.to_sym], strong_validation)
+        coerced_params[key] = coerced if !coerced.nil?
+      end
     end
+    coerced_params
   end
 
   private
 
   Boolean = :boolean
 
-  def coerce(param, type, strong = false, options = {})
+  def coerce(param, type, strong_validation = false, options = {})
     begin
       return nil if param.nil?
       return param if (param.is_a?(type) rescue false)
@@ -27,15 +31,23 @@ module PermitParams
       return Date.parse(param) if type == Date
       return Time.parse(param) if type == Time
       return DateTime.parse(param) if type == DateTime
-      return Array(param.split(options[:delimiter] || ",")) if type == Array
-      return Hash[param.split(options[:delimiter] || ",").map{|c| c.split(options[:separator] || ":")}] if type == Hash
+      return coerce_array(param) if type == Array
+      return coerce_hash(param) if type == Hash
       return coerce_boolean(param) if [TrueClass, FalseClass, Boolean].include? type
       return nil
     rescue ArgumentError
-      raise InvalidParameterError, "'#{param}' is not a valid #{type}" if strong
+      raise InvalidParameterError, "'#{param}' is not a valid #{type}" if strong_validation
     end
   end
 
+  def coerce_array(param)
+    Array(param.split(options[:delimiter] || ","))
+  end
+
+  def coerce_hash(param)
+    Hash[param.split(options[:delimiter] || ",").map{|c| c.split(options[:separator] || ":")}]
+  end
+
   def coerce_boolean(param)
     coerced = /^(false|f|no|n|0)$/i === param.to_s ? false : /^(true|t|yes|y|1)$/i === param.to_s ? true : nil
     raise ArgumentError if coerced.nil?

data/spec/permit_params_spec.rb

@@ -41,21 +41,56 @@ describe "exceptions" do
   it "should return an integer when a pemitted can be cast into integer" do
     input = { param_1: "1" }
     output = { param_1: 1 }
-    expect(input).to eq permitted_params(input, { param_1: Integer })
+    expect(output).to eq permitted_params(input, { param_1: Integer })
   end
 
   it "should return a false(boolean) when a pemitted is boolean" do
     input = { param_1: "false" }
-    output = { param_1: "false" }
+    output = { param_1: false }
     expect(output).to eq permitted_params(input, { param_1: Boolean })
   end
 
   it "should return a true(boolean) when a pemitted is boolean" do
     input = { param_1: "true" }
-    output = { param_1: "true" }
+    output = { param_1: true }
     expect(output).to eq permitted_params(input, { param_1: Boolean })
   end
 
+  it "should return an array when a pemitted is array" do
+    input = { param_1: [1,2] }
+    expect(input).to eq permitted_params(input, { param_1: Array })
+  end
+
+  it "should return a hash when a pemitted is hash" do
+    input = { param_1: { a: 1 } }
+    expect(input).to eq permitted_params(input, { param_1: Hash })
+  end
+
+  it "should return a hash when a pemitted is hash" do
+    input = { param_1: { :a => 1 } }
+    expect(input).to eq permitted_params(input, { param_1: Hash })
+  end
+
+  it "should return a hash when a pemitted is hash" do
+    input = { param_1: { "a": 1 } }
+    expect(input).to eq permitted_params(input, { param_1: Hash })
+  end
+
+  it "should return a several types for several inputs" do
+    input = { number: 1, string: "string", bol: "true", array: [1,2], hsh: {a: 3}  }
+    output = { number: 1, string: "string", bol: true, array: [1,2], hsh: {a: 3}  }
+    expect(output).to eq permitted_params(
+      input, 
+      { 
+        number: Integer,
+        string: String,
+        bol: Boolean,
+        array: Array,
+        hsh: Hash
+      }
+    )
+  end
+
   it "should remove a string when a pemitted is integer" do
     input = { param_1: "a string" }
     output = {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-my-params
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Marco Aviles