psd 3.2.4 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5853601336a5bf10d6b88f63b5531ceb88bdd4aa
-  data.tar.gz: d7334ea5cf8f8c4ef2ef8ee407ebbe65cffb73db
+  metadata.gz: 6c7fc077ce3a8060aa8522a16838388a5a1930fa
+  data.tar.gz: 07cd330663d7d94810c89f031d09bc41269610b3
 SHA512:
-  metadata.gz: 0ce5801d31518ae76637c103b39847ee2a2fc09bd8ca23b4db7e60b63661e76e9881cbb4e6096a2e35ba21c6b3bd6bb640eab4e08be8af64a588e483114b9923
-  data.tar.gz: 380ac3504e5de0048aa9d7c229d6bed86da035d3d296dac525231f42ef0bf33c0d02d5656bd2e5aad2c00bbb9b31ead2e1b764b76ed063082470658cff73322c
+  metadata.gz: 0b6deef34cb5f66e8c079da3c72ffae7d2f8ad8baed3a91f1f8552d29a8bd6dcead464474bed1f715c60a1927e48e22ecd7583f80aaad580c95e536bc2e86532
+  data.tar.gz: 5526dceb6954320be9ae3fd1d3a5a55b9820a8db16e68fea257e07f49f2f1207780010ec09a4cb2a73feca8c11895d112cb4dc16097fc3deff619c90268ebbfd

data/.travis.yml

@@ -3,4 +3,5 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.2.1
   - jruby-19mode

data/README.md

