rufus-treechecker 1.0.6 → 1.0.7

data/CHANGELOG.txt

@@ -2,6 +2,11 @@
 = rufus-treechecker CHANGELOG.txt
 
 
+== rufus-treechecker - 1.0.7   released 2011/07/31
+
+- "rescue => e" not triggering "global vars forbidden" anymore
+
+
 == rufus-treechecker - 1.0.6   released 2011/05/10
 
 - clone then add_rules issue, the real fix

data/lib/rufus/treechecker.rb

@@ -122,7 +122,7 @@ module Rufus
   #
   class TreeChecker
 
-    VERSION = '1.0.6'
+    VERSION = '1.0.7'
 
     # pretty-prints the sexp tree of the given rubycode
     #
@@ -242,16 +242,17 @@ module Rufus
           # accepted patterns are evaluated before excluded patterns
           # if one is found the excluded patterns are skipped
 
-          pats = @accepted_patterns[sexp.first]
-          pats.each { |pat| return if check_pattern(sexp, pat) } if pats
+          pats = @accepted_patterns[sexp.first] || []
+          return false if pats.find { |pat| check_pattern(sexp, pat) }
 
-          pats = @excluded_patterns[sexp.first]
-          return unless pats
+          pats = @excluded_patterns[sexp.first] || []
 
           pats.each do |pat, msg|
             raise SecurityError.new(msg) if check_pattern(sexp, pat)
           end
         end
+
+        true
       end
 
       def freeze
@@ -303,11 +304,14 @@ module Rufus
 
         return false if sexp.length < pat.length
 
-        (1..pat.length-1).each do |i|
+        (1..pat.length - 1).each do |i|
+          #puts '.'
+          #p (pat[i], sexp[i])
+          #p (pat[i] != :any and pat[i] != sexp[i])
           return false if (pat[i] != :any and pat[i] != sexp[i])
         end
 
-        return true # we have a match
+        true # we have a match
       end
     end
 
@@ -432,7 +436,7 @@ module Rufus
       @current_set.exclude_symbol(:defn, 'method definitions are forbidden')
     end
 
-    # Bans the defintion and the [re]openening of classes
+    # Bans the definition and the [re]opening of classes
     #
     # a list of exceptions (classes) can be passed. Subclassing those
     # exceptions is permitted.
@@ -466,6 +470,9 @@ module Rufus
     #
     def exclude_global_vars
 
+      @current_set.accept_pattern([ :gvar, :$! ])
+        # "rescue => e" is accepted
+
       @current_set.exclude_symbol(:gvar, 'global vars are forbidden')
       @current_set.exclude_symbol(:gasgn, 'global vars are forbidden')
     end
@@ -516,10 +523,15 @@ module Rufus
     #
     def do_check(sexp)
 
-      @set.check(sexp)
+      continue = @set.check(sexp)
 
-      return unless sexp.is_a?(Array) # check over, seems fine...
+      return unless continue
+        # found an accepted pattern, no need to dive into it
 
+      return unless sexp.is_a?(Array)
+        # check over, seems fine...
+
+      #
       # check children
 
       sexp.each { |c| do_check(c) }

data/spec/high_spec.rb

@@ -19,9 +19,19 @@ describe Rufus::TreeChecker do
     end
 
     it 'does not block "1 + 1"' do
+
       lambda { tc.check("1 + 1") }.should_not raise_error
     end
 
+    it 'does not block begin/rescue/end' do
+
+      tc.check(%{
+        begin
+        rescue => e
+        end
+      })
+    end
+
     [
 
       "$ENV",

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rufus-treechecker
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: 
-  version: 1.0.6
+  segments: 
+  - 1
+  - 0
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - John Mettraux
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-10 00:00:00 +09:00
+date: 2011-07-31 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +26,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 2
+        - 0
+        - 5
         version: 2.0.5
   type: :runtime
   version_requirements: *id001
@@ -32,6 +42,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -43,6 +56,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
         version: "2.0"
   type: :development
   version_requirements: *id003
@@ -86,12 +103,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []