psd 3.1.5 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7fd480c63ed0479fe1dbbe9a621bbc9c16fe2f5
-  data.tar.gz: eb7a6ea8d275291b777cebceaa9ebf473d31ee5b
+  metadata.gz: f4bd38eaf1619d328b37f11d93117c313c645bd6
+  data.tar.gz: 4b54b449211063657e903917e20f0c78c5fd3297
 SHA512:
-  metadata.gz: 4644af2996008d6bc7837b2dffb0df524131e23fd1c176167d8dd8ff6f048c350ff6e5fb3e55c9ee5101e6514274a17d70e965a38f7807b564e355da3fd84788
-  data.tar.gz: e6857feefbbcfb2347954c0ddcb4439c886475ef17f64cdca8dbdac6f032fe33a5137207e37f36f759672249f6272928709f18b3d47cbbafcf2685bdad9fb334
+  metadata.gz: e4d989a86acfc3b2b3b7f3dcea3bad859aabc0e3cdbf74d7cc165decf5b490d75933368f6aff7ca7d4c9dbb87c0d8d67ed5bb393acc7ed4bc4d9fa75f6cf8de5
+  data.tar.gz: 0d8dc9000a99878c9f2806faba5d82a1dc387f01a6c201263643059154d836702e76b2228d9b4c9bc1daaa1a4ad1d40d9b4629137f6c726863604ce9e719fc50

data/lib/psd/node.rb

@@ -1,5 +1,6 @@
 require 'psd/nodes/ancestry'
 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.
@@ -10,6 +11,7 @@ class PSD
       include Enumerable
       include Ancestry
       include Search
+      include LayerComps
       include BuildPreview
 
       # Default properties that all nodes contain

data/lib/psd/nodes/layer.rb

@@ -16,18 +16,33 @@ class PSD
 
       # Exports this layer to a Hash.
       def to_hash
-        super.merge({
+        hash = super.merge({
           type: :layer,
           text: @layer.text,
-          ref_x: @layer.reference_point.x,
-          ref_y: @layer.reference_point.y,
+          ref_x: reference_point.x,
+          ref_y: reference_point.y,
           mask: @layer.mask.to_hash,
           image: {
             width: @layer.image.width,
             height: @layer.image.height,
             channels: @layer.channels_info
-          }
+          },
+          layer_comps: {}
         })
+
+        root.psd.layer_comps.each do |comp|
+          hash[:layer_comps][comp[:name]] = {
+            visible: visible_in_comp?(comp[:id]),
+            position: position_in_comp(comp[:id])
+          }
+        end
+
+        hash
+      end
+
+      # In case the layer doesn't have a reference point
+      def reference_point
+        @layer.reference_point || Struct.new(:x, :y).new(0, 0)
       end
 
       # If the method is missing, we blindly send it to the layer.

data/lib/psd/nodes/layer_comps.rb

@@ -0,0 +1,93 @@
+class PSD
+  module Node
+    module LayerComps
+      # Given a layer comp ID or name, create a new
+      # tree with layer/group visibility altered based on the layer comp.
+      def filter_by_comp(id)
+        comp = find_comp(id)
+        root = PSD::Node::Root.new(psd)
+        
+        # Force layers to be visible if they are enabled for the comp
+        root.descendants.each do |c|
+          set_visibility(comp, c) if Resource::Section::LayerComps.visibility_captured?(comp)
+          set_position(comp, c) if Resource::Section::LayerComps.position_captured?(comp)
+
+          PSD.logger.debug "#{c.path}: visible = #{c.visible?}, position = #{c.left}, #{c.top}"
+        end
+
+        return root
+      end
+
+      def visible_in_comp?(id)
+        determine_visibility(find_comp(id), self)
+      end
+
+      def position_in_comp(id)
+        offset = determine_position_offset(find_comp(id), self)
+        
+        {
+          top: top + offset[:y],
+          right: right + offset[:x],
+          bottom: bottom + offset[:y],
+          left: left + offset[:x]
+        }
+      end
+
+      private
+
+      def find_comp(id)
+        comp = if id.is_a?(String)
+          psd.layer_comps.select { |c| c[:name] == id }.first
+        else
+          psd.layer_comps.select { |c| c[:id] == id }.first
+        end
+
+        raise "Layer comp not found" if comp.nil?
+        comp
+      end
+
+      def set_visibility(comp, c)
+        c.force_visible = determine_visibility(comp, c)
+      end
+
+      def determine_visibility(comp, c)
+        visible = true
+        found = false
+
+        c
+          .metadata
+          .data[:layer_comp]['layerSettings'].each do |l|
+            visible = l['enab'] if l.has_key?('enab')
+            found = true and break if l['compList'].include?(comp[:id])
+          end
+
+        found && visible
+      end
+
+      def set_position(comp, c)
+        offset = determine_position_offset(comp, c)
+        
+        c.left_offset = offset[:x]
+        c.top_offset = offset[:y]
+      end
+
+      def determine_position_offset(comp, c)
+        x = 0
+        y = 0
+
+        c
+          .metadata
+          .data[:layer_comp]['layerSettings'].each do |l|
+            if l.has_key?('Ofst')
+              x = l['Ofst']['Hrzn']
+              y = l['Ofst']['Vrtc']
+            end
+            
+            break if l['compList'].include?(comp[:id])
+          end
+
+        { x: x, y: y }
+      end
+    end
+  end
+end

data/lib/psd/nodes/search.rb

@@ -25,67 +25,6 @@ class PSD
         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 with layer/group visibility altered based on the layer comp.
-      def filter_by_comp(id)
-        if id.is_a?(String)
-          comp = psd.layer_comps.select { |c| c[:name] == id }.first
-          raise "Layer comp not found" if comp.nil?
-
-          id = comp[:id]
-        else
-          comp = psd.layer_comps.select { |c| c[:id] == id }.first
-          raise "Layer comp not found" if comp.nil?
-        end
-
-        root = PSD::Node::Root.new(psd)
-        
-        # Force layers to be visible if they are enabled for the comp
-        root.descendants.each do |c|
-          set_visibility(comp, c) if Resource::Section::LayerComps.visibility_captured?(comp)
-          set_position(comp, c) if Resource::Section::LayerComps.position_captured?(comp)
-
-          PSD.logger.debug "#{c.path}: visible = #{c.visible?}, position = #{c.left}, #{c.top}"
-        end
-
-        return root
-      end
-
-      private
-
-      def set_visibility(comp, c)
-        visible = true
-        found = false
-
-        c
-          .metadata
-          .data[:layer_comp]['layerSettings'].each do |l|
-            visible = l['enab'] if l.has_key?('enab')
-            found = true and break if l['compList'].include?(comp[:id])
-          end
-
-        c.force_visible = found && visible
-      end
-
-      def set_position(comp, c)
-        x = 0
-        y = 0
-
-        c
-          .metadata
-          .data[:layer_comp]['layerSettings'].each do |l|
-            if l.has_key?('Ofst')
-              x = l['Ofst']['Hrzn']
-              y = l['Ofst']['Vrtc']
-            end
-            
-            break if l['compList'].include?(comp[:id])
-          end
-
-        c.left_offset = x
-        c.top_offset = y
-      end
     end
   end
 end

data/lib/psd/version.rb

@@ -1,3 +1,3 @@
 class PSD
-  VERSION = "3.1.5"
+  VERSION = "3.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psd
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.2.0
 platform: ruby
 authors:
 - Ryan LeFevre
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -215,6 +215,7 @@ files:
 - lib/psd/nodes/build_preview.rb
 - lib/psd/nodes/group.rb
 - lib/psd/nodes/layer.rb
+- lib/psd/nodes/layer_comps.rb
 - lib/psd/nodes/root.rb
 - lib/psd/nodes/search.rb
 - lib/psd/path_record.rb