psd 3.3.3 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bda3103c40e7402bbf6caa70f3c9087088f47a5
-  data.tar.gz: e8bf4ebb6539390b2c64820392a35f01a3d3e730
+  metadata.gz: 3d022d5b521a64f3578c5755ba18d5bbc1f419ea
+  data.tar.gz: 3f72cd4899c112f55171eab1f96629e354d1eb9f
 SHA512:
-  metadata.gz: 0c337cdc436e76d11c84ebee5e87070c101ebd49bb8f143bf25767de5aef5be26839874acb38ac00368a763de7830bdb9c640ecb6be9a92145f7920f1248e586
-  data.tar.gz: 73b3e7a6072a3e6e3dcc3a1fb84373523d46553250a2dd343efedde77e34d9c307e4e383b857020a91b4a82e41d542adac7c76c891b6a4525c9fa1251f47fe24
+  metadata.gz: ed4a582c87fd81ee3a6a19d487cea8fa6e388740e16097e185268581af549d032c125b3d66fde8dfe52ec0af2f4d67c57bce0990030e3eb7b8f06b18b1b62c51
+  data.tar.gz: dce119bc89f527695fbd46229fbd82447d23722b60f19002afb0984bb10e3c7aee992ba301ad7f53cdd15ea4ad6277e47a2842ec21ca9bc17941e5ff4d561475

data/lib/psd/header.rb

@@ -59,6 +59,10 @@ class PSD
       MODES[@mode]
     end
 
+    def big?
+      version == 2
+    end
+
     def rgb?
       mode == 3
     end
@@ -67,4 +71,4 @@ class PSD
       mode == 4
     end
   end
-end
+end

data/lib/psd/image_formats/layer_rle.rb

@@ -7,7 +7,7 @@ class PSD
       def parse_byte_counts!
         byte_counts = []
         height.times do
-          byte_counts << @file.read_short
+          byte_counts << (@header.big? ? @file.read_int : @file.read_short)
         end
 
         return byte_counts
@@ -21,4 +21,4 @@ class PSD
       end
     end
   end
-end
+end

data/lib/psd/layer/info.rb

@@ -51,6 +51,8 @@ class PSD
         gradient_fill: GradientFill
       }.freeze
 
+      BIG_LAYER_INFO_KEYS = %w{ LMsk Lr16 Lr32 Layr Mt16 Mt32 Mtrn Alph FMsk lnk2 FEid FXid PxSD }
+
       attr_reader :adjustments
       alias :info :adjustments
 
@@ -60,6 +62,14 @@ class PSD
 
       private
 
+      def parse_additional_layer_info_length(key)
+        if @header.big? && BIG_LAYER_INFO_KEYS.include?(key)
+          Util.pad2 @file.read_longlong
+        else
+          Util.pad2 @file.read_int
+        end
+      end
+
       # This section is a bit tricky to parse because it represents all of the
       # extra data that describes this layer.
       def parse_layer_info
@@ -73,7 +83,7 @@ class PSD
           key = @file.read_string(4)
           @info_keys << key
 
-          length = Util.pad2 @file.read_int
+          length = parse_additional_layer_info_length(key)
           pos = @file.tell
 
           key_parseable = false

data/lib/psd/layer/position_and_channels.rb

@@ -21,7 +21,7 @@ class PSD
 
         @channels.times do
           channel_id = @file.read_short
-          channel_length = @file.read_int
+          channel_length = @header.big? ? @file.read_longlong : @file.read_int
 
           @channels_info << {id: channel_id, length: channel_length}
         end
@@ -40,4 +40,4 @@ class PSD
       end
     end
   end
-end
+end

data/lib/psd/layer_mask.rb

@@ -18,13 +18,14 @@ class PSD
     # Allows us to skip this section because it starts with the length of the section
     # stored as an integer.
     def skip
-      @file.seek @file.read_int, IO::SEEK_CUR
+      @file.seek parse_mask_size, IO::SEEK_CUR
       return self
     end
 
     # Parse this section, including all of the layers and folders.
     def parse
