psd 2.1.2 → 3.9.0

data/lib/psd/resources/slices.rb

@@ -1,11 +1,13 @@
+require 'psd/resources/base'
+
 class PSD
   class Resource
-    class Section
-      class Slices < Section
-        attr_reader :data, :version
+    module Section
+      class Slices < Base
+        resource_id 1050
+        name :slices
 
-        def self.id; 1050; end
-        def self.name; :slices; end
+        attr_reader :data, :version
 
         def parse
           @version = @file.read_int

data/lib/psd/resources/work_path.rb

@@ -0,0 +1,22 @@
+require 'psd/resources/base'
+
+class PSD
+  class Resource
+    module Section
+      class WorkPath < Base
+        resource_id 1025
+        name :work_path
+
+        def parse
+          paths = []
+          record_count = @resource.size / 26
+          record_count.times do
+            paths << PathRecord.new(@file)
+          end
+
+          @resource.data = paths
+        end
+      end
+    end
+  end
+end

data/lib/psd/resources/xmp_metadata.rb

@@ -0,0 +1,46 @@
+require 'psd/resources/base'
+
+class PSD
+  class Resource
+    module Section
+      class XMPMetadata < Base
+        resource_id 1060
+        name :xmp_metadata
+
+        attr_reader :xml, :data
+        alias_method :to_hash, :data
+
+        def parse
+          @xml = @file.read(@resource.size)
+          @data = {}
+
+          @xmp = XMP.new(xml)
+          @xmp.namespaces.each do |a|
+            parse_tree(a.to_sym)
+          end
+        rescue
+          PSD.logger.error "Unable to parse XMP Metadata"
+        ensure
+          @resource.data = self
+        end
+
+        private
+
+        def parse_tree(attr_name)
+          @data[attr_name] = {}
+          @xmp.send(attr_name).attributes.each do |a|
+            begin
+              @data[attr_name][a.to_sym] = @xmp.send(attr_name).send(a)[0]
+            rescue
+              @data[attr_name][a.to_sym] = parse_text_node(@xmp.send(attr_name), "//#{attr_name}:#{a}")
+            end
+          end
+        end
+
+        def parse_text_node(node, path)
+          node.send(:xml).xpath(path).first.text
+        end
+      end
+    end
+  end
+end

data/lib/psd/resources.rb

@@ -1,11 +1,13 @@
+require 'psd/resource_section'
+require 'psd/resource'
+require 'psd/resources/base'
+
 class PSD
   # Parses and reads all of the Resource records in the document.
   class Resources
-    include Section
-
     attr_reader :resources
     alias :data :resources
-    
+
     def initialize(file)
       @file = file
       @resources = {}
@@ -15,14 +17,9 @@ class PSD
 
     # Parses each Resource and stores them.
     def parse
-      start_section
-
-      n = length
-      start = @file.tell
-
-      while n > 0
-        pos = @file.tell
+      finish = length + @file.tell
 
+      while @file.tell < finish
         resource = Resource.new(@file)
         resource.parse
 
@@ -33,14 +30,9 @@ class PSD
         @type_index[name] = resource.id unless name.nil?
 
         @file.seek resource_end
-        n -= @file.tell - pos
       end
 
-      unless n == 0
-        @file.seek start + length
-      end
-
-      end_section
+      @file.seek finish if @file.tell != finish
     end
 
     def skip
@@ -55,15 +47,19 @@ class PSD
       end
     end
 
+    # Paths exist between resource ID 2000 and 2997
+    def saved_paths
+      @resources.
+        select { |id, r| id >= 2000 && id <= 2997 }.
+        map { |id, r| r }
+    end
+
     def by_type(id)
       @resources[@type_index[id]]
     end
 
-    private
-
     def length
-      return @length unless @length.nil?
-      @length = @file.read_int
+      @length ||= @file.read_int
     end
   end
-end
+end

data/lib/psd/slice.rb

@@ -0,0 +1,44 @@
+class PSD
+  class Slice
+    attr_reader :id, :group_id, :origin, :associated_layer_id, :name, :type,
+                :bounds, :url, :target, :message, :alt, :cell_text_is_html,
+                :cell_text, :horizontal_alignment, :vertical_alignment,
+                :color, :outset
+
+    def initialize(psd, data)
+      @psd = psd
+      @keys = data.keys
+      data.each do |k, v|
+        instance_variable_set("@#{k}", v)
+      end
+    end
+
+    [:left, :top, :right, :bottom].each do |dir|
+      define_method(dir) { @bounds[dir] }
+    end
+
+    def width
+      right - left
+    end
+
+    def height
+      bottom - top
+    end
+
+    def associated_layer
+      @psd.tree.find_by_id(associated_layer_id)
+    end
+
+    def to_png
+      @png ||= @psd.image.to_png.crop(left, top, width, height)
+    end
+
+    def save_as_png(file)
+      @png.save(file, :fast_rgba)
+    end
+
+    def to_hash
+      Hash[@keys.map { |k| [k.to_sym, self.send(k)] }]
+    end
+  end
+end

