util-params 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fd1ab494a27202fc9796355ecaebcf9b9c67943
-  data.tar.gz: 496d08fbd05d12cd70a112f4c73bf2f214f55b12
+  metadata.gz: 9b76df33dec504afda2e70986287005d449b6434
+  data.tar.gz: b5dc45683e7644e4dd4f3c9f8cc8ef2e956b6a73
 SHA512:
-  metadata.gz: 4a6749be2796880c8e1698d23171f560cb9e3cfdfc8f7d84202e627a84a99d1d0c911c3f69f469a69b224709838aaec1b492ba80dd5f852eb607c94efa304e1d
-  data.tar.gz: 0f1a24934ac17c7854d8165fc5be1107309a28afee87a412495f4512425f107bc58ea8c56219adf0fbea23de3e3897f9138de13cfb37fa8c1f50829baf4fe931
+  metadata.gz: 9bd2337b0a2e3cd6aabe976031c526131026507142a631c66a28555afeb97a801e0a6939819a4e01f7fb8ae55ba15f1eb2e1cdac0666562c4b631b79bc1a9248
+  data.tar.gz: 493578f109393d4489d3f4b5f755f4d42e46bac8dc5afa4b239db6fd98627bd1d63eb3f969d0118c0fd9f718d26db33fd693dfa665afbce85ebacf7d8c249f14

data/lib/util/params/params.rb

@@ -10,17 +10,17 @@ module Util
     end
 
     module Type
-      INTEGER = 1
-      STRING  = 2
-      FLOAT   = 3
-      FILE    = 4
-      BOOLEAN = 5
-      OBJECT  = 6
-      ARRAY   = 7
+      INTEGER = :integer
+      STRING  = :string
+      FLOAT   = :float
+      FILE    = :file
+      BOOLEAN = :boolean
+      OBJECT  = :object
+      ARRAY   = :array
     end
 
     def get_params options
-      options = _symbolize_keys options
+      options = options.deep_symbolize_keys
 
       key = options[:key]
       val = _load_val params, key, options[:default], options[:require]
@@ -73,7 +73,7 @@ module Util
     def _load_val vals, key, default, is_require
 
       unless vals.has_key? key
-        push_error "#{key.to_s} == nil" if is_require
+        _push_error "#{key.to_s} == nil" if is_require
         return default
       end
 
@@ -116,7 +116,7 @@ module Util
       return nil if val.blank?
 
       if /[^\d]/ =~ val.to_s
-        push_error "#{key.to_s} type [#{val.to_s}] != integer"
+        _push_error "#{key.to_s} type [#{val.to_s}] != integer"
       end
 
       v = val.to_i
@@ -125,15 +125,15 @@ module Util
         for e in enum
           return v if e === v
         end
-        push_error "#{key.to_s} == unknone val [#{v.to_s}]"
+        _push_error "#{key.to_s} == unknone val [#{v.to_s}]"
       end
 
       if min && (v < min)
-        push_error "#{key.to_s} val [#{v.to_s}] < #{min.to_s}"
+        _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}"
+        _push_error "#{key.to_s} val [#{v.to_s}] > #{max.to_s}"
       end
 
       v
@@ -148,19 +148,19 @@ module Util
         enum.each do |e|
           return v if e === v
         end
-        push_error "#{key.to_s} == unknone val [#{v.to_s}]"
+        _push_error "#{key.to_s} == unknone val [#{v.to_s}]"
       end
 
       if min && (v.length < min)
-        push_error "#{key.to_s}.length < #{min.to_s} ('#{v.to_s}')"
+        _push_error "#{key.to_s}.length < #{min.to_s} ('#{v.to_s}')"
       end
 
       if max && (v.length > max)
-        push_error "#{key.to_s}.length > #{max.to_s} ('#{v.to_s}')"
+        _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}]"
+        _push_error "#{key.to_s} unmatch /#{reg.to_s}/ =~ [#{v.to_s}]"
       end
 
       v
@@ -170,17 +170,17 @@ module Util
       return nil if val.blank?
 
       if /[^\d.]/ =~ val
-        push_error "#{key.to_s} type [#{val.to_s}] != float"
+        _push_error "#{key.to_s} type [#{val.to_s}] != float"
       end
 
       v = val.to_f
 
       if min && (v < min)
-        push_error "#{key.to_s} val [#{v.to_s}] < #{min.to_s}"
+        _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}"
+        _push_error "#{key.to_s} val [#{v.to_s}] > #{max.to_s}"
       end
 
       v     
@@ -199,7 +199,7 @@ module Util
       return nil if val.nil?
 
       if f.size.blank?
-        push_error "#{key.to_s} == nil"
+        _push_error "#{key.to_s} == nil"
         return nil
       end
 
@@ -213,18 +213,18 @@ module Util
       return nil if val.nil?
 
       unless val.kind_of? Array
-        push_error "#{key.to_s}.type != 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}"
+        _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}"
+        _push_error "#{key.to_s} val [#{v.to_s}.length] > #{max.to_s}"
       end
 
       v
@@ -245,12 +245,8 @@ module Util
       end
     end
 
-    def _symbolize_keys hash
-      hash.map{|k,v| [k.to_sym, v] }.to_h
-    end
-
     # エラー追加
-    def push_error message
+    def _push_error message
       @is_error |= true
       @errors.push message
     end

data/lib/util/params/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: util-params
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - unchi