despecable 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b5565ddf47367e796da5ff33a7efc1eee7f33b3
-  data.tar.gz: 69a24212531937015c179a8ac9587217915ea667
+  metadata.gz: 269604b0ffb17ef578acfa582c7842445bed4c4c
+  data.tar.gz: 7a9f3d1fbee596ef848848b77faaf5cf535b1bc2
 SHA512:
-  metadata.gz: 60375f5a8a3ae600481b0efdc6d71473f11acd0b9ebd00b3799f72445c4c630f97e86d9c02ab3cf647b4b1824f9fc9e8b1179e5af1a4824562743ad7b0d8cd68
-  data.tar.gz: bca4f3e6cd1b0b165ed10feb910fe299f0c4bc5225d60661297caa41e155afa5c49d3a7b9d604f0b7d06f15a699a9e768a1eb8131138beff2ca1fef48b539862
+  metadata.gz: e207aaec581f73bd98f52c01e9e2906cd1a784b86dcf682b51f67923d1df59f7ae6a16a9426684b8c1e9696c9d37f2a6bb09410d02afb82905059d15df26ef9c
+  data.tar.gz: d2b3115499c5418afa3a13589fa1f3a049fbc64c2aca21c830774c2f5897791c98c048842fbe07def6322922e7580efa5fdd6850a9dada7fb7d027d448a45e45

data/lib/despecable/errors/despecable_error.rb

@@ -1 +1,15 @@
-Despecable::DespecableError = Class.new(StandardError)
+class Despecable::DespecableError < StandardError
+  def despecable_message
+    message == self.class.to_s ? nil : message
+  end
+
+  def insert_name_here(name)
+    msg = introduction(name)
+    msg += " " + despecable_message unless despecable_message.nil?
+    return exception(msg)
+  end
+
+  def introduction(name)
+    "Invalid value for paramter #{name}."
+  end
+end

data/lib/despecable/errors/incorrect_parameter_error.rb

@@ -1 +1,5 @@
-Despecable::IncorrectParameterError = Class.new(Despecable::DespecableError)
+class Despecable::IncorrectParameterError < Despecable::DespecableError
+  def introduction(name)
+    "Incorrect value for paramter '#{name}'."
+  end
+end

data/lib/despecable/errors/invalid_parameter_error.rb

@@ -1 +1,5 @@
-Despecable::InvalidParameterError = Class.new(Despecable::DespecableError)
+class Despecable::InvalidParameterError < Despecable::DespecableError
+  def introduction(name)
+    "Invalid value for parameter '#{name}'."
+  end
+end

data/lib/despecable/errors/missing_parameter_error.rb

@@ -1 +1,5 @@
-Despecable::MissingParameterError = Class.new(Despecable::DespecableError)
+class Despecable::MissingParameterError < Despecable::DespecableError
+  def intro_message(name)
+    "Missing required parameter '#{name}'."
+  end
+end

data/lib/despecable/spectacles.rb

@@ -1,55 +1,65 @@
 module Despecable
   class Spectacles
-    attr_reader :params
-    
-    def initialize(params)
-      @params = params
+    def arrayable?(value)
+      value.is_a?(::Array) || /,/ =~ value.to_s
     end
 
-    def validate_param(name, options)
-      validate_param_presence(name) if options[:required]
-      validate_param_value(name, options[:in]) if options.key?(:in) && params.key?(name)
+    def arrayify(value)
+      return value if value.is_a?(Array)
+      value.to_s.split(",")
     end
 
-    def validate_param_presence(name)
-      raise Despecable::MissingParameterError, "Missing required param: '#{name}'" if !params.key?(name)
+    def read(value, type, options)
+      value = public_send(type, value) unless value.nil?
+      validate_param(value, options)
+      return value
     end
 
-    def validate_param_value(name, allowed_values)
-      raise Despecable::IncorrectParameterError, "Incorrect value for param: '#{name}'" if !allowed_values.include?(params[name])
+    def validate_param(value, options)
+      validate_param_presence(value) if options[:required]
+      validate_param_value(value, options[:in]) if options.key?(:in) && !value.nil?
     end
 
-    def integer(name)
-      int = params[name].to_i
-      raise Despecable::InvalidParameterError, "Invalid value for param: '#{name}'. Required type: integer." if int.to_s != params[name].sub(/^0+/, "")
-      return int
+    def validate_param_presence(value)
+      raise Despecable::MissingParameterError if value.nil?
     end
 
-    def string(name)
+    def validate_param_value(value, allowed_values)
+      raise Despecable::IncorrectParameterError, "Value received: #{value}." if !allowed_values.include?(value)
+    end
+
+    def integer(value)
+      Integer(value)
+    rescue ArgumentError
+      raise unless /^invalid value for Integer/ =~ $!.message
+      raise Despecable::InvalidParameterError, "Required type: integer."
+    end
+
+    def string(value)
       # This is really a no-op.
-      params[name].to_s
+      value.to_s
     end
 
-    def boolean(name)
-      case params[name].to_s
+    def boolean(value)
+      case value.to_s
       when "true", "1" then true
       when "false", "0", nil then false
-      else raise Despecable::InvalidParameterError, "Invalid value for param: '#{name}'. Require type: boolean (1/0 or true/false)"
+      else raise Despecable::InvalidParameterError, "Require type: boolean (1/0 or true/false)"
       end
     end
 
-    def date(name)
-      Date.rfc3339(params[name] + "T00:00:00+00:00")
+    def date(value)
+      Date.rfc3339(value + "T00:00:00+00:00")
     rescue ArgumentError
       raise unless $!.message == "invalid date"
-      raise Despecable::InvalidParameterError, "Invalid value for param: '#{name}'. Required type: date (e.g. '2012-12-31')."
+      raise Despecable::InvalidParameterError, "Required type: date (e.g. '2012-12-31')."
     end
 
-    def datetime(name)
-      DateTime.rfc3339(params[name])
+    def datetime(value)
+      DateTime.rfc3339(value)
     rescue ArgumentError
       raise unless $!.message == "invalid date"
-      raise Despecable::InvalidParameterError, "Invalid value for param: '#{name}'. Required type: rfc3339 datetime (e.g. '2009-06-19T00:00:00-04:00')."
+      raise Despecable::InvalidParameterError, "Required type: rfc3339 datetime (e.g. '2009-06-19T00:00:00-04:00')."
     end
   end
 end

data/lib/despecable/spectator.rb

@@ -4,7 +4,7 @@ module Despecable
 
     def initialize(params)
       @params = params
-      @spectacles = ::Despecable::Spectacles.new(params)
+      @spectacles = ::Despecable::Spectacles.new
     end
 
     def integer(name, options = {})
@@ -30,14 +30,17 @@ module Despecable
     private
 
     def _spec(name, type, options = {})
-      if params.key?(name)
-        params[name] = @spectacles.public_send(type, name)
-      elsif options.key?(:default)
+      if !params.key?(name) && options[:default]
         params[name] = options[:default]
+      elsif options[:arrayable] && @spectacles.arrayable?(params[name])
+        values = @spectacles.arrayify(params[name])
+        params[name] = values.map{|val| @spectacles.read(val, type, options)}
+      else
+        value = @spectacles.read(params[name], type, options)
+        params[name] = value if params.key?(name)
       end
-      @spectacles.validate_param(name, options)
-      return params[name]
+    rescue ::Despecable::DespecableError
+      ::Kernel.raise $!.insert_name_here(name)
     end
-
   end
 end

metadata

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