assembly-image 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9379ec53a26a08578c11910512bd73045366fc337fcafb0c7eb1a247370566b1
-  data.tar.gz: 316fbef312cb027f4061bbe74dc2f8dce993a095d6779da100abeeecbf24b9da
+  metadata.gz: '088a4b9c59b50f893f7b50c16898321770006b4ab22dc08a8ddd70cdba9a15da'
+  data.tar.gz: f22bf6d6acbd4d6885e2102526e7c5e0ac76b93af71eff0d2237d32334afd223
 SHA512:
-  metadata.gz: 97cc720649bdc6e0bb6d7453afdefc7abe3f0931a45976d397f1f77fd2f2dacbcbd4991e64c0e4849a2ae61efa51d72d428ce9a8a15e9a125abdeefcb17b0d5b
-  data.tar.gz: 8e6580aaade8302319e7cbf41d56d8ac0ebe1a05db5607bed8580cebe8a3c87b5795cb90f50e2b9eb4b081d9048a600799b0e373badf811ff9a084e5f9af3fcc
+  metadata.gz: 91f0be3622982ad69823a45eca8111d05756e0442cd7d7aa16cb8099e71ee2e95c21f17c7f14b7ccab04c11724233c9a9739e24f8b8302f07f42b16738c6400e
+  data.tar.gz: d1ab206c475413496a6add9376cb246705df18a3142bdc32189b202e31af698b8cfded84464d00e94357fc08396ab142270043b3b862cc0d68cd57834863b649

data/.circleci/config.yml

@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
-  ruby-rails: sul-dlss/ruby-rails@3.0.1
+  ruby-rails: sul-dlss/ruby-rails@3.1.2
 workflows:
   build:
     jobs:

data/.gitignore

@@ -2,7 +2,6 @@
 *.gem
 .DS_Store
 .bundle
-Gemfile.lock
 config/certs/*
 config/environments/*
 doc/*

data/.rubocop.yml

@@ -22,11 +22,16 @@ Naming/FileName:
   Exclude:
    - lib/assembly-image.rb
 
+Naming/PredicateName:
+  ForbiddenPrefixes:
+    - is_
+
+RSpec/MultipleMemoizedHelpers:
+  Enabled: false
+
 Style/WordArray:
   Enabled: false
 
-Gemspec/DateAssignment: # new in 1.10
-  Enabled: true
 Gemspec/RequireMFA: # new in 1.23
   Enabled: true
 Layout/LineEndStringConcatenationIndentation: # new in 1.18
@@ -141,7 +146,7 @@ RSpec/SubjectDeclaration: # new in 2.5
 RSpec/FactoryBot/SyntaxMethods: # new in 2.7
   Enabled: true
 RSpec/Rails/AvoidSetupHook: # new in 2.4
-  Enabled: true
+  Enabled: false
 
 Lint/RefinementImportMethods: # new in 1.27
   Enabled: true
@@ -166,3 +171,16 @@ RSpec/VerifiedDoubleReference: # new in 2.10.0
 
 Gemspec/DeprecatedAttributeAssignment: # new in 1.30
   Enabled: true
+Layout/LineContinuationLeadingSpace: # new in 1.31
+  Enabled: true
+Layout/LineContinuationSpacing: # new in 1.31
+  Enabled: true
+Lint/ConstantOverwrittenInRescue: # new in 1.31
+  Enabled: true
+Lint/NonAtomicFileOperation: # new in 1.31
+  Enabled: true
+
+RSpec/Capybara/SpecificMatcher: # new in 2.12
+  Enabled: true
+RSpec/Rails/HaveHttpStatus: # new in 2.12
+  Enabled: false

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-06-16 22:15:07 UTC using RuboCop version 1.30.1.
+# on 2022-07-19 17:18:47 UTC using RuboCop version 1.31.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -13,66 +13,16 @@ Gemspec/RequiredRubyVersion:
   Exclude:
     - 'assembly-image.gemspec'
 
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-Lint/RedundantCopDisableDirective:
-  Exclude:
-    - 'lib/assembly-image/image.rb'
-    - 'lib/assembly-image/images.rb'
-
 # Offense count: 2
 # Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 20
 
-# Offense count: 14
+# Offense count: 11
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
-  Max: 15
-
-# Offense count: 2
-# Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
-# Include: **/*_spec*rb*, **/spec/**/*
-RSpec/FilePath:
-  Exclude:
-    - 'spec/image_spec.rb'
-    - 'spec/images_spec.rb'
-
-# Offense count: 21
-RSpec/MultipleExpectations:
   Max: 13
 
-# Offense count: 5
-RSpec/UnspecifiedException:
-  Exclude:
-    - 'spec/image_spec.rb'
-    - 'spec/images_spec.rb'
-
-# Offense count: 3
-Style/CombinableLoops:
-  Exclude:
-    - 'spec/images_spec.rb'
-
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/GlobalStdStream:
-  Exclude:
-    - 'lib/assembly-image/images.rb'
-
-# Offense count: 1
-# Configuration parameters: AllowedMethods.
-# AllowedMethods: respond_to_missing?
-Style/OptionalBooleanParameter:
-  Exclude:
-    - 'lib/assembly-image/image.rb'
-
-# Offense count: 7
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Mode.
-Style/StringConcatenation:
-  Exclude:
-    - 'bin/console'
-    - 'config/boot.rb'
-    - 'lib/assembly-image.rb'
-    - 'lib/assembly-image/images.rb'
-    - 'spec/spec_helper.rb'
+# Offense count: 15
+RSpec/MultipleExpectations:
+  Max: 11

data/.rvmrc.example

@@ -1 +1 @@
-rvm use 1.9.3@assembly-image --create
+rvm use 3.1.0@assembly-image --create

data/Gemfile.lock

@@ -0,0 +1,105 @@
+PATH
+  remote: .
+  specs:
+    assembly-image (2.1.0)
+      activesupport (> 6.1)
+      assembly-objectfile (>= 1.6.4)
+      ruby-vips (>= 2.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (7.0.3.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    assembly-objectfile (2.1.0)
+      activesupport (>= 5.2.0)
+      mime-types (> 3)
+      mini_exiftool
+    ast (2.4.2)
+    byebug (11.1.3)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    ffi (1.15.5)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
+    json (2.6.2)
+    method_source (1.0.0)
+    mime-types (3.4.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2022.0105)
+    mini_exiftool (2.10.2)
+    minitest (5.16.2)
+    parallel (1.22.1)
+    parser (3.1.2.0)
+      ast (~> 2.4.1)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.5.0)
+    rexml (3.2.5)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.31.2)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.1.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.18.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.19.1)
+      parser (>= 3.1.1.0)
+    rubocop-rspec (2.12.1)
+      rubocop (~> 1.31)
+    ruby-progressbar (1.11.0)
+    ruby-vips (2.1.4)
+      ffi (~> 1.12)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.2.0)
+
+PLATFORMS
+  x86_64-darwin-19
+  x86_64-darwin-21
+  x86_64-linux
+
+DEPENDENCIES
+  assembly-image!
+  pry-byebug
+  rake
+  rspec (~> 3.0)
+  rubocop
+  rubocop-rspec
+  simplecov
+
+BUNDLED WITH
+   2.3.17

data/README.md

@@ -6,24 +6,16 @@
 # Assembly Image Gem
 
 ## Overview
-This gem contains classes used by the Stanford University Digital Library to
-perform image operations necessary for accessioning of content.
+This gem contains classes used by the Stanford University Digital Library to create JP2 image derivatives.
 
-Requires image processing software - see PreRequisites section below.
+Requires image processing software - see [prerequisites section](#prerequisites) below.
 
 ## Notes
 
 1. The gem assumes that the user context in which it is executed has write access to the 'tmp' folder.
-This is because color profiles can be extracted from images during the JP2
-creation process, and these profiles need to be stored as local files, and it
-is beneficial to cache them for later usage by images with the same color profile.
-If you know there are color profiles which are commonly used, it is better to
-capture them in the gem itself in the profile folder so they can be re-used
-and do not need to be extracted.
-1. If any errors occur during JP2 generation for any reason, a runtime exception will be thrown with a description of the error.
-2. If an image is passed in with a color profile that cannot be determined by examining the exif header data, an exception will be thrown.
-
-This can commonly occur in basic test TIFs that are black/white and have no profile, so beware during testing.
+This is to create the temporary tiffs used;  we need temporary tiffs to reliably compress the image using KDUcompress, which doesn’t support arbitrary image types
+2. If any errors occur during JP2 generation for any reason, a runtime exception will be thrown with a description of the error.
+3. If an image is passed in with a color profile that cannot be determined, an exception will be thrown. This can commonly occur in basic test TIFs that are black/white and have no profile, so beware during testing.
 
 ## Usage
 
@@ -31,45 +23,29 @@ To use the JP2 creation method, you first instantiate the image object with an i
 
 ```ruby
 require 'assembly-image'
-input = Assembly::Image.new('/full/path/to/file.tif')
-puts input.exif   # show exif header information for the TIF
-output = input.create_jp2(:output=>'/full/path/to/output.jp2') # generate a new JP2 in the specified location
-puts output.exif  # show exif header information for the JP2
+input_image = Assembly::Image.new('/full/path/to/file.tif')
+output = input_image.create_jp2(output: '/full/path/to/output.jp2') # generate a new JP2 in the specified location
 ```
 
 ## Running tests
 
 ```bash
-bundle exec rake
-```
-
-## Generate documentation
-To generate documentation into the "doc" folder:
-
-```bash
-yard
-```
-
-To keep a local server running with up to date code documentation that you can view in your browser:
-
-```bash
-yard server --reload
+bundle exec rspec
 ```
 
 ## Prerequisites
 
 1. Kakadu Proprietary Software Binaries - for JP2 generation
-1. ImageMagick 6.5.4 or higher
-1. Exiftool
+1. Libvips
+1. Exiftool - upstream dependency of assembly-objectfile (used by specs to check mimetype of produced jp2, and because there is no libvips package available for circleci that speaks jp2)
 
 ### Kakadu
 
 Download and install demonstration binaries from Kakadu:
 http://kakadusoftware.com/downloads/
 
-NOTE: If you have upgrade to El Capitan on OS X, you will need to donwload and re-install the latest version of Kakadu, due to changes made with SIP.  These changes moved the old executable binaries to an inaccessible location.
-
 ### Libvips
+Note: libvips may require a significant amount of space for temporary files. The location for this can be controlled by the TMPDIR environment variable.
 
 #### Mac
 
@@ -79,7 +55,7 @@ brew install libvips
 
 ### Exiftool
 
-#### RHEL
+#### Linux
 Download latest version from: http://www.sno.phy.queensu.ca/~phil/exiftool
 
 ```bash

data/assembly-image.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.push File.expand_path('lib', __dir__)
 
 Gem::Specification.new do |s|
   s.name        = 'assembly-image'
-  s.version     = '2.0.0'
+  s.version     = '2.1.0'
   s.authors     = ['Peter Mangiafico', 'Renzo Sanchez-Silva', 'Monty Hindman', 'Tony Calavano']
   s.email       = ['pmangiafico@stanford.edu']
   s.homepage    = ''
@@ -17,8 +17,8 @@ Gem::Specification.new do |s|
   s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.require_paths = ['lib']
 
+  s.add_dependency 'activesupport', '> 6.1'
   s.add_dependency 'assembly-objectfile', '>= 1.6.4'
-  s.add_dependency 'mini_exiftool', '>= 1.6', '< 3'
   s.add_dependency 'ruby-vips', '>= 2.0'
 
   s.add_development_dependency 'pry-byebug'
@@ -27,5 +27,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rubocop'
   s.add_development_dependency 'rubocop-rspec'
   s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'yard'
 end

data/bin/console

@@ -4,6 +4,6 @@
 require 'rubygems'
 require 'irb'
 
-require File.expand_path(File.dirname(__FILE__) + '/../config/boot')
+require File.expand_path("#{File.dirname(__FILE__)}/../config/boot")
 
 IRB.start

data/config/boot.rb

@@ -2,9 +2,9 @@
 
 require 'rubygems'
 
-project_root = File.expand_path(File.dirname(__FILE__) + '/..')
+project_root = File.expand_path("#{File.dirname(__FILE__)}/..")
 
 # Load config for current environment.
-$LOAD_PATH.unshift(project_root + '/lib')
+$LOAD_PATH.unshift("#{project_root}/lib")
 
 require 'assembly-image'

data/lib/{assembly-image → assembly/image}/jp2_creator.rb

@@ -3,6 +3,7 @@
 require 'assembly-objectfile'
 require 'tempfile'
 require 'English' # see https://github.com/rubocop-hq/rubocop/issues/1747 (not #MAGA related)
+require 'active_support/core_ext/module/delegation'
 
 module Assembly
   class Image < Assembly::ObjectFile
@@ -14,47 +15,46 @@ module Assembly
       # @return [Assembly::Image] object containing the generated JP2 file
       #
       # @param [Assembly::Image] the image file
-      # @param [Hash] params Optional parameters specified as a hash, using symbols for options:
-      #   * :output => path to the output JP2 file (default: mirrors the source file name and path, but with a .jp2 extension)
-      #   * :overwrite => if set to false, an existing JP2 file with the same name won't be overwritten (default: false)
-      #   * :tmp_folder =>  the temporary folder to use when creating the jp2 (default: '/tmp'); also used by imagemagick
+      # @param [String] output path to the output JP2 file (default: mirrors the source file name and path, but with a .jp2 extension)
+      # @param [Boolean] overwrite if set to false, an existing JP2 file with the same name won't be overwritten (default: false)
+      # @param [Dir] tmp_folder the temporary folder to use when creating the jp2 (default: '/tmp'); also used by imagemagick
       #
       # Example:
       #   source_img = Assembly::Image.new('/input/path_to_file.tif')
-      #   derivative_img = source_img.create_jp2(:overwrite=>true)
+      #   derivative_img = source_img.create_jp2(overwrite: true)
       #   puts derivative_img.mimetype # 'image/jp2'
       #   puts derivative_image.path # '/input/path_to_file.jp2'
-      def self.create(image, params = {})
-        new(image, params).create
+      def self.create(image, **args)
+        new(image, **args).create
       end
 
-      def initialize(image, params)
+      def initialize(image, overwrite: false, output: image.jp2_filename, tmp_folder: Dir.tmpdir)
         @image = image
-        @output_path = params.fetch(:output, image.jp2_filename)
-        @tmp_folder = params[:tmp_folder]
-        @overwrite = params[:overwrite]
-        @params = params
+        @output_path = output
+        @tmp_folder = tmp_folder
+        @overwrite = overwrite
       end
 
-      attr_reader :image, :output_path, :tmp_folder, :tmp_path
+      attr_reader :image, :output_path, :tmp_folder, :tmp_tiff_path
+
+      delegate :vips_image, to: :image
 
       # @return [Assembly::Image] object containing the generated JP2 file
       def create
         create_jp2_checks
 
-        # Using instance variable so that can check in tests.
-        # We do this because we need to reliably compress the tiff and KDUcompress doesn’t support arbitrary image types
-        @tmp_path = make_tmp_tiff(tmp_folder: tmp_folder)
+        # KDUcompress doesn’t support arbitrary image types,  so we make a temporary tiff
+        @tmp_tiff_path = make_tmp_tiff
 
-        jp2_command = jp2_create_command(source_path: @tmp_path, output: output_path)
+        jp2_command = jp2_create_command(source_path: tmp_tiff_path, output: output_path)
         result = `#{jp2_command}`
         unless $CHILD_STATUS.success?
           # Clean up any partial result
-          File.delete(output_path) if File.exist?(output_path)
+          FileUtils.rm_rf(output_path)
           raise "JP2 creation command failed: #{jp2_command} with result #{result}"
         end
 
-        File.delete(@tmp_path) unless @tmp_path.nil?
+        File.delete(tmp_tiff_path) unless tmp_tiff_path.nil?
 
         # create output response object, which is an Assembly::Image type object
         Image.new(output_path)
@@ -68,8 +68,10 @@ module Assembly
 
       def jp2_create_command(source_path:, output:)
         options = []
-        # TODO: Consider using ruby-vips to determine the colorspace instead of relying on exif (which is done below)
-        options << '-jp2_space sRGB' if image.samples_per_pixel == 3
+        # CMYK becomes sRGB in make_tmp_tiff, so jp2_space option will be set for sRGB and CMYK
+        #   TODO: we're not sure at this time what happens for grayscale (or what Tony C. wants for grayscale)
+        #   see https://github.com/sul-dlss/assembly-image/issues/98
+        options << '-jp2_space sRGB' if image.srgb?
         options += KDU_COMPRESS_DEFAULT_OPTIONS
         options << "Clayers=#{layers}"
         "kdu_compress #{options.join(' ')} -i '#{source_path}' -o '#{output}' 2>&1"
@@ -100,32 +102,24 @@ module Assembly
         raise SecurityError, 'cannot recreate jp2 over itself' if overwrite? && image.mimetype == 'image/jp2' && output_path == image.path
       end
 
-      # Bigtiff needs to be used if size of image exceeds 2^32 bytes.
-      def need_bigtiff?
-        image.image_data_size >= 2**32
-      end
-
       # We do this because we need to reliably compress the tiff and KDUcompress doesn’t support arbitrary image types
       # rubocop:disable Metrics/MethodLength
-      def make_tmp_tiff(tmp_folder: nil)
-        tmp_folder ||= Dir.tmpdir
-        raise "tmp_folder #{tmp_folder} does not exists" unless File.exist?(tmp_folder)
+      def make_tmp_tiff
+        raise "tmp_folder #{tmp_folder} does not exist" unless File.exist?(tmp_folder)
 
         # make temp tiff filename
         tmp_tiff_file = Tempfile.new(['assembly-image', '.tif'], tmp_folder)
-        tmp_path = tmp_tiff_file.path
-        vips_image = Vips::Image.new_from_file image.path
-
-        vips_image = if vips_image.interpretation.eql?(:cmyk)
-                       vips_image.icc_transform(SRGB_ICC, input_profile: CMYK_ICC)
-                     elsif !image.profile.nil?
-                       vips_image.icc_transform(SRGB_ICC, embedded: true)
-                     else
-                       vips_image
-                     end
-
-        vips_image.tiffsave(tmp_path, bigtiff: need_bigtiff?)
-        tmp_path
+        result_path = tmp_tiff_file.path
+        tmp_tiff_image = if vips_image.interpretation.eql?(:cmyk)
+                           vips_image.icc_transform(SRGB_ICC, input_profile: CMYK_ICC)
+                         elsif image.has_profile?
+                           vips_image.icc_transform(SRGB_ICC, embedded: true)
+                         else
+                           vips_image
+                         end
+
+        tmp_tiff_image.tiffsave(result_path, bigtiff: true) # Use bigtiff so we can support images > 4GB
+        result_path
       end
       # rubocop:enable Metrics/MethodLength
     end

data/lib/assembly/image.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require 'vips'
+require 'assembly-objectfile'
+require_relative 'image/jp2_creator'
+
+module Assembly
+  # The Image class contains methods to operate on an image.
+  class Image < Assembly::ObjectFile
+    # @return [integer] image height in pixels
+    def height
+      vips_image.height
+    end
+
+    # @return [integer] image width in pixels
+    def width
+      vips_image.width
+    end
+
+    # @return [string] full default jp2 path and filename that will be created from the given image
+    # Example:  given original file of '/dir/path_to_file.tif', gives '/dir/path_to_file.jp2'
+    def jp2_filename
+      # path is a property on Assembly::ObjectFile
+      File.extname(path).empty? ? "#{path}.jp2" : path.gsub(File.extname(path), '.jp2')
+    end
+
+    # Create a JP2 file for the current image.
+    # Important note: this will not work for multipage TIFFs.
+    #
+    # @param [String] output path to the output JP2 file (default: mirrors the source file name and path, but with a .jp2 extension)
+    # @param [Boolean] overwrite if set to false, an existing JP2 file with the same name won't be overwritten (default: false)
+    # @param [Dir] tmp_folder the temporary folder to use when creating the jp2 (default: '/tmp'); also used by imagemagick
+    # @return [Assembly::Image] object containing the generated JP2 file
+    #
+    # Example:
+    #   source_img = Assembly::Image.new('/dir/path_to_file.tif')
+    #   jp2_img = source_img.create_jp2(overwrite: true)
+    #   jp2_img.mimetype # 'image/jp2'
+    #   jp2_img.path # '/dir/path_to_file.jp2'
+    def create_jp2(**params)
+      Jp2Creator.create(self, **params)
+    end
+
+    def vips_image
+      # autorot will only affect images that need rotation: https://www.libvips.org/API/current/libvips-conversion.html#vips-autorot
+      @vips_image ||= Vips::Image.new_from_file(path).autorot
+    end
+
+    def srgb?
+      vips_image.interpretation == :srgb
+    end
+
+    # Does the image include an ICC profile?
+    def has_profile?
+      vips_image.get_fields.include?('icc-profile-data')
+    end
+  end
+end

data/lib/assembly-image.rb

@@ -2,11 +2,10 @@
 
 module Assembly
   # the path to the gem, used to access profiles stored with the gem
-  PATH_TO_IMAGE_GEM = File.expand_path(File.dirname(__FILE__) + '/..')
+  PATH_TO_IMAGE_GEM = File.expand_path("#{File.dirname(__FILE__)}/..")
   PATH_TO_PROFILES = File.join(Assembly::PATH_TO_IMAGE_GEM, 'profiles')
   SRGB_ICC = File.join(PATH_TO_PROFILES, 'sRGBIEC6196621.icc')
   CMYK_ICC = File.join(PATH_TO_PROFILES, 'cmyk.icc')
 end
 
-require 'assembly-image/image'
-require 'assembly-image/images'
+require 'assembly/image'