psd 2.1.2 → 3.9.0

data/lib/psd/layer/info/exposure.rb

@@ -0,0 +1,20 @@
+require 'psd/layer_info'
+
+class PSD
+  class Exposure < LayerInfo
+    def self.should_parse?(key)
+      key == 'expA'
+    end
+
+    attr_reader :exposure, :offset, :gamma
+
+    def parse
+      @file.seek 2, IO::SEEK_CUR
+
+      # Why this shit is big endian is beyond me. Thanks Adobe.
+      @exposure = @file.read(4).unpack('g')[0]
+      @offset = @file.read(4).unpack('g')[0]
+      @gamma = @file.read(4).unpack('g')[0]
+    end
+  end
+end

data/lib/psd/{layer_info → layer/info}/fill_opacity.rb

@@ -1,8 +1,10 @@
-require_relative '../layer_info'
+require 'psd/layer_info'
 
 class PSD
   class FillOpacity < LayerInfo
-    @key = 'iOpa'
+    def self.should_parse?(key)
+      key == 'iOpa'
+    end
 
     attr_reader :value
 

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/info/gradient_map.rb

@@ -0,0 +1,69 @@
+require 'psd/layer_info'
+
+class PSD
+  class GradientMap < LayerInfo
+    def self.should_parse?(key)
+      key == 'grdm'
+    end
+
+    attr_reader :reverse, :dither, :name, :color_stops, :transparency_stops,
+                :interpolation, :mode, :random_seed, :showing_transparency, :using_vector_color,
+                :roughness_factor, :color_model, :minimum_color, :maximum_color
+
+    def parse
+      # Version
+      @file.seek 2, IO::SEEK_CUR
+
+      @reverse = @file.read_boolean
+      @dither = @file.read_boolean
+
+      @name = @file.read_unicode_string
+
+      color_stops = @file.read_short
+      @color_stops = color_stops.times.map do
+        color = {
+          location: @file.read_int,
+          midpoint: @file.read_int,
+          color: @file.read_space_color
+        }
+
+        # Mystery padding
+        @file.seek 2, IO::SEEK_CUR
+        color
+      end
+
+      transparency_stops = @file.read_short
+      @transparency_stops = transparency_stops.times.map do
+        {
+          location: @file.read_int,
+          midpoint: @file.read_int,
+          opacity: @file.read_short
+        }
+      end
+
+      expansion_count = @file.read_short
+      if expansion_count > 0
+        @interpolation = @file.read_short
+        length = @file.read_short
+        if length >= 32
+          @mode = @file.read_short
+          @random_seed = @file.read_int
+          @showing_transparency = @file.read_short > 0
+          @using_vector_color = @file.read_short > 0
+          @roughness_factor = @file.read_int
+          
+          @color_model = @file.read_short
+          @minimum_color = 4.times.map do
+            @file.read_short >> 8
+          end
+
+          @maximum_color = 4.times.map do
+            @file.read_short >> 8
+          end
+        end
+      end
+
+      @file.seek 2, IO::SEEK_CUR
+    end
+  end
+end

data/lib/psd/layer/info/hue_saturation.rb

@@ -0,0 +1,41 @@
+require 'psd/layer_info'
+
+class PSD
+  class HueSaturation < LayerInfo
+    def self.should_parse?(key)
+      key == 'hue2'
+    end
+
+    attr_reader :type, :colorization, :master, :range_values, :setting_values
+
+    def parse
+      # Version
+      @file.seek 2, IO::SEEK_CUR
+
+      @type = @file.read_byte == 0 ? :hue : :colorization
+
+      # Padding byte
+      @file.seek 1, IO::SEEK_CUR
+
+      @colorization = {
+        hue: @file.read_short,
+        saturation: @file.read_short,
+        lightness: @file.read_short
+      }
+
+      @master = {
+        hue: @file.read_short,
+        saturation: @file.read_short,
+        lightness: @file.read_short
+      }
+
+      @range_values = []
+      @setting_values = []
+
+      6.times do
+        @range_values << 4.times.map { @file.read_short }
+        @setting_values << 3.times.map { @file.read_short }
+      end
+    end
+  end
+end

data/lib/psd/layer/info/invert.rb

@@ -0,0 +1,17 @@
+require 'psd/layer_info'
+
+class PSD
+  class Invert < LayerInfo
+    def self.should_parse?(key)
+      key == 'nvrt'
+    end
+
+    attr_reader :inverted
+
+    def parse
+      # There is no data. The presence of this info block is
+      # all that's provided.
+      @inverted = true
+    end
+  end
+end

data/lib/psd/layer/info/knockout.rb

@@ -0,0 +1,22 @@
+require 'psd/layer_info'
+
+class PSD
+  class Knockout < LayerInfo
+    def self.should_parse?(key)
+      key == 'knko'
+    end
+
+    MODES = [:shallow, :deep]
+
+    attr_reader :enabled, :mode
+
+    def parse
+      val = @file.read_byte
+
+      @enabled = val > 0
+      @mode = MODES[val - 1]
+
+      @file.seek 3, IO::SEEK_CUR
+    end
+  end
+end

data/lib/psd/layer/info/layer_effects.rb

@@ -0,0 +1,16 @@
+require 'psd/layer_info'
+
+class PSD
+  class LayerEffects < LayerInfo
+    def self.should_parse?(key)
+      key == 'lfxs'
+    end
+
+    def parse
+      version = @file.read_int
+      descriptor_version = @file.read_int
+
+      @data = Descriptor.new(@file).parse
+    end
+  end
+end

data/lib/psd/{layer_info → layer/info}/layer_group.rb

@@ -1,4 +1,4 @@
-require_relative '../layer_info'
+require 'psd/layer_info'
 
 class PSD
   # Not 100% sure what the purpose of this key is, but it seems to exist
@@ -7,7 +7,9 @@ class PSD
   #
   # See https://github.com/layervault/psd.rb/issues/38
   class NestedLayerDivider < LayerInfo
-    @key = 'lsdk'
+    def self.should_parse?(key)
+      key == 'lsdk'
+    end
 
     attr_reader :is_folder, :is_hidden
 

data/lib/psd/{layer_info → layer/info}/layer_id.rb

@@ -1,8 +1,10 @@
-require_relative '../layer_info'
+require 'psd/layer_info'
 
 class PSD
   class LayerID < LayerInfo
-    @key = 'lyid'
+    def self.should_parse?(key)
+      key == 'lyid'
+    end
 
     attr_reader :id
 

data/lib/psd/layer/info/layer_mask_as_global_mask.rb

@@ -0,0 +1,16 @@
+require 'psd/layer_info'
+
+class PSD
+  class LayerMaskAsGlobalMask < LayerInfo
+    def self.should_parse?(key)
+      key == 'lmgm'
+    end
+
+    attr_reader :enabled
+
+    def parse
+      @enabled = @file.read_boolean
+      @file.seek 3, IO::SEEK_CUR
+    end
+  end
+end

data/lib/psd/{layer_info → layer/info}/layer_name_source.rb

@@ -1,8 +1,10 @@
-require_relative '../layer_info'
+require 'psd/layer_info'
 
 class PSD
   class LayerNameSource < LayerInfo
-    @key = 'lnsr'
+    def self.should_parse?(key)
+      key == 'lnsr'
+    end
     
     attr_reader :id
     

data/lib/psd/{layer_info → layer/info}/layer_section_divider.rb

@@ -1,8 +1,10 @@
-require_relative '../layer_info'
+require 'psd/layer_info'
 
 class PSD
   class LayerSectionDivider < LayerInfo
-    @key = 'lsct'
+    def self.should_parse?(key)
+      key == 'lsct'
+    end
 
     attr_reader :layer_type, :is_folder, :is_hidden, :blend_mode, :sub_type
 

data/lib/psd/{layer_info → layer/info}/legacy_typetool.rb

@@ -1,9 +1,11 @@
-require_relative '../layer_info'
-require_relative 'typetool'
+require 'psd/layer_info'
+require 'psd/layer/info/typetool'
 
 class PSD
   class LegacyTypeTool < TypeTool
-    @key = 'tySh'
+    def self.should_parse?(key)
+      key == 'tySh'
+    end
     
     def parse      
       version = @file.read_short
@@ -85,4 +87,4 @@ class PSD
       ""
     end
   end
-end
+end

data/lib/psd/layer/info/levels.rb

