sourcify 0.3.0 → 0.4.0

data/spec/proc/to_source_from_do_end_block_w_nested_begin_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 describe "Proc#to_source from do ... end block (w nested begin)" do
 

data/spec/proc/to_source_from_do_end_block_w_nested_case_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 describe "Proc#to_source from do ... end block (w nested case)" do
 

data/spec/proc/to_source_from_do_end_block_w_nested_class_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 describe "Proc#to_source from do ... end block (w nested class)" do
 

data/spec/proc/to_source_from_do_end_block_w_nested_do_end_block_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 describe "Proc#to_source from do ... end block (w nested do ... end block)" do
 

data/spec/proc/to_source_from_do_end_block_w_nested_for_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 describe "Proc#to_source from do ... end block (w nested for block)" do
 

data/spec/proc/to_source_from_do_end_block_w_nested_if_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 describe "Proc#to_source from do ... end block (w nested if)" do
 

data/spec/proc/to_source_from_do_end_block_w_nested_literal_keyword_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 describe "Proc#to_source from do ... end block (w nested literal keyword)" do
 

data/spec/proc/to_source_from_do_end_block_w_nested_method_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 describe "Proc#to_source from do ... end block (w nested method)" do
 

data/spec/proc/to_source_from_do_end_block_w_nested_module_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 describe "Proc#to_source from do ... end block (w nested module)" do
 

data/spec/proc/to_source_from_do_end_block_w_nested_unless_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 describe "Proc#to_source from do ... end block (w nested unless)" do
 

data/spec/proc/to_source_from_do_end_block_w_nested_until_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 describe "Proc#to_source from do ... end block (w nested until block)" do
 

data/spec/proc/to_source_from_do_end_block_w_nested_while_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 describe "Proc#to_source from do ... end block (w nested while block)" do
 

data/spec/proc/to_source_from_do_end_block_wo_nesting_complication_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 describe "Proc#to_source from do ... end block (wo nesting complication)" do
 

data/spec/proc/to_source_from_multi_blocks_w_many_matches_spec.rb

@@ -1,147 +1,41 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 describe 'Proc#to_source from multi blocks w many matches' do
 
   if has_parsetree?
 
-    expected = 'proc { @x%s }'
-
-    should 'skip non-matching (all do...end blocks)' do
-      (
-        b1 = lambda do |a| @x1 end; b2 = lambda do @x1 end; b3 = lambda do @x10 end; b2
-      ).should.be having_source(expected%1)
-    end
-
-    should 'skip non-matching (all {...} blocks)' do
-      (
-        b1 = lambda {|a| @x2 }; b2 = lambda { @x2 }; b3 = lambda { @x20 }; b2
-      ).should.be having_source(expected%2)
+    should "handle w no nesting on same line" do
+      b1 = lambda {|a| @x1+1 }; b2 = lambda { @x1+2 }; b3 = lambda { @x1+3 }
+      b2.should.be having_source('proc { @x1+2 }')
     end
 
-    should 'skip non-matching (mixed {...} with do...end blocks)' do
-      (
-        b1 = lambda {|a| @x3 }; b2 = lambda do @x3 end; b3 = lambda { @x30 } ; b2
-      ).should.be having_source(expected%3)
+    should "handle w single level nesting on same line" do
+      b1 = lambda {|a| @x2+1 }; b2 = lambda { lambda { @x2+2 } }
+      b2.should.be having_source('proc { lambda { @x2+2 } }')
     end
 
-    should 'skip non-matching (mixed do...end with {...} blocks)' do
-      (
-        b1 = lambda do |a| @x4 end; b2 = lambda { @x4 }; b3 = lambda do @x40 end; b2
-      ).should.be having_source(expected%4)
+    should "handle w multi level nesting on same line" do
+      b2 = (lambda {|a| lambda { lambda { @x3 } } }).call(1)
+      b2.should.be having_source('proc { lambda { @x3 } }')
     end
 
   else
 
