interpol 0.3.1 → 0.3.2

data/lib/interpol/sinatra/request_params_parser.rb

@@ -61,11 +61,11 @@ module Interpol
         end
 
         def params
-          @_parsed_params || super
+          (@_use_parsed_params && @_parsed_params) || super
         end
 
         def validate_params
-          @_parsed_params = endpoint_definition.parse_request_params(params_to_parse)
+          @_parsed_params ||= endpoint_definition.parse_request_params(params_to_parse)
         rescue Interpol::ValidationError => error
           request_params_invalid(error)
         end
@@ -74,6 +74,14 @@ module Interpol
           interpol_config.sinatra_request_params_invalid(self, error)
         end
 
+        def with_parsed_params
+          @_use_parsed_params = true
+          validate_params if settings.parse_params?
+          yield
+        ensure
+          @_use_parsed_params = false
+        end
+
         # Sinatra includes a couple of "meta" params that are always
         # present in the params hash even though they are not declared
         # as params: splat and captures.
@@ -93,8 +101,9 @@ module Interpol
           return super unless SinatraOverriddes.being_processed_by_sinatra?(block)
 
           super do |*block_args|
-            validate_params if settings.parse_params?
-            yield *block_args
+            with_parsed_params do
+              yield *block_args
+            end
           end
         end
 

data/lib/interpol/version.rb

@@ -1,3 +1,3 @@
 module Interpol
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: interpol
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2012-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
@@ -223,7 +223,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2997986651256795952
+      hash: -4117955588587785690
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -232,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2997986651256795952
+      hash: -4117955588587785690
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24