data/lib/psd/slices.rb

@@ -0,0 +1,13 @@
+require 'psd/slice'
+
+class PSD
+  module Slices
+    def slices_by_name(name)
+      slices.select { |s| s.name == name }
+    end
+
+    def slice_by_id(id)
+      slices.select { |s| s.id == id }.first
+    end
+  end
+end

data/lib/psd/util.rb

@@ -12,7 +12,9 @@ class PSD
     end
 
     def clamp(num, min, max)
-      [min, num, max].sort[1]
+      return max if num > max
+      return min if num < min
+      num
     end
   end
-end
+end

data/lib/psd/version.rb

@@ -1,3 +1,3 @@
 class PSD
-  VERSION = "2.1.2"
+  VERSION = "3.9.0"
 end

data/lib/psd.rb

@@ -1,21 +1,29 @@
-require "bindata"
-require "psd/enginedata"
-require "chunky_png"
-
-require_relative 'psd/section'
-
-dir_root = File.dirname(File.absolute_path(__FILE__)) + '/psd'
-[
-  '/image_exports/*',
-  '/image_formats/*',
-  '/image_modes/*',
-  '/nodes/*',
-  '/layer_info/*',
-  '/layer/*',
-  '/**/*'
-].each do |path|
-  Dir.glob(dir_root + path) { |file| require file if File.file?(file) }
-end
+require 'forwardable'
+require 'psd/enginedata'
+require 'chunky_png'
+require 'xmp'
+
+require 'psd/blend_mode'
+require 'psd/channel_image'
+require 'psd/color'
+require 'psd/descriptor'
+require 'psd/file'
+require 'psd/header'
+require 'psd/helpers'
+require 'psd/image'
+require 'psd/layer'
+require 'psd/layer_info'
+require 'psd/layer_mask'
+require 'psd/lazy_execute'
+require 'psd/logger'
+require 'psd/mask'
+require 'psd/node'
+require 'psd/path_record'
+require 'psd/renderer'
+require 'psd/resources'
+require 'psd/slices'
+require 'psd/util'
+require 'psd/version'
 
 # A general purpose parser for Photoshop files. PSDs are broken up in to 4 logical sections:
 # the header, resources, the layer mask (including layers), and the preview image. We parse
@@ -23,7 +31,7 @@ end
 class PSD
   include Logger
   include Helpers
-  include NodeExporting
+  include Slices
 
   attr_reader :file, :opts
   alias :options :opts
@@ -86,7 +94,9 @@ class PSD
   def header
     return @header if @header
 
-    @header = Header.read(@file)
+    @header = Header.new(@file)
+    @header.parse!
+
     PSD.logger.debug @header.inspect
   end
 
@@ -127,30 +137,6 @@ class PSD
     )
   end
 
-  # Export the current file to a new PSD. This may or may not work.
-  def export(file)
-    parse! unless parsed?
-
-    # Create our file for writing
-    outfile = File.open(file, 'w')
-
-    # Reset the file pointer
-    @file.seek 0
-    @header.write outfile
-    @file.seek @header.num_bytes, IO::SEEK_CUR
-
-    # Nothing in the header or resources we want to bother with changing
-    # right now. Write it straight to file.
-    outfile.write @file.read(@resources.end_of_section - @file.tell)
-
-    # Now, the changeable part. Layers and masks.
-    layer_mask.export(outfile)
-
-    # And the rest of the file (merged image data)
-    outfile.write @file.read
-    outfile.flush
-  end
-
   private
 
   def ensure_header
@@ -170,4 +156,4 @@ class PSD
     @layer_mask = LayerMask.new(@file, @header, @opts)
     @layer_mask.skip
   end
-end
+end

data/psd.gemspec

@@ -19,10 +19,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency 'rake'
-  gem.add_dependency 'bindata'
-  gem.add_dependency 'psd-enginedata', '~> 1.0'
-
+  gem.add_dependency 'psd-enginedata', '~> 1'
   gem.add_dependency 'chunky_png'
+  gem.add_dependency 'xmp'
 
   gem.test_files = Dir.glob("spec/**/*")
   gem.add_development_dependency 'rspec'

data/spec/hierarchy_spec.rb

@@ -71,6 +71,11 @@ describe "Hierarchy" do
       expect(node.path).to eq('Version A/Matte')
     end
 
