safemode 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29e339575c91027bf2680aa33c98b8f6c13024b5
-  data.tar.gz: 135d1097eea7885b5930241401353a3d38376c5d
+  metadata.gz: 41adac17799367c9099304167a77d7a58a37faf0
+  data.tar.gz: eff2b6a1ab804d834a9b82b3dc0ada7430a5fc61
 SHA512:
-  metadata.gz: fd43ddc3f3525dc737365792cc34f9521ef54d338f6d2ea3f33aabf8dc1dc6048d9766e02ca9bac04ba200e0ded1b6fa9753ea162257324ebcca29860358a103
-  data.tar.gz: 7a44ab0d645b2dc170c27d43880f45c61783a84469892eb5a5c10ea92c0d9b91bdc3ef6c9c56d771315686ae5bc0be8319f05a6b899095ea33d10c2e52932e6a
+  metadata.gz: df3a0869f3e6b23a3cf52b434d7e0098a5c4035f7109e4a6fa659bbeaeac8fc88c464cf3a5e8cc71c6490889182d5f9a057b2918a3b7900ec8db50d5eb732e24
+  data.tar.gz: 9937ae32e17bdefe4dbd9777689a6f5953cd88421e6588a633fedc6941325e16567603669de557ec9b74263599940db09c12a5e2761c3e63adb66ccfdbc6e427

data/Gemfile

@@ -1,8 +1,8 @@
 source "http://rubygems.org"
 
-gem 'sexp_processor', ">= 4.1.2"
-gem 'ruby2ruby', ">= 2.0.1"
-gem "ruby_parser", ">= 3.0.1"
+gem 'sexp_processor', ">= 4.3.0"
+gem 'ruby2ruby', ">= 2.0.6"
+gem "ruby_parser", ">= 3.2.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
@@ -12,7 +12,7 @@ group :development do
   gem "bundler", "~> 1.0"
   gem "jeweler", "~> 1.8.3"
   gem "rcov", :platforms => :ruby_18
-  gem "simplecov", :platforms => :ruby_19 
-  gem "test-unit", :platforms => :ruby_19
+  gem "simplecov", :platforms => [:ruby_19, :ruby_20, :ruby_21]
+  gem "test-unit", :platforms => [:ruby_19, :ruby_20, :ruby_21]
   gem "rake"
 end

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

data/lib/safemode/parser.rb

@@ -82,6 +82,8 @@ module Safemode
                    :self,
                    # :args is now used for block parameters
                    :args,
+                   # :colon2 is used for module constants
+                   :colon2,
                    # unnecessarily advanced?
                    :argscat, :argspush, :splat, :block_pass,
                    :op_asgn1, :op_asgn2, :op_asgn_and, :op_asgn_or,
@@ -91,7 +93,7 @@ module Safemode
     disallowed = [ # :self,  # self doesn't seem to be needed for vcalls?
                    # see below for :const handling
                    :defn, :defs, :alias, :valias, :undef, :class, :attrset,
-                   :module, :sclass, :colon2, :colon3,
+                   :module, :sclass, :colon3,
                    :fbody, :scope, :block_arg, :postexe,
                    :redo, :retry, :begin, :rescue, :resbody, :ensure,
                    :defined, :super, :zsuper, :return,
@@ -113,10 +115,10 @@ module Safemode
     end
 
     # handling of Encoding constants in ruby 1.9.
-    # Note: ruby_parser evaluates __ENCODING__ to :const Encoding::UTF_8
+    # Note: ruby_parser evaluates __ENCODING__ to s(:colon2, s(:const, :Encoding), :UTF_8)
     def process_const(arg)
-      raise_security_error("constant", super(arg)) unless (RUBY_VERSION >= "1.9" and arg.sexp_type.class == Encoding)
-      "Encoding::#{super(arg).gsub('-', '_')}"
+      raise_security_error("constant", super(arg)) unless (RUBY_VERSION >= "1.9" and arg.sexp_type == :Encoding)
+      "#{super(arg).gsub('-', '_')}"
     end
     
     def raise_security_error(type, info)

data/safemode.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: safemode 1.2.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "safemode"
-  s.version = "1.2.1"
+  s.version = "1.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Sven Fuchs", "Peter Cooper", "Matthias Viehweger", "Kingsley Hendrickse", "Ohad Levy", "Dmitri Dolguikh"]
-  s.date = "2013-02-11"
+  s.date = "2014-11-27"
   s.description = "A library for safe evaluation of Ruby code based on RubyParser and Ruby2Ruby. Provides Rails ActionView template handlers for ERB and Haml."
   s.email = "ohadlevy@gmail.com"
   s.extra_rdoc_files = [
@@ -17,7 +19,6 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     "Gemfile",
-    "Gemfile.lock",
     "LICENCSE",
     "README.markdown",
     "Rakefile",
@@ -39,7 +40,6 @@ Gem::Specification.new do |s|
     "lib/safemode/parser.rb",
     "lib/safemode/scope.rb",
     "safemode.gemspec",
-    "test/test_all.rb",
     "test/test_erb_eval.rb",
     "test/test_helper.rb",
     "test/test_jail.rb",
@@ -48,17 +48,16 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/svenfuchs/safemode"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "2.2.2"
   s.summary = "A library for safe evaluation of Ruby code based on ParseTree/RubyParser and Ruby2Ruby"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sexp_processor>, [">= 4.1.2"])
