psd 1.3.3 → 1.4.0

data/lib/psd/node.rb

@@ -7,6 +7,7 @@ class PSD
   class Node
     include Ancestry
     include Search
+    include BuildPreview
 
     # Default properties that all nodes contain
     PROPERTIES = [:name, :left, :right, :top, :bottom, :height, :width]
@@ -38,7 +39,7 @@ class PSD
     end
 
     def group?
-      is_a?(PSD::Node::Group)
+      is_a?(PSD::Node::Group) || is_a?(PSD::Node::Root)
     end
 
     def to_hash

data/lib/psd/node_layer.rb

@@ -58,7 +58,13 @@ class PSD::Node
         type: :layer,
         text: @layer.text,
         ref_x: @layer.reference_point.x,
-        ref_y: @layer.reference_point.y
+        ref_y: @layer.reference_point.y,
+        mask: @layer.mask.snapshot,
+        image: {
+          width: @layer.image.width,
+          height: @layer.image.height,
+          channels: @layer.channels_info
+        }
       })
     end
 

data/lib/psd/nodes/ancestry.rb

@@ -38,6 +38,18 @@ class PSD
         parent.children
       end
 
+      def next_sibling
+        return nil if parent.nil?
+        index = siblings.index(self)
+        siblings[index + 1]
+      end
+
+      def prev_sibling
+        return nil if parent.nil?
+        index = siblings.index(self)
+        siblings[index - 1]
+      end
+
       # Does this node have any siblings?
       def has_siblings?
         siblings.length > 1

data/lib/psd/nodes/build_preview.rb

@@ -0,0 +1,69 @@
+class PSD
+  class Node
+    module BuildPreview
+      include PSD::Image::Export::PNG
+
+      alias :orig_to_png :to_png
+      def to_png
+        return build_png if group?
+        layer.image.to_png
+      end
+
+      def build_png(png=nil)
+        png ||= create_canvas
+
+        children.reverse.each do |c|
+          next unless c.visible?
+          
+          if c.group?
+            if c.blending_mode == 'passthru'
+              c.build_png(png)
+            else
+              compose! c, png, c.build_png, 0, 0
+            end
+          else
+            compose! c, png, c.image.to_png_with_mask, c.left.to_i, c.top.to_i
+          end
+        end
+
+        png
+      end
+
+      private
+
+      def create_canvas
+        width, height = document_dimensions
+        ChunkyPNG::Canvas.new(width.to_i, height.to_i, ChunkyPNG::Color::TRANSPARENT)
+      end
+
+      # Modified from ChunkyPNG::Canvas#compose! in order to support various blend modes.
+      def compose!(layer, base, other, offset_x = 0, offset_y = 0)
+        blending_mode = layer.blending_mode.gsub(/ /, '_')
+        PSD.logger.warn("Blend mode #{blending_mode} is not implemented") unless Compose.respond_to?(blending_mode)
+        PSD.logger.debug("Blending #{layer.name} with #{blending_mode} blend mode")
+
+        LayerStyles.new(layer, other).apply!
+        other = ClippingMask.new(layer, other).apply
+
+        for y in 0...other.height do
+          for x in 0...other.width do
+            base_x = x + offset_x
+            base_y = y + offset_y
+            
+            next if base_x < 0 || base_y < 0 || base_x >= base.width || base_y >= base.height
+
+            color = Compose.send(
+              blending_mode, 
+              other[x, y],
+              base[base_x, base_y],
+              opacity: layer.opacity,
+              fill_opacity: layer.fill_opacity
+            )
+
+            base[base_x, base_y] = color
+          end
+        end
+      end
+    end
+  end
+end

data/lib/psd/nodes/search.rb

@@ -23,6 +23,7 @@ class PSD
           return matches.map { |m| m.children_at_path(path, opts) }.flatten
         end
       end
+      alias :children_with_path :children_at_path
 
       # Given a layer comp ID, name, or :last for last document state, create a new
       # tree based on the layers/groups that belong to the comp only.

data/lib/psd/resources/slices.rb

@@ -0,0 +1,27 @@
+class PSD
+  class Resource
+    class Section
+        class Slices < Section
+          attr_reader :data, :version
+
+          def self.id; 1050; end
+          def self.name; :slices; end
+
+          def parse
+            @version = @file.read_int
+            @descriptor_version = @file.read_int
+            @resource.data = self
+
+            if @version == 7 || @version == 8
+              @data = Descriptor.new(@file).parse
+            end
+
+          end
+
+          def to_a
+            @data.nil? ? [] : @data['slices']
+          end
+        end
+    end
+  end
+end

data/lib/psd/version.rb

@@ -1,3 +1,3 @@
 class PSD
-  VERSION = "1.3.3"
+  VERSION = "1.4.0"
 end

data/spec/image_spec.rb

