psd 2.1.2 → 3.9.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psd
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 3.9.0
 platform: ruby
 authors:
 - Ryan LeFevre
@@ -9,118 +9,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   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: bindata
+  name: psd-enginedata
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: psd-enginedata
+  name: chunky_png
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: chunky_png
+  name: xmp
   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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 description: Parse Photoshop PSD files with ease
@@ -131,16 +131,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
 - Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- circle.yml
 - lib/psd.rb
 - lib/psd/blend_mode.rb
 - lib/psd/channel_image.rb
@@ -165,69 +164,106 @@ files:
 - lib/psd/layer/exporting.rb
 - lib/psd/layer/helpers.rb
 - lib/psd/layer/info.rb
+- lib/psd/layer/info/black_white.rb
+- lib/psd/layer/info/blend_clipping_elements.rb
+- lib/psd/layer/info/blend_interior_elements.rb
+- lib/psd/layer/info/brightness_contrast.rb
+- lib/psd/layer/info/channel_blending_restrictions.rb
+- lib/psd/layer/info/channel_mixer.rb
+- lib/psd/layer/info/color_balance.rb
+- 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
+- lib/psd/layer/info/gradient_map.rb
+- lib/psd/layer/info/hue_saturation.rb
+- lib/psd/layer/info/invert.rb
+- lib/psd/layer/info/knockout.rb
+- lib/psd/layer/info/layer_effects.rb
+- lib/psd/layer/info/layer_group.rb
+- lib/psd/layer/info/layer_id.rb
+- lib/psd/layer/info/layer_mask_as_global_mask.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/levels.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/pattern_fill.rb
+- lib/psd/layer/info/photo_filter.rb
+- lib/psd/layer/info/placed_layer.rb
+- lib/psd/layer/info/posterize.rb
+- lib/psd/layer/info/reference_point.rb
+- lib/psd/layer/info/selective_color.rb
+- lib/psd/layer/info/sheet_color.rb
+- lib/psd/layer/info/solid_color.rb
+- lib/psd/layer/info/threshold.rb
+- lib/psd/layer/info/transparency_shapes_layer.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_mask_as_global_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/info/vibrance.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/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/placed_layer.rb
-- lib/psd/layer_info/reference_point.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_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/lazy_execute.rb
 - lib/psd/logger.rb
 - lib/psd/mask.rb
 - lib/psd/node.rb
-- lib/psd/node_exporting.rb
-- lib/psd/node_group.rb
-- 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
+- lib/psd/nodes/group.rb
+- lib/psd/nodes/layer.rb
+- lib/psd/nodes/layer_comps.rb
+- lib/psd/nodes/locking.rb
+- lib/psd/nodes/root.rb
 - lib/psd/nodes/search.rb
 - lib/psd/path_record.rb
 - lib/psd/renderer.rb
 - lib/psd/renderer/blender.rb
+- lib/psd/renderer/cairo_helpers.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/renderer/mask_canvas.rb
+- lib/psd/renderer/vector_shape.rb
 - lib/psd/resource.rb
 - lib/psd/resource_section.rb
 - lib/psd/resources.rb
+- lib/psd/resources/base.rb
 - lib/psd/resources/guides.rb
 - lib/psd/resources/layer_comps.rb
+- lib/psd/resources/resolution_info.rb
+- lib/psd/resources/saved_path.rb
 - lib/psd/resources/slices.rb
-- lib/psd/section.rb
+- lib/psd/resources/work_path.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
+- spec/files/alignment_modes.psd
 - spec/files/blendmodes.psd
 - spec/files/empty-layer-subgroups.psd
 - spec/files/empty-layer.psd
+- spec/files/example.psb
 - spec/files/example.psd
 - spec/files/guides.psd
 - spec/files/locked.psd
@@ -243,6 +279,7 @@ files:
 - spec/lazy_execute_spec.rb
 - spec/locked_spec.rb
 - spec/parsing_spec.rb
+- spec/psb_parsing_spec.rb
 - spec/psd_spec.rb
 - spec/slices_spec.rb
 - spec/spec_helper.rb
@@ -257,40 +294,43 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.7.0
 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/spec_helper.rb
+- spec/psb_parsing_spec.rb
+- spec/slices_spec.rb
+- spec/guides_spec.rb
+- spec/parsing_spec.rb
+- spec/image_spec.rb
+- spec/lazy_execute_spec.rb
+- spec/locked_spec.rb
+- spec/text_spec.rb
+- spec/files/slices.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
 - spec/files/pixel.psd
+- spec/files/one_layer.psd
+- spec/files/alignment_modes.psd
+- spec/files/locked.psd
 - spec/files/simplest.psd
-- spec/files/slices.psd
+- spec/files/blendmodes.psd
+- spec/files/example.psd
 - spec/files/text.psd
-- spec/guides_spec.rb
+- spec/files/example.psb
+- spec/files/empty-layer-subgroups.psd
+- spec/files/guides.psd
 - spec/hierarchy_spec.rb
-- spec/image_spec.rb
-- spec/lazy_execute_spec.rb
-- spec/locked_spec.rb
-- spec/parsing_spec.rb
 - spec/psd_spec.rb
-- spec/slices_spec.rb
-- spec/spec_helper.rb
-- spec/text_spec.rb

data/circle.yml

@@ -1,6 +0,0 @@
-machine:
-  ruby:
-    version: 2.0.0-p195
-test:
-  override:
-    - rspec

data/lib/psd/layer_info/vector_mask_2.rb

@@ -1,10 +0,0 @@
-require_relative 'vector_mask'
-
-class PSD
-  # Identical to VectorMask, except with a different key. This
-  # exists in Photoshop >= CS6. If this key exists, then there
-  # is also a vscg key.
-  class VectorMask2 < VectorMask
-    @key = 'vsms'
-  end
-end

data/lib/psd/node_exporting.rb

@@ -1,20 +0,0 @@
-class PSD
-  module NodeExporting #:nodoc:
-    def export_node(node, path)
-      hide_all_nodes
-      node.show!
-      node.lock_to_origin
-
-      width_difference_factor = @header.cols.to_f / node.width
-      height_difference_factor =  @header.rows.to_f / node.height
-      @header.cols, @header.rows = node.width, node.height
-
-      node.scale_path_components(width_difference_factor, height_difference_factor)
-      export path
-    end
-
-    def hide_all_nodes
-      tree.descendants.map(&:hide!)
-    end
-  end
-end

data/lib/psd/node_group.rb

@@ -1,86 +0,0 @@
-require_relative 'node'
-
-class PSD::Node
-  # Represents a group, or folder, in the PSD document. It can have
-  # zero or more children nodes.
-  class Group < PSD::Node
-    include PSD::HasChildren
-    include PSD::Node::LockToOrigin
-
-    attr_reader :name, :top, :left, :bottom, :right
-
-    # Parses the descendant tree structure and figures out the bounds
-    # of the layers within this folder.
-    def initialize(folder)
-      @name = folder[:name]
-      @layer = folder[:layer]
-      
-      super(folder[:layers])
-      get_dimensions
-    end
-
-    # Calculated height of this folder.
-    def rows
-      @bottom - @top
-    end
-    alias :height :rows
-
-    # Calculated width of this folder.
-    def cols
-      @right - @left
-    end
-    alias :width :cols
-
-    # Attempt to translate this folder and all of the descendants.
-    def translate(x=0, y=0)
-      @children.each{ |c| c.translate(x,y) }
-    end
-
-    # Attempt to hide all children of this layer.
-    def hide!
-      @children.each{ |c| c.hide! }
-    end
-
-    # Attempt to show all children of this layer.
-    def show!
-      @children.each{ |c| c.show! }
-    end
-
-    def passthru_blending?
-      blending_mode == 'passthru'
-    end
-
-    def empty?
-      @children.each do |child|
-        return false unless child.empty?
-      end
-      
-      return true
-    end
-
-    # Export this layer and it's children to a hash recursively.
-    def to_hash
-      super.merge({
-        type: :group,
-        visible: visible?,
-        children: children.map(&:to_hash)
-      })
-    end
-
-    # If the method is missing, we blindly send it to the layer.
-    # The layer handles the case in which the method doesn't exist.
-    def method_missing(method, *args, &block)
-      @layer.send(method, *args, &block)
-    end
-
-    private
-
-    def get_dimensions
-      children = @children.reject(&:empty?)
-      @left = children.map(&:left).min || 0
-      @top = children.map(&:top).min || 0
-      @bottom = children.map(&:bottom).max || 0
-      @right = children.map(&:right).max || 0
-    end
-  end
-end

data/lib/psd/node_layer.rb

