psd 3.5.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94c708889f40e2d66fa1f271bbe5a2f385fcfef3
-  data.tar.gz: ff0cf841ac51420fe267285c725cc44191396fac
+  metadata.gz: b21fcce85fa8ca2b9b08cdc8cf21229c58fb021b
+  data.tar.gz: 7b69b3e52405e5d44ad663323d355bf284c4c455
 SHA512:
-  metadata.gz: 5a315bcfd5bf734cfcb2d712b0df72569ee42e34fd593072c91923119ccdcd5a5b5b785ae250af2ef82dda47abf847131eeae4c658a870e7d661977a90cdfb12
-  data.tar.gz: 0666ac938c7f75cc01aff7e60f3fc3c6a7f28d366e4703199fa1ccc1dc292796b111cf877bc803d552db97c06d0b7ce6a151e003fef1afc2f28ecd87bcdc5b1e
+  metadata.gz: 05eaf2063a9814f935f558a28a2b9fa435f4e4a3ac431e66a497f4b302985d0b0bf7c9f84d69a17e31ae7bf664ac378c4aee7823155aca47e3d37fbfe2e81c53
+  data.tar.gz: 64d5cdc4f06316b520d1b1ea13e391153a05593cc026582152e23a64d716a8fdeac34abc355d2bc95d05b38293d589773da563e27c8cdb56b57c33a5fb2e2eba

data/lib/psd/layer/info.rb

@@ -2,6 +2,7 @@ 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_blending_restrictions'
 require 'psd/layer/info/channel_mixer'
 require 'psd/layer/info/color_balance'
 require 'psd/layer/info/color_lookup'
@@ -13,6 +14,8 @@ 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/knockout'
+require 'psd/layer/info/layer_mask_as_global_mask'
 require 'psd/layer/info/layer_group'
 require 'psd/layer/info/layer_id'
 require 'psd/layer/info/layer_name_source'
@@ -32,9 +35,11 @@ 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/transparency_shapes_layer'
 require 'psd/layer/info/typetool'
 require 'psd/layer/info/unicode_name'
 require 'psd/layer/info/vector_mask'
+require 'psd/layer/info/vector_mask_as_global_mask'
 require 'psd/layer/info/vector_origination'
 require 'psd/layer/info/vector_stroke'
 require 'psd/layer/info/vector_stroke_content'
@@ -49,6 +54,7 @@ class PSD
         blend_clipping_elements: BlendClippingElements,
         blend_interior_elements: BlendInteriorElements,
         brightness_contrast: BrightnessContrast,
+        channel_blending_restrictions: ChannelBlendingRestrictions,
         channel_mixer: ChannelMixer,
         color_balance: ColorBalance,
         color_lookup: ColorLookup,
@@ -60,6 +66,8 @@ class PSD
         gradient_map: GradientMap,
         hue_saturation: HueSaturation,
         invert: Invert,
+        knockout: Knockout,
+        layer_mask_as_global_mask: LayerMaskAsGlobalMask,
         layer_id: LayerID,
         layer_name_source: LayerNameSource,
         legacy_type: LegacyTypeTool,
@@ -79,8 +87,10 @@ class PSD
         sheet_color: SheetColor,
         solid_color: SolidColor,
         threshold: Threshold,
+        transparency_shapes_layer: TransparencyShapesLayer,
         type: TypeTool,
         vector_mask: VectorMask,
+        vector_mask_as_global_mask: VectorMaskAsGlobalMask,
         vector_origination: VectorOrigination,
         vector_stroke: VectorStroke,
         vector_stroke_content: VectorStrokeContent,

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

@@ -0,0 +1,27 @@
+require 'psd/layer_info'
+
+class PSD
+  class ChannelBlendingRestrictions < LayerInfo
+    def self.should_parse?(key)
+      key == 'brst'
+    end
+
+    MODES = {
+      'RGBColor' => ['R', 'G', 'B'],
+      'CMYKColor' => ['C', 'M', 'Y', 'K']
+    }
+
+    attr_reader :restricted_channels, :restricted_channels_by_letter
+
+    def parse
+      @restricted_channels = []
+      @restricted_channels_by_letter = []
+
+      (@length / 4).times do
+        channel = @file.read_int
+        @restricted_channels << channel
+        @restricted_channels_by_letter << MODES[@layer.header.mode_name][channel]
+      end
+    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_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/metadata_setting.rb

@@ -34,4 +34,4 @@ class PSD
       @data[:layer_comp] = Descriptor.new(@file).parse
     end
   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

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

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

data/lib/psd/mask.rb

@@ -15,6 +15,8 @@ class PSD
       @left = 0
       @bottom = 0
       @right = 0
+      @default_color = 0
+      @flags = 0
     end
 
     def parse

data/lib/psd/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psd
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.0
 platform: ruby
 authors:
 - Ryan LeFevre
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-22 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -168,6 +168,7 @@ files:
 - 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_blending_restrictions.rb
 - lib/psd/layer/info/channel_mixer.rb
 - lib/psd/layer/info/color_balance.rb
 - lib/psd/layer/info/color_lookup.rb
@@ -179,8 +180,10 @@ files:
 - lib/psd/layer/info/gradient_map.rb
 - lib/psd/layer/info/hue_saturation.rb
 - lib/psd/layer/info/invert.rb
+- lib/psd/layer/info/knockout.rb
 - lib/psd/layer/info/layer_group.rb
 - lib/psd/layer/info/layer_id.rb
+- lib/psd/layer/info/layer_mask_as_global_mask.rb
 - lib/psd/layer/info/layer_name_source.rb
 - lib/psd/layer/info/layer_section_divider.rb
 - lib/psd/layer/info/legacy_typetool.rb
@@ -198,9 +201,11 @@ files:
 - lib/psd/layer/info/sheet_color.rb
 - lib/psd/layer/info/solid_color.rb
 - lib/psd/layer/info/threshold.rb
+- lib/psd/layer/info/transparency_shapes_layer.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_mask_as_global_mask.rb
 - lib/psd/layer/info/vector_origination.rb
 - lib/psd/layer/info/vector_stroke.rb
 - lib/psd/layer/info/vector_stroke_content.rb
@@ -294,7 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: General purpose library for parsing Photoshop files