psd 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef242e267a313a38f9ef7cebab141f870c85555e
-  data.tar.gz: ee3814e3f35306f61b9b26d6124ef021ec22cc00
+  metadata.gz: d9b96175c4675aceb277aa64cf381aa9d7f20561
+  data.tar.gz: 1c4d5d7d68921e1a1dbd222f8022d3f02e3b9d2c
 SHA512:
-  metadata.gz: d7260fadf4dc3a2e99126427a85ce355832a897a058d681e7afe708116c427cf76210f766fcc7641b5c43e889c9c295f8a38c269af16d6ffc96ce861ac21565b
-  data.tar.gz: e97f791180a8452ed959fd72c831929d95d0666f7178d8f4d7dcf92bf229c6004e761782b251a8d3958e324d3a0de139be746db609d21921dd81947f27c37ae2
+  metadata.gz: 9b86b19b017831e85e3c8b28a0d045a3858cc96a7c03e6c501c61225d32c7018f58e03dc4fbfd5252e2016ef67e593435493960cb9eabf76fcfba2cb85487666
+  data.tar.gz: 65e4d1d26be0132d00e4215803dbb709a4af2c39f8ca604ac470daedc5dce5b7ecc5cbadaa134f0a392986c7b8c4f3cbb5fbc322fc660a9fc4649a8f93a634bd

data/lib/psd/node.rb

@@ -5,6 +5,7 @@ require_relative 'nodes/search'
 # A lot of method names borrowed from the Ruby ancestry gem.
 class PSD
   class Node
+    include ParseLayers
     include Ancestry
     include Search
     include BuildPreview
@@ -12,16 +13,14 @@ class PSD
     # Default properties that all nodes contain
     PROPERTIES = [:name, :left, :right, :top, :bottom, :height, :width]
 
-    attr_accessor :parent, :children, :layer, :force_visible
+    attr_accessor :parent, :children, :layer, :force_visible, :top, :left
 
     def initialize(layers=[])
-      @children = []
-      layers.each do |layer|
-        layer.parent = self
-        @children << layer
-      end
+      parse_layers(layers)
 
       @force_visible = nil
+      @top = @layer.top
+      @left = @layer.left
     end
 
     def hidden?
@@ -29,6 +28,7 @@ class PSD
     end
 
     def visible?
+      return false if @layer.clipped? && !next_sibling.visible?
       force_visible.nil? ? @layer.visible? : force_visible
     end
 

data/lib/psd/node_group.rb

@@ -5,7 +5,6 @@ class PSD::Node
   # zero or more children nodes.
   class Group < PSD::Node
     include PSD::HasChildren
-    include PSD::Node::ParseLayers
     include PSD::Node::LockToOrigin
 
     attr_reader :name, :top, :left, :bottom, :right
@@ -15,7 +14,8 @@ class PSD::Node
     def initialize(folder)
       @name = folder[:name]
       @layer = folder[:layer]
-      parse_layers(folder[:layers])
+      
+      super(folder[:layers])
       get_dimensions
     end
 

data/lib/psd/node_layer.rb

@@ -8,14 +8,14 @@ class PSD::Node
 
     # Stores a reference to the PSD::Layer
     def initialize(layer)
-      super([])
-      
       @layer = layer
       layer.node = self
+
+      super([])
     end
 
     # Delegates some methods to the PSD::Layer
-    (PROPERTIES + [:text, :ref_x, :ref_y]).each do |meth|
+    [:text, :ref_x, :ref_y].each do |meth|
       define_method meth do
         @layer.send(meth)
       end

data/lib/psd/nodes/search.rb

@@ -33,34 +33,59 @@ class PSD
           raise "Layer comp not found" if comp.nil?
 
           id = comp[:id]
-        elsif id == :last
-          id = 0
+        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)
-        filter_for_comp!(id, root)
+        filter_for_comp!(comp, root)
 
         return root
       end
 
       private
 
-      def filter_for_comp!(id, node)
+      def filter_for_comp!(comp, node)
         # Force layers to be visible if they are enabled for the comp
         node.children.each do |c|
-          enabled = c.visible?
+          set_visibility(comp, c) if Resource::Section::LayerComps.visibility_captured?(comp)
+          set_position(comp, c) if Resource::Section::LayerComps.position_captured?(comp)
 
-          c
-            .metadata
-            .data[:layer_comp]['layerSettings'].each do |l|
-              enabled = l['enab'] if l.has_key?('enab')
-              break if l['compList'].include?(id)
-            end
-
-          c.force_visible = enabled
-          filter_for_comp!(id, c) if c.group?
+          filter_for_comp!(comp, c) if c.group?
         end
       end
+
+      def set_visibility(comp, c)
+        visible = true
+
+        c
+          .metadata
+          .data[:layer_comp]['layerSettings'].each do |l|
+            visible = l['enab'] if l.has_key?('enab')
+            break if l['compList'].include?(comp[:id])
+          end
+
+        c.force_visible = visible
+      end
+
+      def set_position(comp, c)
+        x = 0
+        y = 0
+
+        c
+          .metadata
+          .data[:layer_comp]['layerSettings'].each do |l|
+            next unless l.has_key?('Ofst')
+            
+            x = l['Ofst']['Hrzn']
+            y = l['Ofst']['Vrtc']
+            break if l['compList'].include?(comp[:id])
+          end
+
+        c.left += x
+        c.top += y
+      end
     end
   end
 end

data/lib/psd/resources/layer_comps.rb

@@ -5,6 +5,18 @@ class PSD
         def self.id; 1065; end
         def self.name; :layer_comps; end
 
+        def self.visibility_captured?(comp)
+          comp[:captured_info] & 0b001 > 0
+        end
+
+        def self.position_captured?(comp)
+          comp[:captured_info] & 0b010 > 0
+        end
+
+        def self.appearance_captured?(comp)
+          comp[:captured_info] & 0b100 > 0
+        end
+
         def parse
           # Descriptor version
           @file.seek 4, IO::SEEK_CUR

data/lib/psd/version.rb

@@ -1,3 +1,3 @@
 class PSD
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

data/psd.gemspec

@@ -28,8 +28,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'guard'
   gem.add_development_dependency 'guard-rspec'
-
-  if RUBY_PLATFORM =~ /darwin/
-    gem.add_development_dependency 'rb-fsevent', '~> 0.9'
-  end
+  gem.add_development_dependency 'rb-fsevent', '~> 0.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psd
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Ryan LeFevre
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake