flay 2.3.0 → 2.3.1

data/History.txt

@@ -1,3 +1,9 @@
+=== 2.3.1 / 2013-07-11
+
+* 1 bug fix:
+
+  * Fixed --diff outputting twice if there are no comments. (kalenkov)
+
 === 2.3.0 / 2013-05-10
 
 * 2 minor enhancements:

data/README.txt

@@ -29,6 +29,7 @@ braces vs do/end, etc are all ignored. Making this totally rad.
 
 == KNOWN EXTENSIONS:
 
+* flay-actionpack  :: Use Rails ERB handler.
 * flay-haml        :: Flay your HAML source.
 * flay-persistence :: Persist results across runs. Great for multi-project analysis.
 

data/lib/flay.rb

@@ -15,7 +15,7 @@ class File
 end
 
 class Flay
-  VERSION = "2.3.0" # :nodoc:
+  VERSION = "2.3.1" # :nodoc:
 
   ##
   # Returns the default options.
@@ -371,6 +371,7 @@ class Flay
       n = subdata.find_index { |s| s !~ /^#/ }
 
       comment, code = subdata[0..n-1], subdata[n..-1]
+      comment = [] if n == 0
 
       comments << comment
       codes    << code

data/test/test_flay.rb

@@ -5,7 +5,7 @@ require 'flay'
 
 $: << "../../sexp_processor/dev/lib"
 
-class TestSexp < MiniTest::Unit::TestCase
+class TestSexp < Minitest::Test
   def setup
     # a(1) { |c| d }
     @s = s(:iter,
@@ -314,6 +314,25 @@ class TestSexp < MiniTest::Unit::TestCase
     assert_equal exp, flay.n_way_diff(*dog_and_cat).gsub(/^ {3}$/, "")
   end
 
+  def test_n_way_diff_no_comments
+    dog_and_cat = ["class Dog\n  def x\n    return \"Hello\"\n  end\nend",
+                   "class Cat\n  def y\n    return \"Hello\"\n  end\nend"]
+
+    flay = Flay.new
+
+    exp = <<-EOM.gsub(/\d+/, "N").gsub(/^ {6}/, "").chomp
+      A: class Dog
+      B: class Cat
+      A:   def x
+      B:   def y
+             return \"Hello\"
+           end
+         end
+    EOM
+
+    assert_equal exp, flay.n_way_diff(*dog_and_cat).gsub(/^ {3}$/, "")
+  end
+
   def test_split_and_group
     flay = Flay.new
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flay
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 2
   - 3
-  - 0
-  version: 2.3.0
+  - 1
+  version: 2.3.1
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2013-05-10 00:00:00 Z
+date: 2013-07-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sexp_processor