psd_native 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3455db8f83d189130541ead18b691098dd5c63b9
-  data.tar.gz: 0a606b3f924bfa86ccfd5dc0a0f81a66868339e8
+  metadata.gz: ea6a18568c0167e52edc9898e46cf1c3ca7fa191
+  data.tar.gz: c1cb23a65ca6bb18cd23b87d6ed21f224b1ccba4
 SHA512:
-  metadata.gz: e9d211703ff9633bb3d74f4fe9e54dfd802d7a183308e23369363d1de83183ec88d8d4de4565fae75e8c13ab9328c48522145a4bbd4a3926ef11ed963b8f4a60
-  data.tar.gz: f10ac6b1d616c6745a9d99bbb65fd7808747b8a7bc8e80a784344e4dc4a4b698ac2233a49ae32389982053260a840a6ccf01dd5217abc6917dc153c86203a8db
+  metadata.gz: a13bc0db5675474519811a44b298bb94b68ae72f32fa300aa36864e973d35c56c3f6489ccd3153418aaccb3bd09e4d56243107d8b6fd51c98c4f1b9198224111
+  data.tar.gz: 8106d269a32bd68cb67aa8980018036dd68b2eed9946adf18c67902ace34e760a19c71bb8885a5fcc864041dfed3c47bec4bad7cd5d0ad24b1f120f389c5a903

data/.gitignore

@@ -19,4 +19,5 @@ Makefile
 *.o
 conftest.dSYM
 .DS_Store
-*.bundle
+*.bundle
+examples/

data/Guardfile

@@ -0,0 +1,6 @@
+guard 'rspec', cli: '--color' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { "spec" }
+  watch(%r{^ext/(.+)$})     { "spec" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end

data/README.md

@@ -1,11 +1,11 @@
 # PSDNative
 
-A gem that includes multiple mixins that speed up [PSD.rb](https://github.com/layervault/psd.rb) by delegating certain parts of the library to native C code. This library allows for PSD.rb to function as a pure Ruby library, while allowing for optional native code speed improvements. It overwrites specific methods within PSD.rb transparently, so you can use PSD.rb as you normally would.
+A gem that includes multiple mixins that speed up [PSD.rb](https://github.com/layervault/psd.rb) by delegating certain parts of the library to native C code. This library allows for PSD.rb to function as a pure Ruby library, while allowing for optional native code speed improvements. It overwrites specific methods within PSD.rb transparently, so you can use PSD.rb like normal.
 
 Currently, PSDNative replaces these sections of PSD.rb with native code:
 
 * RGB processing
-* RLE decoding (disabled; needs optimization)
+* RLE decoding
 
 ## Installation
 
@@ -23,6 +23,8 @@ Or install it yourself as:
 
 ## Usage
 
+Simply require `psd_native` instead of `psd`, and you're good to go.
+
 ``` ruby
 require 'psd_native'
 

data/ext/psd_native/rle_decoding.c

@@ -1,56 +1,51 @@
 #include "psd_native_ext.h"
 
 VALUE psd_native_decode_rle_channel(VALUE self) {
+  int bytes, len, val;
+  int i, j, k;
+
   int height = FIX2INT(rb_funcall(self, rb_intern("height"), 0));
   VALUE channel_data = rb_iv_get(self, "@channel_data");
-  int bytes, finish, len, val;
+  VALUE* byte_counts = RARRAY_PTR(rb_iv_get(self, "@byte_counts"));
+  int line_index = FIX2INT(rb_iv_get(self, "@line_index"));
+  int chan_pos = FIX2INT(rb_iv_get(self, "@chan_pos"));
 
-  for (int i = 0; i < height; i++) {
-    bytes = psd_byte_count(self, i);
-    finish = psd_file_tell(self) + bytes;
+  for (i = 0; i < height; i++) {
+    bytes = FIX2INT(byte_counts[line_index + i]);
 
-    while (psd_file_tell(self) < finish) {
+    for (j = 0; j < bytes;) {
       len = FIX2INT(psd_file_read_byte(self));
+      j++;
 
       if (len < 128) {
         len++;
-        for (int j = psd_chan_pos(self); j < psd_chan_pos(self) + len; j++) {
-          rb_ary_store(channel_data, j, psd_file_read_byte(self));
+        for (k = chan_pos; k < chan_pos + len; k++) {
+          rb_ary_store(channel_data, k, psd_file_read_byte(self));
         }
 
-        rb_iv_set(self, "@chan_pos", INT2FIX(psd_chan_pos(self) + len));
+        chan_pos += len;
+        j += len;
       } else if (len > 128) {
         len ^= 0xff;
         len += 2;
 
         val = psd_file_read_byte(self);
-        for (int j = psd_chan_pos(self); j < psd_chan_pos(self) + len; j++) {
-          rb_ary_store(channel_data, j, val);
+        for (k = chan_pos; k < chan_pos + len; k++) {
+          rb_ary_store(channel_data, k, val);
         }
 
-        rb_iv_set(self, "@chan_pos", INT2FIX(psd_chan_pos(self) + len));
+        chan_pos += len;
+        j++;
       }
     }
   }
 
+  rb_iv_set(self, "@chan_pos", INT2FIX(chan_pos));
   return Qnil;
 }
 
-int psd_byte_count(VALUE self, int line) {
-  return FIX2INT(
-    rb_ary_entry(
-      rb_iv_get(self, "@byte_counts"), 
-      FIX2INT(rb_iv_get(self, "@line_index")) + line
-    )
-  );
-}
-
 VALUE psd_file_read_byte(VALUE self) {
+  // @file.read(1).bytes[0]
   VALUE data = rb_funcall(psd_file(self), rb_intern("read"), 1, INT2FIX(1));
-  VALUE bytes = rb_funcall(data, rb_intern("bytes"), 0);
-  return rb_ary_entry(rb_funcall(bytes, rb_intern("to_a"), 0), 0);
-}
-
-int psd_chan_pos(VALUE self) {
-  return FIX2INT(rb_iv_get(self, "@chan_pos"));
+  return RARRAY_PTR(rb_funcall(data, rb_intern("bytes"), 0))[0];
 }

data/ext/psd_native/rle_decoding.h

@@ -2,8 +2,6 @@
 #define PSD_NATIVE_RLE_DECODING
 
 VALUE psd_native_decode_rle_channel(VALUE self);
-int psd_byte_count(VALUE self, int line);
 VALUE psd_file_read_byte(VALUE self);
-int psd_chan_pos(VALUE self);
 
 #endif

data/lib/psd_native/version.rb

@@ -1,3 +1,3 @@
 module PSDNative
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/psd_native.rb

@@ -7,7 +7,7 @@ module PSDNative
     base::Image.send(:include, PSDNative::ImageMode::RGB)
 
     # Disabled until optimized
-    # base::Image.send(:include, PSDNative::ImageFormat::RLE)
+    base::Image.send(:include, PSDNative::ImageFormat::RLE)
   end
 end
 

data/psd_native.gemspec

@@ -25,4 +25,13 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rake-compiler"
+
+  spec.test_files = Dir.glob("spec/**/*")
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'guard'
+  spec.add_development_dependency 'guard-rspec'
+
+  if RUBY_PLATFORM =~ /darwin/
+    spec.add_development_dependency 'rb-fsevent', '~> 0.9'
+  end
 end

data/spec/image_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+
+describe 'Image Exporting' do
+  before(:each) do
+    class PSD::Image 
+      attr_accessor :pixel_data
+    end
+
+    @psd = PSD.new('spec/files/pixel.psd')
+  end
+
+  describe "the full preview image" do
+    it "should successfully parse the image data" do
+      @psd.parse!
+      expect(@psd).to be_parsed
+      expect(@psd.image).to_not be_nil
+      expect(@psd.image.width).to eq(1)
+      expect(@psd.image.height).to eq(1)
+      expect(@psd.image.pixel_data).to eq([ChunkyPNG::Color.rgba(0, 100, 200, 255)])
+    end
+
+    it "should be able to skip to the image" do
+      expect(@psd).to_not be_parsed
+      expect(@psd.image.width).to eq(1)
+      expect(@psd.image.height).to eq(1)
+      expect(@psd.image.pixel_data).to eq([ChunkyPNG::Color.rgba(0, 100, 200, 255)])
+    end
+
+    describe "as PNG" do
+      it "should produce a valid PNG object" do
+        expect(@psd.image.to_png).to be_an_instance_of(ChunkyPNG::Image)
+
+        expect(@psd.image.to_png.width).to eq(1)
+        expect(@psd.image.to_png.height).to eq(1)
+        expect(
+          ChunkyPNG::Color.to_truecolor_alpha_bytes(@psd.image.to_png[0,0])
+        ).to eq([0, 100, 200, 255])
+      end
+    end
+  end
+
+  describe "layer images" do
+    it "should successfully parse the image data" do
+      @psd.options[:parse_layer_images] = true
+      @psd.parse!
+
+      image = @psd.tree.children.first.image
+      expect(image).to be_an_instance_of(PSD::ChannelImage)
+      expect(image.width).to eq(1)
+      expect(image.height).to eq(1)
+
+      expect(image.pixel_data).to eq([ChunkyPNG::Color.rgba(0, 100, 200, 255)])
+    end
+
+    describe "as PNG" do
+      it "should produce a valid PNG object" do
+        @psd.options[:parse_layer_images] = true
+        @psd.parse!
+
+        png = @psd.tree.children.first.image.to_png
+        expect(png).to be_an_instance_of(ChunkyPNG::Image)
+        expect(png.width).to eq(1)
+        expect(png.height).to eq(1)
+        expect(
+          ChunkyPNG::Color.to_truecolor_alpha_bytes(png[0,0])
+        ).to eq([0, 100, 200, 255])
+      end
+    end
+  end
+end

data/spec/psd_spec.rb

@@ -0,0 +1,31 @@
+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
+    expect(psd).to be_an_instance_of(PSD)
+	end
+
+  it 'should refuse to open a bad filename' do
+    expect { PSD.open('') }.to raise_error
+  end
+
+  it 'should open a file and feed it to a block' do
+    PSD.open(filename) do |psd|
+      expect(psd).to be_parsed
+      expect(psd).to be_an_instance_of(PSD)
+    end
+  end
+
+  # We have to use #should syntax here because the DSL binds
+  # the block to the PSD instance.
+  it 'should open a file and feed it to a block DSL style' do
+    PSD.open(filename) do
+      parsed?.should == true
+      is_a?(PSD).should == true
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,13 @@
+require 'psd_native'
+
+class PSD
+  attr_reader :file
+end
+
+RSpec.configure do |config|
+  unless ENV['CIRCLECI']
+    config.filter_run :focus => true
+  end
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: psd_native
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ryan LeFevre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-22 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: psd
@@ -66,6 +66,62 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 description: Native mixins to speed up PSD.rb
 email:
 - ryan@layervault.com
@@ -76,6 +132,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -89,6 +146,15 @@ files:
 - lib/psd_native.rb
 - lib/psd_native/version.rb
 - psd_native.gemspec
+- spec/files/example.psd
+- spec/files/one_layer.psd
+- spec/files/path.psd
+- spec/files/pixel.psd
+- spec/files/simplest.psd
+- spec/files/text.psd
+- spec/image_spec.rb
+- spec/psd_spec.rb
+- spec/spec_helper.rb
 homepage: http://cosmos.layervault.com/psdrb.html
 licenses:
 - MIT
@@ -114,4 +180,13 @@ rubygems_version: 2.0.8
 signing_key: 
 specification_version: 4
 summary: Native C mixins to speed up the slowest parts of PSD.rb
-test_files: []
+test_files:
+- spec/files/example.psd
+- spec/files/one_layer.psd
+- spec/files/path.psd
+- spec/files/pixel.psd
+- spec/files/simplest.psd
+- spec/files/text.psd
+- spec/image_spec.rb
+- spec/psd_spec.rb
+- spec/spec_helper.rb