psd.rb in psd-3.3.1

- old
+ new
@@ -1,31 +1,38 @@
+require 'forwardable'
 require 'psd/enginedata'
 require 'chunky_png'
 require 'xmp'
-# require "cairo"
 
-require 'active_support/core_ext/module/delegation'
-require 'active_support/concern'
+require 'psd/blend_mode'
+require 'psd/channel_image'
+require 'psd/color'
+require 'psd/descriptor'
+require 'psd/file'
+require 'psd/header'
+require 'psd/helpers'
+require 'psd/image'
+require 'psd/layer'
+require 'psd/layer_info'
+require 'psd/layer_mask'
+require 'psd/lazy_execute'
+require 'psd/logger'
+require 'psd/mask'
+require 'psd/node'
+require 'psd/path_record'
+require 'psd/renderer'
+require 'psd/resources'
+require 'psd/slices'
+require 'psd/util'
+require 'psd/version'
 
-dir_root = File.dirname(File.absolute_path(__FILE__)) + '/psd'
-[
-  '/image_exports/*',
-  '/image_formats/*',
-  '/image_modes/*',
-  '/nodes/*',
-  '/layer_info/*',
-  '/layer/*',
-  '/**/*'
-].each do |path|
-  Dir.glob(dir_root + path) { |file| require file if File.file?(file) }
-end
-
 # A general purpose parser for Photoshop files. PSDs are broken up in to 4 logical sections:
 # the header, resources, the layer mask (including layers), and the preview image. We parse
 # each of these sections in order.
 class PSD
   include Logger
   include Helpers
+  include Slices
 
   attr_reader :file, :opts
   alias :options :opts
 
   # Opens the named file, parses it, and makes it available for reading. Then, closes it after you're finished.