rufus-treechecker 1.0.5 → 1.0.6

data/CHANGELOG.txt

@@ -2,6 +2,11 @@
 = rufus-treechecker CHANGELOG.txt
 
 
+== rufus-treechecker - 1.0.6   released 2011/05/10
+
+- clone then add_rules issue, the real fix
+
+
 == rufus-treechecker - 1.0.5   released 2011/05/10
 
 - clone then add_rules issue fix

data/lib/rufus/treechecker.rb

@@ -122,7 +122,7 @@ module Rufus
   #
   class TreeChecker
 
-    VERSION = '1.0.5'
+    VERSION = '1.0.6'
 
     # pretty-prints the sexp tree of the given rubycode
     #
@@ -179,12 +179,7 @@ module Rufus
     #
     def clone
 
-      tc = TreeChecker.allocate
-      tc.instance_variable_set(:@root_set, @root_set.clone)
-      tc.instance_variable_set(:@set, @set.clone)
-      tc.instance_variable_set(:@current_set, tc.instance_variable_get(:@set))
-
-      tc
+      Marshal.load(Marshal.dump(self))
     end
 
     # Adds a set of checks (rules) to this treechecker. Returns self.
@@ -220,16 +215,6 @@ module Rufus
         @excluded_patterns = {} # 1st elt of pattern => pattern, excl_message
       end
 
-      def clone
-
-        rs = RuleSet.new
-        rs.excluded_symbols = @excluded_symbols.dup
-        rs.accepted_patterns = @accepted_patterns.dup
-        rs.excluded_patterns = @excluded_patterns.dup
-
-        rs
-      end
-
       def exclude_symbol(s, message)
 
         @excluded_symbols[s] = (message || ":#{s} is excluded")

data/spec/misc_spec.rb

@@ -29,11 +29,10 @@ describe Rufus::TreeChecker do
 
       tc1 = tc0.clone
 
-      class << tc0
-        attr_reader :set, :root_set
-      end
-      class << tc1
-        attr_reader :set, :root_set
+      [ tc0, tc1 ].each do |tc|
+        class << tc
+          attr_reader :set, :root_set
+        end
       end
 
       tc1.set.object_id.should_not == tc0.set.object_id
@@ -43,7 +42,7 @@ describe Rufus::TreeChecker do
       tc1.root_set.should == tc0.root_set
     end
 
-    it "sets @current_set correclty when cloning" do
+    it "sets @current_set correctly when cloning" do
 
       tc0 = Rufus::TreeChecker.new
 
@@ -51,17 +50,69 @@ describe Rufus::TreeChecker do
 
       tc1.add_rules do
         exclude_def
+        exclude_raise
       end
 
-      class << tc0
-        attr_reader :set, :root_set
-      end
-      class << tc1
-        attr_reader :set, :root_set
+      [ tc0, tc1 ].each do |tc|
+        class << tc
+          attr_reader :set, :root_set
+        end
       end
 
       tc0.set.excluded_symbols.keys.should_not include(:defn)
       tc1.set.excluded_symbols.keys.should include(:defn)
+
+      tc0.set.excluded_patterns.size.should == 0
+      tc1.set.excluded_patterns.size.should == 3
+    end
+
+    it "does deep copy" do
+
+      tc0 = Rufus::TreeChecker.new do
+
+        exclude_fvccall :abort, :exit, :exit!
+        exclude_fvccall :system, :fork, :syscall, :trap, :require, :load
+        exclude_fvccall :at_exit
+
+        exclude_fvcall :private, :public, :protected
+
+        exclude_eval              # no eval, module_eval or instance_eval
+        exclude_backquotes        # no `rm -fR the/kitchen/sink`
+        exclude_alias             # no alias or aliast_method
+        exclude_global_vars       # $vars are off limits
+        exclude_module_tinkering  # no module opening
+
+        exclude_rebinding Kernel # no 'k = Kernel'
+
+        exclude_access_to(
+          IO, File, FileUtils, Process, Signal, Thread, ThreadGroup)
+
+        exclude_call_to :instance_variable_get, :instance_variable_set
+      end
+
+      tc1 = tc0.clone
+      tc1.add_rules do
+        exclude_def
+      end
+
+      tc2 = tc0.clone
+      tc2.add_rules do
+        exclude_raise
+      end
+
+      [ tc0, tc1, tc2 ].each do |tc|
+        class << tc
+          attr_reader :set, :root_set
+        end
+      end
+
+      tc0.set.excluded_symbols.keys.size.should == 6
+      tc1.set.excluded_symbols.keys.size.should == 7
+      tc2.set.excluded_symbols.keys.size.should == 6
+
+      tc0.set.excluded_patterns[:fcall].size.should == 13
+      tc1.set.excluded_patterns[:fcall].size.should == 13
+      tc2.set.excluded_patterns[:fcall].size.should == 15
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: rufus-treechecker
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors: 
 - John Mettraux