psd 3.4.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d022d5b521a64f3578c5755ba18d5bbc1f419ea
-  data.tar.gz: 3f72cd4899c112f55171eab1f96629e354d1eb9f
+  metadata.gz: 94c708889f40e2d66fa1f271bbe5a2f385fcfef3
+  data.tar.gz: ff0cf841ac51420fe267285c725cc44191396fac
 SHA512:
-  metadata.gz: ed4a582c87fd81ee3a6a19d487cea8fa6e388740e16097e185268581af549d032c125b3d66fde8dfe52ec0af2f4d67c57bce0990030e3eb7b8f06b18b1b62c51
-  data.tar.gz: dce119bc89f527695fbd46229fbd82447d23722b60f19002afb0984bb10e3c7aee992ba301ad7f53cdd15ea4ad6277e47a2842ec21ca9bc17941e5ff4d561475
+  metadata.gz: 5a315bcfd5bf734cfcb2d712b0df72569ee42e34fd593072c91923119ccdcd5a5b5b785ae250af2ef82dda47abf847131eeae4c658a870e7d661977a90cdfb12
+  data.tar.gz: 0666ac938c7f75cc01aff7e60f3fc3c6a7f28d366e4703199fa1ccc1dc292796b111cf877bc803d552db97c06d0b7ce6a151e003fef1afc2f28ecd87bcdc5b1e

data/.travis.yml

@@ -1,3 +1,4 @@
+sudo: false
 language: ruby
 rvm:
   - 1.9.3

data/lib/psd/color.rb

@@ -6,8 +6,17 @@ class PSD
   module Color
     extend self
 
-      # This is a relic of libpsd that will likely go away in a future version. It
-      # stored the entire color value in a 32-bit address space for speed.
+    COLOR_SPACE = {
+      0 => :rgb,
+      1 => :hsb,
+      2 => :cmyk,
+      7 => :lab,
+      8 => :grayscale
+    }
+
+    # In some places in the PSD file, colors are stored with a short that
+    # describes the color space, and the following 4 bytes that store the
+    # color data.
     def color_space_to_argb(color_space, color_component)
       color = case color_space
       when 0
@@ -20,7 +29,7 @@ class PSD
           color_component[1] / 100.0, color_component[2] / 100.0,
           color_component[3] / 100.0
       when 7
-        lab_to_color *color_component
+        alab_to_color *color_component
       else
         0x00FFFFFF
       end
@@ -101,7 +110,7 @@ class PSD
 
     def alab_to_color(alpha, l, a, b)
       xyz = lab_to_xyz(l, a, b)
-      axyz_to_color alpha, xyz[:x], xyz[:y], xyz[:z]
+      axyz_to_color alpha, xyz[0], xyz[1], xyz[2]
     end
 
     def lab_to_xyz(l, a, b)
@@ -122,4 +131,4 @@ class PSD
       }.map { |k, v| [k, Util.clamp(v, 0, 255)] }]
     end
   end
-end
+end

data/lib/psd/file.rb

@@ -96,12 +96,12 @@ class PSD
     # Reads a 32-bit color space value.
     def read_space_color
       color_space = read_short
-      color_component = []
-      4.times do |i|
-        color_component.push(read_short >> 8)
+      color_components = []
+      4.times.map do |i|
+        color_components.push(read_short >> 8)
       end
 
-      Color.color_space_to_argb(color_space, color_component)
+      { color_mode: color_space, color_components: color_components }
     end
   end
 end

data/lib/psd/layer/info.rb

@@ -1,54 +1,90 @@
+require 'psd/layer/info/black_white'
 require 'psd/layer/info/blend_clipping_elements'
 require 'psd/layer/info/blend_interior_elements'
+require 'psd/layer/info/brightness_contrast'
+require 'psd/layer/info/channel_mixer'
+require 'psd/layer/info/color_balance'
+require 'psd/layer/info/color_lookup'
+require 'psd/layer/info/content_generator'
+require 'psd/layer/info/curves'
+require 'psd/layer/info/exposure'
 require 'psd/layer/info/fill_opacity'
 require 'psd/layer/info/gradient_fill'
+require 'psd/layer/info/gradient_map'
+require 'psd/layer/info/hue_saturation'
+require 'psd/layer/info/invert'
 require 'psd/layer/info/layer_group'
 require 'psd/layer/info/layer_id'
 require 'psd/layer/info/layer_name_source'
 require 'psd/layer/info/layer_section_divider'
 require 'psd/layer/info/legacy_typetool'
+require 'psd/layer/info/levels'
 require 'psd/layer/info/locked'
 require 'psd/layer/info/metadata_setting'
 require 'psd/layer/info/object_effects'
 require 'psd/layer/info/pattern'
+require 'psd/layer/info/pattern_fill'
+require 'psd/layer/info/photo_filter'
 require 'psd/layer/info/placed_layer'
+require 'psd/layer/info/posterize'
 require 'psd/layer/info/reference_point'
+require 'psd/layer/info/selective_color'
 require 'psd/layer/info/sheet_color'
 require 'psd/layer/info/solid_color'
+require 'psd/layer/info/threshold'
 require 'psd/layer/info/typetool'
 require 'psd/layer/info/unicode_name'
 require 'psd/layer/info/vector_mask'
 require 'psd/layer/info/vector_origination'
 require 'psd/layer/info/vector_stroke'
 require 'psd/layer/info/vector_stroke_content'
+require 'psd/layer/info/vibrance'
 
 class PSD
   class Layer
     module Info
       # All of the extra layer info sections that we know how to parse.
       LAYER_INFO = {
+        black_white: BlackWhite,
         blend_clipping_elements: BlendClippingElements,
         blend_interior_elements: BlendInteriorElements,
-        type: TypeTool,
+        brightness_contrast: BrightnessContrast,
+        channel_mixer: ChannelMixer,
+        color_balance: ColorBalance,
+        color_lookup: ColorLookup,
+        content_generator: ContentGenerator,
+        curves: Curves,
+        exposure: Exposure,
+        fill_opacity: FillOpacity,
+        gradient_fill: GradientFill,
+        gradient_map: GradientMap,
+        hue_saturation: HueSaturation,
+        invert: Invert,
+        layer_id: LayerID,
+        layer_name_source: LayerNameSource,
         legacy_type: LegacyTypeTool,
+        levels: Levels,
+        locked: Locked,
         metadata: MetadataSetting,
-        layer_name_source: LayerNameSource,
-        object_effects: ObjectEffects,
         name: UnicodeName,
-        section_divider: LayerSectionDivider,
-        sheet_color: SheetColor,
         nested_section_divider: NestedLayerDivider,
-        reference_point: ReferencePoint,
-        layer_id: LayerID,
-        fill_opacity: FillOpacity,
+        object_effects: ObjectEffects,
+        pattern_fill: PatternFill,
+        photo_filter: PhotoFilter,
         placed_layer: PlacedLayer,
-        locked: Locked,
+        posterize: Posterize,
+        reference_point: ReferencePoint,
+        selective_color: SelectiveColor,
+        section_divider: LayerSectionDivider,
+        sheet_color: SheetColor,
         solid_color: SolidColor,
+        threshold: Threshold,
+        type: TypeTool,
         vector_mask: VectorMask,
         vector_origination: VectorOrigination,
         vector_stroke: VectorStroke,
         vector_stroke_content: VectorStrokeContent,
-        gradient_fill: GradientFill
+        vibrance: Vibrance
       }.freeze
 
       BIG_LAYER_INFO_KEYS = %w{ LMsk Lr16 Lr32 Layr Mt16 Mt32 Mtrn Alph FMsk lnk2 FEid FXid PxSD }

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