-    describe 'wo nesting on same line' do
-
-      should 'raise Sourcify::MultipleMatchingProcsPerLineError (all do...end blocks)' do
-        lambda {
-          (
-            b1 = lambda do |a| @x1 end; b2 = lambda do @x1 end; b3 = lambda do @x1 end ; b2
-          ).to_source
-        }.should.raise(Sourcify::MultipleMatchingProcsPerLineError)
-      end
-
-      should 'raise Sourcify::MultipleMatchingProcsPerLineError (all {...} blocks)' do
-        lambda {
-          (
-            b1 = lambda {|a| @x2 }; b2 = lambda { @x2 }; b3 = lambda { @x2 } ; b2
-          ).to_source
-        }.should.raise(Sourcify::MultipleMatchingProcsPerLineError)
-      end
-
-      should 'raise Sourcify::MultipleMatchingProcsPerLineError (mixed {...} w do...end blocks)' do
-        lambda {
-          (
-            b1 = lambda {|a| @x3 }; b2 = lambda do @x3 end; b3 = lambda { @x4 } ; b2
-          ).to_source
-        }.should.raise(Sourcify::MultipleMatchingProcsPerLineError)
-      end
-
-      should 'raise Sourcify::MultipleMatchingProcsPerLineError (mixed do...end w {...} blocks)' do
-        lambda {
-          (
-            b1 = lambda do |a| @x4 end; b2 = lambda { @x4 }; b3 = lambda do @x4 end ; b2
-          ).to_source
-        }.should.raise(Sourcify::MultipleMatchingProcsPerLineError)
-      end
+    error = Sourcify::MultipleMatchingProcsPerLineError
 
+    should "raise #{error} w no nesting on same line" do
+      b1 = lambda {|a| @x }; b2 = lambda { @x }; b3 = lambda { @x }
+      lambda { b2.to_source }.should.raise(error)
     end
 
-    describe 'w single level nesting on same line' do
-
-      should 'raise Sourcify::MultipleMatchingProcsPerLineError (all do...end blocks)' do
-        lambda {
-          (
-            b1 = lambda do |a| @x1 end; b2 = lambda do lambda do @x1 end end; b2
-          ).to_source
-        }.should.raise(Sourcify::MultipleMatchingProcsPerLineError)
-      end
-
-      should 'raise Sourcify::MultipleMatchingProcsPerLineError (all {...} blocks)' do
-        lambda {
-          (
-            b1 = lambda {|a| @x2 }; b2 = lambda { lambda { @x2 } }; b2
-          ).to_source
-        }.should.raise(Sourcify::MultipleMatchingProcsPerLineError)
-      end
-
-      should 'raise Sourcify::MultipleMatchingProcsPerLineError (mixed {...} w do...end blocks)' do
-        lambda {
-          (
-            b1 = lambda {|a| @x3 }; b2 = lambda do lambda { @x4 } end; b2
-          ).to_source
-        }.should.raise(Sourcify::MultipleMatchingProcsPerLineError)
-      end
-
-      should 'raise Sourcify::MultipleMatchingProcsPerLineError (mixed do...end w {...} blocks)' do
-        lambda {
-          (
-            b1 = lambda do |a| @x4 end; b2 = lambda { lambda do @x4 end }; b2
-          ).to_source
-        }.should.raise(Sourcify::MultipleMatchingProcsPerLineError)
-      end
-
+    should "raise #{error} w single level nesting on same line" do
+      b1 = lambda {|a| @x }; b2 = lambda { lambda { @x } }
+      lambda { b2.to_source }.should.raise(error)
     end
 
-    describe 'w multi level nesting on same line' do
-
-      should 'raise Sourcify::MultipleMatchingProcsPerLineError (all do...end blocks)' do
-        lambda {
-          (
-            b1 = lambda do |a| lambda do lambda do @x1 end end end
-            b2 = b1.call(1)
-          ).to_source
-        }.should.raise(Sourcify::MultipleMatchingProcsPerLineError)
-      end
-
-      should 'raise Sourcify::MultipleMatchingProcsPerLineError (all {...} blocks)' do
-        lambda {
-          (
-            b1 = lambda {|a| lambda { lambda { @x2 } } }
-            b2 = b1.call(1)
-          ).to_source
-        }.should.raise(Sourcify::MultipleMatchingProcsPerLineError)
-      end
-
-      should 'raise Sourcify::MultipleMatchingProcsPerLineError (mixed {...} w do...end blocks)' do
-        lambda {
-          (
-            b1 = lambda {|a| lambda do lambda { @x4 } end }
-            b2 = b1.call(1)
-          ).to_source
-        }.should.raise(Sourcify::MultipleMatchingProcsPerLineError)
-      end
-
-      should 'raise Sourcify::MultipleMatchingProcsPerLineError (mixed do...end w {...} blocks)' do
-        lambda {
-          (
-            b1 = lambda do |a| lambda { lambda do @x4 end } end
-            b2 = b1.call(1)
-          ).to_source
-        }.should.raise(Sourcify::MultipleMatchingProcsPerLineError)
-      end
-
+    should "raise #{error} w multi level nesting on same line" do
+      b2 = (lambda {|a| lambda { lambda { @x } } }).call(1)
+      lambda { b2.to_source }.should.raise(error)
     end
 
   end

