lucky_param 0.1.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74c92c60d88a3b80c6dcf648a3eebcd94867d9c3f332c383a59b034e53d0ab10
-  data.tar.gz: 598848e0d283df5c34089c9e497073b33891ae7b0b40e5555527e2809b10da5d
+  metadata.gz: 64d261e249956a9e8999bf426edf5cea2124db4b52bf53663d1344b691adaa8b
+  data.tar.gz: 7cafcbab4a0a503ff8046a0793dff7daee279491d8e33984be0b0dbbee917cd6
 SHA512:
-  metadata.gz: 3fac2010cc62e11ed9696977ee2f40518d185408de28f8ddb40c024eeea82532d3f9e1e828924fd6c045d9094e345f6a4c4f9eba180d377bb20bfa60e2274a8c
-  data.tar.gz: 9573ff399451714f7d9742fe2772b102feb1073182f911ce265172b5a41d712197c53136d0ecaab0aefd4a685991b45c1848b71d57f481f2432a1011d9c83f0e
+  metadata.gz: a61dc099c8033054be240c3b67b869149b49e72abbdf832f38244ec484d0d6dd3937d4fca6c2f204ec05d628aac82faa9a02b16bd104182badddeb723fc62943
+  data.tar.gz: 43285f26a67eae20d0486a4e6c257366d7a7eccef49e223d10334dd65d005b56f54d44858dd39fc8688cb7114f360f0b5361362aa5e887f0f2c9cf8da1da2c9a

data/.rubocop.yml

@@ -8,12 +8,6 @@ AllCops:
 Style/AndOr:
   Enabled: true
 
-# Do not use braces for hash literals when they are the last argument of a
-# method call.
-Style/BracesAroundHashParameters:
-  Enabled: true
-  EnforcedStyle: context_dependent
-
 # Align `when` with `case`.
 Layout/CaseIndentation:
   Enabled: true
@@ -58,7 +52,7 @@ Style/HashSyntax:
 # extra level of indentation.
 Layout/IndentationConsistency:
   Enabled: true
-  EnforcedStyle: rails
+  EnforcedStyle: indented_internal_methods
 
 # Two spaces, no tabs (for indentation).
 Layout/IndentationWidth:
@@ -125,12 +119,8 @@ Style/StringLiterals:
   Enabled: true
   EnforcedStyle: double_quotes
 
-# Detect hard tabs, no hard tabs.
-Layout/Tab:
-  Enabled: true
-
 # Blank lines should not have any spaces.
-Layout/TrailingBlankLines:
+Layout/TrailingEmptyLines:
   Enabled: true
 
 # No trailing whitespace.
@@ -138,7 +128,7 @@ Layout/TrailingWhitespace:
   Enabled: true
 
 # Use quotes for string literals when they are enough.
-Style/UnneededPercentQ:
+Style/RedundantPercentQ:
   Enabled: true
 
 # Use my_method(my_arg) not my_method( my_arg ) or my_method my_arg.

data/.travis.yml

@@ -2,7 +2,7 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.5.1
+  -  2.6.3
 
 before_script:
   - bundle install

data/Gemfile.lock

@@ -1,119 +1,26 @@
 PATH
   remote: .
   specs:
