util-params 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c3a8f3f96de0a41c9b895831f9cf8ac798b514e
-  data.tar.gz: 7798f50c0c5f38cb25616cdd93f3cdc56bb4c068
+  metadata.gz: 0fd1ab494a27202fc9796355ecaebcf9b9c67943
+  data.tar.gz: 496d08fbd05d12cd70a112f4c73bf2f214f55b12
 SHA512:
-  metadata.gz: f4e5083fb3c436148c44f48255eb68595dc9d55a085323dab2a8f7cca26b1f17ebd4cc2243222726102184135fdc7e90579f2651303a56b6d7c5d3ffac7bc31d
-  data.tar.gz: 81c97e94fcffc6c3b217cc903d700fed4010808499f7cb449e6be1e7f3696af895b053675aab1831d1c1588dff87fea9b87d8e2a16fc18a5e91a806b7ecad5c7
+  metadata.gz: 4a6749be2796880c8e1698d23171f560cb9e3cfdfc8f7d84202e627a84a99d1d0c911c3f69f469a69b224709838aaec1b492ba80dd5f852eb607c94efa304e1d
+  data.tar.gz: 0f1a24934ac17c7854d8165fc5be1107309a28afee87a412495f4512425f107bc58ea8c56219adf0fbea23de3e3897f9138de13cfb37fa8c1f50829baf4fe931

data/lib/util/params/params.rb

@@ -8,125 +8,185 @@ module Util
       # エラーリスト
       @errors = []
     end
-  
-    # パラメーター取得
-    # param[in] name
-    # param[in] default
-    # param[in] isRequire
-    # param[in] params (min_length, max_length, reg)
-    def get_param_str name, default = nil, is_require = false, params = {}
-  
-      val = get_param_val name, default, is_require
-  
+
+    module Type
+      INTEGER = 1
+      STRING  = 2
+      FLOAT   = 3
+      FILE    = 4
+      BOOLEAN = 5
+      OBJECT  = 6
+      ARRAY   = 7
+    end
+
+    def get_params options
+      options = _symbolize_keys options
+
+      key = options[:key]
+      val = _load_val params, key, options[:default], options[:require]
+
       return nil if val.nil?
-      v = val.to_s
+
+      _validate key, options[:type], val, options
+    end
+
+    def get_int_params key, options
+      get_params options.merge(key: key, type: Type::INTEGER)
+    end
+
+    def get_str_params key, options
+      get_params options.merge(key: key, type: Type::STRING)
+    end
+
+    def get_float_params key, options
+      get_params options.merge(key: key, type: Type::FLOAT)
+    end
+
+    def get_file_params key, options
+      get_params options.merge(key: key, type: Type::FILE)
+    end
+
+    def get_bool_params key, options
+      get_params options.merge(key: key, type: Type::BOOLEAN)
+    end
+
+    def get_array_params key, options
+      get_params options.merge(key: key, type: Type::ARRAY)
+    end
+
+    def get_object_params key, options
+      get_params options.merge(key: key, type: Type::OBJECT)
+    end
+
+
+    # エラーがあるか
+    def has_params_error?
+      @is_error
+    end
+    # エラーメッセージ入りスト
+    def get_params_error
+      @errors.join ', '
+    end
   
-      if params.key? :enum
-        for e in params[:enum]
-          return v if e === v
+  protected
+
+    def _load_val vals, key, default, is_require
+
+      unless vals.has_key? key
+        push_error "#{key.to_s} == nil" if is_require
+        return default
+      end
+
+      vals[key]
+    end
+
+    def _validate key_label, type, val, options
+      options ||= {}
+
+      case type
+      when Type::INTEGER
+        _validate_int key_label, val, options[:min], options[:max], options[:enum]
+      when Type::STRING
+        _validate_str key_label, val, options[:min], options[:max], options[:enum], options[:reg]
+      when Type::FLOAT
+        _validate_float key_label, val, options[:min], options[:max]
+      when Type::BOOLEAN
+        _validate_bool key_label, val
+      when Type::FILE
+        _validate_file key_label, val
+      when Type::OBJECT
+        _validate_object key_label, val, options[:elements]
+      when Type::ARRAY
+        vals = _validate_array key_label, val, options[:min], options[:max]
+        return nil if vals.nil?
+        elem_options = options[:element] || {}
+        elem_type = elem_options[:type] || Type::STRING
+
+        vals.map.with_index do |_, i|
+          elem_val = vals[i]
+          _validate "#{key_label}[#{i}]", elem_type, elem_val, elem_options
         end
