psd 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e77eb4145c66513958eb9d5c51cf3939106bcdd5
-  data.tar.gz: 98cabd790e222e4162813293ea261786839e182a
+  metadata.gz: c100d128dba86088c063508116bc3a1acd0bd650
+  data.tar.gz: 042fe61f2579e7f7dfeda0e223abac81375908b4
 SHA512:
-  metadata.gz: c070bad2a230a570d90014ae9b477d91f8c6b2928a54502fc217b647196cb48f96c4e27416cf351baee818bb310dcf93be3cd5993e081894490a6e4c81e2f611
-  data.tar.gz: 54e63d06ae78fd5a87824ffa33c2f4e81acf9e73084d8d0068da10839ee9706dc366fdf8db8e1f14cd92ca895c26c30a042e9923533d668e445d118b310dbbf8
+  metadata.gz: f261b03bea18d788a5d3c608fdb4c41886a2f76030ee4d670a21ae03305940fd610743ea089bcde1c5dd15643b464b7655f591e592950020fd80151547963288
+  data.tar.gz: 3547fe009db381c5e0286c2e7a66e14944388f02591436d20cef0c4d470c4b4cf870bcd105a793aa44cf0d3d38880a2be52f893d49eb4ed40ef310d8dd640b96

data/README.md

@@ -1,6 +1,6 @@
 # PSD.rb
 
