sinatra-my-params 0.0.2 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08a02ee0bcfe3f018ef811ac5ba3c1c5b53591461a4d6022714faa9ea55d57c8'
-  data.tar.gz: d3e4314359090e1118e7e007bf05bf9e760aaa2f43170d42dd33c7daa95714da
+  metadata.gz: 004ffa9a419a6ca94f76672d37e9cd242aca9f69ca1c92ada97ac135a1329abc
+  data.tar.gz: a0dcc3771df668d6356a4443e98cd1bcb4d1ad6e877076bbc3cc5f99e904a078
 SHA512:
-  metadata.gz: a596f13ac286229ba0bb7c836e5f177716e9fc9ce25c86da25ee730ef36e6833bd0e2ae980d7ceeb0f8f0e56641799e287eeea17d7c0082be88fbfd690e9b3a3
-  data.tar.gz: 7daedfd337eaa9ff6320d182690b5430f943105f98c17e2a9295c971964103ed3b931fbbdc50dbeaa1e6bb2fd75b79973c1ca76ccdc48f4f5a6535e2989357a6
+  metadata.gz: 04d4e285426806ac16f36f7b757eed7682d1502c272dedf7f0fd3291234e9cf3eb611c52c25a73cca3f3b29d6190ed83523cde335125599cfb92f81e2eee8c17
+  data.tar.gz: 861c6fc9858865ac856e66ed030f5bd8ac7005b268c3a3a2cb66deec648feec52b1c596808e6736b4495bf20e1fe7e4e818ccbfa8ebb24fe2727d77511bb13cf

data/Rakefile

@@ -1,8 +1,13 @@
-require 'rake/testtask'
+require "rake/testtask"
+require "rspec/core/rake_task"
 
 Rake::TestTask.new do |t|
-  t.libs << 'test'
+  t.libs << "test"
 end
 
-desc "Run tests"
-task :default => :test
+begin
+  RSpec::Core::RakeTask.new(:spec)
+
+  task :default => :spec
+rescue LoadError
+end

data/bin/permit_params

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
 
-require 'permit_params'
+require "permit_params"

data/lib/permit_params.rb

@@ -3,18 +3,28 @@ module PermitParams
     attr_accessor :param, :options
   end
 
+  def permitted_params(params, permitted = {}, strong_validation = false)
+    return params if permitted.empty?
   
-  def permitted_params(params, permitted, strong_validation = false)
-    params.select do |k,v| 
-      permitted.keys.map(&:to_s).include?(k.to_s) && 
-        !v.nil? && 
-        coerce(v, permitted[k.to_sym], strong_validation)
+    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
 
-  def coerce(param, type, strong = false, options = {})
+  Boolean = :boolean
+  Any = :any
+
+  def coerce(param, type, strong_validation = false, options = {})
+    return param if type == Any
+
     begin
       return nil if param.nil?
       return param if (param.is_a?(type) rescue false)
@@ -24,19 +34,27 @@ 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
-      if [TrueClass, FalseClass, Boolean].include? type
-        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?
-        return coerced
-      end
+      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
-      if strong
-        raise InvalidParameterError, "'#{param}' is not a valid #{type}"
-      end
+      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?
+    coerced
+  end
 end
 

data/spec/permit_params_spec.rb

@@ -0,0 +1,118 @@
+require "test/unit"
+require "permit_params"
+require "rspec"
+require "rack/test"
+
+include PermitParams
+
+describe "exceptions" do
+  before do
+    class TestClass; end
+  end
+
+  it "should raise error when at least one param is invalid" do
+    input = { param_1: "a" }
+    expect{
+      permitted_params(input, { param_1: Integer }, true)
+    }.to raise_error(InvalidParameterError, "'a' is not a valid Integer") 
+  end
+
+  it "should return a string when a pemitted is string" do
+    input = { param_1: "a string" }
+    expect(input).to eq permitted_params(input, { param_1: String })
+  end
+
+  it "should return a float when a pemitted is float" do
+    input = { param_1: 10.0 }
+    expect(input).to eq permitted_params(input, { param_1: Float })
+  end
+
+  it "should return a date when a pemitted is date" do
+    input = { param_1: Date.new }
+    expect(input).to eq permitted_params(input, { param_1: Date })
+  end
+
+  it "should return a time when a pemitted is time" do
+    input = { param_1: Time.new }
+    expect(input).to eq permitted_params(input, { param_1: Time })
+  end
+
+  it "should return an integer when a pemitted is integer" do
+    input = { param_1: 1 }
+    expect(input).to eq permitted_params(input, { param_1: Integer })
+  end
+
+  it "should return an integer when a pemitted can be cast into integer" do
+    input = { param_1: "1" }
+    output = { param_1: 1 }
+    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 }
+    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 }
+    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 "returns the paramter without casting if Any" do
+    input = { param_1: "1" }
+    output = { param_1: "1" }
+    expect(output).to eq permitted_params(input, { param_1: Any })
+
+    input = { param_1: TestClass.new }
+    expect(input).to eq permitted_params(input, { param_1: Any })
+  end
+
+  it "should remove a string when a pemitted is integer" do
+    input = { param_1: "a string" }
+    output = {}
+    expect(output).to eq permitted_params(input, { param_1: Integer })
+  end
+
+  it "should allow all params when no restriction is given" do
+    input = { param_1: "a string" }
+    expect(input).to eq permitted_params(input)
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-my-params
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.6
 platform: ruby
 authors:
 - Marco Aviles
@@ -11,7 +11,7 @@ cert_chain: []
 date: 2021-09-19 00:00:00.000000000 Z
 dependencies: []
 description: A simple sinatra params sanitizer
-email: nick@quaran.to
+email: gdmarav374@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -19,8 +19,8 @@ files:
 - Rakefile
 - bin/permit_params
 - lib/permit_params.rb
-- test/test_permit_params.rb
-homepage: http://rubygems.org/gems/sinatra-my-params
+- spec/permit_params_spec.rb
+homepage: https://github.com/mhero/sinatra-my-params
 licenses: []
 metadata: {}
 post_install_message:
@@ -43,4 +43,4 @@ signing_key:
 specification_version: 3
 summary: permit_params!
 test_files:
-- test/test_permit_params.rb
+- spec/permit_params_spec.rb

data/test/test_permit_params.rb

@@ -1,35 +0,0 @@
-require 'test/unit'
-require 'permit_params'
-require 'rspec'
-require 'rack/test'
-
-class PermitParamsTest < Test::Unit::TestCase
-  include PermitParams
-
-  def test_pemit_string
-    input = { param_1: "hola" }
-    output = { param_1: "hola" }
-    assert_equal output, permitted_params( input, { param_1: String } )
-  end
-
-  def test_permit_integer
-    input = { param_1: 1 }
-    output = { param_1: 1 }
-    assert_equal output, permitted_params( input, { param_1: Integer } )
-  end
-
-  def test_remove_integer
-    input = { param_1: "a"}
-    output = {}
-    assert_equal output, permitted_params( input, { param_1: Integer } )
-  end
-
-  describe 'Exception' do
-    describe 'raise' do
-      it 'should raise error when no parameters are specified' do
-        input = { param_1: "a"}
-        expect(permitted_params( input, { param_1: Integer }, true )).to raise_error InvalidParameterError
-      end
-    end
-  end
-end