-        push_error "#{name.to_s} == unknone val [#{v.to_s}]"
+      else
+        # do nothing
       end
-  
-      if params.key?(:min_length) && (v.length < params[:min_length])
-        push_error "#{name.to_s} len [#{v.to_s}] < #{params[:min_length].to_s}"
+
+    end
+
+    def _validate_int key, val, min, max, enum
+      return nil if val.blank?
+
+      if /[^\d]/ =~ val.to_s
+        push_error "#{key.to_s} type [#{val.to_s}] != integer"
       end
-  
-      if params.key?(:max_length) && (v.length > params[:max_length])
-        push_error "#{name.to_s} len [#{v.to_s}] > #{params[:max_length].to_s}"
+
+      v = val.to_i
+
+      if enum
+        for e in enum
+          return v if e === v
+        end
+        push_error "#{key.to_s} == unknone val [#{v.to_s}]"
       end
-  
-      if params.key?(:reg) && !(/#{params[:reg]}/ =~ val)
-        push_error "#{name.to_s} unmatch /#{params[:reg].to_s}/ =~ [#{v.to_s}]"
+
+      if min && (v < min)
+        push_error "#{key.to_s} val [#{v.to_s}] < #{min.to_s}"
       end
-  
+
+      if max && (v > max)
+        push_error "#{key.to_s} val [#{v.to_s}] > #{max.to_s}"
+      end
+
       v
     end
-    #
-    def get_param_strs name, default = [], is_require = false
-      vals = get_param_val name, default, is_require
-  
-      return nil if vals.nil?
-  
-      vals
-    end
 
-    # パラメーター取得
-    def get_param_int name, default = nil, is_require = false, params = {}
-  
-      val = get_param_val name, default, is_require
-  
+    def _validate_str key, val, min, max, enum, reg
       return nil if val.nil?
-      return val if val.kind_of? Integer
-  
-      if /[^\d]/ =~ val
-        push_error "#{name.to_s} type [#{val.to_s}] != integer"
-      end
-  
-      v = val.to_i
-  
-      if params.key? :enum
-        for e in params[:enum]
-          logger.debug e
+
+      v = val.to_s
+
+      if enum
+        enum.each do |e|
           return v if e === v
         end
-        push_error "#{name.to_s} == unknone val [#{v.to_s}]"
+        push_error "#{key.to_s} == unknone val [#{v.to_s}]"
       end
-  
-      if params.key?(:min) && (v.length < params[:min])
-        push_error "#{name.to_s} val [#{v.to_s}] < #{params[:min].to_s}"
+
+      if min && (v.length < min)
+        push_error "#{key.to_s}.length < #{min.to_s} ('#{v.to_s}')"
       end
-  
-      if params.key?(:max) && (v.length > params[:max])
-        push_error "#{name.to_s} val [#{v.to_s}] > #{params[:max].to_s}"
+
+      if max && (v.length > max)
+        push_error "#{key.to_s}.length > #{max.to_s} ('#{v.to_s}')"
       end
+
+      if reg && !(/#{reg}/ =~ val)
+        push_error "#{key.to_s} unmatch /#{reg.to_s}/ =~ [#{v.to_s}]"
+      end
+
       v
     end
 
-    def get_param_ints name, default = [], is_require = false
-      vals = get_param_val name, default, is_require
-      return nil if vals.nil?
-  
-      rs = []
-  
-      vals.each do |v|
-  
-        if params.key? :enum
-          for e in params[:enum]
-            next rs << v.to_i if e === v
-          end
-          push_error "#{name.to_s} == unknone val [#{v.to_s}]"
-        end
-  
-        if params.key?(:min) && (v.length < params[:min])
-          push_error "#{name.to_s} val [#{v.to_s}] < #{params[:min].to_s}"
-        end
-  
-        if params.key?(:max) && (v.length > params[:max])
-          push_error "#{name.to_s} val [#{v.to_s}] > #{params[:max].to_s}"
-        end
-  
-        rs << v.to_i
+    def _validate_float key, val, min, max
+      return nil if val.blank?
+
+      if /[^\d.]/ =~ val
+        push_error "#{key.to_s} type [#{val.to_s}] != float"
       end
-  
-      rs
-    end
-  
-    def get_param_objects name, default = [], is_require = false
-      vals = get_param_val name, default, is_require
-      vals.map do |v|
-        v.permit!.to_h.deep_symbolize_keys
+
+      v = val.to_f
+
+      if min && (v < min)
+        push_error "#{key.to_s} val [#{v.to_s}] < #{min.to_s}"
       end
+
+      if max && (v > max)
+        push_error "#{key.to_s} val [#{v.to_s}] > #{max.to_s}"
+      end
+
+      v     
     end
-  
-    def get_param_object name, default = {}, is_require = false
-      val = get_param_val name, default, is_require
-      val.permit!.to_h.deep_symbolize_keys
-    end
-  
-    #
-    def get_param_bool name, default = nil, is_require = false
-      val = get_param_val name, default, is_require
+
+    def _validate_bool key, val
       return false if val.kind_of? FalseClass
       return true if val.kind_of? TrueClass
       return nil if val.blank?
@@ -134,59 +194,67 @@ module Util
       return true if val == 'true'
       val.to_i > 0
     end
-  
-    # ファイル受け取り
-    def get_file name, is_require = false
-  
-      f = params[name]
-  
-      if is_require
-  
-        if f.nil?
-          push_error "#{name.to_s} == nil"
-          return nil
-        end
-        if f.size.blank?
-          push_error "#{name.to_s} == nil"
-          return nil
-        end
+
+    def _validate_file key, val
+      return nil if val.nil?
+
+      if f.size.blank?
+        push_error "#{key.to_s} == nil"
+        return nil
       end
-  
-      return nil if f.nil?
-      return nil if f.size.blank?
-  
-      f
+
+      return nil if val.nil?
+      return nil if val.size.blank?
+
+      val
     end
-    #
-    def has_param? name
-      params.include? name
+
+    def _validate_array key, val, min, max
+      return nil if val.nil?
+
+      unless val.kind_of? Array
+        push_error "#{key.to_s}.type != Array"
+        return nil
+      end
+
+      v = val
+
+      if min && (v.length < min)
+        push_error "#{key.to_s} val [#{v.to_s}.length] < #{min.to_s}"
+      end
+
+      if max && (v.length > max)
+        push_error "#{key.to_s} val [#{v.to_s}.length] > #{max.to_s}"
+      end
+
+      v
     end
-    # エラーがあるか
-    def has_param_error?
-      @is_error
+
+    def _validate_object key, val, elements
+      return nil if val.nil?
+
+      elements.map do |options|
+        options ||= {}
+        elem_key = options[:key]
+        elem_type = options[:type]
+        elem_default = options[:default]
+        elem_require = options[:require]
+        elem_val = _load_val val, elem_key, elem_default, elem_require
+
+        _validate "#{key}[#{elem_key}]", elem_type, elem_val, options
+      end
     end
-    # エラーメッセージ入りスト
-    def get_error
-      @errors.join ', '
+
+    def _symbolize_keys hash
+      hash.map{|k,v| [k.to_sym, v] }.to_h
     end
-  
-  protected
-  
+
     # エラー追加
     def push_error message
       @is_error |= true
       @errors.push message
     end
   
-    # パラメーター取得
-    def get_param_val name, default, is_require
-      unless params.include? name
-        push_error "#{name.to_s} == nil" if is_require
-        return default
-      end
-      params[name]
-    end
-
   end
 
 end

data/lib/util/params/version.rb

@@ -1,5 +1,5 @@
 module Util
   module Params
-    VERSION = "0.1.3"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: util-params
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - unchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-19 00:00:00.000000000 Z
+date: 2016-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler