psd_native 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba6252238c0a42264e81b13c9ad094d459f937cc
-  data.tar.gz: a9d7254957111c606e550f1e05217070075c1bc2
+  metadata.gz: 3ca7170880c6cfc11f56e1299059a9926bdac2e0
+  data.tar.gz: 6ed9335c31bf6f9513cfd2bbf5a35dfec8c526a5
 SHA512:
-  metadata.gz: 51b58c58785979aff5206139ba2ba1bdfdb987e464bed797f64922c058c5fd9d286b9b205343f8eee705345b5f2e2a7338ce80bd23f499418cd88d1e7fecc0c4
-  data.tar.gz: e0fb65e4287bb98cd45362549cebb806e0a3450979756fe20d3b34801f27110812a2093c863fff411ad5f18092a34b11e1570023c88950c2addbc8c998037b6f
+  metadata.gz: 5f7e6354f464fe99c4183c4b13d248cb07c82b541e7fdedf44da2632ebb53b63fa89dff365933a5a0b2c5beb62c7969611232ea8e926ce36f41d134a25b44c5e
+  data.tar.gz: e59760913c83add6f05131651c5adb41f0e1ed1da7a112d7a4cbe1757c6de071a1f9dcd73b3c7b1914babe7534ae853e8962da48ed4687b7fcb9a5e84e0ef0b8

data/ext/psd_native/mask.c

@@ -16,6 +16,8 @@ VALUE psd_native_mask_apply_bang(VALUE self) {
   int mask_left = FIX2INT(rb_funcall(mask, rb_intern("left"), 0));
   int mask_top = FIX2INT(rb_funcall(mask, rb_intern("top"), 0));
 
+  int layer_height = FIX2INT(rb_funcall(layer, rb_intern("height"), 0));
+  int layer_width = FIX2INT(rb_funcall(layer, rb_intern("width"), 0));
   int layer_left = FIX2INT(rb_funcall(layer, rb_intern("left"), 0));
   int layer_top = FIX2INT(rb_funcall(layer, rb_intern("top"), 0));
 
@@ -29,6 +31,8 @@ VALUE psd_native_mask_apply_bang(VALUE self) {
       layer_x = doc_x - layer_left;
       layer_y = doc_y - layer_top;
 
+      if (layer_x < 0 || layer_x > layer_width || layer_y < 0 || layer_y > layer_height) continue;
+      
       color = FIX2UINT(rb_funcall(canvas, rb_intern("[]"), 2, INT2FIX(layer_x), INT2FIX(layer_y)));
 
       if (doc_x < 0 || doc_x >= doc_width || doc_y < 0 || doc_y > doc_height) {

data/lib/psd_native/version.rb

@@ -1,3 +1,3 @@
 module PSDNative
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/psd_native.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.extensions    = ["ext/psd_native/extconf.rb"]
   spec.require_paths = ["lib", "ext"]
 
-  spec.add_runtime_dependency "psd", "~> 2.1.1"
+  spec.add_runtime_dependency "psd", ">= 2.1.1"
   spec.add_runtime_dependency "oily_png", "~> 1.1"
 
   spec.add_development_dependency "bundler", "~> 1.3"

data/spec/psd_spec.rb

@@ -3,11 +3,17 @@ require 'spec_helper'
 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
+  it 'should open a file without a block' do
+    psd = PSD.new(filename)
+    expect(psd).to_not be_parsed
     expect(psd).to be_an_instance_of(PSD)
-	end
+  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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psd_native
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Ryan LeFevre
@@ -14,14 +14,14 @@ dependencies:
   name: psd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.1.1
 - !ruby/object:Gem::Dependency