Fix encoding issues with text data

examples/table.rb

@@ -0,0 +1,26 @@
+require './lib/psd'
+require 'terminal-table'
+require 'colorize'
+
+file = ARGV[0] || 'examples/images/example.psd'
+layer_comp = ARGV[1]
+
+psd = PSD.new(file)
+psd.parse!
+
+tree = layer_comp ? psd.tree.filter_by_comp(layer_comp) : psd.tree
+
+title = "#{File.basename(file)} / #{layer_comp || "Last Document State"}"
+header = ["Visible?", "Position", "Dimensions", "Path"]
+rows = tree.descendants.map do |node|
+  [
+    node.visible?.to_s.colorize(node.visible? ? :green : :red), 
+    "(#{node.left}, #{node.top})",
+    "#{node.width}x#{node.height}",
+    { value: node.path, width: 90 }
+  ]
+end
+
+table = Terminal::Table.new rows: rows, headings: header, title: title
+
+puts table

examples/tree.rb

@@ -1,26 +1,9 @@
 require './lib/psd'
-require 'terminal-table'
-require 'colorize'
+require 'pp'
 
+psd = nil
 file = ARGV[0] || 'examples/images/example.psd'
-layer_comp = ARGV[1]
-
 psd = PSD.new(file)
 psd.parse!
 
-tree = layer_comp ? psd.tree.filter_by_comp(layer_comp) : psd.tree
-
-title = "#{File.basename(file)} / #{layer_comp || "Last Document State"}"
-header = ["Visible?", "Position", "Dimensions", "Path"]
-rows = tree.descendants.map do |node|
-  [
-    node.visible?.to_s.colorize(node.visible? ? :green : :red), 
-    "(#{node.left}, #{node.top})",
-    "#{node.width}x#{node.height}",
-    { value: node.path, width: 90 }
-  ]
-end
-
-table = Terminal::Table.new rows: rows, headings: header, title: title
-
-puts table
+pp psd.tree.to_hash

lib/psd/file.rb

@@ -82,7 +82,10 @@ def read_byte
     # Reads a unicode string, which is double the length of a normal string and encoded as UTF-16.
     def read_unicode_string(length=nil)
       length ||= read_int if length.nil?
-      !length.nil? && length > 0 ? read(length * 2).encode('UTF-8', 'UTF-16BE').delete("\000") : ''
+      return '' if length.nil? || length <= 0
+      read(length * 2)
+        .encode('UTF-8', 'UTF-16BE', universal_newline: true)
+        .delete("\000")
     end
 
     # Reads a boolean value.

lib/psd/layer_info/typetool.rb

@@ -18,9 +18,6 @@ def parse
       descriptor_version = @file.read_int
 
       @data[:text] = Descriptor.new(@file).parse
-      @data[:text]['EngineData']
-        .encode!('UTF-8', 'MacRoman', invalid: :replace, undef: :replace)
-        .delete!("\000")
 
       @data[:engine_data] = nil
       begin
@@ -44,12 +41,7 @@ def parse
     # Extracts the text within the text area. In the event that psd-enginedata fails
     # for some reason, we attempt to extract the text using some rough regex.
     def text_value
-      if engine_data.nil?
-        # Something went wrong, lets hack our way through.
-        /\/Text \(˛ˇ(.*)\)$/.match(@data[:text]['EngineData'])[1].gsub /\r/, "\n"
-      else
-        engine_data.EngineDict.Editor.Text
-      end
+      @data[:text]['Txt ']
     end
     alias :to_s :text_value
 

psd.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency 'rake'
-  gem.add_dependency 'psd-enginedata', '~> 1.0'
+  gem.add_dependency 'psd-enginedata', '~> 1'
   gem.add_dependency 'chunky_png'
   gem.add_dependency 'activesupport', '~> 3.2.7'
   gem.add_dependency 'xmp'