cerulean 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff333f5e197758c6b4c0614f27179ca77824c62a
-  data.tar.gz: 598cb45f6432f5cb299ad14caad290cfed03a4c0
+  metadata.gz: 8a55c2f55e2a8e0b5706ecc63c45195b3694ebe3
+  data.tar.gz: caeff050b3016337f6e3d27c25815f2a53f7eecb
 SHA512:
-  metadata.gz: a3a70d26556c3f14880db10ad313b3a90240db82699c840a9e9b2e574cb2c110f1162b821853a270f44de7cff41e7153f8436a35fe9affd515a77aee5dc33499
-  data.tar.gz: dd80aced8e677fce697dd9533465a7597806751306b490464c9a95ca4b66c10a1ed25f73c023b6fecba31133dcd4d0c38bcc67487476dd68097eb2293db18971
+  metadata.gz: cffe40593fc289fefc08e3ae36afd19c11d52eb171a40478e263285e6c9ce4b21c9750babf297ba9bb39f1219d1fd7152a34b85cc7f1db65fb1b7b33b984d2e6
+  data.tar.gz: 11d1b53ea9435d18df564290b3639694ddf4c92817f7db332ffa1949828ccb6cc86472048725b07fbb9bbdfeda7de5eb4ec633f0b617ad5e7db189405a6b6253

data/lib/cerulean.rb

@@ -80,22 +80,40 @@ module Cerulean
           @meta ||= self.class.class_variable_get(:@@meta)[action_name.to_sym]
         end
 
+        def parse_integer(val)
+          Integer(val) rescue nil
+        end
+
+        def parse_float(val)
+          Float(val) rescue nil
+        end
+
+        def parse_boolean(val)
+          case val.to_s.downcase
+          when 'true'
+            true
+          when 'false'
+            false
+          else
+            nil
+          end
+        end
+
         def validate_param_type(val, type)
-          case type.to_s
-          when 'Integer'
-            Integer(val) rescue false
-          when 'Float'
-            Float(val) rescue false
-          when 'Boolean'
-            %w(true false).include?(val.to_s.downcase)
-          when 'Array[Integer]'
-            !val.any? { |el| !Integer(el) rescue true }
-          when 'Array[Float]'
-            !val.any? { |el| !Float(el) rescue true }
-          when 'Array[Boolean]'
-            !val.any? { |el| %w(true false).include?(el.downcase) }
+          if val.is_a?(Array)
+            parsed = val.map { |el| validate_param_type(el, type[0].to_s) }
+            parsed.all? ? parsed : nil
           else
-            true
+            case type.to_s
+            when 'Integer'
+              parse_integer(val)
+            when 'Float'
+              parse_float(val)
+            when 'Boolean'
+              parse_boolean(val)
+            when 'String'
+              val
+            end
           end
         end
 
@@ -112,27 +130,31 @@ module Cerulean
             @declared = {}
             meta[:params].each do |param, opts|
               if params.has_key?(param.to_s)
-                raise "#{param} is not a #{opts[:type]}" unless validate_param_type(params[param.to_s], opts[:type])
+                p = validate_param_type(params[param.to_s], opts[:type])
+                
+                if p.nil?
+                  raise "#{param} is not a #{opts[:type]}"
+                end
 
                 if opts.has_key?(:min)
-                  if Float(params[param]) < opts[:min]
+                  if p < opts[:min]
                     raise "#{param} must be greater than or equal to #{opts[:min]}"
                   end
                 end
 
                 if opts.has_key?(:max)
-                  if Float(params[param]) > opts[:max]
+                  if p > opts[:max]
                     raise "#{param} must be less than or equal to #{opts[:max]}"
                   end
                 end
 
                 if opts.has_key?(:values)
-                  unless opts[:values].map { |val| val.to_s }.include?(params[param])
+                  unless opts[:values].map { |val| val.to_s }.include?(p.to_s)
                     raise "#{param} must be one of #{opts[:values]}"
                   end
                 end
 
-                @declared[param] = params[param]
+                @declared[param] = p
               else
                 params[param] = opts[:default] if opts.has_key?(:default)
                 raise "#{param} is required" if opts[:required]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cerulean
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Kyle Kestell
@@ -37,7 +37,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Cerulean