rester 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5143699dbaa79cd397a03f99d475bc202f9d9f4
-  data.tar.gz: 4c8dee2c75a5882aae4e71aa924d6cc15c576d71
+  metadata.gz: a42d1da2e2332fbb0d9d4e2216fef9cc7c777ca2
+  data.tar.gz: e6c2cf707d421525c9ee2a8ea2432258f3733ce9
 SHA512:
-  metadata.gz: 1381c2c074c106a809fef74f9e8b0d72b5e5c7606b60f45ca8d3b34d4e3dbe72cb441d4d14512f04080f1ce34885ccc68ebdadecc56707f755bbaa2984bae743
-  data.tar.gz: 322f2a2cd5151179cdbeb62073d6ba4f34bba42ed30f3f747ece6065b00837561e8682cbb07b3fc38427238a0c4011cc94e664bb06812a89f34acf7c9e286dee
+  metadata.gz: e66f2074f0015dd2fad664c0e192f17399fa0123ddf375d5017fc1b9537bbdf3b52b90e9c3802957ceff6a26a52b83d6f26072d4665fd361642b52cdc74df58b
+  data.tar.gz: fa0cd4d19223d0abd91339a7e99901787af7abd3b87165825fc840377e12d5158851131aec184c0626ec45df118e14961d91d2643e2ab786b32f28164a1a3b30

data/lib/rester/service/resource/params.rb

@@ -14,6 +14,7 @@ module Rester
 
       def initialize(opts={}, &block)
         @options = DEFAULT_OPTS.merge(opts).freeze
+        @_dynamic_fields = []
         @_required_fields = []
         @_defaults = {}
         @_all_fields = []
@@ -34,6 +35,7 @@ module Rester
       def freeze
         @_validators.freeze
         @_required_fields.freeze
+        @_dynamic_fields.freeze
         @_defaults.freeze
         @_all_fields.freeze
         super
@@ -47,9 +49,7 @@ module Rester
           _error!("missing params: #{missing.join(', ')}")
         end
 
-        if strict? && !(unexpected = param_keys - @_all_fields).empty?
-          _error!("unexpected params: #{unexpected.join(', ')}")
-        end
+        _validate_strict(param_keys)
 
         validated_params = Hash[
           params.map { |key, value| [key.to_sym, validate!(key.to_sym, value)] }
@@ -59,7 +59,13 @@ module Rester
       end
 
       def validate!(key, value)
-        klass, opts = @_validators[key]
+        if @_validators.key?(key)
+          klass, opts = @_validators[key]
+        else
+          dynamic_key = @_dynamic_fields.find { |r| r.match(key) }
+          klass, opts = @_validators[dynamic_key]
+        end
+
         _validate(key, value, klass, opts)
       end
 
@@ -105,6 +111,10 @@ module Rester
         @_required_fields.dup
       end
 
+      def dynamic_fields
+        @_dynamic_fields.dup
+      end
+
       def defaults
         @_defaults.dup
       end
@@ -120,8 +130,6 @@ module Rester
       private
 
       def method_missing(meth, *args)
-        meth_str = meth.to_s
-
         if meth.to_s.match(/\A[A-Z][A-Za-z]+\z/)
           name = args.shift
           opts = args.shift || {}
@@ -137,20 +145,37 @@ module Rester
         default_opts = { match: DEFAULT_TYPE_MATCHERS[klass] }
         opts = default_opts.merge(opts)
 
-        @_required_fields << name.to_sym if opts.delete(:required)
-        default = opts.delete(:default)
+        if name.is_a?(Regexp)
+          @_dynamic_fields << name
+        else
+          name = name.to_sym
+          @_required_fields << name if opts.delete(:required)
+          default = opts.delete(:default)
+        end
 
-        @_all_fields << name.to_sym
-        @_validators[name.to_sym] = [klass, opts]
+        @_all_fields << name
+        @_validators[name] = [klass, opts]
 
-        if default
-          _validate_default(name.to_sym, default)
-          @_defaults[name.to_sym] = default
+        if name.is_a?(Symbol) && default
+          _validate_default(name, default)
+          @_defaults[name] = default
         end
 
         nil
       end
 
+      def _validate_strict(keys)
+        if strict?
+          unexpected = (keys - @_all_fields).reject do |k|
+            @_dynamic_fields.find { |f| f.match(k) }
+          end
+
+          unless unexpected.empty?
+            _error!("unexpected params: #{unexpected.join(', ')}")
+          end
+        end
+      end
+
       ##
       # Validates a default value specified in the params block. Raises
       # validation error if necessary.
@@ -310,6 +335,7 @@ module Rester
         @_validators       = @_validators.merge!(params.validators)
         @_defaults         = @_defaults.merge!(params.defaults)
         @_required_fields |= params.required_params
+        @_dynamic_fields  |= params.dynamic_fields
         @_all_fields      |= params.all_fields
       end
     end

data/lib/rester/version.rb

@@ -1,3 +1,3 @@
 module Rester
-  VERSION = '0.5.5'
+  VERSION = '0.5.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rester
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Robert Honer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack