psd 2.1.2 → 3.1.2

data/lib/psd/layer/blend_modes.rb

@@ -1,29 +1,29 @@
 class PSD
   class Layer
     module BlendModes
-      attr_reader :blend_mode, :opacity
+      attr_reader :blend_mode
+
+      delegate :opacity, :visible, :clipped?, to: :blend_mode
+      alias_method :visible?, :visible
+
+      # Is this layer hidden?
+      def hidden?
+        !visible
+      end
 
       def blending_mode
         if !info[:section_divider].nil? && info[:section_divider].blend_mode
           BlendMode::BLEND_MODES[info[:section_divider].blend_mode.strip.to_sym]
         else
-          @blending_mode
+          @blend_mode.mode
         end
       end
 
-      # Is the layer below this one a clipping mask?
-      def clipped?
-        @blend_mode.clipping == 1
-      end
-
       private
       
       def parse_blend_modes
-        @blend_mode = BlendMode.read(@file)
-
-        @blending_mode = @blend_mode.mode
-        @opacity = @blend_mode.opacity
-        @visible = @blend_mode.visible
+        @blend_mode = BlendMode.new(@file)
+        @blend_mode.parse!
       end
     end
   end

data/lib/psd/layer/helpers.rb

@@ -47,16 +47,6 @@ class PSD
         info[:locked].transparency_locked
       end
 
-      # Is this layer visible?
-      def visible?
-        @visible
-      end
-
-      # Is this layer hidden?
-      def hidden?
-        !@visible
-      end
-
       # Helper that exports the text data in this layer, if any.
       def text
         return nil unless info[:type]
@@ -72,6 +62,14 @@ class PSD
         return 255 unless info.has_key?(:fill_opacity)
         info[:fill_opacity].value
       end
+
+      def raster_mask?
+        image.has_mask? && image.mask_data.length > 0
+      end
+
+      def vector_mask?
+        !vector_mask.nil?
+      end
     end
   end
 end

data/lib/psd/layer/info.rb

@@ -12,21 +12,27 @@ class PSD
         object_effects: ObjectEffects,
         name: UnicodeName,
         section_divider: LayerSectionDivider,
+        sheet_color: SheetColor,
         nested_section_divider: NestedLayerDivider,
         reference_point: ReferencePoint,
         layer_id: LayerID,
         fill_opacity: FillOpacity,
         placed_layer: PlacedLayer,
         locked: Locked,
+        solid_color: SolidColor,
         vector_mask: VectorMask,
-        vector_mask_2: VectorMask2,
+        vector_origination: VectorOrigination,
         vector_stroke: VectorStroke,
         vector_stroke_content: VectorStrokeContent
-      }
+      }.freeze
 
       attr_reader :adjustments
       alias :info :adjustments
 
+      LAYER_INFO.keys.each do |key|
+        define_method(key) { @adjustments[key] }
+      end
+
       private
 
       # This section is a bit tricky to parse because it represents all of the
@@ -47,7 +53,7 @@ class PSD
 
           key_parseable = false
           LAYER_INFO.each do |name, info|
-            next unless info.key == key
+            next unless info.should_parse?(key)
 
             PSD.logger.debug "Layer Info: key = #{key}, start = #{pos}, length = #{length}"
 
@@ -65,10 +71,6 @@ class PSD
 
         @extra_data_end = @file.tell
       end
-
-      def vector_mask
-        info[:vector_mask_2] || info[:vector_mask]
-      end
     end
   end
 end

data/lib/psd/layer/position_and_channels.rb

@@ -10,8 +10,6 @@ class PSD
       private
 
       def parse_position_and_channels
-        start_section(:info)
-
         @top = @file.read_int
         @left = @file.read_int
         @bottom = @file.read_int
@@ -27,8 +25,6 @@ class PSD
 
           @channels_info << {id: channel_id, length: channel_length}
         end
-
-        end_section(:info)
       end
 
       def export_position_and_channels(outfile)

data/lib/psd/layer_info.rb

@@ -3,10 +3,6 @@ class PSD
   class LayerInfo
     attr_reader :data
 
-    # The value of the key as used in the PSD format.
-    class << self; attr_accessor :key; end
-    @key = ""
-
     def initialize(layer, length)
       @layer = layer
       @file = layer.file

data/lib/psd/layer_info/blend_clipping_elements.rb

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

data/lib/psd/layer_info/blend_interior_elements.rb

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

data/lib/psd/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/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_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_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_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/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

data/lib/psd/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/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

data/lib/psd/layer_info/object_effects.rb

@@ -1,8 +1,10 @@
-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

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/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/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/sheet_color.rb

@@ -0,0 +1,18 @@
+require 'psd/layer_info'
+
+class PSD
+  class SheetColor < LayerInfo
+    def self.should_parse?(key)
+      key == 'lclr'
+    end
+
+    def parse
+      @data = [
+        @file.read_short,
+        @file.read_short,
+        @file.read_short,
+        @file.read_short
+      ]
+    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/typetool.rb

@@ -1,11 +1,13 @@
 # encoding: UTF-8
-require_relative '../layer_info'
+require 'psd/layer_info'
 
 class PSD
   # Parses and provides information about text areas within layers in
   # the document.
   class TypeTool < LayerInfo
-    @key = 'TySh'
+    def self.should_parse?(key)
+      key == 'TySh'
+    end
     
     # Parse all of the text data in the layer.
     def parse

data/lib/psd/layer_info/unicode_name.rb

@@ -1,8 +1,10 @@
-require_relative '../layer_info'
+require 'psd/layer_info'
 
 class PSD
   class UnicodeName < LayerInfo
-    @key = 'luni'
+    def self.should_parse?(key)
+      key == 'luni'
+    end
 
     def parse
       pos = @file.tell