psd 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9b96175c4675aceb277aa64cf381aa9d7f20561
-  data.tar.gz: 1c4d5d7d68921e1a1dbd222f8022d3f02e3b9d2c
+  metadata.gz: b59b96e20719a364948a8b25311fbe7ce9dfa6ba
+  data.tar.gz: fae553661c48a2caaee9212dd14e33589dd4c865
 SHA512:
-  metadata.gz: 9b86b19b017831e85e3c8b28a0d045a3858cc96a7c03e6c501c61225d32c7018f58e03dc4fbfd5252e2016ef67e593435493960cb9eabf76fcfba2cb85487666
-  data.tar.gz: 65e4d1d26be0132d00e4215803dbb709a4af2c39f8ca604ac470daedc5dce5b7ecc5cbadaa134f0a392986c7b8c4f3cbb5fbc322fc660a9fc4649a8f93a634bd
+  metadata.gz: a8629e8bca3c0e42bef10e2ab7b645c27b05a7e985fab315c3eadf878e6818b57fa32705ed679431cb60ebae2b558a08498ee1e134413830f0cf80add147ec67
+  data.tar.gz: c8e49f5511f1e9cfba8169e45853cd2c4e7c6b22da8e659d0573cfabbe745d85422e12a0bbef73092b3595d85a4f9078bf3a54d96dde53c99ad339ed56a328f6

data/lib/psd.rb

@@ -32,11 +32,11 @@ class PSD
   # @param filename [String]  the name of the file to open
   # @return [PSD] the {PSD} object if no block was given, otherwise the value of the block
   def self.open(filename, opts={}, &block)
+    raise "Must supply a block. Otherwise, use PSD.new." unless block_given?
+
     psd = PSD.new(filename, opts)
     psd.parse!
 
-    return psd unless block_given?
-
     if 0 == block.arity
       psd.instance_eval(&block)
     else

data/lib/psd/renderer/mask.rb

@@ -1,67 +1,44 @@
 class PSD
   class Renderer
     class Mask
-      attr_accessor :pixel_data, :mask_data, :layer_width, :layer_height
+      attr_accessor :mask_data
 
-      def initialize(canvas, options = {})
+      def initialize(canvas)
         @canvas = canvas
         @layer = canvas.node
-        @options = options
 
-        @pixel_data = @canvas.pixels
         @mask_data = @layer.image.mask_data
 
-        @layer_width = (@layer.folder? ? @layer.mask.width : @layer.width).to_i
-        @layer_height = (@layer.folder? ? @layer.mask.height : @layer.height).to_i
+        @doc_width = @layer.header.width.to_i
+        @doc_height = @layer.header.height.to_i
       end
 
       def apply!
         PSD.logger.debug "Applying mask to #{@layer.name}"
         
-        # We generate the preview at the document size instead to make applying the mask
-        # significantly easier.
-        width = @layer.header.width.to_i
-        height = @layer.header.height.to_i
-        png = ChunkyPNG::Canvas.new(width, height, ChunkyPNG::Color::TRANSPARENT)
-
-        i = 0
-        @layer_height.times do |y|
-          @layer_width.times do |x|
-            offset_x = x + @layer.left
-            offset_y = y + @layer.top
-
-            i +=1 and next if offset_x < 0 || offset_y < 0 || offset_x >= png.width || offset_y >= png.height
-
-            png[offset_x, offset_y] = @pixel_data[i]
-            i += 1
-          end
-        end
-        
         # Now we apply the mask
         i = 0
         @layer.mask.height.times do |y|
           @layer.mask.width.times do |x|
-            offset_x = @layer.mask.left + x
-            offset_y = @layer.mask.top + y
+            doc_x = @layer.mask.left + x
+            doc_y = @layer.mask.top + y
+
+            layer_x = doc_x - @layer.left
+            layer_y = doc_y - @layer.top
 
-            i += 1 and next if offset_x < 0 || offset_y < 0 || offset_x >= png.width || offset_y >= png.height
+            color = ChunkyPNG::Color.to_truecolor_alpha_bytes(@canvas[layer_x, layer_y])
 
-            color = ChunkyPNG::Color.to_truecolor_alpha_bytes(png[offset_x, offset_y])
-            color[3] = color[3] * @mask_data[i] / 255
+            # We're off the document canvas. Crop.
+            if doc_x < 0 || doc_x >= @doc_width || doc_y < 0 || doc_y > @doc_height
+              color[3] = 0
+            else
+              color[3] = color[3] * @mask_data[i] / 255
+            end 
 
-            png[offset_x, offset_y] = ChunkyPNG::Color.rgba(*color)
+            @canvas[layer_x, layer_y] = ChunkyPNG::Color.rgba(*color)
             i += 1
           end
         end
-
-        crop_left = PSD::Util.clamp(@layer.left, 0, png.width)
-        crop_top = PSD::Util.clamp(@layer.top, 0, png.height)
-        crop_width = PSD::Util.clamp(@layer_width, 0, png.width - crop_left)
-        crop_height = PSD::Util.clamp(@layer_height, 0, png.height - crop_top)
-
-        png.crop!(crop_left, crop_top, crop_width, crop_height)
-
-        @canvas.canvas = png
       end
     end
   end

data/lib/psd/version.rb

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

data/spec/psd_spec.rb

@@ -4,11 +4,17 @@ describe 'PSD' do
   let(:filename) { 'spec/files/example.psd' }
 
 	it 'should open a file without a block' do
-    psd = PSD.open(filename)
-    expect(psd).to be_parsed
+    psd = PSD.new(filename)
+    expect(psd).to_not be_parsed
     expect(psd).to be_an_instance_of(PSD)
 	end
 
+  it 'should raise an exception if using open without a block' do
+    expect {
+      PSD.open(filename)  
+    }.to raise_error
+  end
+
   it 'should refuse to open a bad filename' do
     expect { PSD.open('') }.to raise_error
   end

metadata

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