@@ -0,0 +1,33 @@
+require 'psd/layer_info'
+
+class PSD
+  class BlackWhite < LayerInfo
+    def self.should_parse?(key)
+      key == 'blwh'
+    end
+
+    attr_reader :red, :yellow, :green, :cyan, :blue, :magenta
+    attr_reader :tint, :tint_color, :preset_id, :preset_name
+
+    def parse
+      @file.seek 4, IO::SEEK_CUR
+      @data = Descriptor.new(@file).parse
+
+      @red = @data['Rd  ']
+      @yellow = @data['Yllw']
+      @green = @data['Grn ']
+      @cyan = @data['Cyn ']
+      @blue = @data['Bl  ']
+      @magenta = @data['Mgnt']
+      @tint = @data['useTint']
+      @tint_color = {
+        red: @data['tintColor']['Rd  '],
+        green: @data['tintColor']['Grn '],
+        blue: @data['tintColor']['Bl  ']
+      }
+
+      @preset_id = @data['bwPresetKind']
+      @preset_name = @data['blackAndWhitePresetFileName']
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+require 'psd/layer_info'
+
+class PSD
+  # NOTE: this only has the correct values when the "Use Legacy"
+  # checkbox is checked. If the 'CgEd' info key is present, these
+  # values will all be 0. Use that info block instead.
+  class BrightnessContrast < LayerInfo
+    def self.should_parse?(key)
+      key == 'brit'
+    end
+
+    attr_reader :brightness, :contrast, :mean_value, :lab_color
+
+    def parse
+      @brightness = @file.read_short
+      @contrast = @file.read_short
+      @mean_value = @file.read_short
+      @lab_color = @file.read_boolean
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+require 'psd/layer_info'
+
+class PSD
+  class ChannelMixer < LayerInfo
+    def self.should_parse?(key)
+      key == 'mixr'
+    end
+
+    attr_reader :monochrome, :color
+
+    def parse
+      @file.seek 2, IO::SEEK_CUR
+
+      @monochrome = @file.read_short > 0
+
+      @color = 4.times.map do
+        {
+          red_cyan: @file.read_short,
+          green_magenta: @file.read_short,
+          blue_yellow: @file.read_short,
+          black: @file.read_short,
+          constant: @file.read_short
+        }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+require 'psd/layer_info'
+
+class PSD
+  class ColorBalance < LayerInfo
+    def self.should_parse?(key)
+      key == 'blnc'
+    end
+
+    attr_reader :shadows, :midtones, :highlights, :preserve_luminosity
+
+    def parse
+      @shadows, @midtones, @highlights = 3.times.map do
+        {
+          cyan_red: @file.read_short,
+          magenta_green: @file.read_short,
+          yellow_blue: @file.read_short
+        }
+      end
+
+      @preserve_luminosity = @file.read_short > 0
+    end
+  end
+end

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

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

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

@@ -0,0 +1,42 @@
+require 'psd/layer_info'
+
+class PSD
+  # This is the new way that Photoshop stores the brightness/contrast
+  # data. If this data is present, DO NOT use the legacy BrightnessContrast
+  # info block.
+  class ContentGenerator < LayerInfo
+    def self.should_parse?(key)
+      key == 'CgEd'
+    end
+
+    def parse
+      # Version
+      @file.seek 4, IO::SEEK_CUR
+      @data = Descriptor.new(@file).parse
+    end
+
+    def brightness
+      @data['Brgh']
+    end
+
+    def contrast
+      @data['Cntr']
+    end
+
+    def mean_value
+      @data['means']
+    end
+
+    def lab_color
+      @data['Lab ']
+    end
+
+    def use_legacy
+      @data['useLegacy']
+    end
+
+    def auto
+      @data['Auto']
+    end
+  end
+end

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

@@ -0,0 +1,78 @@
+require 'psd/layer_info'
+
+class PSD
+  class Curves < LayerInfo
+    def self.should_parse?(key)
+      key == 'curv'
+    end
+
+    attr_reader :curves
+
+    def parse
+      # Padding, spec is wrong. Maybe Photoshop bug?
+      @file.seek 1, IO::SEEK_CUR
+
+      # Version
+      @file.seek 2, IO::SEEK_CUR
+
+      tag = @file.read_int
+      curve_count = 0
+
+      # Legacy data, it looks like there are 32 positions
+      # where you can adjust the curve, and there is a chunk
+      # of 32 bytes that determine whether that chunk is set.
+      32.times do |i|
+        curve_count += 1 if tag & (1 << i) > 0
+      end
+
+      @curves = []
+      curve_count.times do |i|
+        # Before each curve is a channel index
+        count = 0
+        curve = {}
+        32.times do |j|
+          if tag & (1 << j) > 0
+            if count == i
+              curve[:channel_index] = j
+              break
+            end
+
+            count += 1
+          end
+        end
+
+        point_count = @file.read_short
+        curve[:points] = point_count.times.map do
+          {
+            output_value: @file.read_short,
+            input_value: @file.read_short
+          }
+        end
+
+        @curves << curve
+      end
+
+      if @file.tell < @section_end - 4
+        tag = @file.read_string(4)
+        raise "Extra curves key error: #{tag}" if tag != 'Crv '
+
+        @file.seek 2, IO::SEEK_CUR
+
+        curve_count = @file.read_int
+        curve_count.times do
+          curve = { channel_index: @file.read_short }
+
+          point_count = @file.read_short
+          curve[:points] = point_count.times.map do
+            {
+              output_value: @file.read_short,
+              input_value: @file.read_short
+            }
+          end
+
+          @curves << curve
+        end
+      end
+    end
+  end
+end

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/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/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/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/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/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