data/spec/proc/to_source_from_multi_blocks_w_single_match_spec.rb

@@ -1,99 +1,20 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 describe 'Proc#to_source from multi blocks w single match' do
 
-  expected = 'proc { @x%s }'
-
-  describe 'wo nesting on same line' do
-
-    should 'skip non-matching (all do...end blocks)' do
-      (
-        b1 = lambda do |a| @x1 end; b2 = lambda do @x1 end; b2
-      ).should.be having_source(expected%1)
-    end
-
-    should 'skip non-matching (all {...} blocks)' do
-      (
-        b1 = lambda {|a| @x2 }; b2 = lambda { @x2 }; b2
-      ).should.be having_source(expected%2)
-    end
-
-    should 'skip non-matching (mixed {...} with do...end blocks)' do
-      (
-        b1 = lambda {|a| @x3 }; b2 = lambda do @x3 end; b2
-      ).should.be having_source(expected%3)
-    end
-
-    should 'skip non-matching (mixed do...end with {...} blocks)' do
-      (
-        b1 = lambda do |a| @x4 end; b2 = lambda { @x4 }; b2
-      ).should.be having_source(expected%4)
-    end
-
+  should 'skip non-matching w no nesting on same line' do
+    b1 = lambda do |a| @x1 end; b2 = lambda do @x1 end
+    b2.should.be having_source('proc { @x1 }')
   end
 
-  describe 'w single level nesting on same line' do
-
-    should 'skip non-matching (all do...end blocks)' do
-      (
-        b1 = lambda do |a| lambda do @x1 end end
-        b2 = b1.call(1) # returns the inner proc
-      ).should.be having_source(expected%1)
-    end
-
-    should 'skip non-matching (all {...} blocks)' do
-      (
-        b1 = lambda {|a| lambda { @x2 } }
-        b2 = b1.call(1) # returns the inner proc
-      ).should.be having_source(expected%2)
-    end
-
-    should 'skip non-matching (mixed {...} with do...end blocks)' do
-      (
-        b1 = lambda {|a| lambda do @x3 end }
-        b2 = b1.call(1) # returns the inner proc
-      ).should.be having_source(expected%3)
-    end
-
-    should 'skip non-matching (mixed do...end with {...} blocks)' do
-      (
-        b1 = lambda do |a| lambda { @x4 } end
-        b2 = b1.call(1) # returns the inner proc
-      ).should.be having_source(expected%4)
-    end
-
+  should 'skip non-matching w single level nesting on same line' do
+    b2 = (lambda {|a| lambda { @x2 } }).call(1)
+    b2.should.be having_source('proc { @x2 }')
   end
 
-  describe 'w multi level nesting on same line' do
-
-    should 'skip non-matching (all do...end blocks)' do
-      (
-        b1 = lambda do |a| lambda do |a| b2 = lambda do @x1 end end end
-        b2 = b1.call(1).call(1) # returns the inner-most proc
-      ).should.be having_source(expected%1)
-    end
-
-    should 'skip non-matching (all {...} blocks)' do
-      (
-        b1 = lambda {|a| lambda {|a| b2 = lambda { @x2 } } }
-        b2 = b1.call(1).call(1) # returns the inner-most proc
-      ).should.be having_source(expected%2)
-    end
-
-    should 'skip non-matching (mixed {...} with do...end blocks)' do
-      (
-        b1 = lambda {|a| lambda do |a| b2 = lambda do @x3 end end }
-        b2 = b1.call(1).call(1) # returns the inner-most proc
-      ).should.be having_source(expected%3)
-    end
-
-    should 'skip non-matching (mixed do...end with {...} blocks)' do
-      (
-        b1 = lambda do |a| lambda do |a| lambda { @x4 } end end
-        b2 = b1.call(1).call(1) # returns the inner-most proc
-      ).should.be having_source(expected%4)
-    end
-
+  should 'skip non-matching w multi level nesting on same line' do
+    b2 = (lambda {|a| lambda {|a| b2 = lambda { @x3 } } }).call(1).call(1)
+    b2.should.be having_source('proc { @x3 }')
   end
 
 end