@@ -28,7 +28,7 @@ describe 'Image Exporting' do
 
     describe "as PNG" do
       it "should produce a valid PNG object" do
-        expect(@psd.image.to_png).to be_an_instance_of(ChunkyPNG::Image)
+        expect(@psd.image.to_png).to be_an_instance_of(ChunkyPNG::Canvas)
 
         expect(@psd.image.to_png.width).to eq(1)
         expect(@psd.image.to_png.height).to eq(1)
@@ -58,7 +58,7 @@ describe 'Image Exporting' do
         @psd.parse!
 
         png = @psd.tree.children.first.image.to_png
-        expect(png).to be_an_instance_of(ChunkyPNG::Image)
+        expect(png).to be_an_instance_of(ChunkyPNG::Canvas)
         expect(png.width).to eq(1)
         expect(png.height).to eq(1)
         expect(

data/spec/slices_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe 'Slices' do
+
+  describe "Handle file with slice properly" do
+
+
+    it "should successfully parse a the PSD file of version 7 or above and has slices" do
+      psd = PSD.new('spec/files/slices.psd')
+      psd.parse!
+
+      # File should parse
+      expect(psd).to be_parsed
+
+      # Slices should not be nil
+      expect(psd.resources[:slices]).to_not be_nil
+
+      # slices version should be above 6
+      expect(psd.resources[:slices].data.version).to be > 6
+
+      # Bounds of each slice should not be nil
+      psd.resources[:slices].data.to_a.each do |slice|
+        expect(slice).to_not be_nil
+        expect(slice['bounds']).to_not be_nil
+      end
+    end
+
+
+    it "should successfully parse a the PSD file of version 6 and has slices" do
+      psd = PSD.new('spec/files/pixel.psd')
+      psd.parse!
+
+      # File should parse
+      expect(psd).to be_parsed
+
+      # Slices should still be not nil
+      expect(psd.resources[:slices]).to_not be_nil
+
+      # But slices version should be equal to 6
+      expect(psd.resources[:slices].data.version).to eq 6
+
+      # Slices data to be nil
+      expect(psd.resources[:slices].data.to_a).to eq []
+    end
+  end
+
+  describe "Handle file without slices properly" do
+    #TODO: All files have atleast one autogenerated slice. Dunno how to handle this case yet!
+    #it "should successfully parse a PSD file which does not have slices" do
+    #end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psd
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Ryan LeFevre
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-23 00:00:00.000000000 Z
+date: 2013-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -144,7 +144,9 @@ 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
@@ -170,6 +172,8 @@ files:
 - lib/psd/layer/path_components.rb
 - lib/psd/layer/position_and_channels.rb
 - lib/psd/layer_info.rb
+- lib/psd/layer_info/blend_clipping_elements.rb
+- lib/psd/layer_info/blend_interior_elements.rb
 - lib/psd/layer_info/fill_opacity.rb
 - lib/psd/layer_info/layer_group.rb
 - lib/psd/layer_info/layer_id.rb
@@ -183,7 +187,11 @@ files:
 - 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_2.rb
+- 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/logger.rb
 - lib/psd/mask.rb
 - lib/psd/node.rb
@@ -192,6 +200,7 @@ files:
 - lib/psd/node_layer.rb
 - lib/psd/node_root.rb
 - lib/psd/nodes/ancestry.rb
+- lib/psd/nodes/build_preview.rb
 - lib/psd/nodes/has_children.rb
 - lib/psd/nodes/lock_to_origin.rb
 - lib/psd/nodes/parse_layers.rb
@@ -201,6 +210,7 @@ files:
 - lib/psd/resource_section.rb
 - lib/psd/resources.rb
 - lib/psd/resources/layer_comps.rb
+- lib/psd/resources/slices.rb
 - lib/psd/section.rb
 - lib/psd/util.rb
 - lib/psd/version.rb
@@ -210,12 +220,14 @@ files:
 - spec/files/path.psd
 - spec/files/pixel.psd
 - spec/files/simplest.psd
+- spec/files/slices.psd
 - spec/files/text.psd
 - spec/hierarchy_spec.rb
 - spec/identity_spec.rb
 - spec/image_spec.rb
 - spec/parsing_spec.rb
 - spec/psd_spec.rb
+- spec/slices_spec.rb
 - spec/spec_helper.rb
 - spec/text_spec.rb
 homepage: http://cosmos.layervault.com/psdrb.html
@@ -248,11 +260,13 @@ test_files:
 - spec/files/path.psd
 - spec/files/pixel.psd
 - spec/files/simplest.psd
+- spec/files/slices.psd
 - spec/files/text.psd
 - spec/hierarchy_spec.rb
 - spec/identity_spec.rb
 - spec/image_spec.rb
 - spec/parsing_spec.rb
 - spec/psd_spec.rb
+- spec/slices_spec.rb
 - spec/spec_helper.rb
 - spec/text_spec.rb