@@ -1,12 +1,26 @@
 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,
@@ -14,5 +28,9 @@ class PSD
         @file.read_short
       ]
     end
+
+    def color
+      COLORS[@data[0]]
+    end
   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/vibrance.rb

@@ -0,0 +1,22 @@
+require 'psd/layer_info'
+
+class PSD
+  class Vibrance < LayerInfo
+    def self.should_parse?(key)
+      key == 'vibA'
+    end
+
+    def parse
+      @file.seek 4, IO::SEEK_CUR
+      @data = Descriptor.new(@file).parse
+    end
+
+    def vibrance
+      @data['vibrance']
+    end
+
+    def saturation
+      @data['Strt']
+    end
+  end
+end

data/lib/psd/mask.rb

@@ -54,6 +54,10 @@ class PSD
       (@flags & (0x01 << 2)) > 0
     end
 
+    def from_other_data
+      (@flags & (0x01 << 3)) > 0
+    end
+
     def to_hash
       return {} if @size == 0
 
@@ -71,4 +75,4 @@ class PSD
       }
     end
   end
-end
+end

data/lib/psd/node.rb

@@ -2,6 +2,7 @@ require 'psd/nodes/ancestry'
 require 'psd/nodes/build_preview'
 require 'psd/nodes/search'
 require 'psd/nodes/layer_comps'
+require 'psd/nodes/locking'
 
 # Internal structure to help us build trees of a Photoshop documents.
 # A lot of method names borrowed from the Ruby ancestry gem.
@@ -15,6 +16,7 @@ class PSD
       include Search
       include LayerComps
       include BuildPreview
+      include Locking
 
       # Default properties that all nodes contain
       PROPERTIES = [:name, :left, :right, :top, :bottom, :height, :width]
@@ -91,6 +93,17 @@ class PSD
       end
       alias_method :clipped_by, :clipping_mask
 
+      # Color label is a little tricky. If you set the color of a group, all
+      # of it's descendants inhert the color unless manually overridden. So,
+      # if this node has no defined color, we have to walk up the ancestry tree
+      # to make sure the color isn't set somewhere else.
+      def color_label
+        color = layer.sheet_color.color
+        return color if color != :no_color || node.parent.root?
+
+        parent.color_label
+      end
+
       def layer?
         is_a?(PSD::Node::Layer)
       end

data/lib/psd/nodes/locking.rb

@@ -0,0 +1,36 @@
+class PSD
+  module Node
+    # Locking is inherited by descendants, but Photoshop doesn't reflect
+    # this directly in the file, so we have to recursively traverse the
+    # ancestry tree to make sure an ancestor isn't locked.
+    module Locking
+      def all_locked?
+        return true if layer.all_locked?
+        return false if parent.root?
+        return parent.all_locked?
+      end
+
+      def any_locked?
+        position_locked? || composite_locked? || transparency_locked?
+      end
+
+      def position_locked?
+        return true if layer.position_locked?
+        return false if parent.root?
+        return parent.position_locked?
+      end
+
+      def composite_locked?
+        return true if layer.composite_locked?
+        return false if parent.root?
+        return parent.composite_locked?
+      end
+
+      def transparency_locked?
+        return true if layer.transparency_locked?
+        return false if parent.root?
+        return parent.transparency_locked?
+      end
+    end
+  end
+end

data/lib/psd/version.rb

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

data/spec/locked_spec.rb

@@ -45,10 +45,10 @@ describe 'Locked' do
     expect(psd.tree.children[7].composite_locked?).to eq(true)
     expect(psd.tree.children[7].transparency_locked?).to eq(true)
 
-    expect(psd.tree.children[7].children[0].position_locked?).to eq(false)
-    expect(psd.tree.children[7].children[0].all_locked?).to eq(false)
-    expect(psd.tree.children[7].children[0].composite_locked?).to eq(false)
-    expect(psd.tree.children[7].children[0].transparency_locked?).to eq(false)
+    expect(psd.tree.children[7].children[0].position_locked?).to eq(true)
+    expect(psd.tree.children[7].children[0].all_locked?).to eq(true)
+    expect(psd.tree.children[7].children[0].composite_locked?).to eq(true)
+    expect(psd.tree.children[7].children[0].transparency_locked?).to eq(true)
 
     expect(psd.tree.children[7].children[1].position_locked?).to eq(true)
     expect(psd.tree.children[7].children[1].all_locked?).to eq(true)