data/spec/proc/to_source_from_multi_blocks_w_specified_attached_to_and_many_matches_spec.rb

@@ -0,0 +1,45 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
+
+describe 'Proc#to_source w specified {:attached_to => ...} & single match' do
+
+  options = {:attached_to => :lambda}
+
+  if has_parsetree?
+
+    should 'handle no nesting on same line' do
+      b1 = lambda {|a| @x1+1 }; b2 = lambda { @x1+2 }; b3 = lambda { @x1+3 }
+      b2.should.be having_source('proc { @x1+2 }', options)
+    end
+
+    should 'handle single level nesting on same line' do
+      b1 = lambda {|a| @x2+1 }; b2 = lambda { lambda { @x2+2 } }
+      b2.should.be having_source('proc { lambda { @x2+2 } }', options)
+    end
+
+    should 'handle multi level nesting on same line' do
+      b2 = (lambda {|a| lambda { lambda { @x3 } } }).call(1)
+      b2.should.be having_source('proc { lambda { @x3 } }', options)
+    end
+
+  else
+
+    error = Sourcify::MultipleMatchingProcsPerLineError
+
+    should "raise #{error} w no nesting on same line" do
+      b1 = lambda {|a| @x }; b2 = lambda { @x }; b3 = lambda { @x }
+      lambda { b2.to_source(options) }.should.raise(error)
+    end
+
+    should "raise #{error} w single level nesting on same line" do
+      b1 = lambda {|a| @x }; b2 = lambda { lambda { @x } }
+      lambda { b2.to_source(options) }.should.raise(error)
+    end
+
+    should "raise #{error} w multi level nesting on same line" do
+      b2 = (lambda {|a| lambda { lambda { @x } } }).call(1)
+      lambda { b2.to_source(options) }.should.raise(error)
+    end
+
+  end
+
+end

data/spec/proc/to_source_from_multi_blocks_w_specified_attached_to_and_no_match_spec.rb

@@ -0,0 +1,45 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
+
+describe 'Proc#to_source w specified {:attached_to => ...} & no match' do
+
+  options = {:attached_to => :forever}
+
+  if has_parsetree?
+
+    should 'handle no nesting on same line' do
+      b1 = lambda do |a| @x1+1 end; b2 = lambda do @x1+2 end; b3 = lambda do @x1+3 end
+      b2.should.be having_source('proc { @x1+2 }', options)
+    end
+
+    should 'handle single level nesting on same line' do
+      b1 = lambda do |a| @x2+1 end; b2 = lambda do lambda do @x2+2 end end
+      b2.should.be having_source('proc { lambda { @x2+2 } }', options)
+    end
+
+    should 'handle multi level nesting on same line' do
+      b2 = (lambda do |a| lambda do lambda do @x3 end end end).call(1)
+      b2.should.be having_source('proc { lambda { @x3 } }', options)
+    end
+
+  else
+
+    error = Sourcify::NoMatchingProcError
+
+    should "raise #{error} w no nesting on same line" do
+      b1 = lambda {|a| @x }; b2 = watever { @x }; b3 = lambda { @x }
+      lambda { b2.to_source(options) }.should.raise(error)
+    end
+
+    should "raise #{error} w single level nesting on same line" do
+      b1 = lambda {|a| @x }; b2 = watever { lambda { @x } }
+      lambda { b2.to_source(options) }.should.raise(error)
+    end
+
+    should "raise #{error} w multi level nesting on same line" do
+      b2 = (lambda {|a| watever { lambda { @x } } }).call(1)
+      lambda { b2.to_source(options) }.should.raise(error)
+    end
+
+  end
+
+end