sandboxed_erb 0.4.4 → 0.4.5

data/Gemfile

@@ -11,5 +11,5 @@ group :development do
   gem "shoulda", ">= 0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.1"
-  gem "rcov", ">= 0"
+  gem "simplecov", ">= 0"
 end

data/Rakefile

@@ -33,13 +33,13 @@ Rake::TestTask.new(:test) do |test|
 end
 
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-  test.rcov_opts << '--exclude "gems/*"'
-end
+#require 'rcov/rcovtask'
+#Rcov::RcovTask.new do |test|
+#  test.libs << 'test'
+#  test.pattern = 'test/**/test_*.rb'
+#  test.verbose = true
+#  test.rcov_opts << '--exclude "gems/*"'
+#end
 
 task :default => :test
 

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.5

data/lib/sandboxed_erb/sandbox_methods.rb

@@ -72,11 +72,12 @@ class Module
   def not_sandboxed_methods(include_superclasses = false, allowed_mixins=[], *disallowed_methods)
 
     __the_methods_to_check = public_instance_methods(false)
+    puts "#{self.name}: direct: #{__the_methods_to_check.inspect}" if $DEBUG
     if include_superclasses
       clz = self.superclass
       while !clz.nil?
-        unless clz == Object
-          #puts "#{self.name}: #{clz.name}: #{clz.public_instance_methods(false).inspect}"
+        unless clz == Object || (defined? BasicObject && clz == BasicObject)
+          puts "#{self.name}: #{clz.name}: #{clz.public_instance_methods(false).inspect}" if $DEBUG
           __the_methods_to_check += clz.public_instance_methods(false)
         end
         clz = clz.superclass
@@ -86,7 +87,7 @@ class Module
         #we include any mixins
         for m in self.included_modules
           if allowed_mixins.include?(m)
-            #puts "#{self.name}: #{m.name}: #{m.public_instance_methods(false).inspect}"
+            puts "#{self.name}: #{m.name}: #{m.public_instance_methods(false).inspect}" if $DEBUG
             __the_methods_to_check += m.public_instance_methods(false)
           end
         end
@@ -108,7 +109,7 @@ class Module
       end
     end
     
-    #puts "#{self.name}: #{__the_methods_to_check.inspect}"
+    puts "#{self.name}: #{__the_methods_to_check.inspect}" if $DEBUG
      
     sandboxed_methods(*__the_methods_to_check)
     

data/lib/sandboxed_erb/template.rb

@@ -119,7 +119,12 @@ module SandboxedErb
       cmd.push('_erbout')
   
       ecompiler.post_cmd = cmd
-      ecompiler.compile(str_template)
+      e_template = ecompiler.compile(str_template)
+      if e_template.class == Array #ruby 1.9 returns an array with the encoding prefixed as a comment on the first line...
+        e_template = e_template[0].lines.to_a[1..-1].join
+      end
+      
+      e_template
     end
     
     def sandbox_code(erb_template) #:nodoc:

data/sandboxed_erb.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sandboxed_erb}
-  s.version = "0.4.4"
+  s.version = "0.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["MarkPent"]
@@ -46,11 +46,10 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/markpent/SandboxedERB}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{Run an erb template in a sandbox.}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
@@ -59,14 +58,14 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.1"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
       s.add_dependency(%q<partialruby>, [">= 0.2.0"])
       s.add_dependency(%q<ruby_parser>, [">= 2.0.6"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.1"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
     s.add_dependency(%q<partialruby>, [">= 0.2.0"])
@@ -74,7 +73,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.1"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
   end
 end
 

data/test/test_compile_errors.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require File.expand_path('../helper', __FILE__)
 
 class TestCompileErrors < Test::Unit::TestCase
   should "report insecure call during compile: global" do
@@ -137,6 +137,6 @@ class TestCompileErrors < Test::Unit::TestCase
     template = SandboxedErb::Template.new
     assert_equal false, template.compile(str_template)
     
-    assert_match /compile error\nline:4: syntax error/, template.get_error
+    assert_match /line:4: syntax error/, template.get_error
   end
 end

data/test/test_error_handling.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require File.expand_path('../helper', __FILE__)
 
 class TestErrorHandling < Test::Unit::TestCase
   should "handle missing function of object" do

data/test/test_sandboxed_erb.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require File.expand_path('../helper', __FILE__)
 
 class TestSandboxedErb < Test::Unit::TestCase
   should "compile an erb template" do

data/test/test_valid_templates.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require File.expand_path('../helper', __FILE__)
 
 class TestValidTemplates < Test::Unit::TestCase
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sandboxed_erb
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
+  hash: 5
+  prerelease: 
   segments: 
   - 0
   - 4
-  - 4
-  version: 0.4.4
+  - 5
+  version: 0.4.5
 platform: ruby
 authors: 
 - MarkPent
@@ -20,8 +20,7 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: partialruby
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,12 +31,12 @@ dependencies:
         - 2
         - 0
         version: 0.2.0
-  requirement: *id001
+  name: partialruby
   type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: ruby_parser
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -48,12 +47,12 @@ dependencies:
         - 0
         - 6
         version: 2.0.6
-  requirement: *id002
+  name: ruby_parser
   type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: shoulda
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -62,12 +61,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
+  name: shoulda
   type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: bundler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -78,12 +77,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id004
+  name: bundler
   type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: jeweler
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -94,12 +93,12 @@ dependencies:
         - 6
         - 1
         version: 1.6.1
-  requirement: *id005
+  name: jeweler
   type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rcov
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -108,8 +107,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id006
+  name: simplecov
   type: :development
+  version_requirements: *id006
 description: Run erb templates safely within a sandbox.
 email: mark.pent@gmail.com
 executables: []
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Run an erb template in a sandbox.