libdolt 0.33.2 → 0.33.3

data/lib/libdolt/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Dolt
-  VERSION = "0.33.2"
+  VERSION = "0.33.3"
 end

data/lib/libdolt/view/blob.rb

@@ -72,6 +72,17 @@ The content you're attempting to browse appears to be binary.
         "<pre class=\"#{class_names.join(' ')}\">" +
           "<ol class=\"linenums gts-lines\">#{lines}</ol></pre>"
       end
+
+      def safe_blob_text(blob)
+        text = blob.text(nil, defined?(Encoding) ? Encoding.default_external : nil)
+
+        if text.respond_to?(:encode)
+          text = text.encode('UTF-16', :invalid => :replace, :undef => :replace,
+                                       :replace => "�").encode('UTF-8')
+        end
+
+        text
+      end
     end
   end
 end

data/test/fixtures/dolt-test-repo.git/refs/heads/master

@@ -1 +1 @@
-383216e07edec271936c7fd87b69c346511aedb2
+cd104f8b749c206e7faef1cb7c03f453cbb1aa57

data/test/libdolt/view/blob_test.rb

@@ -73,4 +73,13 @@ describe Dolt::View::Blob do
       assert_match /<hey>/, html
     end
   end
+
+  describe "safe_blob_text" do
+    it "returns blob's text with all invalid characters (for string's encoding) replaced with �" do
+      repository = Dolt::Git::Repository.new(Dolt.fixture_repo_path)
+      blob = repository.blob('master', 'bad-utf.txt')
+
+      assert_equal "żółć & �.", safe_blob_text(blob)
+    end
+  end
 end

data/views/blob.erb

@@ -28,6 +28,6 @@
       <li><a href="<%= raw_url(repository_slug, ref, path) %>">Raw blob</a></li>
     </ul>
     <%= breadcrumb(repository_slug, ref, path) %>
-    <%= format_blob(path, blob.text(nil, defined?(Encoding) ? Encoding.default_external : nil), repository_slug, ref) %>
+    <%= format_blob(path, safe_blob_text(blob), repository_slug, ref) %>
   </div>
 </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libdolt
 version: !ruby/object:Gem::Version
-  version: 0.33.2
+  version: 0.33.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2013-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -236,6 +236,7 @@ files:
 - test/fixtures/dolt-test-repo.git/config
 - test/fixtures/dolt-test-repo.git/description
 - test/fixtures/dolt-test-repo.git/info/exclude
+- test/fixtures/dolt-test-repo.git/objects/03/0bc1fa37aac317a5d38fbb4f3a6d22b34c6eba
 - test/fixtures/dolt-test-repo.git/objects/04/76d88d4c60823927c52f872ff09e7f84fb3549
 - test/fixtures/dolt-test-repo.git/objects/07/4e4c198421bfc8a1bf9a9c0fc117c4569ba0bd
 - test/fixtures/dolt-test-repo.git/objects/12/67a0fbd3ec606c20f3f1dca1f53bb9505ba9b5
@@ -264,7 +265,9 @@ files:
 - test/fixtures/dolt-test-repo.git/objects/c0/35ba24bb3bed31589bc6736ca9b116175eb723
 - test/fixtures/dolt-test-repo.git/objects/c8/cc83f1a1fc3640fce14ab73d4fa4b22b6211d8
 - test/fixtures/dolt-test-repo.git/objects/ca/d2309100006f94967cdafe678356b96bb098a5
+- test/fixtures/dolt-test-repo.git/objects/cd/104f8b749c206e7faef1cb7c03f453cbb1aa57
 - test/fixtures/dolt-test-repo.git/objects/cd/888aef50e3742885630ea4aa8c05f12b5518f4
+- test/fixtures/dolt-test-repo.git/objects/d1/f94fb68cf34f7f121a949e89e09d1a8c1b3825
 - test/fixtures/dolt-test-repo.git/objects/da/dd1e7ec0c822ba96fcee5d064bea66a7be3d5a
 - test/fixtures/dolt-test-repo.git/objects/de/dbf2faa4f522716ab727e4325a3d75772e137b
 - test/fixtures/dolt-test-repo.git/objects/df/d46204a2c44405a2591c2dbc7e73d1a81b5334