-      s.add_runtime_dependency(%q<ruby2ruby>, [">= 2.0.1"])
-      s.add_runtime_dependency(%q<ruby_parser>, [">= 3.0.1"])
+      s.add_runtime_dependency(%q<sexp_processor>, [">= 4.3.0"])
+      s.add_runtime_dependency(%q<ruby2ruby>, [">= 2.0.6"])
+      s.add_runtime_dependency(%q<ruby_parser>, [">= 3.2.0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
@@ -68,9 +67,9 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<test-unit>, [">= 0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
     else
-      s.add_dependency(%q<sexp_processor>, [">= 4.1.2"])
-      s.add_dependency(%q<ruby2ruby>, [">= 2.0.1"])
-      s.add_dependency(%q<ruby_parser>, [">= 3.0.1"])
+      s.add_dependency(%q<sexp_processor>, [">= 4.3.0"])
+      s.add_dependency(%q<ruby2ruby>, [">= 2.0.6"])
+      s.add_dependency(%q<ruby_parser>, [">= 3.2.0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
@@ -81,9 +80,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rake>, [">= 0"])
     end
   else
-    s.add_dependency(%q<sexp_processor>, [">= 4.1.2"])
-    s.add_dependency(%q<ruby2ruby>, [">= 2.0.1"])
-    s.add_dependency(%q<ruby_parser>, [">= 3.0.1"])
+    s.add_dependency(%q<sexp_processor>, [">= 4.3.0"])
+    s.add_dependency(%q<ruby2ruby>, [">= 2.0.6"])
+    s.add_dependency(%q<ruby_parser>, [">= 3.2.0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])

data/test/test_jail.rb

@@ -20,6 +20,7 @@ class TestJail < Test::Unit::TestCase
 
   def test_jail_instances_should_have_limited_methods
     expected = ["class", "inspect", "method_missing", "methods", "respond_to?", "respond_to_missing?", "to_jail", "to_s", "instance_variable_get"]
+    expected.delete('respond_to_missing?') if RUBY_VERSION > '1.9.3' # respond_to_missing? is private in rubies above 1.9.3
     objects.each do |object|
       assert_equal expected.sort, reject_pretty_methods(object.to_jail.methods.map(&:to_s).sort)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: safemode
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Sven Fuchs
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+date: 2014-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -21,42 +21,42 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: 4.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: ruby2ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.6
 - !ruby/object:Gem::Dependency
   name: ruby_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +178,6 @@ extra_rdoc_files:
 - README.markdown
 files:
 - Gemfile
-- Gemfile.lock
 - LICENCSE
 - README.markdown
 - Rakefile
@@ -200,7 +199,6 @@ files:
 - lib/safemode/parser.rb
 - lib/safemode/scope.rb
 - safemode.gemspec
-- test/test_all.rb
 - test/test_erb_eval.rb
 - test/test_helper.rb
 - test/test_jail.rb
@@ -228,7 +226,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A library for safe evaluation of Ruby code based on ParseTree/RubyParser
   and Ruby2Ruby
 test_files: []

data/Gemfile.lock

@@ -1,52 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (3.2.8)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    git (1.2.5)
-    i18n (0.6.1)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-      rdoc
-    json (1.7.5)
-    multi_json (1.3.6)
-    rake (0.9.2.2)
-    rcov (1.0.0)
-    rdoc (3.12)
-      json (~> 1.4)
-    ruby2ruby (2.0.1)
-      ruby_parser (~> 3.0.0)
-      sexp_processor (~> 4.0)
-    ruby_parser (3.0.1)
-      sexp_processor (~> 4.1)
-    sexp_processor (4.1.2)
-    shoulda (3.3.2)
-      shoulda-context (~> 1.0.1)
-      shoulda-matchers (~> 1.4.1)
-    shoulda-context (1.0.1)
-    shoulda-matchers (1.4.1)
-      activesupport (>= 3.0.0)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    test-unit (2.5.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.0)
-  jeweler (~> 1.8.3)
-  rake
-  rcov
-  rdoc (~> 3.12)
-  ruby2ruby (>= 2.0.1)
-  ruby_parser (>= 3.0.1)
-  sexp_processor (>= 4.1.2)
-  shoulda
-  simplecov
-  test-unit

data/test/test_all.rb

@@ -1,14 +0,0 @@
-require File.join(File.dirname(__FILE__), 'test_helper')
-Test::Unit.run = false
-
-require File.join(File.dirname(__FILE__), 'test_jail')
-require File.join(File.dirname(__FILE__), 'test_safemode_parser')
-require File.join(File.dirname(__FILE__), 'test_safemode_eval')
-require File.join(File.dirname(__FILE__), 'test_erb_eval')
-
-# ['ParseTree', 'RubyParser'].each do |parser|
-['RubyParser'].each do |parser|
-  Safemode::Parser.parser = parser
-  puts "Running suite with Safemode::Parser using #{parser}"
-  Test::Unit::AutoRunner.run
-end