@@ -219,6 +219,31 @@ psd.tree.filter_by_comp("Version A").save_as_png('./Version A.png')
 psd.tree.children_at_path("Group 1").first.to_png
 ```
 
+### Slices
+
+Because slices are relative to the full document, you can access them directly on the `psd` object. Use `psd.slices` to get an array of all slices in the document.
+
+``` ruby
+slices = psd.slices
+slices.first.name #=> "Logo"
+slices.first.left #=> 20
+slices.first.width #=> 200
+```
+
+You can also search for slices if you know their name or ID. Because slice names do not need to be unique, `slices_by_name` will always return an array of all matches.
+
+``` ruby
+psd.slice_by_id(2)
+psd.slices_by_name('Logo')
+```
+
+Finally, you can export slices as PNGs.
+
+``` ruby
+psd.slices.first.to_png #=> ChunkyPNG canvas
+psd.slices_by_name('Logo').first.save_as_png('Logo.png') #=> writes Logo.png
+```
+
 ### Debugging
 
 If you run into any problems parsing a PSD, you can enable debug logging via the `PSD_DEBUG` environment variable. For example:

data/lib/psd.rb

@@ -1,23 +1,29 @@
+require 'forwardable'
 require 'psd/enginedata'
 require 'chunky_png'
 require 'xmp'
-# require "cairo"
-
-require 'active_support/core_ext/module/delegation'
-require 'active_support/concern'
-
-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 '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
@@ -25,6 +31,7 @@ end
 class PSD
   include Logger
   include Helpers
+  include Slices
 
   attr_reader :file, :opts
   alias :options :opts

data/lib/psd/channel_image.rb

@@ -1,4 +1,6 @@
 require 'psd/image'
+require 'psd/image_formats/layer_rle'
+require 'psd/image_formats/layer_raw'
 
 class PSD
   # Represents an image for a single layer, which differs slightly in format from

data/lib/psd/helpers.rb

@@ -45,7 +45,7 @@ class PSD
     end
 
     def slices
-      resource(:slices).to_a
+      @slices ||= resource(:slices).to_a.map { |s| Slice.new(self, s) }
     end
   end
-end
+end

data/lib/psd/image.rb

@@ -1,6 +1,14 @@
+require 'psd/image_formats/raw'
+require 'psd/image_formats/rle'
+require 'psd/image_modes/cmyk'
+require 'psd/image_modes/greyscale'
+require 'psd/image_modes/rgb'
+require 'psd/image_exports/png'
+
 class PSD
   # Parses the full preview image at the end of the PSD document.
   class Image
+    extend Forwardable
     include ImageFormat::RAW
     include ImageFormat::RLE
     include ImageMode::CMYK
@@ -11,6 +19,9 @@ class PSD
     attr_reader :pixel_data, :opacity, :has_mask
     alias :has_mask? :has_mask
 
+    # We delegate a few useful methods to the header.
+    def_delegators :@header, :height, :width, :channels, :depth, :mode
+
     # All of the possible compression formats Photoshop uses.
     COMPRESSIONS = [
       'Raw',
@@ -60,13 +71,6 @@ class PSD
       return self
     end
 
-    # We delegate a few useful methods to the header.
-    [:height, :width, :channels, :depth, :mode].each do |attribute|
-      define_method attribute do
-        @header.send(attribute)
-      end
-    end
-
     private
 
     def set_channels_info

data/lib/psd/layer.rb

@@ -1,3 +1,14 @@
+require 'psd/layer/blend_modes'
+require 'psd/layer/blending_ranges'
+require 'psd/layer/channel_image'
+require 'psd/layer/exporting'
+require 'psd/layer/helpers'
+require 'psd/layer/info'
+require 'psd/layer/mask'
+require 'psd/layer/name'
+require 'psd/layer/path_components'
+require 'psd/layer/position_and_channels'
+
 class PSD
   # Represents a single layer and all of the data associated with
   # that layer.
@@ -60,4 +71,4 @@ class PSD
       self.send(val)
     end
   end
-end
+end

data/lib/psd/layer/blend_modes.rb

@@ -1,9 +1,11 @@
 class PSD
   class Layer
     module BlendModes
+      extend Forwardable
+      
       attr_reader :blend_mode
 
-      delegate :opacity, :visible, :clipped?, to: :blend_mode
+      def_delegators :blend_mode, :opacity, :visible, :clipped?
       alias_method :visible?, :visible
 
       # Is this layer hidden?
@@ -27,4 +29,4 @@ class PSD
       end
     end
   end
-end
+end

data/lib/psd/layer/info.rb

@@ -1,3 +1,27 @@
+require 'psd/layer/info/blend_clipping_elements'
+require 'psd/layer/info/blend_interior_elements'
+require 'psd/layer/info/fill_opacity'
+require 'psd/layer/info/gradient_fill'
+require 'psd/layer/info/layer_group'
+require 'psd/layer/info/layer_id'
+require 'psd/layer/info/layer_name_source'
+require 'psd/layer/info/layer_section_divider'
+require 'psd/layer/info/legacy_typetool'
+require 'psd/layer/info/locked'
+require 'psd/layer/info/metadata_setting'
+require 'psd/layer/info/object_effects'
+require 'psd/layer/info/pattern'
+require 'psd/layer/info/placed_layer'
+require 'psd/layer/info/reference_point'
+require 'psd/layer/info/sheet_color'
+require 'psd/layer/info/solid_color'
+require 'psd/layer/info/typetool'
+require 'psd/layer/info/unicode_name'
+require 'psd/layer/info/vector_mask'
+require 'psd/layer/info/vector_origination'
+require 'psd/layer/info/vector_stroke'
+require 'psd/layer/info/vector_stroke_content'
+
 class PSD
   class Layer
     module Info

data/lib/psd/{layer_info → layer/info}/legacy_typetool.rb

@@ -1,5 +1,5 @@
 require 'psd/layer_info'
-require 'psd/layer_info/typetool'
+require 'psd/layer/info/typetool'
 
 class PSD
   class LegacyTypeTool < TypeTool
@@ -87,4 +87,4 @@ class PSD
       ""
     end
   end
-end
+end

data/lib/psd/node.rb

@@ -1,13 +1,15 @@
 require 'psd/nodes/ancestry'
+require 'psd/nodes/build_preview'
 require 'psd/nodes/search'
 require 'psd/nodes/layer_comps'
-require 'psd/nodes/build_preview'
 
 # Internal structure to help us build trees of a Photoshop documents.
 # A lot of method names borrowed from the Ruby ancestry gem.
 class PSD
   module Node
     class Base
+      extend Forwardable
+
       include Enumerable
       include Ancestry
       include Search
@@ -17,13 +19,12 @@ class PSD
       # Default properties that all nodes contain
       PROPERTIES = [:name, :left, :right, :top, :bottom, :height, :width]
 
-      attr_reader :name, :parent
+      attr_reader :id, :name, :parent
       attr_accessor :children, :layer, :force_visible, :top_offset, :left_offset
 
-      delegate :psd, to: :parent
-      delegate :name, to: :layer
-      delegate :each, to: :children
-      delegate :document_dimensions, to: :parent
+      def_delegators :parent, :psd, :document_dimensions
+      def_delegator :layer, :name
+      def_delegator :children, :each
 
       def initialize(layer, parent = nil)
         @layer = layer
@@ -32,6 +33,7 @@ class PSD
         @parent = parent
         @children = []
         
+        @id = begin layer.layer_id.id rescue nil end
         @force_visible = nil
         @top = @layer.top.to_i
         @bottom = @layer.bottom.to_i
@@ -141,4 +143,8 @@ class PSD
       end
     end
   end
-end
+end
+
+require 'psd/nodes/group'
+require 'psd/nodes/layer'
+require 'psd/nodes/root'

data/lib/psd/nodes/ancestry.rb

@@ -2,102 +2,98 @@ class PSD
   module Node
     # Collection of methods to help in traversing the PSD tree structure.
     module Ancestry
-      extend ActiveSupport::Concern
-
-      included do
-        # Returns the root node
-        def root
-          return self if is_root?
-          return parent.root
-        end
+      # Returns the root node
+      def root
+        return self if is_root?
+        return parent.root
+      end
 
-        # Is this node the root node?
-        def root?
-          self.is_a?(PSD::Node::Root)
-        end
-        alias :is_root? :root?
+      # Is this node the root node?
+      def root?
+        self.is_a?(PSD::Node::Root)
+      end
+      alias :is_root? :root?
 
-        # Returns all ancestors in the path of this node. This
-        # does NOT return the root node.
-        def ancestors
-          return [] if parent.nil? || parent.is_root?
-          return parent.ancestors + [parent]
-        end
+      # Returns all ancestors in the path of this node. This
+      # does NOT return the root node.
+      def ancestors
+        return [] if parent.nil? || parent.is_root?
+        return parent.ancestors + [parent]
+      end
 
-        # Does this node have any children nodes?
-        def has_children?
-          children.length > 0
-        end
+      # Does this node have any children nodes?
+      def has_children?
+        children.length > 0
+      end
 
-        # Inverse of has_children?
-        def childless?
-          !has_children?
-        end
+      # Inverse of has_children?
+      def childless?
+        !has_children?
+      end
 
-        # Returns all sibling nodes including the current node. Can also
-        # be thought of as all children of the parent of this node.
-        def siblings
-          return [] if parent.nil?
-          parent.children
-        end
+      # Returns all sibling nodes including the current node. Can also
+      # be thought of as all children of the parent of this node.
+      def siblings
+        return [] if parent.nil?
+        parent.children
+      end
 
-        def next_sibling
-          return nil if parent.nil?
-          index = siblings.index(self)
-          siblings[index + 1]
-        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
+      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
-        end
+      # Does this node have any siblings?
+      def has_siblings?
+        siblings.length > 1
+      end
 
-        # Is this node the only descendant of its parent?
-        def only_child?
-          siblings.length == 1
-        end
+      # Is this node the only descendant of its parent?
+      def only_child?
+        siblings.length == 1
+      end
 
-        # Recursively get all descendant nodes, not including this node.
-        def descendants
-          children.map(&:subtree).flatten
-        end
+      # Recursively get all descendant nodes, not including this node.
+      def descendants
+        children.map(&:subtree).flatten
+      end
 
-        # Same as descendants, except it includes this node.
-        def subtree
-          [self] + descendants
-        end
+      # Same as descendants, except it includes this node.
+      def subtree
+        [self] + descendants
+      end
 
-        # Depth from the root node. Root depth is 0.
-        def depth
-          return ancestors.length + 1
-        end
+      # Depth from the root node. Root depth is 0.
+      def depth
+        return ancestors.length + 1
+      end
 
-        def path(as_array = false)
-          path = (ancestors.map(&:name) + [name])
-          as_array ? path : path.join('/')
-        end
+      def path(as_array = false)
+        path = (ancestors.map(&:name) + [name])
+        as_array ? path : path.join('/')
+      end
 
-        def method_missing(method, *args, &block)
-          test = /^(.+)_(layers|groups)$/.match(method)
-          if test
-            m = self.respond_to?(test[1]) ? test[1] : "#{test[1]}s"
-            self.send(m).select &method("#{test[2]}_only")
-          else
-            super
-          end
+      def method_missing(method, *args, &block)
+        test = /^(.+)_(layers|groups)$/.match(method)
+        if test
+          m = self.respond_to?(test[1]) ? test[1] : "#{test[1]}s"
+          self.send(m).select &method("#{test[2]}_only")
+        else
+          super
         end
+      end
 
-        private
+      private
 
-        def layers_only(d); d.layer?; end
-        def groups_only(d); d.group?(false); end
-      end
+      def layers_only(d); d.layer?; end
+      def groups_only(d); d.group?(false); end
     end
   end
-end
+end

data/lib/psd/nodes/layer.rb

@@ -3,12 +3,12 @@ require 'psd/node'
 class PSD
   module Node
     class Layer < PSD::Node::Base
+      extend Forwardable
+      
       attr_reader :layer
 
-      [:text, :ref_x, :ref_y, :blending_mode].each do |prop|
-        delegate prop, to: :@layer
-        delegate "#{prop}=", to: :@layer
-      end
+      def_delegators :@layer, :text, :ref_x, :ref_y, :blending_mode
+      def_delegators :@layer, :text=, :ref_x=, :ref_y=, :blending_mode=
 
       def empty?
         width == 0 || height == 0
@@ -42,4 +42,4 @@ class PSD
       end
     end
   end
-end
+end

data/lib/psd/nodes/search.rb

@@ -1,6 +1,10 @@
 class PSD
   module Node
     module Search
+      def find_by_id(id)
+        subtree.select { |n| n.id == id }.first
+      end
+
       # Searches the tree structure for a node at the given path. The path is
       # defined by the layer/folder names. Because the PSD format does not
       # require unique layer/folder names, we always return an array of all
@@ -27,4 +31,4 @@ class PSD
       alias :children_with_path :children_at_path
     end
   end
-end
+end

data/lib/psd/renderer.rb

@@ -1,4 +1,11 @@
+require 'psd/renderer/blender'
+require 'psd/renderer/canvas'
 require 'psd/renderer/canvas_management'
+require 'psd/renderer/clipping_mask'
+require 'psd/renderer/compose'
+require 'psd/renderer/layer_styles'
+require 'psd/renderer/mask'
+require 'psd/renderer/mask_canvas'
 
 class PSD
   class Renderer
@@ -92,4 +99,4 @@ class PSD
       @node_stack.last
     end
   end
-end
+end

data/lib/psd/renderer/canvas.rb

@@ -1,10 +1,12 @@
 class PSD
   class Renderer
     class Canvas
+      extend Forwardable
+
       attr_reader :canvas, :node, :opts, :width, :height, :opacity, :fill_opacity
 
-      delegate :top, :right, :bottom, :left, to: :node
-      delegate :[], :[]=, :get_pixel, :set_pixel, to: :canvas
+      def_delegators :node, :top, :right, :bottom, :left
+      def_delegators :canvas, :[], :[]=, :get_pixel, :set_pixel
 
       def initialize(node, width = nil, height = nil, opts = {})
         @node = node

data/lib/psd/resources.rb

@@ -1,3 +1,7 @@
+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
@@ -51,4 +55,4 @@ class PSD
       @length ||= @file.read_int
     end
   end
-end
+end

data/lib/psd/resources/base.rb

@@ -1,5 +1,3 @@
-require 'psd/resources/base'
-
 class PSD
   class Resource
     module Section
@@ -24,4 +22,9 @@ class PSD
       end
     end
   end
-end
+end
+
+require 'psd/resources/guides'
+require 'psd/resources/layer_comps'
+require 'psd/resources/slices'
+require 'psd/resources/xmp_metadata'

data/lib/psd/slice.rb

@@ -0,0 +1,39 @@
+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
+
+    def initialize(psd, data)
+      @psd = psd
+      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
+  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/version.rb

@@ -1,3 +1,3 @@
 class PSD
-  VERSION = "3.2.4"
+  VERSION = "3.3.1"
 end

data/psd.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'rake'
   gem.add_dependency 'psd-enginedata', '~> 1'
   gem.add_dependency 'chunky_png'
-  gem.add_dependency 'activesupport'
   gem.add_dependency 'xmp'
 
   gem.test_files = Dir.glob("spec/**/*")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psd
 version: !ruby/object:Gem::Version
-  version: 3.2.4
+  version: 3.3.1
 platform: ruby
 authors:
 - Ryan LeFevre
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-21 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -53,20 +53,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: xmp
   requirement: !ruby/object:Gem::Requirement
@@ -178,34 +164,34 @@ files:
 - lib/psd/layer/exporting.rb
 - lib/psd/layer/helpers.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/gradient_fill.rb
+- lib/psd/layer/info/layer_group.rb
+- lib/psd/layer/info/layer_id.rb
+- lib/psd/layer/info/layer_name_source.rb
+- lib/psd/layer/info/layer_section_divider.rb
+- lib/psd/layer/info/legacy_typetool.rb
+- lib/psd/layer/info/locked.rb
+- lib/psd/layer/info/metadata_setting.rb
+- lib/psd/layer/info/object_effects.rb
+- lib/psd/layer/info/pattern.rb
+- lib/psd/layer/info/placed_layer.rb
+- lib/psd/layer/info/reference_point.rb
+- lib/psd/layer/info/sheet_color.rb
+- lib/psd/layer/info/solid_color.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_origination.rb
+- lib/psd/layer/info/vector_stroke.rb
+- lib/psd/layer/info/vector_stroke_content.rb
 - lib/psd/layer/mask.rb
 - lib/psd/layer/name.rb
 - 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/gradient_fill.rb
-- lib/psd/layer_info/layer_group.rb
-- lib/psd/layer_info/layer_id.rb
-- lib/psd/layer_info/layer_name_source.rb
-- lib/psd/layer_info/layer_section_divider.rb
-- lib/psd/layer_info/legacy_typetool.rb
-- lib/psd/layer_info/locked.rb
-- lib/psd/layer_info/metadata_setting.rb
-- lib/psd/layer_info/object_effects.rb
-- lib/psd/layer_info/pattern.rb
-- lib/psd/layer_info/placed_layer.rb
-- lib/psd/layer_info/reference_point.rb
-- lib/psd/layer_info/sheet_color.rb
-- lib/psd/layer_info/solid_color.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_origination.rb
-- lib/psd/layer_info/vector_stroke.rb
-- lib/psd/layer_info/vector_stroke_content.rb
 - lib/psd/layer_mask.rb
 - lib/psd/lazy_execute.rb
 - lib/psd/logger.rb
@@ -239,6 +225,8 @@ files:
 - lib/psd/resources/layer_comps.rb
 - lib/psd/resources/slices.rb
 - lib/psd/resources/xmp_metadata.rb
+- lib/psd/slice.rb
+- lib/psd/slices.rb
 - lib/psd/util.rb
 - lib/psd/version.rb
 - psd.gemspec
@@ -285,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: General purpose library for parsing Photoshop files