psd 3.6.0 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b21fcce85fa8ca2b9b08cdc8cf21229c58fb021b
-  data.tar.gz: 7b69b3e52405e5d44ad663323d355bf284c4c455
+  metadata.gz: d0df3c9415bc9d3724a1b47edfdd05e556486ab6
+  data.tar.gz: e7eaecbf86a2d7e117214dfbe024341fb70df9e8
 SHA512:
-  metadata.gz: 05eaf2063a9814f935f558a28a2b9fa435f4e4a3ac431e66a497f4b302985d0b0bf7c9f84d69a17e31ae7bf664ac378c4aee7823155aca47e3d37fbfe2e81c53
-  data.tar.gz: 64d5cdc4f06316b520d1b1ea13e391153a05593cc026582152e23a64d716a8fdeac34abc355d2bc95d05b38293d589773da563e27c8cdb56b57c33a5fb2e2eba
+  metadata.gz: 985a277130a940ccbd75f6028332a265c0a526b1db2906a8fb2d2a97a94ec13c7f399d07a610655888849fd4ab0439279bace6c53fb96767c660a2f01cdb2a1b
+  data.tar.gz: d8a068fe24e27e95e03c3c4f14dc8034dd0beb7c4127908287acef89d83ab667e201890374b546981fea87be06802a76bdaf10b9898274ab4fbcb26ecb7534f4

data/lib/psd/layer/info.rb

@@ -8,6 +8,7 @@ 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/effects_layer'
 require 'psd/layer/info/exposure'
 require 'psd/layer/info/fill_opacity'
 require 'psd/layer/info/gradient_fill'
@@ -60,6 +61,7 @@ class PSD
         color_lookup: ColorLookup,
         content_generator: ContentGenerator,
         curves: Curves,
+        effects_layer: EffectsLayer,
         exposure: Exposure,
         fill_opacity: FillOpacity,
         gradient_fill: GradientFill,

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

