psd 3.8.0 → 3.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 43595c7e888f62819c37d2d678a3c14f8091333e
-  data.tar.gz: d2c512bdc4e9f0803bec3c8451494e9778b0e34d
+SHA256:
+  metadata.gz: 1199316b606804a9a2c3812a1fcddc5e62d4171693ad201475ce833774bff52f
+  data.tar.gz: de991a2e3bb3c6eae0998d31baff59223510b6c07b0baebd41cea6e485656cab
 SHA512:
-  metadata.gz: f9a5fdc682dbacd83626a68802abd8b485ef7257cf7b6e487851fcb94e56aaa0dfba3ccc4fe2fec1e4810eae0d50a8b7218e9466633b73a686422b6289463f3d
-  data.tar.gz: 0ed23ff08f47f66251b3853e884d9f7e197358ad19d83175583be1d568f8a530923834d4693bbf4a8e4110457204a3c9eb5ad331d95504b51170f12742ba4344
+  metadata.gz: 3299a64c6b5b21dd38d844bea52ae6d42c1ddd864e8b9a9e0bdccc6690d0340beae15852c3c682d74ef1fe658813aff233c350b3daf2e9dad97cca8d228cc4e1
+  data.tar.gz: ad77e3095d489ad3799a61d95b35e37a72e48adb6fd76b89b0160cb425e4b87c23132b4a3c998c3179d1ad0c9a5910a8c88d4f7a16d6ffbe140a5d2c8d69dca4

data/lib/psd/path_record.rb

@@ -19,6 +19,7 @@ class PSD
       case @record_type
       when 0, 3 then read_path_record
       when 1, 2, 4, 5 then read_bezier_point
+      when 6 then read_path_fill_rule_record
       when 7 then read_clipboard_record
       when 8 then read_initial_fill
       else @file.seek(24, IO::SEEK_CUR)
@@ -93,6 +94,10 @@ class PSD
       @leaving_horiz = @file.read_path_number
     end
 
+    def read_path_fill_rule_record
+      @file.seek(24, IO::SEEK_CUR)
+    end
+
     def read_clipboard_record
       @clipboard_top = @file.read_path_number
       @clipboard_left = @file.read_path_number
@@ -107,4 +112,4 @@ class PSD
       @file.seek(22, IO::SEEK_CUR)
     end
   end
-end
+end

data/lib/psd/resource_section.rb

@@ -2,9 +2,15 @@ class PSD
   class Resource
     module Section
       def self.factory(file, resource)
+        if path_resource?(resource)
+          section = Section::SavedPath.new(file, resource)
+          section.parse
+          return section.name
+        end
+
         Section.constants.each do |c|
           next if c == :Base
-          
+
           section = Section.const_get(c)
           next unless section.resource_id == resource.id
 
@@ -14,6 +20,10 @@ class PSD
 
         return nil
       end
+
+      def self.path_resource?(resource)
+        resource.id >= 2000 && resource.id <= 2997
+      end
     end
   end
-end
+end

data/lib/psd/resources.rb

@@ -7,7 +7,7 @@ class PSD
   class Resources
     attr_reader :resources
     alias :data :resources
-    
+
     def initialize(file)
       @file = file
       @resources = {}
@@ -47,6 +47,13 @@ class PSD
       end
     end
 
+    # Paths exist between resource ID 2000 and 2997
+    def saved_paths
+      @resources.
+        select { |id, r| id >= 2000 && id <= 2997 }.
+        map { |id, r| r }
+    end
+
     def by_type(id)
       @resources[@type_index[id]]
     end

data/lib/psd/resources/base.rb

@@ -26,5 +26,8 @@ end
 
 require 'psd/resources/guides'
 require 'psd/resources/layer_comps'
+require 'psd/resources/resolution_info'
+require 'psd/resources/saved_path'
 require 'psd/resources/slices'
+require 'psd/resources/work_path'
 require 'psd/resources/xmp_metadata'

data/lib/psd/resources/resolution_info.rb

