despecable 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bd312e2dbfeb02c7d6f895e360225eee7b6f9ab
-  data.tar.gz: 3d2d7fa1ef7c0690ae947dd03afbe874f1818718
+  metadata.gz: 844167e9ba0dad9d3420d9da0055e5f03429a173
+  data.tar.gz: c6e592b5c7b15ff362e6544435313f55a842a595
 SHA512:
-  metadata.gz: fd6525433243bf037bd0fbced8ee13f01832a016c0942a741dfbf27dbe47a914e3f56aff1dfa0406b13051a2c5d41e97914586ebde487871c7958929d02eebee
-  data.tar.gz: f3abcf704a9d4226e20ec91d7abc924c4cabd552d0d9341c25e8f56a137a3627ffcd5b98d71c2ac39949275335404ec3c269d5132b98d288abfa4dbedfb84703
+  metadata.gz: b3e960887d49d22504ac2d2085a0719dec32ea74dcb0750f780b855399635c0f1e54acbf92d0f266cd76831071e23ab8b81fc511a413ac4f61608db294464042
+  data.tar.gz: 789378ab03e1ff0e829c36255c8d6b76c0826124db5737012e60bf7fc1749cf643d46882f064513c1ff2b7e884b1aac454ad489c1b111a4487db2133900cbf68

data/lib/despecable/spectacles.rb

@@ -10,44 +10,77 @@ module Despecable
     end
 
     def read(name, value, type, options)
-      value = public_send(type, name, value) unless value.nil?
+      value = public_send(type, name, value, options) unless value.nil?
       validate_param(name, value, options)
       return value
     end
 
     def validate_param(name, value, options)
       validate_param_presence(name, value) if options[:required]
-      validate_param_value(name, value, options[:in]) if options.key?(:in) && !value.nil?
+      validate_param_value(name, value, options) if options.key?(:in) && !value.nil?
     end
 
     def validate_param_presence(name, value)
       raise Despecable::MissingParameterError.new("Missing required parameter: '#{name}'", parameters: name) if value.nil?
     end
 
-    def validate_param_value(name, value, allowed_values)
-      raise Despecable::IncorrectParameterError.new("Unacceptable value for parameter: '#{name}'", parameters: name) if !allowed_values.include?(value)
+    def validate_param_value(name, value, options)
+      allowed_values = options[:in]
+      allowed_values = allowed_values.map{|x| x.is_a?(String) ? x.downcase : x} if options[:case] == false
+      value = value.downcase if options[:case] == false && value.is_a?(String)
+      if !allowed_values.include?(value)
+        msg = "Unacceptable value for parameter: '#{name}'"
+        allowed_values_message = expected_values_message(allowed_values)
+        msg += "; acceptable values are" + allowed_values_message if !allowed_values_message.nil?
+        raise Despecable::IncorrectParameterError.new(msg, parameters: name)
+      end
+    end
+
+    def validate_string_length(name, value, options)
+      allowed_lengths = options[:length]
+      allowed_lengths = [*allowed_lengths] unless allowed_lengths.is_a?(Range)
+      if !allowed_lengths.include?(value.length)
+        msg = "Unacceptable length for parameter: '#{name}'"
+        allowed_values_message = expected_values_message(allowed_lengths)
+        msg += "; acceptable lengths are" + allowed_values_message if !allowed_values_message.nil?
+        raise Despecable::IncorrectParameterError.new(msg, parameters: name)
+      end
     end
 
-    def integer(name, value)
+    def expected_values_message(allowed_values)
+      case allowed_values
+      when Array
+        msg = ": " + allowed_values.slice(0..99).join(", ")
+        msg += ", ... [truncated]" if allowed_values.length > 100
+        return msg
+      when Range
+        " between #{allowed_values.first} and #{allowed_values.last}"
+      else
+        nil
+      end
+    end
+
+    def integer(name, value, options)
       Integer(value)
     rescue ArgumentError
       raise unless /^invalid value for Integer/ =~ $!.message
       raise Despecable::InvalidParameterError.new("Integer type required for parameter: '#{name}'", parameters: name)
     end
 
-    def float(name, value)
+    def float(name, value, options)
       Float(value)
     rescue ArgumentError
       raise unless /^invalid value for Float/ =~ $!.message
       raise Despecable::InvalidParameterError.new("Float type required for parameter: '#{name}'", parameters: name)
     end
 
-    def string(name, value)
-      # This is really a no-op.
-      value.to_s
+    def string(name, value, options)
+      value = value.to_s #no-op
+      validate_string_length(name, value, options) if options.key?(:length)
+      return value
     end
 
-    def boolean(name, value)
+    def boolean(name, value, options)
       case value.to_s
       when "true", "1" then true
       when "false", "0", nil then false
@@ -55,26 +88,26 @@ module Despecable
       end
     end
 
-    def date(name, value)
+    def date(name, value, options)
       Date.rfc3339(value + "T00:00:00+00:00")
     rescue ArgumentError
       raise unless $!.message == "invalid date"
       raise Despecable::InvalidParameterError.new("Date type (e.g. '2012-12-31') required for parameter: '#{name}'", parameters: name)
     end
 
-    def datetime(name, value)
+    def datetime(name, value, options)
       DateTime.rfc3339(value)
     rescue ArgumentError
       raise unless $!.message == "invalid date"
       raise Despecable::InvalidParameterError.new("Rfc3339 datetime type (e.g. '2009-06-19T00:00:00-04:00') required for parameter: '#{name}'", parameters: name)
     end
 
-    def file(name, value)
-      raise Despecable::InvalidParameterError.new("File upload type required for parameter: '#{name}'" , parameters: name) if !(value.respond_to?(:original_filename) && value.original_filename.present?)
+    def file(name, value, options)
+      raise Despecable::InvalidParameterError.new("File upload type required for parameter: '#{name}'" , parameters: name) if !(value.respond_to?(:original_filename) && value.original_filename.to_s.length > 0)
       return value
     end
 
-    def any(name, value)
+    def any(name, value, options)
       value
     end
   end

data/lib/despecable/spectator.rb

@@ -44,7 +44,7 @@ module Despecable
 
     def _spec(name, type, options = {})
       @specd << (name)
-      if !params.key?(name) && options[:default]
+      if !params.key?(name) && options.key?(:default)
         params[name] = options[:default]
       elsif options[:array]
         values = @spectacles.arrayify(params[name])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: despecable
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Schwartz