@@ -1,81 +0,0 @@
-require_relative 'node'
-
-class PSD::Node
-  class Layer < PSD::Node
-    include PSD::Node::LockToOrigin
-
-    attr_reader :layer
-
-    # Stores a reference to the PSD::Layer
-    def initialize(layer)
-      @layer = layer
-      layer.node = self
-
-      super([])
-    end
-
-    # Delegates some methods to the PSD::Layer
-    [:text, :ref_x, :ref_y].each do |meth|
-      define_method meth do
-        @layer.send(meth)
-      end
-
-      define_method "#{meth}=" do |val|
-        @layer.send("#{meth}=", val)
-      end
-    end
-
-    # Attempt to translate the layer.
-    def translate(x=0, y=0)
-      @layer.translate x, y
-    end
-
-    # Attempt to scale the path components of the layer.
-    def scale_path_components(xr, yr)
-      @layer.scale_path_components(xr, yr)
-    end
-
-    # Tries to hide the layer by moving it way off canvas.
-    def hide!
-      # TODO actually mess with the blend modes instead of
-      # just putting things way off canvas
-      return if @hidden_by_kelly
-      translate(100000, 10000)
-      @hidden_by_kelly = true
-    end
-
-    # Tries to re-show the canvas by moving it back to it's original position.
-    def show!
-      if @hidden_by_kelly
-        translate(-100000, -10000)
-        @hidden_by_kelly = false
-      end
-    end
-
-    def empty?
-      width == 0 || height == 0
-    end
-
-    # Exports this layer to a Hash.
-    def to_hash
-      super.merge({
-        type: :layer,
-        text: @layer.text,
-        ref_x: @layer.reference_point.x,
-        ref_y: @layer.reference_point.y,
-        mask: @layer.mask.to_hash,
-        image: {
-          width: @layer.image.width,
-          height: @layer.image.height,
-          channels: @layer.channels_info
-        }
-      })
-    end
-
-    # If the method is missing, we blindly send it to the layer.
-    # The layer handles the case in which the method doesn't exist.
-    def method_missing(method, *args, &block)
-      @layer.send(method, *args, &block)
-    end
-  end
-end

data/lib/psd/node_root.rb

@@ -1,93 +0,0 @@
-require_relative 'node'
-
-class PSD::Node
-  # Represents the root node of a Photoshop document
-  class Root < PSD::Node
-    include PSD::HasChildren
-    include PSD::Node::ParseLayers
-
-    attr_accessor :children
-    attr_reader :psd
-
-    # Stores a reference to the parsed PSD and builds the
-    # tree hierarchy.
-    def initialize(psd)
-      @psd = psd
-      build_hierarchy
-    end
-
-    # Recursively exports the hierarchy to a Hash
-    def to_hash
-      {
-        children: children.map(&:to_hash),
-        document: {
-          width: document_width,
-          height: document_height,
-          resources: {
-            layer_comps: @psd.layer_comps,
-            guides: @psd.guides,
-            slices: @psd.slices
-          }
-        }
-      }
-    end
-
-    # Returns the width and height of the entire PSD document.
-    def document_dimensions
-      [document_width, document_height]
-    end
-
-    # The width of the full PSD document as defined in the header.
-    def document_width
-      @psd.header.width.to_i
-    end
-    alias_method :width, :document_width
-
-    # The height of the full PSD document as defined in the header.
-    def document_height
-      @psd.header.height.to_i
-    end
-    alias_method :height, :document_height
-
-    # The root node has no name since it's not an actual layer or group.
-    def name
-      nil
-    end
-
-    # The depth of the root node is always 0.
-    def depth
-      0
-    end
-
-    [:top, :right, :bottom, :left].each do |meth|
-      define_method(meth) { 0 }
-    end
-
-    def opacity; 255; end
-    def fill_opacity; 255; end
-
-    private
-
-    def build_hierarchy
-      @children = []
-      result = { layers: [] }
-      parseStack = []
-
-      # First we build the hierarchy
-      @psd.layers.each do |layer|
-        if layer.folder?
-          parseStack << result
-          result = { name: layer.name, layer: layer, layers: [] }
-        elsif layer.folder_end?
-          temp = result
-          result = parseStack.pop
-          result[:layers] << temp
-        else
-          result[:layers] << layer
-        end
-      end
-
-      parse_layers(result[:layers])
-    end
-  end
-end

data/lib/psd/nodes/has_children.rb

@@ -1,13 +0,0 @@
-class PSD
-  module HasChildren
-    # Returns all group/folder children of this node.
-    def groups
-      @children.select{ |c| c.is_a?(PSD::Group) }
-    end
-
-    # Returns all layer children of this node.
-    def layers
-      @children.select{ |c| c.is_a?(PSD::Layer) }
-    end
-  end
-end

data/lib/psd/nodes/lock_to_origin.rb

@@ -1,7 +0,0 @@
-class PSD::Node
-  module LockToOrigin #:nodoc:
-    def lock_to_origin
-      translate(-left - 1, -top - 1)
-    end
-  end
-end