-      mask_size = @file.read_int
+      mask_size = parse_mask_size
+
       start_position = @file.tell
       finish = start_position + mask_size
 
@@ -49,8 +50,20 @@ class PSD
 
     private
 
+    def parse_mask_size
+      @header.big? ? @file.read_longlong : @file.read_int
+    end
+
+    def parse_layer_info_size
+      Util.pad2(@header.big? ? @file.read_longlong : @file.read_int)
+    end
+
+    def channel_information_length
+      @header.big? ? 10 : 6
+    end
+
     def parse_layers
-      layer_info_size = Util.pad2(@file.read_int)
+      layer_info_size = parse_layer_info_size
 
       if layer_info_size > 0
         layer_count = @file.read_short
@@ -60,7 +73,7 @@ class PSD
           @merged_alpha = true
         end
 
-        if layer_count * (18 + 6 * @header.channels) > layer_info_size
+        if layer_count * (18 + channel_information_length * @header.channels) > layer_info_size
           PSD.logger.error "Unlikely number of layers parsed: #{layer_count}"
         end
 

data/lib/psd/nodes/group.rb

@@ -21,6 +21,7 @@ class PSD
       def to_hash
         super.merge({
           type: :group,
+          open: section_divider ? section_divider.layer_type == 'open folder' : false,
           children: children.map(&:to_hash)
         })
       end

data/lib/psd/version.rb

@@ -1,3 +1,3 @@
 class PSD
-  VERSION = "3.3.3"
+  VERSION = "3.4.0"
 end

data/spec/psb_parsing_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+describe 'Photoshop Big parsing' do
+  before(:each) do
+    @psd = PSD.new('spec/files/example.psb')
+  end
+
+  it 'parses without error' do
+    @psd.parse!
+    expect(@psd).to be_parsed
+  end
+
+  describe 'Header' do
+    before(:each) do
+      @psd.parse!
+    end
+
+    it 'should contain data' do
+      expect(@psd.header).not_to be_nil
+    end
+
+    it 'should be the proper version' do
+      expect(@psd.header.version).to eq(2)
+    end
+  end
+
+  describe 'Layer Mask' do
+    before(:each) do
+      @psd.parse!
+    end
+
+    it 'contains data' do
+      expect(@psd.layer_mask).to_not be_nil
+      expect(@psd.layer_mask).to be_an_instance_of(PSD::LayerMask)
+    end
+
+    it 'contains layers' do
+      expect(@psd.layer_mask.layers.size).to be > 0
+    end
+  end
+
+  describe 'Layers' do
+    before(:each) do
+      @psd.parse!
+    end
+
+    it 'contains each layer' do
+      expect(@psd.layer_mask.layers.size).to eq(2)
+      expect(@psd.layers).to be @psd.layer_mask.layers
+      @psd.layers.each { |l| expect(l).to be_an_instance_of(PSD::Layer) }
+    end
+
+    it 'shows the proper layer names' do
+      expect(@psd.layers.map(&:name)).to match_array(['summer', 'haze'])
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psd
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.4.0
 platform: ruby
 authors:
 - Ryan LeFevre
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -234,6 +234,7 @@ files:
 - spec/files/blendmodes.psd
 - spec/files/empty-layer-subgroups.psd
 - spec/files/empty-layer.psd
+- spec/files/example.psb
 - spec/files/example.psd
 - spec/files/guides.psd
 - spec/files/locked.psd
@@ -249,6 +250,7 @@ files:
 - 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
@@ -273,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: General purpose library for parsing Photoshop files
@@ -282,6 +284,7 @@ test_files:
 - spec/files/blendmodes.psd
 - spec/files/empty-layer-subgroups.psd
 - spec/files/empty-layer.psd
+- spec/files/example.psb
 - spec/files/example.psd
 - spec/files/guides.psd
 - spec/files/locked.psd
@@ -297,6 +300,7 @@ test_files:
 - 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