psd 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 041d9171afea1dcddd97b7466d804bf2caa39935
-  data.tar.gz: e8512840bae631128967d55a7df8ea34f4f56edc
+  metadata.gz: cd304c938fae5c2e76f30356d35bbb6a53151c5f
+  data.tar.gz: 1b109cfefe59ac367216f1cd541180789714531f
 SHA512:
-  metadata.gz: 88b090498daaa95c0c78235a513d37f790622d03d0de4340fa02ac662c1a3dc2a9bbb9d622bb85bbda21c1b277f7b10056555be09178208ac3c784815ebcc694
-  data.tar.gz: 25edcad79447dd549a89feb77ed63f513778bdbe890dcdb76a9a92f3fc24da14ba2b499d93eb1f6ee447bf24fd1ce35dd062aa1172cff730cec3fe891769ffaa
+  metadata.gz: 418c704ed6dd5b33a0b96e0de0d9b8cd327ea93a09a75a4b9c916b74b2e129fa0e6e16e352e8da3bda19ef07bc4ee70f4342f4889e9601983f74eaec8d5a361a
+  data.tar.gz: 63037689cfc8f00a0afd27883d0979b9cf34144bf38d3faab48dc28a53d60f991783f9245d10bba1ec200c8111afb4f5ad41d0ae36265daf3f155508f7fe63bd

data/lib/psd/file.rb

@@ -70,7 +70,8 @@ class PSD
     end
 
     # Reads a string of the given length and converts it to UTF-8 from the internally used MacRoman encoding.
-    def read_string(length)
+    def read_string(length=nil)
+      length = @file.read(1).bytes.to_a[0] if length.nil?
       read(length).encode('UTF-8', 'MacRoman').delete("\000")
     end
 

data/lib/psd/layer_info/legacy_typetool.rb

@@ -19,9 +19,9 @@ class PSD
         @data[:face][i] = {}
         @data[:face][i][:mark] = @file.read_short
         @data[:face][i][:font_type] = @file.read_int
-        @data[:face][i][:font_name] = PascalString.read(@file)
-        @data[:face][i][:font_family_name] = PascalString.read(@file)
-        @data[:face][i][:font_style_name] = PascalString.read(@file)
+        @data[:face][i][:font_name] = @file.read_string
+        @data[:face][i][:font_family_name] = @file.read_string
+        @data[:face][i][:font_style_name] = @file.read_string
         @data[:face][i][:script] = @file.read_short
         @data[:face][i][:number_axes_vector] = @file.read_int
         @data[:face][i][:vector] = []

data/lib/psd/layer_info/unicode_name.rb

@@ -6,8 +6,7 @@ class PSD
 
     def parse
       pos = @file.tell
-      len = @file.read_int * 2
-      @data = @file.read(len).unpack("A#{len}")[0].encode('UTF-8').delete("\000")
+      @data = @file.read_unicode_string
 
       # The name seems to be padded with null bytes. This is the easiest solution.
       @file.seek pos + @length

data/lib/psd/version.rb

@@ -1,3 +1,3 @@
 class PSD
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psd
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Ryan LeFevre
@@ -167,7 +167,6 @@ files:
 - lib/psd/nodes/lock_to_origin.rb
 - lib/psd/nodes/parse_layers.rb
 - lib/psd/nodes/search.rb
-- lib/psd/pascal_string.rb
 - lib/psd/path_record.rb
 - lib/psd/resource.rb
 - lib/psd/resource_section.rb

data/lib/psd/pascal_string.rb

@@ -1,14 +0,0 @@
-# Helper class that parses a pascal string, which is a
-# string that has it's length prepended to it.
-class PascalString < BinData::Record
-  uint8  :len,  value: lambda { data.length }
-  string :data, read_length: :len
-
-  def get
-    self.data
-  end
-
-  def set(v)
-    self.data = v
-  end
-end