psd 1.4.4 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfdf8466e7c4a858bf93d47ec823c26ef3a667fa
-  data.tar.gz: bab2a4414c765c27a0d8de12b401067a2a894ba5
+  metadata.gz: 3c9491d68bacd47bd02b6ef1ebd95679de8f780d
+  data.tar.gz: 3890b2b104af1b45d7754005cf91736cfd88c2fa
 SHA512:
-  metadata.gz: c80d095fbce20218530a13a3adcf29d9193a6dfe4e4a7b73bc3202bc04ddc3d1a80869d2c9f648ebca606f460647cc34e9d95f81a8bcdba0a044bd2070be8da0
-  data.tar.gz: fabf5fcfceeab8e772228ac3088aa73c5d9382cae2d31f41b405cfd5c2542139f08bbeb1f5e20fe3f99a153b8e65071398315f7fb47b36bd2070e86ec4a0e065
+  metadata.gz: 03d6f9c5332ca2b8ac5e981743e3955f0b26d5cd8f6b3ec7643602cebd4d7f0ac766190e1ca7d4e6618c9784d33d319a7ab8b548919bd491079096290ca74166
+  data.tar.gz: e94c59785c2d9e6cac71e44e2f5a4efc8961e32da61f8382e36682af3a9ab6c58dba757a4411f383f87c6bc1a69cd9eaf9a5eedaa87ce4b2e6163b1d8e26a842

data/.travis.yml

@@ -3,4 +3,4 @@ rvm:
   - 1.9.3
   - 2.0.0
   - jruby-19mode
-  - rbx-19mode
+  # - rbx-19mode

data/lib/psd.rb

@@ -120,7 +120,9 @@ class PSD
       # The image is the last section in the file, so we don't have to
       # bother with skipping over the bytes to read more data.
       image = Image.new(@file, @header)
-      LazyExecute.new(image, @file).later(:parse)
+      LazyExecute.new(image, @file)
+        .later(:parse)
+        .ignore(:width, :height)
     )
   end
 

data/lib/psd/layer/channel_image.rb

@@ -5,7 +5,10 @@ class PSD
 
       def parse_channel_image(header)
         image = PSD::ChannelImage.new(@file, header, self)
-        @image = LazyExecute.new(image, @file).now(:skip).later(:parse)
+        @image = LazyExecute.new(image, @file)
+          .now(:skip)
+          .later(:parse)
+          .ignore(:width, :height)
       end
     end
   end

data/lib/psd/lazy_execute.rb

@@ -9,6 +9,7 @@ class PSD
       @loaded = false
       @load_method = nil
       @load_args = []
+      @passthru = []
 
       PSD.logger.debug "Marked #{@obj.class.name} at position #{@start_pos} for lazy execution"
     end
@@ -25,12 +26,17 @@ class PSD
       return self
     end
 
+    def ignore(*args)
+      @passthru += args
+      return self
+    end
+
     def loaded?
       @loaded
     end
 
     def method_missing(method, *args, &block)
-      load! unless loaded?
+      load! if !loaded? && !@passthru.include?(method.to_sym)
       @obj.send(method, *args, &block)
     end
 

data/lib/psd/mask.rb

@@ -1,45 +1,74 @@
 class PSD
-  # Represents the mask for a single layer
-  class Mask < BinData::Record
-    endian :big
+  class Mask
+    attr_reader :size, :top, :left, :bottom, :right, :default_color
 
-    int32  :mask_size
+    def self.read(file)
+      mask = Mask.new(file)
+      mask.parse
 
-    int32 :top,           onlyif: :has_data?
-    int32 :left,          onlyif: :has_data?
-    int32 :bottom,        onlyif: :has_data?
-    int32 :right,         onlyif: :has_data?
-    int8  :default_color, onlyif: :has_data?
-    bit8  :flags,         onlyif: :has_data?
+      mask
+    end
+
+    def initialize(file)
+      @file = file
+      @top = 0
+      @left = 0
+      @bottom = 0
+      @right = 0
+    end
+
+    def parse
+      @size = @file.read_int
+      return if @size == 0
+
+      @mask_end = @file.tell + @size
 
-    skip length: 2,   onlyif: lambda { mask_size == 20 }
-    skip length: 18,  onlyif: lambda { mask_size > 0 && mask_size != 20}
+      @top = @file.read_int
+      @left = @file.read_int
+      @bottom = @file.read_int
+      @right = @file.read_int
 
-    # Is there a mask defined?
-    def has_data?
-      mask_size > 0
+      @default_color = @file.read_byte
+      @flags = @file.read_byte
+
+      @file.seek @mask_end # Useless info/padding
     end
 
-    # Width of the mask
     def width
       right - left
     end
 
-    # Height of the mask
     def height
       bottom - top
     end
 
     def relative
-      flags & 0x01
+      (@flags & 0x01) > 0
     end
 
     def disabled
-      (flags & (0x01 << 1)) > 0
+      (@flags & (0x01 << 1)) > 0
     end
 
     def invert
-      (flags & (0x01 << 2)) > 0
+      (@flags & (0x01 << 2)) > 0
+    end
+
+    def to_hash
+      return {} if @size == 0
+
+      {
+        top: top,
+        left: left,
+        bottom: bottom,
+        right: right,
+        width: width,
+        height: height,
+        default_color: default_color,
+        relative: relative,
+        disabled: disabled,
+        invert: invert
+      }
     end
   end
 end

data/lib/psd/node_layer.rb

@@ -59,7 +59,7 @@ class PSD::Node
         text: @layer.text,
         ref_x: @layer.reference_point.x,
         ref_y: @layer.reference_point.y,
-        mask: @layer.mask.snapshot,
+        mask: @layer.mask.to_hash,
         image: {
           width: @layer.image.width,
           height: @layer.image.height,

data/lib/psd/version.rb

@@ -1,3 +1,3 @@
 class PSD
-  VERSION = "1.4.4"
+  VERSION = "1.4.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psd
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors:
 - Ryan LeFevre
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-25 00:00:00.000000000 Z
+date: 2013-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake