psd 2.1.2 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62a564e222daa1c918ef3bdf9c2a4f99dfd59833
-  data.tar.gz: 93c28d4cba1c961cb28734da81f54e1617adcbdd
+  metadata.gz: e01eed6ed75e5db88c644ea838ff2f29d89c9df2
+  data.tar.gz: ca303780610167552c62d169a886595d71b55a6d
 SHA512:
-  metadata.gz: 5eb251154704e8172420d3aa1d97851f739f516dcda1d659349719933f354e7443e3a4cebad498084ccf475505e5f97fef0a16f5cf15b25c4bdc3264401b9c59
-  data.tar.gz: 7b4c1554a65b7f491f197839b2a99fe383e97c6b1f79ee0528374c919e11abbf3d26293c1b27fc11ca11098b64594651d820d4e9a88e192a4ef4182f0d922106
+  metadata.gz: f69ddfe1cf1ce6f9600151080928539f5529ae94fdbf0cb94c32bc7e4f0b6e2eef8058dc7af1cc9094202181bce10265a67c6fb850f182772aacbc48ca5ff3b5
+  data.tar.gz: cf3f1ae5c8a4c25eeaadc90e93f0d36b479d024fe7da33909a25f2b2b8d00c1ceb1d2d2fe058af67f106781400d29a7e35bdd7da57c7f6fdb4d50a2e35f4eb68

data/README.md

@@ -100,7 +100,7 @@ psd.tree.children_at_path("Version A/Matte")
 
 ### Layer Comps
 
