psd 1.5.0 → 2.0.0

data/spec/parsing_spec.rb

@@ -147,4 +147,17 @@ describe 'Parsing' do
       end
     end
   end
+  
+  describe 'Blend Modes' do
+    before(:each) do
+      @psd = PSD.new('spec/files/blendmodes.psd')
+      @psd.parse!
+    end
+
+    it "should parse all blend modes" do
+      @psd.layers.each do |layer|
+        expect(layer.blend_mode.mode).to eq layer.name
+      end      
+    end
+  end  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psd
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Ryan LeFevre
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-27 00:00:00.000000000 Z
+date: 2014-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -54,7 +54,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: oily_png
+  name: chunky_png
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -144,9 +144,7 @@ files:
 - lib/psd.rb
 - lib/psd/blend_mode.rb
 - lib/psd/channel_image.rb
-- lib/psd/clipping_mask.rb
 - lib/psd/color.rb
-- lib/psd/compose.rb
 - lib/psd/descriptor.rb
 - lib/psd/file.rb
 - lib/psd/header.rb
@@ -192,7 +190,6 @@ files:
 - lib/psd/layer_info/vector_stroke.rb
 - lib/psd/layer_info/vector_stroke_content.rb
 - lib/psd/layer_mask.rb
-- lib/psd/layer_styles.rb
 - lib/psd/lazy_execute.rb
 - lib/psd/logger.rb
 - lib/psd/mask.rb
@@ -208,17 +205,31 @@ files:
 - lib/psd/nodes/parse_layers.rb
 - lib/psd/nodes/search.rb
 - lib/psd/path_record.rb
+- lib/psd/renderer.rb
+- lib/psd/renderer/blender.rb
+- lib/psd/renderer/canvas.rb
+- lib/psd/renderer/canvas_management.rb
+- lib/psd/renderer/clipping_mask.rb
+- lib/psd/renderer/compose.rb
+- lib/psd/renderer/layer_styles.rb
+- lib/psd/renderer/layer_styles/color_overlay.rb
+- lib/psd/renderer/layer_styles/drop_shadow.rb
+- lib/psd/renderer/mask.rb
 - lib/psd/resource.rb
 - lib/psd/resource_section.rb
 - lib/psd/resources.rb
+- lib/psd/resources/guides.rb
 - lib/psd/resources/layer_comps.rb
 - lib/psd/resources/slices.rb
 - lib/psd/section.rb
 - lib/psd/util.rb
 - lib/psd/version.rb
 - psd.gemspec
+- spec/files/blendmodes.psd
+- spec/files/empty-layer-subgroups.psd
 - spec/files/empty-layer.psd
 - spec/files/example.psd
+- spec/files/guides.psd
 - spec/files/locked.psd
 - spec/files/one_layer.psd
 - spec/files/path.psd
@@ -226,6 +237,7 @@ files:
 - spec/files/simplest.psd
 - spec/files/slices.psd
 - spec/files/text.psd
+- spec/guides_spec.rb
 - spec/hierarchy_spec.rb
 - spec/image_spec.rb
 - spec/lazy_execute_spec.rb
@@ -255,13 +267,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: General purpose library for parsing Photoshop files
 test_files:
+- spec/files/blendmodes.psd
+- spec/files/empty-layer-subgroups.psd
 - spec/files/empty-layer.psd
 - spec/files/example.psd
+- spec/files/guides.psd
 - spec/files/locked.psd
 - spec/files/one_layer.psd
 - spec/files/path.psd
@@ -269,6 +284,7 @@ test_files:
 - spec/files/simplest.psd
 - spec/files/slices.psd
 - spec/files/text.psd
+- spec/guides_spec.rb
 - spec/hierarchy_spec.rb
 - spec/image_spec.rb
 - spec/lazy_execute_spec.rb

data/lib/psd/clipping_mask.rb

