psd-enginedata 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1957969e897d576400ab12b55602144ed46d35cf
-  data.tar.gz: 62f0f5c777a3abdd50090ebfeb5a94b4a01a2dff
+  metadata.gz: 465b34ea22f9b1ee7d0113b90eb4436919c9212b
+  data.tar.gz: 14949103aecbb7fd7898aea297598dc3139646f1
 SHA512:
-  metadata.gz: 425deaa7d82ddce71ce370648481a1414c34b5ca80610598591240f023690df82a0f415c2c6725d128ed207e0cac73e3010039272b983adc0b278428c0320428
-  data.tar.gz: 32b3e197b45ce9b132cb4555be9e9a160800abe6e44ea44ef4e15159b09f57c16bcd89d8a6263c1303104472acc033f631e5bc64de37da59246c9c191dd40e32
+  metadata.gz: 47ca212b1102ff6844cc37028084c51b50591bc5dcb1d9909f922c490a21f6a60b496508a3850a540d5ba8a74db9ed9494714d2e368a731557255f96a94d02ab
+  data.tar.gz: cbcf5c281d8eb7cf59551e26309f7f67ba132dc395021837c1dfa6077c296e665a33dfcbf517bd8363ceac30a477245d0bb4802d87556bdf7ba6ff0b4f21d657

data/lib/psd/enginedata.rb

@@ -37,7 +37,7 @@ class PSD
 
     # Read a file containing EngineData markup and initialize a new instance.
     def self.load(file)
-      self.new File.read(file)
+      self.new File.new(file, 'rb').read
     end
 
     # Create a new Text instance and initialize our parsing stacks.

data/lib/psd/enginedata/instruction.rb

@@ -8,7 +8,11 @@ class PSD
 
       # Checks to see if the given text is a match for this token.
       def self.match(text)
-        token.match(text)
+        begin
+          token.match(text)
+        rescue Encoding::CompatibilityError
+          nil
+        end
       end
 
       # Stores a reference to the EngineData document and the current

data/lib/psd/enginedata/instructions/string.rb

@@ -3,10 +3,21 @@ class PSD
   class EngineData
     class Instruction
       class String < Instruction
-        def self.token; /^\(\u{2db}\u{2c7}(.*)\)$/; end
+        def self.token; Regexp.new('^\(\xFE\xFF(.*)\)$'.force_encoding('binary')); end
 
         def execute!
-          match[1].gsub(/\r/, "\n").strip
+          data = self.class.token.match(
+            @text.force_encoding('binary')
+          )[1]
+
+          begin
+            data
+              .force_encoding('UTF-16BE')
+              .encode('UTF-8', 'UTF-16BE', universal_newline: true)
+              .strip
+          rescue
+            data
+          end
         end
       end
     end

data/lib/psd/enginedata/version.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 class PSD
   class EngineData
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/spec/parser_spec.rb

@@ -0,0 +1,31 @@
+# -*- encoding : utf-8 -*-
+require 'spec_helper'
+
+describe 'Parser' do
+  let(:parser) { PSD::EngineData.load('spec/files/enginedata') }
+
+  it "is ready to parse" do
+    expect(parser.text).to_not be_nil
+    expect(parser).to_not be_parsed
+  end
+
+  it "does not error when parsing" do
+    parser.parse!
+    expect(parser).to be_parsed
+  end
+
+  describe "result data" do
+    before(:each) do
+      parser.parse!
+    end
+
+    it "contains the proper data" do
+      expect(parser.result.EngineDict.Editor.Text).to eq("PSD · Enginedata")
+    end
+
+    it "parses font data" do
+      names = parser.result.ResourceDict.FontSet.map(&:Name)
+      expect(names).to include 'MyriadPro-Regular'
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: psd-enginedata
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Ryan LeFevre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-25 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -143,8 +143,8 @@ files:
 - lib/psd/enginedata/version.rb
 - psd-enginedata.gemspec
 - spec/files/enginedata
-- spec/files/enginedata_simple
-- spec/integration/parser_spec.rb
+- spec/files/source.psd
+- spec/parser_spec.rb
 - spec/spec_helper.rb
 homepage: http://cosmos.layervault.com/psdrb.html
 licenses:
@@ -166,12 +166,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Parser for the markup format used in the PSD file format
 test_files:
 - spec/files/enginedata
-- spec/files/enginedata_simple
-- spec/integration/parser_spec.rb
+- spec/files/source.psd
+- spec/parser_spec.rb
 - spec/spec_helper.rb

data/spec/files/enginedata_simple

@@ -1,26 +0,0 @@
-<<
-  /EngineDict
-  <<
-    /Editor
-    <<
-      /Text (˛ˇMake a change and save.)
-    >>
-  >>
-  /Font
-  <<
-    /Name (˛ˇHelveticaNeue-Light)
-    /Script 0
-    /FontType 1
-    /Synthetic 0
-    /FillColor
-    <<
-      /Type 1
-      /Values [ 1.0 0.0 0.0 0.0 ]
-    >>
-    /StyleSheetSet [
-    <<
-      /Name (˛ˇNormal RGB)
-    >>
-    ]
-  >>
->>

data/spec/integration/parser_spec.rb

@@ -1,25 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'spec_helper'
-
-describe 'Parser' do
-  before(:each) do
-    @parser = PSD::EngineData.load('spec/files/enginedata')
-  end
-
-  it "is ready to parse" do
-    expect(@parser.text).to_not be_nil
-    expect(@parser).to_not be_parsed
-  end
-
-  it "does not error when parsing" do
-    @parser.parse!
-    expect(@parser).to be_parsed
-  end
-
-  it "contains the proper data" do
-    @parser.parse!
-
-    expect(@parser.result.EngineDict.Editor.Text).to eq("Make a change and save.")
-    expect(@parser.result.ResourceDict.FontSet.first.Name).to eq("HelveticaNeue-Light")
-  end
-end