smart_diff 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cf02a3500e0380989296dfce081facae794b7b1
-  data.tar.gz: 40db6403781250648e874d07766a77fd7c84d53d
+  metadata.gz: 4fbffcc611b3c05d3bdac4daa287a3738634919d
+  data.tar.gz: f02216481f1250072a1b1ae2bfbe02e6721c4457
 SHA512:
-  metadata.gz: 5c3a76c3c50d0cfd447e208d3f0b74b73cdc9a9943ac3ad7d06075c1cee97f5181859a5c3a4610d952bdb3349a6622724c4943e9fe04259dc440b7c70e36acf0
-  data.tar.gz: 0d2613f418b7896dd7180d02c694387b42de4af1f934412fabfba9b38a30744d078366cc9ce7089fd1f0aeef0972f9675a76d36406f13430f3d62bce68523722
+  metadata.gz: 0c6966ad3a35ac7b804df1fa7e6e22253f2950162aaa908ab860ee19c782daa35fef8ac3b953842a9dcce92704062b65419bb8c8fbefabfd2db0cdbdb495f0cb
+  data.tar.gz: 863c8c4ca0db686a47416bb4eb98524ba770b877f2300fc8f6a9995b4cd77705358dd45988378f5810e23be055d20a507d0f7e9be884de469e0f66dc23b3b30c

data/README.md

@@ -10,8 +10,8 @@ said NodeDiff classes are entirely unrelated to psydiff, except that they do
 something quite similar (create a diff of source code based on the AST rather than comparing the text directly).
 
 This application should especially serve as an example of using the subdiff's
-produced by NodeDiff to improve the quality of the output. See `bin/smart_diff`
- or [check out the docs](http://rubydoc.info/gems/smart_diff/0.0.1/frames).
+produced by NodeDiff to improve the quality of the output. See [`bin/smart_diff`](https://github.com/edubkendo/smart_diff/blob/master/bin/smart_diff)
+ or [check out the docs](http://edubkendo.github.io/smart_diff/).
 
 ## Install
 

data/bin/smart_diff

@@ -3,6 +3,13 @@
 require_relative "../lib/smart_diff"
 require_relative "../lib/smart_diff/htmlize"
 
+if ARGV.size < 2
+  puts "Please call SmartDiff with two ruby files."
+  puts "Like: "
+  puts "\t$ smart_diff example/file1.rb example/file2.rb"
+  exit -1
+end
+
 file_path1 = ARGV[0]
 file_path2 = ARGV[1]
 

data/doc/Htmlize.html

@@ -547,13 +547,13 @@ tags for each.</p>
       <pre class="lines">
 
 
+55
+56
 57
-58
-59
-60</pre>
+58</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 57</span>
+      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 55</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_initialize'>initialize</span>
   <span class='ivar'>@uid_count</span> <span class='op'>=</span> <span class='op'>-</span><span class='int'>1</span>
@@ -597,12 +597,12 @@ tags for each.</p>
       <pre class="lines">
 
 
-55
-56
-57</pre>
+53
+54
+55</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 55</span>
+      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 53</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_uid_count'>uid_count</span>
   <span class='ivar'>@uid_count</span>
@@ -640,12 +640,12 @@ tags for each.</p>
       <pre class="lines">
 
 
-55
-56
-57</pre>
+53
+54
+55</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 55</span>
+      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 53</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_uid_hash'>uid_hash</span>
   <span class='ivar'>@uid_hash</span>
@@ -743,6 +743,8 @@ appropriate text.</p>
       <pre class="lines">
 
 
+182
+183
 184
 185
 186
@@ -757,12 +759,10 @@ appropriate text.</p>
 195
 196
 197
-198
-199
-200</pre>
+198</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 184</span>
+      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 182</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_apply_tags'>apply_tags</span><span class='lparen'>(</span><span class='id identifier rubyid_s'>s</span><span class='comma'>,</span> <span class='id identifier rubyid_tags'>tags</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_tags'>tags</span> <span class='op'>=</span> <span class='id identifier rubyid_tags'>tags</span><span class='period'>.</span><span class='id identifier rubyid_sort_by'>sort_by</span> <span class='lbrace'>{</span> <span class='op'>|</span><span class='id identifier rubyid_x'>x</span><span class='op'>|</span> <span class='lbracket'>[</span><span class='id identifier rubyid_x'>x</span><span class='period'>.</span><span class='id identifier rubyid_idx'>idx</span><span class='comma'>,</span> <span class='op'>-</span><span class='id identifier rubyid_x'>x</span><span class='period'>.</span><span class='id identifier rubyid_start'>start</span><span class='rbracket'>]</span> <span class='rbrace'>}</span>
@@ -850,18 +850,18 @@ appropriate text.</p>
       <pre class="lines">
 
 
+250
+251
 252
 253
 254
 255
 256
 257
-258
-259
-260</pre>
+258</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 252</span>
+      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 250</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_change_class'>change_class</span><span class='lparen'>(</span><span class='id identifier rubyid_change'>change</span><span class='rparen'>)</span>
   <span class='kw'>if</span> <span class='op'>!</span><span class='id identifier rubyid_change'>change</span><span class='period'>.</span><span class='id identifier rubyid_old_node'>old_node</span>
@@ -958,6 +958,8 @@ tags for each.</p>
       <pre class="lines">
 
 
+209
+210
 211
 212
 213
@@ -988,12 +990,10 @@ tags for each.</p>
 238
 239
 240
-241
-242
-243</pre>
+241</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 211</span>
+      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 209</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_change_tags'>change_tags</span><span class='lparen'>(</span><span class='id identifier rubyid_changes'>changes</span><span class='comma'>,</span> <span class='id identifier rubyid_side'>side</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_tags'>tags</span> <span class='op'>=</span> <span class='lbracket'>[</span><span class='rbracket'>]</span>
@@ -1048,13 +1048,13 @@ tags for each.</p>
       <pre class="lines">
 
 
+60
+61
 62
-63
-64
-65</pre>
+63</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 62</span>
+      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 60</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_clear_uid'>clear_uid</span><span class='lparen'>(</span><span class='rparen'>)</span>
   <span class='ivar'>@uid_count</span> <span class='op'>=</span> <span class='op'>-</span><span class='int'>1</span>
@@ -1193,6 +1193,8 @@ tags for each.</p>
       <pre class="lines">
 
 
+156
+157
 158
 159
 160
@@ -1206,12 +1208,10 @@ tags for each.</p>
 168
 169
 170
-171
-172
-173</pre>
+171</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 158</span>
+      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 156</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_create_html'>create_html</span><span class='lparen'>(</span><span class='id identifier rubyid_changes'>changes</span><span class='comma'>,</span> <span class='id identifier rubyid_file1'>file1</span><span class='comma'>,</span> <span class='id identifier rubyid_file2'>file2</span><span class='comma'>,</span> <span class='id identifier rubyid_text1'>text1</span><span class='comma'>,</span> <span class='id identifier rubyid_text2'>text2</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_tags1'>tags1</span> <span class='op'>=</span> <span class='id identifier rubyid_change_tags'>change_tags</span><span class='lparen'>(</span><span class='id identifier rubyid_changes'>changes</span><span class='comma'>,</span> <span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>left</span><span class='tstring_end'>&#39;</span></span><span class='rparen'>)</span>
@@ -1278,13 +1278,13 @@ tags for each.</p>
       <pre class="lines">
 
 
+115
+116
 117
-118
-119
-120</pre>
+118</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 117</span>
+      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 115</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_html_footer'>html_footer</span>
   <span class='id identifier rubyid_out'>out</span> <span class='op'>=</span> <span class='tstring'><span class='tstring_beg'>%Q{</span><span class='tstring_content'>&lt;/body&gt;\n
@@ -1339,6 +1339,8 @@ tags for each.</p>
       <pre class="lines">
 
 
+88
+89
 90
 91
 92
@@ -1357,12 +1359,10 @@ tags for each.</p>
 105
 106
 107
-108
-109
-110</pre>
+108</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 90</span>
+      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 88</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_html_header'>html_header</span>
   <span class='id identifier rubyid_install_path'>install_path</span> <span class='op'>=</span> <span class='id identifier rubyid_get_install_path'>get_install_path</span>
@@ -1470,6 +1470,9 @@ tags for each.</p>
       <pre class="lines">
 
 
+279
+280
+281
 282
 283
 284
@@ -1477,13 +1480,10 @@ tags for each.</p>
 286
 287
 288
-289
-290
-291
-292</pre>
+289</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 282</span>
+      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 279</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_link_start'>link_start</span><span class='lparen'>(</span><span class='id identifier rubyid_change'>change</span><span class='comma'>,</span> <span class='id identifier rubyid_side'>side</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_cls'>cls</span> <span class='op'>=</span> <span class='id identifier rubyid_change_class'>change_class</span><span class='lparen'>(</span><span class='id identifier rubyid_change'>change</span><span class='rparen'>)</span>
@@ -1565,12 +1565,12 @@ tags for each.</p>
       <pre class="lines">
 
 
-301
-302
-303</pre>
+298
+299
+300</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 301</span>
+      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 298</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_qs'>qs</span><span class='lparen'>(</span><span class='id identifier rubyid_s'>s</span><span class='rparen'>)</span>
   <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>&#39;</span><span class='embexpr_beg'>#{</span><span class='id identifier rubyid_s'>s</span><span class='embexpr_end'>}</span><span class='tstring_content'>&#39;</span><span class='tstring_end'>&quot;</span></span>
@@ -1594,8 +1594,6 @@ tags for each.</p>
     
 <p>Takes a Change and creates a span tag.</p>
 
-<p>an insertion or deletion.</p>
-
 
   </div>
 </div>
@@ -1614,7 +1612,7 @@ tags for each.</p>
       
         &mdash;
         <div class='inline'>
-<p>A single change from the diff representing either</p>
+<p>A single change, either an insertion or deletion.</p>
 </div>
       
     </li>
@@ -1646,12 +1644,12 @@ tags for each.</p>
       <pre class="lines">
 
 
-270
-271
-272</pre>
+267
+268
+269</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 270</span>
+      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 267</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_span_start'>span_start</span><span class='lparen'>(</span><span class='id identifier rubyid_change'>change</span><span class='rparen'>)</span>
   <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>&lt;span class=</span><span class='embexpr_beg'>#{</span><span class='id identifier rubyid_qs'>qs</span><span class='lparen'>(</span><span class='id identifier rubyid_change_class'>change_class</span><span class='lparen'>(</span><span class='id identifier rubyid_change'>change</span><span class='rparen'>)</span><span class='rparen'>)</span><span class='embexpr_end'>}</span><span class='tstring_content'>&gt;</span><span class='tstring_end'>&quot;</span></span>
@@ -1726,17 +1724,17 @@ already has one, fetch it from the hash and return it.</p>
       <pre class="lines">
 
 
+74
+75
 76
 77
 78
 79
 80
-81
-82
-83</pre>
+81</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 76</span>
+      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 74</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_uid'>uid</span><span class='lparen'>(</span><span class='id identifier rubyid_node'>node</span><span class='rparen'>)</span>
   <span class='kw'>if</span> <span class='ivar'>@uid_hash</span><span class='period'>.</span><span class='id identifier rubyid_has_key?'>has_key?</span><span class='lparen'>(</span><span class='id identifier rubyid_node'>node</span><span class='rparen'>)</span>
@@ -1831,6 +1829,8 @@ already has one, fetch it from the hash and return it.</p>
       <pre class="lines">
 
 
+128
+129
 130
 131
 132
@@ -1844,12 +1844,10 @@ already has one, fetch it from the hash and return it.</p>
 140
 141
 142
-143
-144
-145</pre>
+143</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 130</span>
+      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 128</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_write_html'>write_html</span><span class='lparen'>(</span><span class='id identifier rubyid_text'>text</span><span class='comma'>,</span> <span class='id identifier rubyid_side'>side</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_out'>out</span> <span class='op'>=</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_end'>&quot;</span></span>
@@ -1877,7 +1875,7 @@ already has one, fetch it from the hash and return it.</p>
 </div>
 
     <div id="footer">
-  Generated on Mon Sep 16 03:40:02 2013 by
+  Generated on Wed Sep 18 04:58:10 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.1 (ruby-2.0.0).
 </div>

data/doc/SmartDiff.html

@@ -257,7 +257,7 @@
         <li class="public ">
   <span class="summary_signature">
     
-      <a href="#diff-instance_method" title="#diff (instance method)">- (java.util.ArrayList) <strong>diff</strong> </a>
+      <a href="#diff-instance_method" title="#diff (instance method)">- (java.util.ArrayList&lt;DeepDiff&gt;) <strong>diff</strong> </a>
     
 
     
@@ -671,7 +671,7 @@ on AST generated by JRubyParser.</p>
       <div class="method_details first">
   <h3 class="signature first" id="diff-instance_method">
   
-    - (<tt>java.util.ArrayList</tt>) <strong>diff</strong> 
+    - (<tt>java.util.ArrayList&lt;DeepDiff&gt;</tt>) <strong>diff</strong> 
   
 
   
@@ -682,8 +682,6 @@ on AST generated by JRubyParser.</p>
     
 <p>Create a diff of the two AST objects.</p>
 
-<p>org.jrubyparser.DeepDiff objects.</p>
-
 
   </div>
 </div>
@@ -695,13 +693,13 @@ on AST generated by JRubyParser.</p>
     <li>
       
       
-        <span class='type'>(<tt>java.util.ArrayList</tt>)</span>
+        <span class='type'>(<tt>java.util.ArrayList&lt;DeepDiff&gt;</tt>)</span>
       
       
       
         &mdash;
         <div class='inline'>
-<p>An ArrayList containing</p>
+<p>The differences.</p>
 </div>
       
     </li>
@@ -714,6 +712,7 @@ on AST generated by JRubyParser.</p>
       <pre class="lines">
 
 
+58
 59
 60
 61
@@ -722,11 +721,10 @@ on AST generated by JRubyParser.</p>
 64
 65
 66
-67
-68</pre>
+67</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/smart_diff.rb', line 59</span>
+      <pre class="code"><span class="info file"># File 'lib/smart_diff.rb', line 58</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_diff'>diff</span><span class='lparen'>(</span><span class='rparen'>)</span>
   <span class='ivar'>@code_one</span> <span class='op'>=</span> <span class='id identifier rubyid_read'>read</span><span class='lparen'>(</span><span class='ivar'>@file_one</span><span class='rparen'>)</span>
@@ -755,7 +753,7 @@ on AST generated by JRubyParser.</p>
 </h3><div class="docstring">
   <div class="discussion">
     
-<p>Parse the source into an abstract syntax tree. AST.</p>
+<p>Parse the source into an abstract syntax tree.</p>
 
 
   </div>
@@ -810,7 +808,7 @@ on AST generated by JRubyParser.</p>
       
         &mdash;
         <div class='inline'>
-<p>A Node object representing the code as an</p>
+<p>A Node object representing the code as AST.</p>
 </div>
       
     </li>
@@ -932,7 +930,7 @@ on AST generated by JRubyParser.</p>
 </div>
 
     <div id="footer">
-  Generated on Mon Sep 16 03:40:01 2013 by
+  Generated on Wed Sep 18 04:58:09 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.1 (ruby-2.0.0).
 </div>

data/doc/Tag.html

@@ -286,8 +286,6 @@ be linked to their matches.</p>
     
 <p>Construct a new tag.</p>
 
-<p>The end offset of the node if it is a closing tag. for a closing tag.</p>
-
 
   </div>
 </div>
@@ -322,7 +320,7 @@ be linked to their matches.</p>
       
         &mdash;
         <div class='inline'>
-<p>The start of the node&#39;s offset for an opening tag,</p>
+<p>for open tag: start offset. closing tag: end offset</p>
 </div>
       
     </li>
@@ -340,7 +338,7 @@ be linked to their matches.</p>
       
         &mdash;
         <div class='inline'>
-<p>Left -1 for an open tag, the node&#39;s start offset</p>
+<p>for open tag: -1. for closing tag: start offset.</p>
 </div>
       
     </li>
@@ -354,14 +352,14 @@ be linked to their matches.</p>
       <pre class="lines">
 
 
+27
+28
 29
 30
-31
-32
-33</pre>
+31</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 29</span>
+      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 27</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_initialize'>initialize</span><span class='lparen'>(</span><span class='id identifier rubyid_tag'>tag</span><span class='comma'>,</span> <span class='id identifier rubyid_idx'>idx</span><span class='comma'>,</span> <span class='id identifier rubyid_start'>start</span><span class='op'>=</span><span class='op'>-</span><span class='int'>1</span><span class='rparen'>)</span>
   <span class='ivar'>@tag</span> <span class='op'>=</span> <span class='id identifier rubyid_tag'>tag</span>
@@ -558,12 +556,12 @@ be linked to their matches.</p>
       <pre class="lines">
 
 
-40
-41
-42</pre>
+38
+39
+40</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 40</span>
+      <pre class="code"><span class="info file"># File 'lib/smart_diff/htmlize.rb', line 38</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_to_s'>to_s</span>
   <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>tag: </span><span class='embexpr_beg'>#{</span><span class='ivar'>@tag</span><span class='embexpr_end'>}</span><span class='tstring_content'>, idx: </span><span class='embexpr_beg'>#{</span><span class='ivar'>@idx</span><span class='embexpr_end'>}</span><span class='tstring_content'> start: </span><span class='embexpr_beg'>#{</span><span class='ivar'>@start</span><span class='embexpr_end'>}</span><span class='tstring_end'>&quot;</span></span>
@@ -578,7 +576,7 @@ be linked to their matches.</p>
 </div>
 
     <div id="footer">
-  Generated on Mon Sep 16 03:40:01 2013 by
+  Generated on Wed Sep 18 04:58:09 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.1 (ruby-2.0.0).
 </div>

data/doc/Utils.html

@@ -568,7 +568,7 @@ the HTML.</p>
 </div>
 
     <div id="footer">
-  Generated on Mon Sep 16 03:40:00 2013 by
+  Generated on Wed Sep 18 04:58:08 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.1 (ruby-2.0.0).
 </div>

data/doc/_index.html

@@ -140,7 +140,7 @@
 </div>
 
     <div id="footer">
-  Generated on Mon Sep 16 03:39:58 2013 by
+  Generated on Wed Sep 18 04:58:07 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.1 (ruby-2.0.0).
 </div>

data/doc/file.README.html

@@ -84,9 +84,9 @@ rather than comparing the text directly).</p>
 
 <p>This application should especially serve as an example of using the
 subdiff&#39;s produced by NodeDiff to improve the quality of the output.
-See <code>bin/smart_diff</code>  or <a
-href="http://rubydoc.info/gems/smart_diff/0.0.1/frames">check out the
-docs</a>.</p>
+See <a
+href="https://github.com/edubkendo/smart_diff/blob/master/bin/smart_diff">bin/smart_diff</a>
+or <a href="http://edubkendo.github.io/smart_diff/">check out the docs</a>.</p>
 
 <h2 id="label-Install">Install</h2>
 
@@ -123,7 +123,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 </div></div>
 
     <div id="footer">
-  Generated on Mon Sep 16 03:40:00 2013 by
+  Generated on Wed Sep 18 04:58:08 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.1 (ruby-2.0.0).
 </div>

data/doc/index.html

@@ -84,9 +84,9 @@ rather than comparing the text directly).</p>
 
 <p>This application should especially serve as an example of using the
 subdiff&#39;s produced by NodeDiff to improve the quality of the output.
-See <code>bin/smart_diff</code>  or <a
-href="http://rubydoc.info/gems/smart_diff/0.0.1/frames">check out the
-docs</a>.</p>
+See <a
+href="https://github.com/edubkendo/smart_diff/blob/master/bin/smart_diff">bin/smart_diff</a>
+or <a href="http://edubkendo.github.io/smart_diff/">check out the docs</a>.</p>
 
 <h2 id="label-Install">Install</h2>
 
@@ -123,7 +123,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 </div></div>
 
     <div id="footer">
-  Generated on Mon Sep 16 03:39:59 2013 by
+  Generated on Wed Sep 18 04:58:07 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.1 (ruby-2.0.0).
 </div>

data/doc/top-level-namespace.html

@@ -105,7 +105,7 @@
 </div>
 
     <div id="footer">
-  Generated on Mon Sep 16 03:40:00 2013 by
+  Generated on Wed Sep 18 04:58:08 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.6.1 (ruby-2.0.0).
 </div>

data/lib/smart_diff.rb

@@ -1,6 +1,7 @@
 require "jruby-parser"
 require "pathname"
 require "jruby-parser.jar"
+import org.jrubyparser.lexer.SyntaxException
 
 import org.jrubyparser.util.diff.NodeDiff
 
@@ -41,21 +42,28 @@ class SmartDiff
 
   #
   # Parse the source into an abstract syntax tree.
+  #
   # @param  code_to_parse [String] Ruby source code.
   # @param  file_name [String] The path to the file containing code_to_parse
   #
-  # @return [org.jrubyparser.Node] A Node object representing the code as an
-  # AST.
+  # @return [org.jrubyparser.Node] A Node object representing the code as AST.
   def parse(code_to_parse, file_name)
-    JRubyParser.parse(code_to_parse, { :filename => file_name })
+    begin
+      JRubyParser.parse(code_to_parse, { :filename => file_name })
+    rescue SyntaxException => e
+      message = e.message
+      message << "\nThis file, #{file_name} ,is not valid ruby."
+      message << "\nCheck syntax and try again."
+      se = SyntaxException.new(e.pid, e.position, message)
+      raise se
+    end
   end
 
 
   #
   # Create a diff of the two AST objects.
   #
-  # @return [java.util.ArrayList] An ArrayList containing
-  # org.jrubyparser.DeepDiff objects.
+  # @return [java.util.ArrayList<DeepDiff>] The differences.
   def diff()
     @code_one = read(@file_one)
     @code_two = read(@file_two)

data/lib/smart_diff/htmlize.rb

@@ -20,10 +20,8 @@ class Tag
   # Construct a new tag.
   #
   # @param  tag [String] An HTML tag.
-  # @param  idx [Fixnum] The start of the node's offset for an opening tag,
-  # The end offset of the node if it is a closing tag.
-  # @param  start [Fixnum] Left -1 for an open tag, the node's start offset
-  # for a closing tag.
+  # @param  idx [Fixnum] for open tag: start offset. closing tag: end offset
+  # @param  start [Fixnum] for open tag: -1. for closing tag: start offset.
   #
   # @return [Tag] The Tag which was constructed.
   def initialize(tag, idx, start=-1)
@@ -263,8 +261,7 @@ class Htmlize
   #
   # Takes a Change and creates a span tag.
   #
-  # @param  change [Change] A single change from the diff representing either
-  # an insertion or deletion.
+  # @param  change [Change] A single change, either an insertion or deletion.
   #
   # @return [String] A span tag based on the Change passed in.
   def span_start(change)

data/spec/smart_diff_spec.rb

@@ -1,4 +1,5 @@
 require "smart_diff"
+import org.jrubyparser.lexer.SyntaxException
 
 describe "SmartDiff" do
   before(:each) do
@@ -23,6 +24,11 @@ describe "SmartDiff" do
     @rd.parse(code_for_parse, @rd.file_one).instance_of?(org.jrubyparser.ast.RootNode).should be(true)
   end
 
+  it "should raise an exception if the code is invalid ruby" do
+    code_for_parse = "Def BadRubyCodeIsBAda end puts cLas$"
+    expect { @rd.parse(code_for_parse, @rd.file_one) }.to raise_error(SyntaxException)
+  end
+
   it "should create a diff of the two ASTs" do
     @rd.node_diff.size.should >= 1
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_diff
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Eric West