zapwhite 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81bcca5ce52c55d266fdfa3cffde9ce3cd270669
-  data.tar.gz: 9b2c1de397485ca1897e159fc5872dbd56e2ddfe
+  metadata.gz: f2423f66a8de55eaf85a5fe00334753d88b11e3b
+  data.tar.gz: 4f889dcf0c72139d7b3737824958b78d890489ef
 SHA512:
-  metadata.gz: a72c6981d8c3bb449503bc2fad48f21d89c989f27d5cbe8ea0301ddb75409dee025ca69fcb4d441207e89039f74da1019712931beb7fb59f4a2edd30d746558a
-  data.tar.gz: de3cb47158d66835ae676bfabf4b8c4280a374aa9bdbad90994660de4791014cb2d111cb19cd52782ebae8fec8c7653bdefa39e5bf0d5c771beda9b7490fd009
+  metadata.gz: f035b6ad39e25cf9877e3b5d80b43b9b2c83a72bdaf0ffeb906640afe6225fe6a25d0d4f7c06b04de04acab724f3224d2283ee52f62b0d8be50434551a692aac
+  data.tar.gz: 40ede83227770a08bb4b5034444550dfe3372fdd00be0631a430977643010d0a86b970f5270f4d2ae7bb118ef7d8c485bdc9fc3348ed904d8e9938ca628818df

data/lib/reality/zapwhite.rb

@@ -72,10 +72,12 @@ module Reality
 
       files.each_pair do |filename, config|
         full_filename = "#{@base_directory}/#{filename}"
-        content = File.read(full_filename)
+        original_bin_content = File.binread(full_filename)
+
+        encoding = config[:encoding].nil? ? 'utf-8' : config[:encoding].gsub(/^UTF/,'utf-')
+
+        content = File.read(full_filename, :encoding => "bom|#{encoding}")
 
-        content = patch_encoding(content) unless config[:encoding]
-        original_content = content.dup
         content =
           config[:dos] ?
             clean_dos_whitespace(filename, content, config[:eofnl]) :
@@ -85,7 +87,7 @@ module Reality
             # Keep removing duplicate new lines till they have gone
           end
         end
-        if content != original_content
+        if content.bytes != original_bin_content.bytes
           normalize_count += 1
           if check_only?
             puts "Non-normalized whitespace in #{filename}"
@@ -177,15 +179,6 @@ module Reality
       content
     end
 
-    def patch_encoding(content)
-      content =
-        content.respond_to?(:encode!) ?
-          content.encode!('UTF-8', 'binary', :invalid => :replace, :undef => :replace, :replace => '') :
-          content
-      content.gsub!(/^\xEF\xBB\xBF/, '')
-      content
-    end
-
     # Evaluate block after changing directory to specified directory
     def in_dir(dir, &block)
       original_dir = Dir.pwd
@@ -228,7 +221,7 @@ module Reality
       attributes.text_rule('*.rdoc')
       attributes.text_rule('*.html')
       attributes.text_rule('*.xhtml')
-      attributes.text_rule('*.css', :encoding => 'UTF8')
+      attributes.text_rule('*.css')
       attributes.text_rule('*.js')
       attributes.binary_rule('*.jpg')
       attributes.binary_rule('*.jpeg')

data/test/fixtures/file_with_bom.tsql

@@ -0,0 +1 @@
+CREATE TYPE [dbo].[Boolean__Yes_No_] FROM [tinyint] NOT NULL

data/test/fixtures/utf8.tcss

@@ -0,0 +1 @@
+→

data/test/reality/test_zapwhite.rb

@@ -266,4 +266,46 @@ Fixing: .gitattributes
 OUTPUT
     end
   end
+
+  def test_file_with_bom
+    dir = create_git_repo do
+      write_gitattributes_file(<<TEXT)
+*.tsql text
+TEXT
+      write_file('test.tsql', IO.binread(File.expand_path(BASE_DIR + '/test/fixtures/file_with_bom.tsql')))
+    end
+    in_dir(dir) do
+      output = run_command("#{ZAPWHITE_BIN} --no-generate-gitattributes", 1)
+      assert_equal "Fixing: test.tsql\n", output
+      assert_equal "CREATE TYPE [dbo].[Boolean__Yes_No_] FROM [tinyint] NOT NULL\n", IO.binread("#{dir}/test.tsql")
+    end
+  end
+
+  def test_file_with_utf8_encoding
+    dir = create_git_repo do
+      write_gitattributes_file(<<TEXT)
+*.tcss text
+TEXT
+      write_file('test.tcss', IO.binread(File.expand_path(BASE_DIR + '/test/fixtures/utf8.tcss')))
+    end
+    in_dir(dir) do
+      output = run_command("#{ZAPWHITE_BIN} --no-generate-gitattributes", 0)
+      assert_equal '', output
+      assert_equal IO.binread(File.expand_path(BASE_DIR + '/test/fixtures/utf8.tcss')), IO.binread("#{dir}/test.tcss")
+    end
+  end
+
+  def test_file_with_bom_encoding_set
+    dir = create_git_repo do
+      write_gitattributes_file(<<TEXT)
+*.tsql text encoding=utf-8
+TEXT
+      write_file('test.tsql', IO.binread(File.expand_path(BASE_DIR + '/test/fixtures/file_with_bom.tsql')))
+    end
+    in_dir(dir) do
+      output = run_command("#{ZAPWHITE_BIN} --no-generate-gitattributes", 1)
+      assert_equal "Fixing: test.tsql\n", output
+      assert_equal "CREATE TYPE [dbo].[Boolean__Yes_No_] FROM [tinyint] NOT NULL\n", IO.binread("#{dir}/test.tsql")
+    end
+  end
 end

data/zapwhite.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name               = %q{zapwhite}
-  s.version            = '2.7.0'
+  s.version            = '2.8.0'
   s.platform           = Gem::Platform::RUBY
 
   s.authors            = ['Peter Donald']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zapwhite
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Peter Donald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-18 00:00:00.000000000 Z
+date: 2017-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitattributes
@@ -70,6 +70,8 @@ files:
 - Rakefile
 - bin/zapwhite
 - lib/reality/zapwhite.rb
+- test/fixtures/file_with_bom.tsql
+- test/fixtures/utf8.tcss
 - test/helper.rb
 - test/reality/test_zapwhite.rb
 - zapwhite.gemspec