-You can also filter nodes based on a layer comp. To generate a new tree consisting only of the layers that are enabled in a certain layer comp:
+You can also filter nodes based on a layer comp. To generate a new tree with layer visibility and position set according to the layer comp data:
 
 ``` ruby
 # Get information about all the available layer comps

data/lib/psd.rb

@@ -1,8 +1,9 @@
-require "bindata"
-require "psd/enginedata"
-require "chunky_png"
+require 'psd/enginedata'
+require 'chunky_png'
+# require "cairo"
 
-require_relative 'psd/section'
+require 'active_support/core_ext/module/delegation'
+require 'active_support/concern'
 
 dir_root = File.dirname(File.absolute_path(__FILE__)) + '/psd'
 [
@@ -23,7 +24,6 @@ end
 class PSD
   include Logger
   include Helpers
-  include NodeExporting
 
   attr_reader :file, :opts
   alias :options :opts
@@ -86,7 +86,9 @@ class PSD
   def header
     return @header if @header
 
-    @header = Header.read(@file)
+    @header = Header.new(@file)
+    @header.parse!
+
     PSD.logger.debug @header.inspect
   end
 

data/lib/psd/blend_mode.rb

@@ -1,14 +1,6 @@
 class PSD
-  # Describes the blend mode for a single layer or folder.
-  class BlendMode < BinData::Record
-    endian  :big
-
-    string  :sig, read_length: 4
-    string  :blend_key, read_length: 4, trim_value: true
-    uint8   :opacity
-    uint8   :clipping
-    bit8    :flags
-    skip    length: 1
+  class BlendMode
+    attr_reader :blend_key, :opacity, :clipping
 
     # All of the blend modes are stored in the PSD file with a specific key.
     # This is the mapping of that key to its readable name.
@@ -24,57 +16,73 @@ class PSD
       scrn: 'screen',
       diss: 'dissolve',
       over: 'overlay',
-      hLit: 'hard light',
-      sLit: 'soft light',
+      hLit: 'hard_light',
+      sLit: 'soft_light',
       diff: 'difference',
       smud: 'exclusion',
-      div:  'color dodge',
-      idiv: 'color burn',
-      lbrn: 'linear burn',
-      lddg: 'linear dodge',
-      vLit: 'vivid light',
-      lLit: 'linear light',
-      pLit: 'pin light',
-      hMix: 'hard mix',
+      div:  'color_dodge',
+      idiv: 'color_burn',
+      lbrn: 'linear_burn',
+      lddg: 'linear_dodge',
+      vLit: 'vivid_light',
+      lLit: 'linear_light',
+      pLit: 'pin_light',
+      hMix: 'hard_mix',
       pass: 'passthru',
-      dkCl: 'darker color',
-      lgCl: 'lighter color',
+      dkCl: 'darker_color',
+      lgCl: 'lighter_color',
       fsub: 'subtract',
       fdiv: 'divide'
-    }
+    }.freeze
 
-    # Get the readable name for this blend mode.
-    def mode
-      BLEND_MODES[blend_key.strip.to_sym]
+    def initialize(file)
+      @file = file
+      
+      @blend_key = nil
+      @opacity = nil
+      @clipping = nil
+      @flags = nil
     end
 
-    # Set the blend mode with the readable name.
-    def mode=(val)
-      blend_key = BLEND_MODES.invert[val.strip.downcase]
+    def parse!
+      @file.seek 4, IO::SEEK_CUR
+
+      @blend_key = @file.read_string(4).strip
+      @opacity = @file.read_byte
+      @clipping = @file.read_byte
+      @flags = @file.read_byte
+
+      @file.seek 1, IO::SEEK_CUR
     end
 
-    # Opacity is stored as an integer between 0-255. This converts the opacity
-    # to a percentage value to match the Photoshop interface.
+    def mode
+      BLEND_MODES[@blend_key.to_sym]
+    end
+    alias_method :blending_mode, :mode
+
     def opacity_percentage
-      opacity * 100 / 255
+      @opacity_percentage ||= @opacity * 100 / 255
+    end
+
+    def clipped?
+      @clipping == 1
     end
 
     def transparency_protected
-      flags & 0x01
+      @flags & 0x01
     end
 
-    # Is this layer/folder visible?
     def visible
-      !((flags & (0x01 << 1)) > 0)
+      !((@flags & (0x01 << 1)) > 0)
     end
 
     def obsolete
-      (flags & (0x01 << 2)) > 0
+      (@flags & (0x01 << 2)) > 0
     end
 
     def pixel_data_irrelevant
-      return nil unless (flags & (0x01 << 3)) > 0
-      (flags & (0x01 << 4)) > 0
+      return nil unless (@flags & (0x01 << 3)) > 0
+      (@flags & (0x01 << 4)) > 0
     end
   end
 end

data/lib/psd/channel_image.rb

@@ -1,4 +1,4 @@
-require_relative 'image'
+require 'psd/image'
 
 class PSD
   # Represents an image for a single layer, which differs slightly in format from
@@ -18,7 +18,7 @@ class PSD
       super(file, header)
 
       @channels_info = @layer.channels_info
-      @has_mask = @layer.mask.width * @layer.mask.height > 0
+      @has_mask = @channels_info.any? { |chan| chan[:id] == -2 }
       @opacity = @layer.opacity / 255.0
       @mask_data = []
     end
@@ -47,7 +47,7 @@ class PSD
 
         # If the ID of this current channel is -2, then we assume the dimensions
         # of the layer mask.
-        if ch_info[:id] == -2
+        if ch_info[:id] < -1
           @width = @layer.mask.width
           @height = @layer.mask.height
         else
@@ -97,8 +97,12 @@ class PSD
     def parse_user_mask
       return unless has_mask?
 
-      channel = @channels_info.select { |c| c[:id] == -2 }.first
-      index = @channels_info.index { |c| c[:id] == -2 }
+      mask_id = -2
+
+      PSD.logger.debug "Using mask in channel #{mask_id}"
+
+      channel = @channels_info.select { |c| c[:id] == mask_id }.first
+      index = @channels_info.index { |c| c[:id] == mask_id }
       return if channel.nil?
 
       start = @channel_length * index

data/lib/psd/descriptor.rb

@@ -84,13 +84,27 @@ class PSD
     def parse_identifier; @file.read_int; end
     def parse_index; @file.read_int; end
     def parse_offset; @file.read_int; end
-    def parse_property; parse_id; end
+    
+    def parse_property
+      {
+        class: parse_class,
+        id: parse_id
+      }
+    end
 
-    # Discard the first ID becasue it's the same as the key
-    # parsed from the Key/Item. Also, YOLO.
     def parse_enum
-      parse_id
-      parse_id
+      {
+        type: parse_id,
+        value: parse_id
+      }
+    end
+
+    def parse_enum_reference
+      {
+        class: parse_class,
+        type: parse_id,
+        value: parse_id
+      }
     end
 
     def parse_alias
@@ -149,18 +163,27 @@ class PSD
     end
 
     def parse_reference
-      form = @file.read_string(4)
-      klass = parse_class
-
-      case form
-      when 'Clss' then nil
-      when 'Enmr' then parse_enum
-      when 'Idnt' then parse_identifier
-      when 'indx' then parse_index
-      when 'name' then @file.read_unicode_string
-      when 'rele' then parse_offset
-      when 'prop' then parse_property
+      num_items = @file.read_int
+      items = []
+      
+      num_items.times do
+        type = @file.read_string(4)
+        PSD.logger.debug "Reference type = #{type}"
+
+        value = case type
+        when 'prop' then parse_property
+        when 'Clss' then parse_class
+        when 'Enmr' then parse_enum_reference
+        when 'Idnt' then parse_identifier
+        when 'indx' then parse_index
+        when 'name' then @file.read_unicode_string
+        when 'rele' then parse_offset
+        end
+
+        items << {type: type, value: value}
       end
+
+      items
     end
 
     def parse_unit_double

data/lib/psd/header.rb

@@ -1,22 +1,6 @@
 class PSD
-  # Describes the Header for the PSD file, which is the first section of the file.
-  class Header < BinData::Record
-    endian :big
-
-    string  :sig, read_length: 4
-    uint16  :version
-
-    # Reserved bytes
-    skip    length: 6
-
-    uint16  :channels
-    uint32  :rows
-    uint32  :cols
-    uint16  :depth
-    uint16  :mode
-
-    uint32  :color_data_len
-    skip    length: :color_data_len
+  class Header
+    attr_reader :sig, :version, :channels, :rows, :cols, :depth, :mode
 
     # All of the color modes are stored internally as a short from 0-15.
     # This is a mapping of that value to a human-readable name.
@@ -37,25 +21,42 @@ class PSD
       'CMYK64',
       'DeepMultichannel',
       'Duotone16'
-    ]
+    ].freeze
 
-    # Get the human-readable color mode name.
-    def mode_name
-      if mode >= 0 && mode <= 15
-        MODES[mode]
-      else
-        "(#{mode})"
-      end
+    alias_method :width, :cols
+    alias_method :height, :rows
+
+    def initialize(file)
+      @file = file
+
+      @sig = nil
+      @version = nil
+      @channels = nil
+      @rows = nil
+      @cols = nil
+      @depth = nil
+      @mode = nil
     end
 
-    # Width of the entire document in pixels.
-    def width
-      cols
+    def parse!
+      @sig = @file.read_string(4)
+      @version = @file.read_ushort
+
+      # Reserved bytes, must be 0
+      @file.seek 6, IO::SEEK_CUR
+
+      @channels = @file.read_ushort
+      @rows = @file.read_uint
+      @cols = @file.read_uint
+      @depth = @file.read_ushort
+      @mode = @file.read_ushort
+
+      color_data_len = @file.read_uint
+      @file.seek color_data_len, IO::SEEK_CUR
     end
 
-    # Height of the entire document in pixels.
-    def height
-      rows
+    def mode_name
+      MODES[@mode]
     end
 
     def rgb?

data/lib/psd/image_formats/rle.rb

@@ -35,24 +35,18 @@ class PSD
           finish = @file.tell + byte_count
 
           while @file.tell < finish
-            len = @file.read(1).bytes.to_a[0]
+            len = @file.read_byte
 
             if len < 128
               len += 1
-              (@chan_pos...@chan_pos+len).each do |k|
-                @channel_data[k] = @file.read(1).bytes.to_a[0]
-              end
-
+              @channel_data.insert @chan_pos, *@file.read(len).bytes.to_a
               @chan_pos += len
             elsif len > 128
               len ^= 0xff
               len += 2
 
-              val = @file.read(1).bytes.to_a[0]
-              (@chan_pos...@chan_pos+len).each do |k|
-                @channel_data[k] = val
-              end
-
+              val = @file.read(1).bytes.to_a
+              @channel_data.insert @chan_pos, *(val * len) 
               @chan_pos += len
             end
           end

data/lib/psd/image_modes/rgb.rb

@@ -7,16 +7,16 @@ class PSD
       def combine_rgb_channel
         PSD.logger.debug "Beginning RGB processing"
 
+        rgb_channels = @channels_info.map { |ch| ch[:id] }.reject { |ch| ch < -1 }
+
         (0...@num_pixels).step(pixel_step) do |i|
           r = g = b = 0
           a = 255
 
-          @channels_info.each_with_index do |chan, index|
-            next if chan[:id] == -2
-            
+          rgb_channels.each_with_index do |chan, index|
             val = @channel_data[i + (@channel_length * index)]
 
-            case chan[:id]
+            case chan
             when -1 then  a = val
             when 0 then   r = val
             when 1 then   g = val

data/lib/psd/layer.rb

@@ -2,17 +2,16 @@ class PSD
   # Represents a single layer and all of the data associated with
   # that layer.
   class Layer
-    include Section
     include BlendModes
     include BlendingRanges
     include ChannelImage
     include Exporting
-    include Helpers
     include Info
     include Mask
     include Name
     include PathComponents
     include PositionAndChannels
+    include Helpers
 
     attr_reader :id, :info_keys, :header
     attr_accessor :group_layer, :node, :file
@@ -29,9 +28,6 @@ class PSD
       @blend_mode = {}
       @group_layer = nil
 
-      @blending_mode = 'normal'
-      @opacity = 255
-
       # Just used for tracking which layer adjustments we're parsing.
       # Not essential.
       @info_keys = []
@@ -39,8 +35,6 @@ class PSD
 
     # Parse the layer and all of it's sub-sections.
     def parse(index=nil)
-      start_section
-
       @id = index
 
       parse_position_and_channels
@@ -58,7 +52,6 @@ class PSD
 
       @file.seek @layer_end # Skip over any filler zeros
 
-      end_section
       return self
     end
 
@@ -66,12 +59,5 @@ class PSD
     def [](val)
       self.send(val)
     end
-
-    # We delegate all missing method calls to the extra layer info to make it easier
-    # to access that data.
-    def method_missing(method, *args, &block)
-      return @adjustments[method] if @adjustments.has_key?(method)
-      super
-    end
   end
 end