+    it "should be able to return a path as an array" do
+      node = @tree.children_at_path('Version A/Matte').first
+      expect(node.path(:as_array)).to eq(['Version A', 'Matte'])
+    end
+
     describe "Searching" do
       it "should find a node given a path" do
         expect(@tree.children_at_path('Version A/Matte')).to be_an_instance_of(Array)

data/spec/locked_spec.rb

@@ -45,10 +45,10 @@ describe 'Locked' do
     expect(psd.tree.children[7].composite_locked?).to eq(true)
     expect(psd.tree.children[7].transparency_locked?).to eq(true)
 
-    expect(psd.tree.children[7].children[0].position_locked?).to eq(false)
-    expect(psd.tree.children[7].children[0].all_locked?).to eq(false)
-    expect(psd.tree.children[7].children[0].composite_locked?).to eq(false)
-    expect(psd.tree.children[7].children[0].transparency_locked?).to eq(false)
+    expect(psd.tree.children[7].children[0].position_locked?).to eq(true)
+    expect(psd.tree.children[7].children[0].all_locked?).to eq(true)
+    expect(psd.tree.children[7].children[0].composite_locked?).to eq(true)
+    expect(psd.tree.children[7].children[0].transparency_locked?).to eq(true)
 
     expect(psd.tree.children[7].children[1].position_locked?).to eq(true)
     expect(psd.tree.children[7].children[1].all_locked?).to eq(true)
@@ -56,9 +56,9 @@ describe 'Locked' do
     expect(psd.tree.children[7].children[1].transparency_locked?).to eq(true)
 
     expect(psd.tree.children[7].children[1].children[0].position_locked?).to eq(true)
-    expect(psd.tree.children[7].children[1].children[0].all_locked?).to eq(false)
-    expect(psd.tree.children[7].children[1].children[0].composite_locked?).to eq(false)
-    expect(psd.tree.children[7].children[1].children[0].transparency_locked?).to eq(false)
+    expect(psd.tree.children[7].children[1].children[0].all_locked?).to eq(true)
+    expect(psd.tree.children[7].children[1].children[0].composite_locked?).to eq(true)
+    expect(psd.tree.children[7].children[1].children[0].transparency_locked?).to eq(true)
 
     expect(psd.tree.children[8].position_locked?).to eq(true)
     expect(psd.tree.children[8].all_locked?).to eq(false)
@@ -75,4 +75,4 @@ describe 'Locked' do
     expect(psd.tree.children[12].composite_locked?).to eq(false)
     expect(psd.tree.children[12].transparency_locked?).to eq(false)
   end
-end
+end

data/spec/psb_parsing_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+describe 'Photoshop Big parsing' do
+  before(:each) do
+    @psd = PSD.new('spec/files/example.psb')
+  end
+
+  it 'parses without error' do
+    @psd.parse!
+    expect(@psd).to be_parsed
+  end
+
+  describe 'Header' do
+    before(:each) do
+      @psd.parse!
+    end
+
+    it 'should contain data' do
+      expect(@psd.header).not_to be_nil
+    end
+
+    it 'should be the proper version' do
+      expect(@psd.header.version).to eq(2)
+    end
+  end
+
+  describe 'Layer Mask' do
+    before(:each) do
+      @psd.parse!
+    end
+
+    it 'contains data' do
+      expect(@psd.layer_mask).to_not be_nil
+      expect(@psd.layer_mask).to be_an_instance_of(PSD::LayerMask)
+    end
+
+    it 'contains layers' do
+      expect(@psd.layer_mask.layers.size).to be > 0
+    end
+  end
+
+  describe 'Layers' do
+    before(:each) do
+      @psd.parse!
+    end
+
+    it 'contains each layer' do
+      expect(@psd.layer_mask.layers.size).to eq(2)
+      expect(@psd.layers).to be @psd.layer_mask.layers
+      @psd.layers.each { |l| expect(l).to be_an_instance_of(PSD::Layer) }
+    end
+
+    it 'shows the proper layer names' do
+      expect(@psd.layers.map(&:name)).to match_array(['summer', 'haze'])
+    end
+  end
+end

data/spec/text_spec.rb

@@ -24,4 +24,16 @@ describe 'Text' do
       expect(c[-1]).to eq(";")
     end
   end
-end
+end
+
+describe "Justified Text" do
+  let (:psd) { PSD.new('spec/files/alignment_modes.psd').tap(&:parse!) }
+  
+  ["left", "right", "center", "justify"].each do |alignment|
+    it "that is #{alignment} justified can be exported to CSS" do
+      type = psd.tree.children_at_path(alignment).first.type
+      css = type.to_css
+      expect(css).to include "text-align: #{alignment}"
+    end
+  end
+end