@@ -0,0 +1,48 @@
+require 'psd/resources/base'
+
+class PSD
+  class Resource
+    module Section
+      class ResolutionInfo < Base
+        RES_UNIT_NAMES = %w(pixel/inch pixel/cm).freeze
+        UNIT_NAMES = %w(in cm pt picas columns).freeze
+
+        resource_id 1005
+        name :resolution_info
+
+        attr_reader :h_res, :h_res_unit, :width_unit
+        attr_reader :v_res, :v_res_unit, :height_unit
+
+        def parse
+          # 32-bit fixed-point number (16.16)
+          @h_res = @file.read_uint.to_f / (1 << 16)
+          @h_res_unit = @file.read_ushort
+          @width_unit = @file.read_ushort
+
+          # 32-bit fixed-point number (16.16)
+          @v_res = @file.read_uint.to_f / (1 << 16)
+          @v_res_unit = @file.read_ushort
+          @height_unit = @file.read_ushort
+
+          @resource.data = self
+        end
+
+        def h_res_unit_name
+          RES_UNIT_NAMES.fetch(h_res_unit - 1, 'unknown')
+        end
+
+        def v_res_unit_name
+          RES_UNIT_NAMES.fetch(v_res_unit - 1, 'unknown')
+        end
+
+        def width_unit_name
+          UNIT_NAMES.fetch(width_unit - 1, 'unknown')
+        end
+
+        def height_unit_name
+          UNIT_NAMES.fetch(height_unit - 1, 'unknown')
+        end
+      end
+    end
+  end
+end

data/lib/psd/resources/saved_path.rb

@@ -0,0 +1,19 @@
+require 'psd/resources/base'
+
+class PSD
+  class Resource
+    module Section
+      class SavedPath < Base
+        def parse
+          paths = []
+          record_count = @resource.size / 26
+          record_count.times do
+            paths << PathRecord.new(@file)
+          end
+
+          @resource.data = paths
+        end
+      end
+    end
+  end
+end

data/lib/psd/resources/work_path.rb

@@ -0,0 +1,22 @@
+require 'psd/resources/base'
+
+class PSD
+  class Resource
+    module Section
+      class WorkPath < Base
+        resource_id 1025
+        name :work_path
+
+        def parse
+          paths = []
+          record_count = @resource.size / 26
+          record_count.times do
+            paths << PathRecord.new(@file)
+          end
+
+          @resource.data = paths
+        end
+      end
+    end
+  end
+end

data/lib/psd/version.rb

@@ -1,3 +1,3 @@
 class PSD
-  VERSION = "3.8.0"
+  VERSION = "3.9.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psd
 version: !ruby/object:Gem::Version
-  version: 3.8.0
+  version: 3.9.0
 platform: ruby
 authors:
 - Ryan LeFevre
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -249,7 +249,10 @@ files:
 - lib/psd/resources/base.rb
 - lib/psd/resources/guides.rb
 - lib/psd/resources/layer_comps.rb
+- lib/psd/resources/resolution_info.rb
+- lib/psd/resources/saved_path.rb
 - lib/psd/resources/slices.rb
+- lib/psd/resources/work_path.rb
 - lib/psd/resources/xmp_metadata.rb
 - lib/psd/slice.rb
 - lib/psd/slices.rb
@@ -301,33 +304,33 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.7.0
 signing_key: 
 specification_version: 4
 summary: General purpose library for parsing Photoshop files
 test_files:
-- spec/files/alignment_modes.psd
-- spec/files/blendmodes.psd
-- spec/files/empty-layer-subgroups.psd
+- spec/spec_helper.rb
+- spec/psb_parsing_spec.rb
+- spec/slices_spec.rb
+- spec/guides_spec.rb
+- spec/parsing_spec.rb
+- spec/image_spec.rb
+- spec/lazy_execute_spec.rb
+- spec/locked_spec.rb
+- spec/text_spec.rb
+- spec/files/slices.psd
 - spec/files/empty-layer.psd
-- spec/files/example.psb
-- spec/files/example.psd
-- spec/files/guides.psd
-- spec/files/locked.psd
-- spec/files/one_layer.psd
 - spec/files/path.psd
 - spec/files/pixel.psd
+- spec/files/one_layer.psd
+- spec/files/alignment_modes.psd
+- spec/files/locked.psd
 - spec/files/simplest.psd
-- spec/files/slices.psd
+- spec/files/blendmodes.psd
+- spec/files/example.psd
 - spec/files/text.psd
-- spec/guides_spec.rb
+- spec/files/example.psb
+- spec/files/empty-layer-subgroups.psd
+- spec/files/guides.psd
 - spec/hierarchy_spec.rb
-- spec/image_spec.rb
-- spec/lazy_execute_spec.rb
-- spec/locked_spec.rb
-- spec/parsing_spec.rb
-- spec/psb_parsing_spec.rb
 - spec/psd_spec.rb
-- spec/slices_spec.rb
-- spec/spec_helper.rb
-- spec/text_spec.rb