jruby-parser 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a8e7fce9790155c3de58d121b229d94dae09c80
-  data.tar.gz: 29e91b679491ee3e139e57cb68a3a0679367c045
+  metadata.gz: 0ff10f0bf92834272246c617b94993f1918c804e
+  data.tar.gz: e2e3475e078e7839f2f413bc42ebfbba4e9f4e6b
 SHA512:
-  metadata.gz: 23453af440f18474847c8ac0ee69cecec9dd82fa6c70b481349e73636a9b31d8af718fd5a1e9f457487d0b5f5a2cfa5e299229ff79a5d41e115d3a7f8db8ce33
-  data.tar.gz: 9ff515f22b2116e0d03702612308fa3748ad5e5c84ddf3e37a552c81626973a4f326cca65da0f797ab1ff11d7290d0f53ce5272e25407fc835b49041e7f41768
+  metadata.gz: 1f9484ea74a7d2c0d9bcbbec9079b34ff2ffbdba23e2b5a55f3e394c17134defee652feb799bade91f6366fc7268c373b451c1b1a9af0097d796b52b568659e9
+  data.tar.gz: b65f06c640f489f153e54fe2b3a7c035ea33703543a965dd18fa644f8e9d049f995ac9d06e6be613af64186aa103a849b783fd8a2aff2d9872740435ea736ced

data/lib/jruby-parser/version.rb

@@ -1,3 +1,3 @@
 module JRubyParser
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/spec/util/node_diff_spec.rb

@@ -0,0 +1,168 @@
+require_relative '../helpers'
+import org.jrubyparser.util.diff.SequenceMatcher
+import org.jrubyparser.util.diff.Change
+import org.jrubyparser.util.diff.NodeDiff
+
+describe org.jrubyparser.util.diff.SequenceMatcher do
+
+  before(:each) do
+    SequenceMatcher.__persistent__ = true
+  end
+
+  it 'should take two nodes at creation' do
+    nodeA = parse('a = "a"')
+    nodeB = parse('b = "b"')
+    sm = SequenceMatcher.new(nodeA, nodeB)
+    sm.new_node.should == nodeA
+    sm.old_node.should == nodeB
+  end
+
+  it 'should calculate the complexity of a node' do
+    nodeA = parse("def foo(bar)\n bar\n end\n foo('astring')")
+    nodeB = parse('b = "b"')
+    sm = SequenceMatcher.new(nodeA, nodeB)
+    sm.calc_complexity(nodeA).should == 14
+  end
+
+
+  it 'should call a callback passed in' do
+    nodeA = parse('a = "a"')
+    nodeB = parse('b = "b"')
+    check = false
+    sm = SequenceMatcher.new(nodeA, nodeB) do |node|
+      check = true
+    end
+    sm.diff_nodes
+    check.should == true
+  end
+
+  it 'should diff two Strings of different value' do
+    nodeA = parse("'The rain in Spain falls mainly on the plain. -- My Fair Lady'")
+    nodeB = parse("'The life of the wife is ended by the knife. -- Stewie, Family Guy'")
+    seqm = SequenceMatcher.new(nodeA, nodeB)
+    seqm.diff_nodes.size.should >= 1
+  end
+
+  it 'should diff fcalls' do
+    nodeA = parse('a()')
+    nodeB = parse('b()')
+    seqm = SequenceMatcher.new(nodeA, nodeB)
+    seqm.diff_nodes.size.should >= 1
+  end
+
+  it 'should diff massgnnodes' do
+    nodeA = parse('ninjas.each {|x,y,z| puts "#{x}, #{y}, #{z}"}')
+    nodeB = parse('ninjas.each {|m,n,o| puts "#{x}, #{y}, #{z}"}')
+    seqm = SequenceMatcher.new(nodeA, nodeB)
+    seqm.diff_nodes.size.should >= 1
+
+
+    nodeC = parse('ninjas.each {|m,n,o| puts "#{x}, #{y}, #{z}"}')
+    nodeD = parse('ninjas.each {|m| puts "#{x}, #{y}, #{z}"}')
+    seqmtoo = SequenceMatcher.new(nodeC, nodeD)
+    seqmtoo.diff_nodes.size.should >= 1
+  end
+
+  it 'should not diff matching if statements' do
+    nodeA = parse("if 1 == 1\nputs 1\nelse\n1\nend")
+    nodeB = parse("if 1 == 1\nputs 1\nelse\n1\nend")
+    seqm = SequenceMatcher.new(nodeA, nodeB)
+    seqm.diff_nodes.size.should == 0
+  end
+
+  it 'should diff a changed if statement' do
+    nodeA = parse("if 1 == 1\nputs 1\nelse\n1\nend")
+    nodeB = parse("if 2 == 2\nputs 1\nelse\n1\nend")
+    nodeC = parse("if 2 == 2\nputs 3\nelse\n1\nend")
+    nodeD = parse("if 2 == 2\nputs 1\nelse\n2\nend")
+    seqm = SequenceMatcher.new(nodeA, nodeB)
+    seqm2 = SequenceMatcher.new(nodeB, nodeC)
+    seqm3 = SequenceMatcher.new(nodeB, nodeD)
+    seqm.diff_nodes.size.should >= 1
+    seqm2.diff_nodes.size.should >= 1
+    seqm3.diff_nodes.size.should >= 1
+  end
+
+  it 'should diff an OpElementAsgnNode' do
+    nodeA = parse("a = [1, 2, 3]\na[1] += 2")
+    nodeB = parse("b = [1, 2, 3]\nb[1] += 2")
+    nodeC = parse("a = [1, 2, 3]\na[2] += 2")
+    nodeD = parse("a = [1, 2, 3]\na[1] += 3")
+
+    seqm = SequenceMatcher.new(nodeA, nodeB)
+    seqm2 = SequenceMatcher.new(nodeA, nodeC)
+    seqm3 = SequenceMatcher.new(nodeA, nodeD)
+
+    seqm.diff_nodes[3].old_node.receiver.name.should == 'b'
+    seqm.diff_nodes[2].new_node.receiver.name.should == 'a'
+    seqm2.diff_nodes[1].old_node.args.get(0).value.should == 2
+    seqm2.diff_nodes[0].new_node.args.get(0).value.should == 1
+    seqm3.diff_nodes[1].old_node.value.value.should == 3
+    seqm3.diff_nodes[0].new_node.value.value.should == 2
+  end
+
+  it 'should diff Regexps' do
+    nodeA = parse("/abc/")
+    nodeB = parse("/abc/")
+    nodeC = parse("/abd/")
+    nodeD = parse("/abc/i")
+
+    seqm = SequenceMatcher.new(nodeA, nodeB)
+    seqm2 = SequenceMatcher.new(nodeA, nodeC)
+    seqm3 = SequenceMatcher.new(nodeA, nodeD)
+
+    seqm.diff_nodes.size.should == 0
+    seqm2.diff_nodes.size.should >= 1
+    seqm3.diff_nodes.size.should >= 1
+
+  end
+
+end
+
+describe "Change" do
+  nodeA = parse("b = 'b'")
+  nodeB = parse("b = 'a'")
+  change = Change.new(nodeA, 4, nodeB, 4)
+
+  it 'should hold the old node' do
+    change.old_node.should == nodeB
+  end
+
+  it 'should hold the new node' do
+    change.new_node.should == nodeA
+  end
+
+  it 'should hold the complexity of the nodes' do
+    change.old_cost.should == 4
+    change.new_cost.should == 4
+    change.total_cost.should == 8
+  end
+end
+
+describe org.jrubyparser.util.diff.NodeDiff do
+  before(:each) do
+    NodeDiff.__persistent__ = true
+  end
+
+  it 'should create a diff' do
+    stringA = "b = 'b'"
+    stringB = "b = 'a'"
+    nodeA = parse(stringA)
+    nodeB = parse(stringB)
+    nd = NodeDiff.new(nodeA, stringA, nodeB, stringB)
+    diff = nd.diff
+    diff.size.should >= 1
+  end
+
+  it 'should create a deepdiff (diff of subnodes)' do
+    stringA = "'astring'\ndef foo(bar)\n bar\n end\n"
+    stringB = "def foo(bar)\n puts bar\n end\n"
+    nodeA = parse(stringA)
+    nodeB = parse(stringB)
+    nd = NodeDiff.new(nodeA, stringA, nodeB, stringB)
+    ddiff = nd.deep_diff
+    ddiff[1].subdiff.size.should >= 1
+  end
+
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jruby-parser
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Thomas E. Enebo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-08-17 00:00:00.000000000 Z
+date: 2013-09-13 00:00:00.000000000 Z
 dependencies: []
 description: A Gem for syntactically correct parse trees of Ruby source
 email: tom.enebo@gmail.com
@@ -69,6 +69,7 @@ files:
 - spec/positions/name_spec.rb
 - spec/positions/op_asgn_or_spec.rb
 - spec/positions/str_spec.rb
+- spec/util/node_diff_spec.rb
 - lib/jruby-parser.jar
 homepage: http://github.com/jruby/jruby-parser
 licenses: []
@@ -89,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: jruby-parser
-rubygems_version: 2.0.3
+rubygems_version: 2.1.2
 signing_key:
 specification_version: 4
 summary: A Gem for syntactically correct parse trees of Ruby source
@@ -130,3 +131,4 @@ test_files:
 - spec/positions/name_spec.rb
 - spec/positions/op_asgn_or_spec.rb
 - spec/positions/str_spec.rb
+- spec/util/node_diff_spec.rb