@@ -0,0 +1,48 @@
+require 'psd/layer_info'
+
+class PSD
+  class Levels < LayerInfo
+    def self.should_parse?(key)
+      key == 'levl'
+    end
+
+    attr_reader :records
+
+    def parse
+      @file.seek 2, IO::SEEK_CUR
+
+      @records = 29.times.map do
+        {
+          input_floor: @file.read_short,
+          input_ceiling: @file.read_short,
+          output_floor: @file.read_short,
+          output_ceiling: @file.read_short,
+          gamma: @file.read_short / 100.0,
+        }
+      end
+
+      # Photoshop CS (8.0) additional information
+      if @file.tell < @section_end - 4
+        tag = @file.read_string(4)
+        raise 'Extra levels key error' if tag != 'Lvls'
+
+        @file.seek 2, IO::SEEK_CUR
+
+        # Count of total level record structures. Subtract the legacy number of
+        # level record structures, 29, to determine how many are remaining in
+        # the file for reading.
+        extra_levels = @file.read_short - 29
+
+        extra_levels.times do
+          @records << {
+            input_floor: @file.read_short,
+            input_ceiling: @file.read_short,
+            output_floor: @file.read_short,
+            output_ceiling: @file.read_short,
+            gamma: @file.read_short / 100.0
+          }
+        end
+      end
+    end
+  end
+end

data/lib/psd/{layer_info → layer/info}/locked.rb

@@ -1,8 +1,10 @@
-require_relative '../layer_info'
+require 'psd/layer_info'
 
 class PSD
   class Locked < LayerInfo
-    @key = 'lspf'
+    def self.should_parse?(key)
+      key == 'lspf'
+    end
 
     attr_reader :all_locked, :transparency_locked, :composite_locked, :position_locked
 

data/lib/psd/{layer_info → layer/info}/metadata_setting.rb

@@ -1,8 +1,10 @@
-require_relative '../layer_info'
+require 'psd/layer_info'
 
 class PSD
   class MetadataSetting < LayerInfo
-    @key = 'shmd'
+    def self.should_parse?(key)
+      key == 'shmd'
+    end
 
     def parse
       count = @file.read_int
@@ -32,4 +34,4 @@ class PSD
       @data[:layer_comp] = Descriptor.new(@file).parse
     end
   end
-end
+end

data/lib/psd/{layer_info → layer/info}/object_effects.rb

@@ -1,16 +1,16 @@
-require_relative '../layer_info'
+require 'psd/layer_info'
 
 class PSD
   class ObjectEffects < LayerInfo
-    @key = 'lfx2'
+    def self.should_parse?(key)
+      key == 'lfx2'
+    end
     
     def parse
       version = @file.read_int
       descriptor_version = @file.read_int
 
       @data = Descriptor.new(@file).parse
-
-      return self
     end
   end
-end
+end

data/lib/psd/layer/info/pattern.rb

@@ -0,0 +1,14 @@
+require 'psd/layer_info'
+
+class PSD
+  class Pattern < LayerInfo
+    def self.should_parse?(key)
+      return false
+      ['Patt', 'Pat2', 'Pat3'].include?(key)
+    end
+
+    def parse
+
+    end
+  end
+end

data/lib/psd/layer/info/pattern_fill.rb

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

data/lib/psd/layer/info/photo_filter.rb

@@ -0,0 +1,44 @@
+require 'psd/layer_info'
+
+class PSD
+  class PhotoFilter < LayerInfo
+    def self.should_parse?(key)
+      key == 'phfl'
+    end
+
+    attr_reader :color, :density, :preserve_luminosity
+
+    def parse
+      version = @file.read_short
+
+      case version
+      when 2 then parse_version_2
+      when 3 then parse_version_3
+      else return
+      end
+
+      @density = @file.read_int
+      @preserve_luminosity = @file.read_boolean
+    end
+
+    private
+
+    def parse_version_2
+      color_space = @file.read_short
+      color_components = 4.times.map { @file.read_short }
+
+      @color = {
+        color_space: Color::COLOR_SPACE[color_space],
+        components: color_components
+      }
+    end
+
+    def parse_version_3
+      @color = {
+        x: @file.read_int >> 8,
+        y: @file.read_int >> 8,
+        z: @file.read_int >> 8
+      }
+    end
+  end
+end

data/lib/psd/{layer_info → layer/info}/placed_layer.rb

@@ -1,8 +1,10 @@
-require_relative '../layer_info'
+require 'psd/layer_info'
 
 class PSD
   class PlacedLayer < LayerInfo
-    @key = 'SoLd'
+    def self.should_parse?(key)
+      key == 'SoLd'
+    end
 
     def parse
       # Useless id/version info