@@ -0,0 +1,174 @@
+require 'psd/layer_info'
+
+class PSD
+  # The file specification is majorly fucked for this info block. Had to make
+  # lots of tweaks.
+  class EffectsLayer < LayerInfo
+    def self.should_parse?(key)
+      key == 'lrFX'
+    end
+
+    BEVEL_STYLES = [
+      'Outer Bevel',
+      'Inner Bevel',
+      'Emboss',
+      'Pillow Emboss',
+      'Stroke Emboss'
+    ].freeze
+
+    def parse
+      version = @file.read_short
+      effects_count = @file.read_short
+
+      @data = {}
+      effects_count.times do
+        sig = @file.read_string(4)
+        if sig != "8BIM"
+          PSD.logger.debug "Effect layer signature was not 8BIM, got #{sig}. Skipping."
+          return false
+        end
+
+        key = @file.read_string(4)
+        case key
+        when 'cmnS' then common_state
+        when 'dsdw' then shadow(:drop_shadow)
+        when 'isdw' then shadow(:inner_shadow)
+        when 'oglw' then outer_glow
+        when 'iglw' then inner_glow
+        when 'bevl' then bevel
+        when 'sofi' then solid_fill
+        end
+      end
+    end
+
+    private
+
+    # This is the most pointless block of data yet.
+    def common_state
+      @file.seek 11, IO::SEEK_CUR
+      @data[:visible] = true
+    end
+
+    def shadow(key)
+      @data[key] = {}
+      size = @file.read_int
+
+      @data[key][:version] = @file.read_int
+      @data[key][:size] = @file.read_short
+      @data[key][:spread] = @file.read_int
+      @data[key][:angle] = @file.read_int
+      @data[key][:distance] = @file.read_int
+
+      # Not sure if Photoshop or the spec is wrong, but somebody done goofed.
+      @file.seek 2, IO::SEEK_CUR
+
+      @data[key][:color] = @file.read_space_color
+
+      @file.seek 4, IO::SEEK_CUR # blend mode sig
+      @data[key][:blend_mode] = @file.read_string(4)
+      @data[key][:enabled] = @file.read_boolean
+      @data[key][:use_global_light] = @file.read_boolean
+      @data[key][:opacity] = (255.0 / @file.read_byte).round
+
+      if size == 51
+        @data[key][:native_color] = @file.read_space_color
+      end
+    end
+
+    def outer_glow
+      @data[:outer_glow] = {}
+      size = @file.read_int
+
+      @data[:outer_glow][:version] = @file.read_int
+      @data[:outer_glow][:size] = @file.read_short
+      @data[:outer_glow][:spread] = @file.read_int
+      @file.seek 2, IO::SEEK_CUR
+
+      @data[:outer_glow][:color] = @file.read_space_color
+
+      @file.seek 4, IO::SEEK_CUR # blend sig
+      @data[:outer_glow][:blend_mode] = @file.read_string(4)
+      @data[:outer_glow][:enabled] = @file.read_boolean
+      @data[:outer_glow][:opacity] = (255.0 / @file.read_byte).round
+
+      if size ==42
+        @data[:outer_glow][:native_color] = @file.read_space_color
+      end
+    end
+
+    def inner_glow
+      @data[:inner_glow] = {}
+      size = @file.read_int
+
+      @data[:inner_glow][:version] = @file.read_int
+      @data[:inner_glow][:size] = @file.read_short
+      @data[:inner_glow][:spread] = @file.read_int
+      @file.seek 2, IO::SEEK_CUR
+
+      @data[:inner_glow][:color] = @file.read_space_color
+
+      @file.seek 4, IO::SEEK_CUR # blend sig
+      @data[:inner_glow][:blend_mode] = @file.read_string(4)
+      @data[:inner_glow][:enabled] = @file.read_boolean
+      @data[:inner_glow][:opacity] = (255.0 / @file.read_byte).round
+
+      if @data[:inner_glow][:version] == 2
+        @data[:inner_glow][:invert] = @file.read_boolean
+        @data[:inner_glow][:native_color] = @file.read_space_color
+      end
+    end
+
+    def bevel
+      @data[:bevel] = {}
+      size = @file.read_int
+
+      @data[:bevel][:version] = @file.read_int
+
+      # Okay somebody really goofed, this is super weird.
+      @data[:bevel][:angle] = @file.read_short
+      @file.seek 2, IO::SEEK_CUR
+      @data[:bevel][:size] = @file.read_short
+      @file.seek 2, IO::SEEK_CUR
+      @data[:bevel][:soften] = @file.read_short
+      @file.seek 2, IO::SEEK_CUR
+
+      @file.seek 4, IO::SEEK_CUR
+      @data[:bevel][:highlight_blend] = @file.read_string(4)
+
+      @file.seek 4, IO::SEEK_CUR
+      @data[:bevel][:shadow_blend] = @file.read_string(4)
+
+      @data[:bevel][:highlight_color] = @file.read_space_color
+      @data[:bevel][:shadow_color] = @file.read_space_color
+
+      @data[:bevel][:style_id] = @file.read_byte
+      @data[:bevel][:style] = BEVEL_STYLES[@data[:bevel][:style_id]]
+
+      @data[:bevel][:highlight_opacity] = @file.read_byte
+      @data[:bevel][:shadow_opacity] = @file.read_byte
+      @data[:bevel][:enabled] = @file.read_boolean
+      @data[:bevel][:use_global_light] = @file.read_boolean
+      @data[:bevel][:direction] = @file.read_byte == 0 ? 'Up' : 'Down'
+
+      if @data[:bevel][:version] == 2
+        @data[:bevel][:real_highlight_color] = @file.read_space_color
+        @data[:bevel][:real_shadow_color] = @file.read_space_color
+      end
+    end
+
+    def solid_fill
+      @data[:solid_fill] = {}
+      @file.seek 4, IO::SEEK_CUR
+
+      @data[:solid_fill][:version] = @file.read_int
+
+      @file.seek 4, IO::SEEK_CUR
+      @data[:solid_fill][:blend_mode] = @file.read_string(4)
+
+      @data[:solid_fill][:color] = @file.read_space_color
+      @data[:solid_fill][:opacity] = (255.0 / @file.read_byte).round
+      @data[:solid_fill][:enabled] = @file.read_boolean
+      @data[:solid_fill][:native_color] = @file.read_space_color
+    end
+  end
+end

data/lib/psd/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psd
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.7.0
 platform: ruby
 authors:
 - Ryan LeFevre
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -174,6 +174,7 @@ files:
 - lib/psd/layer/info/color_lookup.rb
 - lib/psd/layer/info/content_generator.rb
 - lib/psd/layer/info/curves.rb
+- lib/psd/layer/info/effects_layer.rb
 - lib/psd/layer/info/exposure.rb
 - lib/psd/layer/info/fill_opacity.rb
 - lib/psd/layer/info/gradient_fill.rb
@@ -299,7 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: General purpose library for parsing Photoshop files