psd 2.1.2 → 3.1.2

data/lib/psd/resource_section.rb

@@ -1,10 +1,12 @@
 class PSD
   class Resource
-    class Section
+    module Section
       def self.factory(file, resource)
         Section.constants.each do |c|
+          next if c == :Base
+          
           section = Section.const_get(c)
-          next unless section.id == resource.id
+          next unless section.resource_id == resource.id
 
           section.new(file, resource).parse
           return section.name
@@ -12,11 +14,6 @@ class PSD
 
         return nil
       end
-
-      def initialize(file, resource)
-        @file = file
-        @resource = resource
-      end
     end
   end
 end

data/lib/psd/resources.rb

@@ -1,8 +1,6 @@
 class PSD
   # Parses and reads all of the Resource records in the document.
   class Resources
-    include Section
-
     attr_reader :resources
     alias :data :resources
     
@@ -15,14 +13,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 +26,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
@@ -59,11 +47,8 @@ class PSD
       @resources[@type_index[id]]
     end
 
-    private
-
     def length
-      return @length unless @length.nil?
-      @length = @file.read_int
+      @length ||= @file.read_int
     end
   end
 end

data/lib/psd/resources/base.rb

@@ -0,0 +1,27 @@
+require 'psd/resources/base'
+
+class PSD
+  class Resource
+    module Section
+      class Base
+        def self.resource_id(id = nil)
+          @resource_id = id unless id.nil?
+          @resource_id
+        end
+
+        def self.name(name = nil)
+          @name = name unless name.nil?
+          @name
+        end
+
+        def initialize(file, resource)
+          @file = file
+          @resource = resource
+        end
+
+        def resource_id; self.class.resource_id; end
+        def name; self.class.name; end
+      end
+    end
+  end
+end

data/lib/psd/resources/guides.rb

@@ -1,9 +1,11 @@
+require 'psd/resources/base'
+
 class PSD
   class Resource
-    class Section
-      class Guides < Section
-        def self.id; 1032; end
-        def self.name; :guides; end
+    module Section
+      class Guides < Base
+        resource_id 1032
+        name :guides
 
         def parse
           # Descriptor version

data/lib/psd/resources/layer_comps.rb

@@ -1,9 +1,11 @@
+require 'psd/resources/base'
+
 class PSD
   class Resource
-    class Section
-      class LayerComps < Section
-        def self.id; 1065; end
-        def self.name; :layer_comps; end
+    module Section
+      class LayerComps < Base
+        resource_id 1065
+        name :layer_comps
 
         def self.visibility_captured?(comp)
           comp[:captured_info] & 0b001 > 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/version.rb

@@ -1,3 +1,3 @@
 class PSD
-  VERSION = "2.1.2"
+  VERSION = "3.1.2"
 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 'chunky_png'
+  gem.add_dependency 'activesupport', '~> 3.2.7'
 
   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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psd
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 3.1.2
 platform: ruby
 authors:
 - Ryan LeFevre
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -25,20 +25,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bindata
-  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: psd-enginedata
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +53,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.7
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -181,12 +181,15 @@ files:
 - 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_mask_2.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
@@ -194,34 +197,32 @@ files:
 - 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/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/slices.rb
-- lib/psd/section.rb
 - lib/psd/util.rb
 - lib/psd/version.rb
 - psd.gemspec

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