@@ -1,49 +0,0 @@
-class PSD
-  class ClippingMask
-    def initialize(layer, png=nil)
-      @layer = layer
-      @png = png
-    end
-
-    def apply
-      return @png unless @layer.clipped?
-
-      PSD.logger.debug "Applying clipping mask #{mask.name} to #{@layer.name}"
-
-      width, height = @layer.document_dimensions
-      full_png = compose_to_full
-
-      height.times do |y|
-        width.times do |x|
-          if y < mask.top || y > mask.bottom || x < mask.left || x > mask.right
-            alpha = 0
-          else
-            mask_x = x - mask.left
-            mask_y = y - mask.top
-
-            pixel = mask.image.pixel_data[mask_y * mask.width + mask_x]
-            alpha = pixel.nil? ? 0 : ChunkyPNG::Color.a(pixel)
-          end
-          
-          color = full_png[x, y]
-          full_png[x, y] = (color & 0xffffff00) | (ChunkyPNG::Color.a(color) * alpha / 255)
-        end
-      end
-
-      full_png.crop!(@layer.left, @layer.top, @layer.width, @layer.height)
-    end
-
-    private
-
-    def mask
-      @mask ||= @layer.next_sibling
-    end
-
-    def compose_to_full
-      width, height = @layer.document_dimensions
-      full_png = ChunkyPNG::Canvas.new(width.to_i, height.to_i, ChunkyPNG::Color::TRANSPARENT)
-      full_png.compose!(@png, @layer.left, @layer.top)
-      full_png
-    end
-  end
-end

data/lib/psd/layer_styles.rb

@@ -1,84 +0,0 @@
-class PSD
-  class LayerStyles
-    # Blend modes in layer effects use different keys
-    # than normal layer blend modes. Thanks Adobe.
-    BLEND_TRANSLATION = {
-      'Nrml' => 'norm',
-      'Dslv' => 'diss',
-      'Drkn' => 'dark',
-      'Mltp' => 'mul',
-      'CBrn' => 'idiv',
-      'linearBurn' => 'lbrn',
-      'Lghn' => 'lite',
-      'Scrn' => 'scrn',
-      'CDdg' => 'div',
-      'linearDodge' => 'lddg',
-      'Ovrl' => 'over',
-      'SftL' => 'sLit',
-      'HrdL' => 'hLit',
-      'vividLight' => 'vLit',
-      'linearLight' => 'lLit',
-      'pinLight' => 'pLit',
-      'hardMix' => 'hMix',
-      'Dfrn' => 'diff',
-      'Xclu' => 'smud',
-      'H   ' => 'hue',
-      'Strt' => 'sat',
-      'Clr ' => 'colr',
-      'Lmns' => 'lum'
-    }
-
-    attr_reader :layer, :data, :png
-
-    def initialize(layer, png=nil)
-      @layer = layer
-      @data = layer.info[:object_effects]
-      @png = png || layer.image.to_png
-
-      if @data.nil?
-        @applied = true
-      else
-        @data = @data.data
-        @applied = false
-      end
-    end
-
-    def apply!
-      return png if @applied || data.nil?
-
-      apply_color_overlay if data.has_key?('SoFi')
-      png
-    end
-
-    private
-
-    def apply_color_overlay
-      overlay_data = data['SoFi']
-      color_data = overlay_data['Clr ']
-      blending_mode = BlendMode::BLEND_MODES[BLEND_TRANSLATION[overlay_data['Md  ']].to_sym]
-
-      width = layer.width.to_i
-      height = layer.height.to_i
-
-      PSD.logger.debug("Layer style: layer = #{layer.name}, type = color overlay, blend mode = #{blending_mode}")
-
-      for y in 0...height do
-        for x in 0...width do
-          pixel = png.get_pixel(x, y)
-          alpha = ChunkyPNG::Color.a(pixel)
-          next if alpha == 0
-
-          overlay_color = ChunkyPNG::Color.rgba(
-            color_data['Rd  '].round, 
-            color_data['Grn '].round,
-            color_data['Bl  '].round,
-            alpha
-          )
-
-          color = Compose.send(blending_mode, overlay_color, pixel)
-          png.set_pixel(x, y, color)
-        end
-      end
-    end
-  end
-end