data/lib/psd/layer/info/posterize.rb

@@ -0,0 +1,16 @@
+require 'psd/layer_info'
+
+class PSD
+  class Posterize < LayerInfo
+    def self.should_parse?(key)
+      key == 'post'
+    end
+
+    attr_reader :levels
+
+    def parse
+      @levels = @file.read_short
+      @file.seek 2, IO::SEEK_CUR # Padding?
+    end
+  end
+end

data/lib/psd/{layer_info → layer/info}/reference_point.rb

@@ -1,8 +1,10 @@
-require_relative '../layer_info'
+require 'psd/layer_info'
 
 class PSD
   class ReferencePoint < LayerInfo
-    @key = 'fxrp'
+    def self.should_parse?(key)
+      key == 'fxrp'
+    end
 
     attr_reader :x, :y
 

data/lib/psd/layer/info/selective_color.rb

@@ -0,0 +1,32 @@
+require 'psd/layer_info'
+
+class PSD
+  class SelectiveColor < LayerInfo
+    def self.should_parse?(key)
+      key == 'selc'
+    end
+
+    attr_reader :correction_mode, :cyan_correction, :magenta_correction,
+                :yellow_correction, :black_correction
+
+    def parse
+      @file.seek 2, IO::SEEK_CUR
+
+      @correction_mode = @file.read_short == 0 ? :relative : :absolute
+      @cyan_correction = []
+      @magenta_correction = []
+      @yellow_correction = []
+      @black_correction = []
+
+      10.times do |i|
+        # First record is all 0 and is ignored by Photoshop
+        @file.seek(8, IO::SEEK_CUR) and next if i == 0
+
+        @cyan_correction    << @file.read_short
+        @magenta_correction << @file.read_short
+        @yellow_correction  << @file.read_short
+        @black_correction   << @file.read_short
+      end
+    end
+  end
+end

data/lib/psd/layer/info/sheet_color.rb

@@ -0,0 +1,36 @@
+require 'psd/layer_info'
+
+class PSD
+  # This is the color label for a group/layer. Not sure why Adobe
+  # refers to it as the "Sheet Color".
+  class SheetColor < LayerInfo
+    def self.should_parse?(key)
+      key == 'lclr'
+    end
+
+    COLORS = [
+      :no_color,
+      :red,
+      :orange,
+      :yellow,
+      :green,
+      :blue,
+      :violet,
+      :gray
+    ]
+
+    def parse
+      # Only the first entry is used, the rest are always 0.
+      @data = [
+        @file.read_short,
+        @file.read_short,
+        @file.read_short,
+        @file.read_short
+      ]
+    end
+
+    def color
+      COLORS[@data[0]]
+    end
+  end
+end

data/lib/psd/layer/info/solid_color.rb

@@ -0,0 +1,36 @@
+require 'psd/layer_info'
+
+class PSD
+  class SolidColor < LayerInfo
+    def self.should_parse?(key)
+      key == 'SoCo'
+    end
+
+    def parse
+      @file.seek 4, IO::SEEK_CUR
+      @data = Descriptor.new(@file).parse
+    end
+
+    def color
+      ChunkyPNG::Color.rgb(r, g, b)
+    end
+
+    def r
+      @r ||= color_data['Rd  '].round
+    end
+
+    def g
+      @g ||= color_data['Grn '].round
+    end
+
+    def b
+      @b ||= color_data['Bl  '].round
+    end
+
+    private
+
+    def color_data
+      @data['Clr ']
+    end
+  end
+end

data/lib/psd/layer/info/threshold.rb

@@ -0,0 +1,16 @@
+require 'psd/layer_info'
+
+class PSD
+  class Threshold < LayerInfo
+    def self.should_parse?(key)
+      key == 'thrs'
+    end
+
+    attr_reader :level
+
+    def parse
+      @level = @file.read_short
+      @file.seek 2, IO::SEEK_CUR # Padding?
+    end
+  end
+end

data/lib/psd/layer/info/transparency_shapes_layer.rb

@@ -0,0 +1,16 @@
+require 'psd/layer_info'
+
+class PSD
+  class TransparencyShapesLayer < LayerInfo
+    def self.should_parse?(key)
+      key == 'tsly'
+    end
+
+    attr_reader :enabled
+
+    def parse
+      @enabled = @file.read_byte == 1
+      @file.seek 3, IO::SEEK_CUR
+    end
+  end
+end