-    lucky_param (0.1.1)
-      rails (>= 4.2)
+    lucky_param (1.0.0)
+      activesupport (>= 4.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.1)
-      actionpack (= 5.2.1)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailer (5.2.1)
-      actionpack (= 5.2.1)
-      actionview (= 5.2.1)
-      activejob (= 5.2.1)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.2.1)
-      actionview (= 5.2.1)
-      activesupport (= 5.2.1)
-      rack (~> 2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.1)
-      activesupport (= 5.2.1)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.1)
-      activesupport (= 5.2.1)
-      globalid (>= 0.3.6)
-    activemodel (5.2.1)
-      activesupport (= 5.2.1)
-    activerecord (5.2.1)
-      activemodel (= 5.2.1)
-      activesupport (= 5.2.1)
-      arel (>= 9.0)
-    activestorage (5.2.1)
-      actionpack (= 5.2.1)
-      activerecord (= 5.2.1)
-      marcel (~> 0.3.1)
-    activesupport (5.2.1)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (9.0.0)
-    builder (3.2.3)
-    concurrent-ruby (1.0.5)
-    crass (1.0.4)
-    erubi (1.7.1)
-    globalid (0.4.1)
-      activesupport (>= 4.2.0)
-    i18n (1.1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    concurrent-ruby (1.1.6)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
-    loofah (2.2.2)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
-    method_source (0.9.0)
-    mimemagic (0.3.2)
-    mini_mime (1.0.1)
-    mini_portile2 (2.3.0)
-    minitest (5.11.3)
-    nio4r (2.3.1)
-    nokogiri (1.8.5)
-      mini_portile2 (~> 2.3.0)
-    rack (2.0.5)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (5.2.1)
-      actioncable (= 5.2.1)
-      actionmailer (= 5.2.1)
-      actionpack (= 5.2.1)
-      actionview (= 5.2.1)
-      activejob (= 5.2.1)
-      activemodel (= 5.2.1)
-      activerecord (= 5.2.1)
-      activestorage (= 5.2.1)
-      activesupport (= 5.2.1)
-      bundler (>= 1.3.0)
-      railties (= 5.2.1)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.1)
-      actionpack (= 5.2.1)
-      activesupport (= 5.2.1)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
-    rake (12.3.1)
-    sprockets (3.7.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    thor (0.20.0)
+    minitest (5.14.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    websocket-driver (0.7.0)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
+    zeitwerk (2.3.1)
 
 PLATFORMS
   ruby
@@ -122,4 +29,4 @@ DEPENDENCIES
   lucky_param!
 
 BUNDLED WITH
-   1.16.6
+   2.1.4

data/README.md

@@ -22,7 +22,7 @@ class ApplicationController
   # If necessary, you can overide or define your own parameter checkers.
   LuckyParam::CUSTOM_CHECKER = {
     Password: [
-      ->(obj) { obj =~ /([0-9a-zA-Z]){6,30}/ },
+      ->(params, column) { params[column] =~ /([0-9a-zA-Z]){6,30}/ },
       "must be valid password"
     ],
   }.freeze

data/lib/lucky_param.rb

@@ -5,6 +5,7 @@ require "active_support/core_ext/object/blank"
 require_relative "./lucky_param/version"
 require_relative "./lucky_param/checker"
 
+# An easy and extendable controller validator helper for Rails.
 module LuckyParam
   class ParamMissError < StandardError; end
   class ParamFormatError < StandardError; end
@@ -12,24 +13,24 @@ module LuckyParam
 
   def 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
+
+    check_param_format(column, checker_type)
   end
 
   def optional(column, checker_type)
     return if params[column].blank?
-    message = checker_message(column, checker_type)
-    raise ParamFormatError.new("Wrong Params Format: #{message}") if message
+
+    check_param_format(column, checker_type)
   end
 
   private
 
-    def checker_message(column, checker_type)
+    def check_param_format(column, checker_type)
       checker = CUSTOM_CHECKER[checker_type] if LuckyParam.const_defined?(:CUSTOM_CHECKER)
-      checker ||= CHECKER.fetch(checker_type) {
-        raise UnknownCheckerError, "Unknown checker `#{checker_type}`, try to define checker with const `LuckyParam::CUSTOM_CHECKER`"
-      }
-      result = checker[0].call(params[column])
-      result ? nil : "#{column} #{checker[1]}"
+      checker ||= CHECKER.fetch(checker_type) do
+        raise UnknownCheckerError.new("Unknown checker `#{checker_type}`, try to define checker with const `LuckyParam::CUSTOM_CHECKER`")
+      end
+      result = checker[0].call(params, column)
+      raise ParamFormatError.new("Wrong Params Format: #{column} #{checker[1]}") unless result
     end
 end

data/lib/lucky_param/checker.rb

@@ -3,53 +3,61 @@
 module LuckyParam
   CHECKER = {
     NONE: [
-      ->(_obj) { true }
+      ->(params, column) { true }
     ],
     String: [
-      ->(obj) { obj.is_a?(String) },
+      ->(params, column) { params[column].is_a?(String) },
       "must be valid String"
     ],
     Boolean: [
-      ->(obj) { %w[true false 1 0].include?(obj.to_s) },
+      ->(params, column) { %w[true false 1 0].include?(params[column].to_s) },
       "must be one of [true false 1 0]"
     ],
     Integer: [
-      ->(obj) { obj.to_s =~ /\A(0|[1-9]\d*)\Z$/ },
+      ->(params, column) { params[column].to_s =~ /\A(0|[1-9]\d*)\Z$/ },
       "must be valid Integer"
     ],
     Float: [
-      ->(obj) { obj.to_s =~ /\A^[-+]?[0-9]+([,.][0-9]+)?\Z$/ },
+      ->(params, column) { params[column].to_s =~ /\A^[-+]?[0-9]+([,.][0-9]+)?\Z$/ },
       "must be valid Float"
     ],
     Number: [
-      ->(obj) { Float(obj) rescue false }
+      lambda do |params, column|
+        begin
+          Float(params[column])
+        rescue StandardError
+          false
+        end
+      end
     ],
     Email: [
-      ->(obj) { obj =~ /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/ },
+      ->(params, column) { params[column].to_s =~ /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/ },
       "must be valid Email"
     ],
     Timestamp: [
-      ->(obj) { obj =~ /^(\+|\-)?\d+$/ },
+      ->(params, column) { params[column].to_s =~ /^(\+|\-)?\d+$/ },
       "must be valid Timestamp"
     ],
     ArrayJSON: [
-      lambda { |obj|
+      lambda do |params, column|
         begin
-          JSON.parse(obj).is_a?(Array)
+          params[column] = JSON.parse(params[column]) if params[column].is_a?(String)
+          params[column].is_a?(Array)
         rescue StandardError
           false
         end
-      },
+      end,
       "must be valid Array JSON"
     ],
     HashJSON: [
-      lambda { |obj|
+      lambda do |params, column|
         begin
-          JSON.parse(obj).is_a?(Hash)
+          params[column] = JSON.parse(params[column]) if params[column].is_a?(String)
+          params[column].respond_to?(:to_hash)
         rescue StandardError
           false
         end
-      },
+      end,
       "must be valid Hash JSON"
     ]
   }.freeze

data/lib/lucky_param/version.rb

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

data/lucky_param.gemspec

@@ -24,5 +24,5 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rails", ">= 4.2"
+  spec.add_dependency "activesupport", ">= 4.2"
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: lucky_param
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Shooting Fly
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2020-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -65,8 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Helper of parameter validation in controller