@@ -56,9 +56,9 @@ describe 'Locked' do
     expect(psd.tree.children[7].children[1].transparency_locked?).to eq(true)
 
     expect(psd.tree.children[7].children[1].children[0].position_locked?).to eq(true)
-    expect(psd.tree.children[7].children[1].children[0].all_locked?).to eq(false)
-    expect(psd.tree.children[7].children[1].children[0].composite_locked?).to eq(false)
-    expect(psd.tree.children[7].children[1].children[0].transparency_locked?).to eq(false)
+    expect(psd.tree.children[7].children[1].children[0].all_locked?).to eq(true)
+    expect(psd.tree.children[7].children[1].children[0].composite_locked?).to eq(true)
+    expect(psd.tree.children[7].children[1].children[0].transparency_locked?).to eq(true)
 
     expect(psd.tree.children[8].position_locked?).to eq(true)
     expect(psd.tree.children[8].all_locked?).to eq(false)
@@ -75,4 +75,4 @@ describe 'Locked' do
     expect(psd.tree.children[12].composite_locked?).to eq(false)
     expect(psd.tree.children[12].transparency_locked?).to eq(false)
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psd
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Ryan LeFevre
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2015-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -164,29 +164,47 @@ files:
 - lib/psd/layer/exporting.rb
 - lib/psd/layer/helpers.rb
 - lib/psd/layer/info.rb
+- lib/psd/layer/info/black_white.rb
 - lib/psd/layer/info/blend_clipping_elements.rb
 - lib/psd/layer/info/blend_interior_elements.rb
+- lib/psd/layer/info/brightness_contrast.rb
+- lib/psd/layer/info/channel_mixer.rb
+- lib/psd/layer/info/color_balance.rb
+- lib/psd/layer/info/color_lookup.rb
+- lib/psd/layer/info/content_generator.rb
+- lib/psd/layer/info/curves.rb
+- lib/psd/layer/info/exposure.rb
 - lib/psd/layer/info/fill_opacity.rb
 - lib/psd/layer/info/gradient_fill.rb
+- lib/psd/layer/info/gradient_map.rb
+- lib/psd/layer/info/hue_saturation.rb
+- lib/psd/layer/info/invert.rb
 - lib/psd/layer/info/layer_group.rb
 - lib/psd/layer/info/layer_id.rb
 - lib/psd/layer/info/layer_name_source.rb
 - lib/psd/layer/info/layer_section_divider.rb
 - lib/psd/layer/info/legacy_typetool.rb
+- lib/psd/layer/info/levels.rb
 - lib/psd/layer/info/locked.rb
 - lib/psd/layer/info/metadata_setting.rb
 - lib/psd/layer/info/object_effects.rb
 - lib/psd/layer/info/pattern.rb
+- lib/psd/layer/info/pattern_fill.rb
+- lib/psd/layer/info/photo_filter.rb
 - lib/psd/layer/info/placed_layer.rb
+- lib/psd/layer/info/posterize.rb
 - lib/psd/layer/info/reference_point.rb
+- lib/psd/layer/info/selective_color.rb
 - lib/psd/layer/info/sheet_color.rb
 - lib/psd/layer/info/solid_color.rb
+- lib/psd/layer/info/threshold.rb
 - lib/psd/layer/info/typetool.rb
 - lib/psd/layer/info/unicode_name.rb
 - lib/psd/layer/info/vector_mask.rb
 - lib/psd/layer/info/vector_origination.rb
 - lib/psd/layer/info/vector_stroke.rb
 - lib/psd/layer/info/vector_stroke_content.rb
+- lib/psd/layer/info/vibrance.rb
 - lib/psd/layer/mask.rb
 - lib/psd/layer/name.rb
 - lib/psd/layer/path_components.rb
@@ -202,6 +220,7 @@ files:
 - lib/psd/nodes/group.rb
 - lib/psd/nodes/layer.rb
 - lib/psd/nodes/layer_comps.rb
+- lib/psd/nodes/locking.rb
 - lib/psd/nodes/root.rb
 - lib/psd/nodes/search.rb
 - lib/psd/path_record.rb