wunderbar 0.14.0 → 0.14.1

data/lib/wunderbar/builder.rb

@@ -223,11 +223,11 @@ module Wunderbar
   end
 
   class BuilderBase
-    def set_variables_from_params
-      @_scope.params.each do |key,value|
+    def set_variables_from_params(locals={})
+      @_scope.params.merge(locals).each do |key,value|
         value = value.first if Array === value
         value.gsub! "\r\n", "\n" if String === value
-        instance_variable_set "@#{key}", value if key =~ /^\w+$/
+        instance_variable_set "@#{key.untaint}", value if key =~ /^[a-z]\w+$/
       end
     end
 

data/lib/wunderbar/sinatra.rb

@@ -43,12 +43,7 @@ module Wunderbar
     private
 
       def _evaluate(builder, scope, locals, &block)
-        builder.instance_eval do
-          scope.params.merge(locals).each do |key,value|
-            value = value.first if ::Array === value
-            instance_variable_set "@#{key}", value if key =~ /^[a-z]\w+$/
-          end
-        end
+        builder.set_variables_from_params(locals)
 
         if not block
           builder.instance_eval(data.untaint, eval_file)

data/lib/wunderbar/version.rb

@@ -2,7 +2,7 @@ module Wunderbar
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 14
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/wunderbar.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "0.14.0"
+  s.version = "0.14.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wunderbar
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 37
   prerelease: 
   segments: 
   - 0
   - 14
-  - 0
-  version: 0.14.0
+  - 1
+  version: 0.14.1
 platform: ruby
 authors: 
 - Sam Ruby