psd 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4bd38eaf1619d328b37f11d93117c313c645bd6
-  data.tar.gz: 4b54b449211063657e903917e20f0c78c5fd3297
+  metadata.gz: 2a7b8aa2fdc727961204ba934d689d5216a5a8f4
+  data.tar.gz: ab928409ec35488d7ec85115e08be60c0b119145
 SHA512:
-  metadata.gz: e4d989a86acfc3b2b3b7f3dcea3bad859aabc0e3cdbf74d7cc165decf5b490d75933368f6aff7ca7d4c9dbb87c0d8d67ed5bb393acc7ed4bc4d9fa75f6cf8de5
-  data.tar.gz: 0d8dc9000a99878c9f2806faba5d82a1dc387f01a6c201263643059154d836702e76b2228d9b4c9bc1daaa1a4ad1d40d9b4629137f6c726863604ce9e719fc50
+  metadata.gz: cf126da9f345dcabf2cff7774fce4202eb12cc72cf8261f4e50f9bb3b9c4a3b32d8b322506a5f0b1860737f5db3025f6a8eb98d7e8f0d59450e01aba9c2ba606
+  data.tar.gz: 95507b3c5a2d302e3ff42ef51b05ed4a7953ad0aed399634af50b12cda8c8e339a928f77bafaa42a6cf37f6630e3a995686970d2b7391c43279fb8aed1fd03fe

data/lib/psd/node.rb

@@ -106,13 +106,21 @@ class PSD
           type: nil,
           visible: visible?,
           opacity: @layer.opacity / 255.0,
-          blending_mode: @layer.blending_mode
+          blending_mode: @layer.blending_mode,
+          layer_comps: {}
         }
 
         PROPERTIES.each do |p|
           hash[p] = self.send(p)
         end
 
+        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
 

data/lib/psd/nodes/layer.rb

@@ -16,7 +16,7 @@ class PSD
 
       # Exports this layer to a Hash.
       def to_hash
-        hash = super.merge({
+        super.merge({
           type: :layer,
           text: @layer.text,
           ref_x: reference_point.x,
@@ -26,18 +26,8 @@ class PSD
             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

data/lib/psd/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psd
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Ryan LeFevre