-![](https://circleci.com/gh/layervault/psd.rb.png?circle-token=ad8a75fdd86f595e0926a963179a3a621d564c6e)
+[![Circle CI](https://circleci.com/gh/layervault/psd.rb.png?circle-token=ad8a75fdd86f595e0926a963179a3a621d564c6e)](https://circleci.com/gh/layervault/psd.rb)
 
 A general purpose Photoshop file parser written in Ruby. It allows you to work with a Photoshop document in a manageable tree structure and find out important data such as:
 
@@ -52,7 +52,7 @@ To access the document as a tree structure, use `psd.tree` to get the root node.
 * `subtree`: same as descendants but starts with the current node
 * `depth`: calculate the depth of the current node
 
-For any of the traversal methods, you can also retrieves folder or layer nodes only by appending `_layers` or `_groups` to the method. For example:
+For any of the traversal methods, you can also retrieve folder or layer nodes only by appending `_layers` or `_groups` to the method. For example:
 
 ``` ruby
 psd.tree.descendant_layers

data/lib/psd/descriptor.rb

@@ -64,6 +64,7 @@ class PSD
       when 'obj '         then parse_reference
       when 'TEXT'         then @file.read_unicode_string
       when 'UntF'         then parse_unit_double
+      when 'UnFl'         then parse_unit_float
       end
 
       return value
@@ -115,18 +116,21 @@ class PSD
     end
 
     def parse_object_array
+      raise NotImplementedError.new("Object array not implemented yet")
       count = @file.read_int
-      klass = parse_class
       items_in_obj = @file.read_int
+      wat = @file.read_short
+      
+      puts count
+      puts items_in_obj
+      puts wat
 
-      obj = []
+      obj = {}
       count.times do |i|
         item = []
-        items_in_obj.times do |j|
-          item << parse_object_array
-        end
-
-        obj << item
+        name = @file.read_string(@file.read_int)
+        puts name
+        obj[name] = parse_list
       end
 
       return obj
@@ -168,5 +172,22 @@ class PSD
       value = @file.read_double
       {id: unit_id, unit: unit, value: value}
     end
+
+    def parse_unit_float
+      unit_id = @file.read_string(4)
+      unit = case unit_id
+      when '#Ang' then 'Angle'
+      when '#Rsl' then 'Density'
+      when '#Rlt' then 'Distance'
+      when '#Nne' then 'None'
+      when '#Prc' then 'Percent'
+      when '#Pxl' then 'Pixels'
+      when '#Mlm' then 'Millimeters'
+      when '#Pnt' then 'Points'
+      end
+
+      value = @file.read_float
+      {id: unit_id, unit: unit, value: value}
+    end
   end
 end

data/lib/psd/layer.rb

@@ -309,19 +309,23 @@ class PSD
         info_parsed = false
         LAYER_INFO.each do |name, info|
           next unless info.key == key
-          
-          i = info.new(@file, length)
-          i.parse
 
-          @adjustments[name] = i
-          info_parsed = true
+          begin
+            i = info.new(@file, length)
+            i.parse
+
+            @adjustments[name] = i
+            info_parsed = true
+          rescue Exception
+          end
+
           break
         end
 
         if !info_parsed
           PSD.keys << key
           # puts "SKIPPING #{key}, length = #{length}"
-          @file.seek length, IO::SEEK_CUR
+          @file.seek pos + length
         end
 
         @file.seek pos + length if @file.tell != (pos + length)

data/lib/psd/layer_info/placed_layer.rb

@@ -7,7 +7,6 @@ class PSD
     def parse
       # Useless id/version info
       @file.seek 12, IO::SEEK_CUR
-      
       @data = Descriptor.new(@file).parse
     end
   end

data/lib/psd/version.rb

@@ -1,3 +1,3 @@
 class PSD
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/psd.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = "http://cosmos.layervault.com/psdrb.html"
   gem.license       = 'MIT'
 
-  gem.files         = `git ls-files`.split($/)
+  gem.files         = `git ls-files`.split($/).delete_if { |f| f.include?('examples/') }
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psd
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Ryan LeFevre
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2013-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -125,17 +125,6 @@ files:
 - README.md
 - Rakefile
 - circle.yml
-- examples/export.rb
-- examples/export_image.rb
-- examples/export_text_data.rb
-- examples/images/example-cmyk.psd
-- examples/images/example-greyscale.psd
-- examples/images/example.psd
-- examples/images/example16.psd
-- examples/parse.rb
-- examples/path.rb
-- examples/tree.rb
-- examples/unimplemented_info.rb
 - lib/psd.rb
 - lib/psd/blend_mode.rb
 - lib/psd/channel_image.rb

data/examples/export.rb

@@ -1,7 +0,0 @@
-require './lib/psd'
-
-psd = PSD.new('examples/images/example.psd')
-psd.parse!
-
-
-psd.export_node psd.tree.children.last.children[1], "asset.psd"

data/examples/export_image.rb

@@ -1,12 +0,0 @@
-require 'benchmark'
-require './lib/psd'
-
-psd = PSD.new('examples/images/example.psd')
-
-results = Benchmark.measure "Image exporting" do
-  psd.image.save_as_png 'output.png'
-end
-
-puts "Flattened image exported to ./output.png\n"
-puts Benchmark::CAPTION
-puts results.to_s

data/examples/export_text_data.rb

@@ -1,13 +0,0 @@
-require './lib/psd'
-
-file = ARGV[0] || 'examples/images/example.psd'
-psd = PSD.new(file)
-psd.parse!
-
-outfile = './enginedata'
-psd.tree.descendant_layers.each do |l|
-  next unless l.layer.adjustments[:type]
-  File.write(outfile, l.layer.adjustments[:type].engine_data)
-  puts "Exported to #{outfile}"
-  exit
-end

data/examples/parse.rb

@@ -1,31 +0,0 @@
-require 'benchmark'
-require './lib/psd'
-
-psd = nil
-file = ARGV[0] || 'examples/images/example.psd'
-results = Benchmark.measure "PSD parsing" do
-  psd = PSD.new(file)
-  psd.parse!
-end
-
-puts "\nVisible Layers:\n===================="
-psd.layers.each do |layer|
-  next if layer.folder? || layer.hidden?
-
-  puts "Name: #{layer.name}"
-  puts "Position: top = #{layer.top}, left = #{layer.left}"
-  puts "Size: width = #{layer.width}, height = #{layer.height}"
-  puts "Mask: width = #{layer.mask.width}, height = #{layer.mask.height}"
-  puts "Reference point: #{layer.ref_x}, #{layer.ref_y}"
-
-  puts ""
-end
-
-puts "\nPSD Info:\n===================="
-puts "#{psd.width}x#{psd.height} #{psd.header.mode_name}"
-puts "#{psd.resources.size} resources parsed"
-puts "#{psd.layers.size} layers, #{psd.folders.size} folders"
-
-puts "\nBenchmark Results (seconds):\n===================="
-puts " "*7 + Benchmark::CAPTION
-puts "parse: " + results.to_s

data/examples/path.rb

@@ -1,7 +0,0 @@
-require './lib/psd'
-require 'pp'
-
-psd = PSD.new('examples/images/example.psd')
-psd.parse!
-
-pp psd.tree.children_at_path("Version D/Version E/Version F").first.to_hash

data/examples/tree.rb

@@ -1,8 +0,0 @@
-require './lib/psd'
-require 'pp'
-
-file = ARGV[0] || 'examples/images/example.psd'
-psd = PSD.new(file)
-psd.parse!
-
-pp psd.tree.to_hash

data/examples/unimplemented_info.rb

@@ -1,9 +0,0 @@
-require './lib/psd'
-require 'pp'
-
-file = ARGV[0] || 'examples/images/example.psd'
-psd = PSD.new(file)
-psd.parse!
-
-puts '-> Layer Info Keys'
-pp PSD.keys.uniq