lucky_param 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccec36d0fcd976004cc8464dde95eaa07c28addad21077dde9081585c53d38ef
-  data.tar.gz: 98a62a979a11ef8f2c35c2963cace3a0e580baf834b22a3ba83049eb3e7f34e2
+  metadata.gz: 74c92c60d88a3b80c6dcf648a3eebcd94867d9c3f332c383a59b034e53d0ab10
+  data.tar.gz: 598848e0d283df5c34089c9e497073b33891ae7b0b40e5555527e2809b10da5d
 SHA512:
-  metadata.gz: f5ae2f511f00e5198f52832e8c9d4fb0e1095ad9fd5334924a3c11c4e208acf7a88bd780eb1843ad4d26478b6c69b755eec0b68472c47b87578704c15e39e0c0
-  data.tar.gz: 6c6c7d91ae8c226b796329d659b1d28dc0a9970087c7fc58b0b4f2a3ace1a6bad8f9654ead328ca0df665ae7d0a2b177d8cb1b61796689c76241a498bf794361
+  metadata.gz: 3fac2010cc62e11ed9696977ee2f40518d185408de28f8ddb40c024eeea82532d3f9e1e828924fd6c045d9094e345f6a4c4f9eba180d377bb20bfa60e2274a8c
+  data.tar.gz: 9573ff399451714f7d9742fe2772b102feb1073182f911ce265172b5a41d712197c53136d0ecaab0aefd4a685991b45c1848b71d57f481f2432a1011d9c83f0e

data/lib/lucky_param/checker.rb

@@ -6,17 +6,24 @@ module LuckyParam
       ->(_obj) { true }
     ],
     String: [
-      ->(obj) { !obj.empty? },
+      ->(obj) { obj.is_a?(String) },
       "must be valid String"
     ],
+    Boolean: [
+      ->(obj) { %w[true false 1 0].include?(obj.to_s) },
+      "must be one of [true false 1 0]"
+    ],
     Integer: [
-      ->(obj) { obj.to_i.to_s == obj },
+      ->(obj) { obj.to_s =~ /\A(0|[1-9]\d*)\Z$/ },
       "must be valid Integer"
     ],
     Float: [
-      ->(obj) { obj.to_f.to_s == obj },
+      ->(obj) { obj.to_s =~ /\A^[-+]?[0-9]+([,.][0-9]+)?\Z$/ },
       "must be valid Float"
     ],
+    Number: [
+      ->(obj) { Float(obj) rescue false }
+    ],
     Email: [
       ->(obj) { obj =~ /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/ },
       "must be valid Email"

data/lib/lucky_param/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LuckyParam
-  VERSION = "0.1.1".freeze
+  VERSION = "0.1.2".freeze
 end

data/lib/lucky_param.rb

@@ -1,39 +1,29 @@
 # frozen_string_literal: true
 
+require "active_support/core_ext/object/blank"
+
 require_relative "./lucky_param/version"
 require_relative "./lucky_param/checker"
 
 module LuckyParam
-  class ParamMissError < StandardError
-  end
-
-  class ParamFormatError < StandardError
-  end
-
-  class UnknownCheckerError < StandardError
-  end
+  class ParamMissError < StandardError; end
+  class ParamFormatError < StandardError; end
+  class UnknownCheckerError < StandardError; end
 
   def required(column, checker_type)
-    required_optional(:required, column, checker_type)
+    raise ParamMissError.new("Missing Params: #{column}") if params[column].blank?
+    message = checker_message(column, checker_type)
+    raise ParamFormatError.new("Wrong Params Format: #{message}") if message
   end
 
   def optional(column, checker_type)
-    required_optional(:optional, column, checker_type)
+    return if params[column].blank?
+    message = checker_message(column, checker_type)
+    raise ParamFormatError.new("Wrong Params Format: #{message}") if message
   end
 
   private
 
-    def required_optional(type, column, checker_type)
-      unless params[column]
-        return if type == :optional
-        raise ParamMissError, "Missing Params: #{column}"
-      end
-      message = checker_message(column, checker_type)
-      if message
-        raise ParamFormatError, "Wrong Params Format: #{message}"
-      end
-    end
-
     def checker_message(column, checker_type)
       checker = CUSTOM_CHECKER[checker_type] if LuckyParam.const_defined?(:CUSTOM_CHECKER)
       checker ||= CHECKER.fetch(checker_type) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucky_param
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Shooting Fly
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-26 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails