psd 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd304c938fae5c2e76f30356d35bbb6a53151c5f
-  data.tar.gz: 1b109cfefe59ac367216f1cd541180789714531f
+  metadata.gz: db9f14cd10de0296d8511ad83cf909f20519d3ca
+  data.tar.gz: 0246042fd4037c9466a0cde4f215ebe411d529e4
 SHA512:
-  metadata.gz: 418c704ed6dd5b33a0b96e0de0d9b8cd327ea93a09a75a4b9c916b74b2e129fa0e6e16e352e8da3bda19ef07bc4ee70f4342f4889e9601983f74eaec8d5a361a
-  data.tar.gz: 63037689cfc8f00a0afd27883d0979b9cf34144bf38d3faab48dc28a53d60f991783f9245d10bba1ec200c8111afb4f5ad41d0ae36265daf3f155508f7fe63bd
+  metadata.gz: e05a52e512a93122255bda14fb3cbb329b75dd5e7be620eed20e7bccf9f109e1ea969b5430383e7910313a22afa6e4e2842631182fd11d4925d998f2a52bfa44
+  data.tar.gz: 82ebbb3fcee334bc73f039dde683c635724cf674f6b392f9523dd30cbf43d17ec54d04f4c2eeb360b93c7f09f781812abb5db30363efc35e6cf2bdcb2245e879

data/README.md

@@ -32,6 +32,8 @@ Or install it yourself as:
 
 ## Usage
 
+The [full source code documentation](http://rubydoc.info/gems/psd/frames) is available, but here are some common ways to use and access the PSD data:
+
 **Loading a PSD**
 
 ``` ruby

data/lib/psd/image_exports/png.rb

@@ -1,4 +1,4 @@
-require 'chunky_png'
+require 'oily_png'
 
 class PSD::Image
   module Export
@@ -8,7 +8,7 @@ class PSD::Image
       # data.
       def to_png
         PSD.logger.debug "Beginning PNG export"
-        png = ChunkyPNG::Image.new(width, height, ChunkyPNG::Color::TRANSPARENT)
+        png = ChunkyPNG::Image.new(width.to_i, height.to_i, ChunkyPNG::Color::TRANSPARENT)
 
         i = 0
         height.times do |y|

data/lib/psd/layer.rb

@@ -287,8 +287,10 @@ class PSD
     # not UTF-8. Luckily Ruby kicks ass at character conversion.
     def parse_legacy_layer_name
       @legacy_name_start = @file.tell
-      len = Util.pad4 @file.read(1).unpack('C')[0]
-      @legacy_name = @file.read(len).encode('UTF-8', 'MacRoman').delete("\000")
+
+      len = Util.pad4 @file.read(1).bytes.to_a[0]
+      @legacy_name = @file.read_string(len)
+
       @legacy_name_end = @file.tell
     end
 
@@ -302,7 +304,7 @@ class PSD
         @file.seek 4, IO::SEEK_CUR
 
         # Key, very important
-        key = @file.read(4).unpack('A4')[0]
+        key = @file.read_string(4)
         @info_keys << key
 
         length = Util.pad2 @file.read_int
@@ -329,14 +331,13 @@ class PSD
         end
 
         if !info_parsed
-          PSD.logger.debug "SKIPPING: key = #{key}, length = #{length}"
+          PSD.logger.debug "Skipping: key = #{key}, pos = #{@file.tell}, length = #{length}"
           @file.seek pos + length
         end
 
         @file.seek pos + length if @file.tell != (pos + length)
       end
 
-      # puts "Layer = #{name}, Parsed = #{@info_keys - PSD.keys.uniq}, Unparsed = #{PSD.keys.uniq - @info_keys}"
       @extra_data_end = @file.tell
     end
 

data/lib/psd/layer_info/typetool.rb

@@ -71,30 +71,46 @@ class PSD
 
     # Return all font sizes for this layer.
     def sizes
-      return [] if engine_data.nil?
-      engine_data.EngineDict.StyleRun.RunArray.map do |r|
-        r.StyleSheet.StyleSheetData.FontSize
-      end.uniq
+      return [] if engine_data.nil? || !styles.has_key?('FontSize')
+      styles['FontSize'].uniq
     end
 
-    # Return all colors used for text in this layer. The colors are returned in RGB
+    # Return all colors used for text in this layer. The colors are returned in RGBA
     # format as an array of arrays.
     #
-    # => [[255, 0, 0], [0, 0, 255]]
+    # => [[255, 0, 0, 255], [0, 0, 255, 255]]
     def colors
-      return [] if engine_data.nil?
-      engine_data.EngineDict.StyleRun.RunArray.map do |r|
-        next unless r.StyleSheet.StyleSheetData.key?('FillColor')
-        r.StyleSheet.StyleSheetData.FillColor.Values.map do |v|
-          (v * 255).round
-        end
-      end.uniq
+      return [] if engine_data.nil? || !styles.has_key?('FillColor')
+      styles['FillColor'].map { |s|
+        values = s['Values'].map { |v| (v * 255).round }
+        values << values.shift # Change ARGB -> RGBA for consistency
+      }.uniq
     end
 
     def engine_data
       @data[:engine_data]
     end
 
+    def styles
+      return {} if engine_data.nil?
+
+      @styles ||= (
+        data = engine_data.EngineDict.StyleRun.RunArray.map do |r|
+          r.StyleSheet.StyleSheetData
+        end
+
+        Hash[data.reduce({}) { |m, o|
+          o.each do |k, v|
+            (m[k] ||= []) << v
+          end
+
+          m
+        }.map { |k, v|
+          [k, v.uniq]
+        }]
+      )
+    end
+
     def parser
       @parser ||= PSD::EngineData.new(@data[:text]['EngineData'])
     end

data/lib/psd/layer_mask.rb

@@ -107,7 +107,7 @@ class PSD
 
     def parse_global_mask
       length = @file.read_int
-      return if length == 0
+      return if length <= 0
 
       mask_end = @file.tell + length
       PSD.logger.debug "Global Mask: length = #{length}"

data/lib/psd/resources/layer_comps.rb

@@ -8,7 +8,17 @@ class PSD
         def parse
           # Descriptor version
           @file.seek 4, IO::SEEK_CUR
-          @resource.data = Descriptor.new(@file).parse
+          
+          @data = Descriptor.new(@file).parse
+          @resource.data = self
+        end
+
+        def names
+          @data['list'].map { |c| c['Nm  '] }
+        end
+
+        def [](val)
+          @data[val]
         end
       end
     end

data/lib/psd/version.rb

@@ -1,3 +1,3 @@
 class PSD
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/psd.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency "bindata"
-  gem.add_dependency "chunky_png"
+  gem.add_dependency "oily_png"
   gem.add_dependency 'psd-enginedata'
 
   gem.test_files = Dir.glob("spec/**/*")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psd
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Ryan LeFevre
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -26,7 +26,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: chunky_png
+  name: oily_png
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='