psd 3.1.3 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f50b617c54533215a7298c60bd67cf41a822b9b4
-  data.tar.gz: 5e460352673f2a562d1539ef354297a776431beb
+  metadata.gz: eb7572d17b8e7e05b8b8b6843c83a22762494919
+  data.tar.gz: 6a818b7de688fb558af6beebebf08c09c302b2df
 SHA512:
-  metadata.gz: 48fb4c174e1faace5c98f63f5a5ed584a4a459c553d7c284efa1e15b22bfdbc5e28bfd93dac16d4e9a1f7c47dba1dc3f40e05d9c514e1045ccd90590d38f39d3
-  data.tar.gz: 79ebfea952eb57031c6cc0d57e803728c20cb107597a2df578261dcf677708d5a998701039ef9a4032aad374a556ce33a2dc816dbf64ab17c9ec5756cfa96f70
+  metadata.gz: 0d91325e567d009ced2d66206c893ec04685ce4c10ed59353f6aba0487bf8934e32af53937f81e1aa4559a92672fa1948059f69fdb57a33194f0cdaeb2320695
+  data.tar.gz: 4ed05ad62147b7b47ca313288edfcce737e7da0dc5470f25b01d9b539494f1842c6f7d51ac1b4d4431c4d45eebf0e2353a6b79a97eb02017c6134c10d24169b8

data/lib/psd/layer/info.rb

@@ -23,7 +23,8 @@ class PSD
         vector_mask: VectorMask,
         vector_origination: VectorOrigination,
         vector_stroke: VectorStroke,
-        vector_stroke_content: VectorStrokeContent
+        vector_stroke_content: VectorStrokeContent,
+        gradient_fill: GradientFill
       }.freeze
 
       attr_reader :adjustments
@@ -59,7 +60,7 @@ class PSD
 
             i = info.new(self, length)
             @adjustments[name] = LazyExecute.new(i, @file).now(:skip).later(:parse)
-              
+
             key_parseable = true and break
           end
 
@@ -73,4 +74,4 @@ class PSD
       end
     end
   end
-end
+end

data/lib/psd/layer_info/gradient_fill.rb

@@ -0,0 +1,14 @@
+require 'psd/layer_info'
+
+class PSD
+  class GradientFill < LayerInfo
+    def self.should_parse?(key)
+      key == 'GdFl'
+    end
+
+    def parse
+      @file.seek 4, IO::SEEK_CUR
+      @data = Descriptor.new(@file).parse
+    end
+  end
+end

data/lib/psd/layer_mask.rb

@@ -12,7 +12,7 @@ class PSD
 
       @layers = []
       @merged_alpha = false
-      @global_mask = nil      
+      @global_mask = nil
     end
 
     # Allows us to skip this section because it starts with the length of the section
@@ -25,10 +25,29 @@ class PSD
     # Parse this section, including all of the layers and folders.
     def parse
       mask_size = @file.read_int
-      finish = @file.tell + mask_size
+      start_position = @file.tell
+      finish = start_position + mask_size
 
       return self if mask_size <= 0
 
+      parse_layers
+      parse_global_mask
+
+      consumed_bytes = @file.tell - start_position
+      parse_layer_tagged_blocks(mask_size - consumed_bytes)
+
+      # Layers are parsed in reverse order
+      layers.reverse!
+
+      # Ensure we're at the end of this section
+      @file.seek finish
+
+      self
+    end
+
+    private
+
+    def parse_layers
       layer_info_size = Util.pad2(@file.read_int)
 
       if layer_info_size > 0
@@ -52,59 +71,43 @@ class PSD
           layer.parse_channel_image(@header)
         end
       end
-
-      # Layers are parsed in reverse order
-      layers.reverse!
-      group_layers
-
-      parse_global_mask
-
-      # Ensure we're at the end of this section
-      @file.seek finish
-
-      return self
     end
 
-    # Export the mask and all the children layers to a file.
-    def export(outfile)
-      if @layers.size == 0
-        # No data, just read whatever's here.
-        return outfile.write @file.read(@section_end[:all] - start_of_section)
+    def parse_layer_tagged_blocks(remaining_length)
+      end_pos = @file.tell + remaining_length
+
+      while @file.tell < end_pos
+        res = parse_additional_layer_info_block
+        break unless res
       end
+    end
 
-      # Read the initial mask data since it won't change
-      outfile.write @file.read(@layer_section_start - @file.tell)
+    def parse_additional_layer_info_block
+      sig = @file.read_string(4)
 
-      @layers.reverse.each do |layer|
-        layer.export(outfile)
+      unless %w(8BIM 8B64).include?(sig)
+        @file.seek(-4, IO::SEEK_CUR)
+        return false
       end
 
-      outfile.write @file.read(end_of_section - @file.tell)
-    end
-
-    private
+      key = @file.read_string(4)
 
-    def group_layers
-      group_layer = nil
-      layers.each do |layer|
-        if layer.folder?
-          group_layer = layer
-        elsif layer.folder_end?
-          group_layer = nil
-        else
-          layer.group_layer = layer
-        end
+      if %w(Lr16 Lr32 Mt16).include?(key)
+        parse_layers
+        return true
       end
+
+      false
     end
 
     def parse_global_mask
       length = @file.read_int
-      
+
       PSD.logger.debug "Global Mask: length = #{length}"
       return if length <= 0
 
       mask_end = @file.tell + length
-      
+
       @global_mask = {}
       @global_mask[:overlay_color_space] = @file.read_short
       @global_mask[:color_components] = 4.times.map { |i| @file.read_short >> 8 }
@@ -119,4 +122,4 @@ class PSD
       @file.seek mask_end
     end
   end
-end
+end

data/lib/psd/nodes/build_preview.rb

@@ -6,7 +6,7 @@
       end
 
       def to_png
-        @png ||= renderer.to_png
+        @png ||= renderer(render_hidden: self.layer?).to_png
       end
 
       def save_as_png(output)

data/lib/psd/nodes/root.rb

@@ -4,10 +4,6 @@ class PSD
   module Node
     # Represents the root node of a Photoshop document
     class Root < PSD::Node::Base
-      include Ancestry
-      include Search
-      include BuildPreview
-
       attr_accessor :children
       attr_reader :psd
 

data/lib/psd/renderer.rb

@@ -7,6 +7,7 @@ class PSD
     def initialize(node, opts = {})
       @root_node = node
       @opts = opts
+      @render_hidden = opts.delete(:render_hidden)
 
       # Our canvas always starts as the full document size because
       # all measurements are relative to this size. We can later crop
@@ -35,8 +36,10 @@ class PSD
     def execute_pipeline
       PSD.logger.debug "Executing pipeline on #{active_node.debug_name}"
       children.reverse.each do |child|
-        # We skip over hidden nodes.
-        next unless child.visible?
+        # We skip over hidden nodes unless explicitly set otherwise.
+        # If rendering a single PSD::Node::Layer, this is automatically
+        # set so that hidden layers will render.
+        next if !@render_hidden && !child.visible?
 
         if child.group?
           push_node(child)

data/lib/psd/version.rb

@@ -1,3 +1,3 @@
 class PSD
-  VERSION = "3.1.3"
+  VERSION = "3.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psd
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.4
 platform: ruby
 authors:
 - Ryan LeFevre
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -186,6 +186,7 @@ files:
 - lib/psd/layer_info/blend_clipping_elements.rb
 - lib/psd/layer_info/blend_interior_elements.rb
 - lib/psd/layer_info/fill_opacity.rb
+- lib/psd/layer_info/gradient_fill.rb
 - lib/psd/layer_info/layer_group.rb
 - lib/psd/layer_info/layer_id.rb
 - lib/psd/layer_info/layer_name_source.rb
@@ -282,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: General purpose library for parsing Photoshop files