psd 3.2.2 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95cafbdacba7787e11c7fb589c36be3d42303e30
-  data.tar.gz: ed724018605eda95b0b2b68050027f5370baa6c6
+  metadata.gz: 2f4587221b7f3298907408b999f0f6974736fdd0
+  data.tar.gz: 0c0db3b667c5bd30f4796835e6b4fb65d188fb28
 SHA512:
-  metadata.gz: d59925d59843d5895333dc2096718312de4e1f2bdd29c2bcb3bd09cae10bb78d6c03342501050417b68309a7506e32ebaec5239c7a332dfb1eda200a44e7f589
-  data.tar.gz: 5cc87352a8b8791c1c137671054fcc8bfcf6cc22410d07b923523978284760f751742349b57d2370567aa6400841362349bc9b6ebe6ed3651301c67aef46e30c
+  metadata.gz: d10bd3f42e0c24d6bed5a731bce1c6fc48dbbb55bc24c5998b8c9e1aad8f4eee8c6597d20cb9a198aa88772f4f36b7242b80bc357639f5b8948a45f9d0fa2777
+  data.tar.gz: affa248b3befb994fd365a4f81447517987904ed2b8c6018ec9c25b8f40d0a3517c4f1a56173a6846b2c01339bacc054fe2872a6ae02268f3ae3e7c33b88bfbc

data/lib/psd.rb

@@ -130,30 +130,6 @@ class PSD
     )
   end
 
-  # Export the current file to a new PSD. This may or may not work.
-  def export(file)
-    parse! unless parsed?
-
-    # Create our file for writing
-    outfile = File.open(file, 'w')
-
-    # Reset the file pointer
-    @file.seek 0
-    @header.write outfile
-    @file.seek @header.num_bytes, IO::SEEK_CUR
-
-    # Nothing in the header or resources we want to bother with changing
-    # right now. Write it straight to file.
-    outfile.write @file.read(@resources.end_of_section - @file.tell)
-
-    # Now, the changeable part. Layers and masks.
-    layer_mask.export(outfile)
-
-    # And the rest of the file (merged image data)
-    outfile.write @file.read
-    outfile.flush
-  end
-
   private
 
   def ensure_header
@@ -173,4 +149,4 @@ class PSD
     @layer_mask = LayerMask.new(@file, @header, @opts)
     @layer_mask.skip
   end
-end
+end

data/lib/psd/image.rb

@@ -29,6 +29,8 @@ class PSD
       @num_pixels *= 2 if depth == 16
 
       calculate_length
+      set_channels_info
+
       @channel_data = []
       @pixel_data = []
       @opacity = 1.0
@@ -38,15 +40,6 @@ class PSD
       @end_pos = @start_pos + @length
 
       PSD.logger.debug "Image: #{width}x#{height}, length = #{@length}, mode = #{@header.mode_name}, position = #{@start_pos}"
-
-      # Each color channel is represented by a unique ID
-      @channels_info = [
-        {id: 0},
-        {id: 1},
-        {id: 2}
-      ]
-
-      @channels_info << {id: -1} if channels == 4
     end
 
     # Begins parsing the image by first figuring out the compression format used, and then
@@ -76,6 +69,14 @@ class PSD
 
     private
 
+    def set_channels_info
+      case mode
+      when 1 then set_greyscale_channels
+      when 3 then set_rgb_channels
+      when 4 then set_cmyk_channels
+      end
+    end
+
     def calculate_length
       @length = case depth
       when 1 then (width + 7) / 8 * height

data/lib/psd/image_modes/cmyk.rb

@@ -3,17 +3,30 @@ class PSD
     module CMYK
       private
 
+      def set_cmyk_channels
+        @channels_info = [
+          { id: 0 },
+          { id: 1 },
+          { id: 2 },
+          { id: 3 }
+        ]
+
+        @channels_info << {id: -1} if channels == 5
+      end
+
       def combine_cmyk_channel
+        cmyk_channels = @channels_info.
+          map    { |ch| ch[:id] }.
+          reject { |ch| ch < -1 }
+
         (0...@num_pixels).step(pixel_step) do |i|
           c = m = y = k = 0
           a = 255
 
-          @channels_info.each_with_index do |chan, index|
-            next if chan[:id] == -2
-
+          cmyk_channels.each_with_index do |chan, index|
             val = @channel_data[i + (@channel_length * index)]
 
-            case chan[:id]
+            case chan
             when -1 then a = val
             when 0 then c = val
             when 1 then m = val
@@ -28,4 +41,4 @@ class PSD
       end
     end
   end
-end
+end

data/lib/psd/image_modes/greyscale.rb

@@ -3,6 +3,11 @@ class PSD
     module Greyscale
       private
 
+      def set_greyscale_channels
+        @channels_info = [{ id: 0 }]
+        @channels_info << { id: -1 } if channels == 2
+      end
+
       def combine_greyscale_channel
         if channels == 2
           (0...@num_pixels).step(pixel_step) do |i|
@@ -19,4 +24,4 @@ class PSD
       end
     end
   end
-end
+end

data/lib/psd/image_modes/rgb.rb

@@ -4,10 +4,22 @@ class PSD
     module RGB
       private
 
+      def set_rgb_channels
+        @channels_info = [
+          { id: 0 },
+          { id: 1 },
+          { id: 2 }
+        ]
+
+        @channels_info << {id: -1} if channels == 4
+      end
+
       def combine_rgb_channel
         PSD.logger.debug "Beginning RGB processing"
 
-        rgb_channels = @channels_info.map { |ch| ch[:id] }.reject { |ch| ch < -1 }
+        rgb_channels = @channels_info.
+          map    { |ch| ch[:id] }.
+          reject { |ch| ch < -1 }
 
         (0...@num_pixels).step(pixel_step) do |i|
           r = g = b = 0
@@ -29,4 +41,4 @@ class PSD
       end
     end
   end
-end
+end

data/lib/psd/layer_info/typetool.rb

@@ -52,6 +52,7 @@ class PSD
         name: fonts.first,
         sizes: sizes,
         colors: colors,
+        alignment: alignment,
         css: to_css
       }
     end
@@ -68,6 +69,13 @@ class PSD
       return [] if engine_data.nil? || !styles.has_key?('FontSize')
       styles['FontSize'].uniq
     end
+    
+    def alignment
+      return {} if engine_data.nil?
+      engine_data.EngineDict.ParagraphRun.RunArray.map do |s| 
+        ["left", "right", "center", "justify"][[s.ParagraphSheet.Properties.Justification.to_i,3].min]
+      end
+    end
 
     # Return all colors used for text in this layer. The colors are returned in RGBA
     # format as an array of arrays.
@@ -119,7 +127,8 @@ class PSD
       definition = {
         'font-family' => fonts.join(', '),
         'font-size' => "#{sizes.first}pt",
-        'color' => "rgba(#{colors.first.join(', ')})"
+        'color' => "rgba(#{colors.first.join(', ')})",
+        'text-align' => alignment.first
       }
 
       css = []

data/lib/psd/renderer/canvas.rb

@@ -2,9 +2,8 @@ class PSD
   class Renderer
     class Canvas
       attr_reader :canvas, :node, :opts, :width, :height, :opacity, :fill_opacity
-      
-      [:top, :right, :bottom, :left].each { |dir| delegate dir, to: :node }
 
+      delegate :top, :right, :bottom, :left, to: :node
       delegate :[], :[]=, :get_pixel, :set_pixel, to: :canvas
 
       def initialize(node, width = nil, height = nil, opts = {})
@@ -112,4 +111,4 @@ class PSD
       end
     end
   end
-end
+end

data/lib/psd/renderer/compose.rb

@@ -5,6 +5,7 @@ class PSD
   # Mostly based on similar code from libpsd.
   module Compose
     extend self
+    extend ChunkyPNG::Color
 
     #
     # Normal blend modes
@@ -318,10 +319,6 @@ class PSD
       rgba(new_r, new_g, new_b, dst_alpha)
     end
 
-    [:r, :g, :b, :a, :rgba, :fully_transparent?].each do |meth|
-      define_method(meth) { |*args| ChunkyPNG::Color.send(meth, *args) }
-    end
-
     # If the blend mode is missing, we fall back to normal composition.
     def method_missing(method, *args, &block)
       normal(*args)
@@ -351,4 +348,4 @@ class PSD
       bg + ((255 - bg) * fg >> 8)
     end
   end
-end
+end

data/lib/psd/util.rb

@@ -12,7 +12,9 @@ class PSD
     end
 
     def clamp(num, min, max)
-      [min, num, max].sort[1]
+      return max if num > max
+      return min if num < min
+      num
     end
   end
-end
+end

data/lib/psd/version.rb

@@ -1,3 +1,3 @@
 class PSD
-  VERSION = "3.2.2"
+  VERSION = "3.2.3"
 end

data/psd.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'rake'
   gem.add_dependency 'psd-enginedata', '~> 1'
   gem.add_dependency 'chunky_png'
-  gem.add_dependency 'activesupport', '~> 3.2.7'
+  gem.add_dependency 'activesupport'
   gem.add_dependency 'xmp'
 
   gem.test_files = Dir.glob("spec/**/*")

data/spec/text_spec.rb

@@ -24,4 +24,16 @@ describe 'Text' do
       expect(c[-1]).to eq(";")
     end
   end
-end
+end
+
+describe "Justified Text" do
+  let (:psd) { PSD.new('spec/files/alignment_modes.psd').tap(&:parse!) }
+  
+  ["left", "right", "center", "justify"].each do |alignment|
+    it "that is #{alignment} justified can be exported to CSS" do
+      type = psd.tree.children_at_path(alignment).first.type
+      css = type.to_css
+      expect(css).to include "text-align: #{alignment}"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psd
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.3
 platform: ruby
 authors:
 - Ryan LeFevre
@@ -9,132 +9,132 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2014-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: psd-enginedata
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: chunky_png
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.7
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.7
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: xmp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !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: Parse Photoshop PSD files with ease
@@ -145,9 +145,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
 - Guardfile
@@ -242,6 +242,7 @@ files:
 - lib/psd/util.rb
 - lib/psd/version.rb
 - psd.gemspec
+- spec/files/alignment_modes.psd
 - spec/files/blendmodes.psd
 - spec/files/empty-layer-subgroups.psd
 - spec/files/empty-layer.psd
@@ -274,12 +275,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -289,6 +290,7 @@ signing_key:
 specification_version: 4
 summary: General purpose library for parsing Photoshop files
 test_files:
+- spec/files/alignment_modes.psd
 - spec/files/blendmodes.psd
 - spec/files/empty-layer-subgroups.psd
 - spec/files/empty-layer.psd