assembly-image 1.6.7 → 1.6.8

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: b213d29d1bbd1206e9268adeff0d7eba4f9e8b26
-  data.tar.gz: 04d757adec2931a7ca42ac9f1cf7f29d6b7dbbc0
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OGE0YzJiODk5NThlM2U1OTU1YjM2N2VhMzY1MTFiNmZhZWI2ZTBkNA==
+  data.tar.gz: !binary |-
+    OWE0YzZiMDMyNDM0MDc4NTM5NzNjNzdiYWQ5YzQwZjQ5ZWFkZDE4Ng==
 SHA512:
-  metadata.gz: 84120410f44ab8fdbf8fe2f7e9943d6209058e6bc4ffc707e149ba134c65b3165e1839ec869bf40b33a823ab395ed7ddfbbb22582f8aee53c2a5befaf8d31b62
-  data.tar.gz: fb93f15796aacf0500337b0afe7997cec9d832edb39f23f6078cacaef061c36efb5e85b48b4f40607f2b7d86bd3d58afdd569f33f3babfe1c980de90179b89d6
+  metadata.gz: !binary |-
+    ZjlhNmFiMmQxNDdlMjc2NTgzMTIzYmYxMWRlNGExZTQwNzY2NzI2ZGQwMzEx
+    ZWU5ZjRjNzMxZmIzODBkYWY1NzM1NTg5ZDJkMWFlMTRmYjliNmZhMTVhNmJl
+    OTQ0ZWY1YTBhYzQ2ZTgwNGZjYzU5ODgwNGNmZGUyNWMyNDI4MzE=
+  data.tar.gz: !binary |-
+    ODQxM2Y0ODBhNzk2YTkwZDA2NTIyZWIxMzlkNTQ4ZDdhN2VhZmVkZTY2MTdh
+    NDljNGI5MDk0YjI4OTQ2MmRkM2I1YzJhMDg2YTJiNzI1OWE2NWViMGI4MjBj
+    MmRhYjJlMDcyOTZkNTVkZGE1YWYwY2Q1NTg3MjRkMmY2ZjNkNDA=

data/Gemfile

@@ -1,4 +1,5 @@
 source "http://rubygems.org"
+source "http://sul-gems.stanford.edu"
 
 # Specify your gem's dependencies in assembly-image.gemspec
 gemspec

data/README.rdoc

@@ -44,8 +44,8 @@ image operations necessary for accessioning of content.
 - 1.6.1 bump version number of assembly-objectfile required to fix UTF-8 errors during JP2-create
 - 1.6.2-1.6.3 small change to jp2 generation to try and fix bug with tiffs that have multiple input profile layers 
 - 1.6.4 added in some additional checks to try and create jp2s with mismatching exif data
-- 1.6.5 fix problem with lack of extension in incoming tif causing a problem when creating jp2
-- 1.6.7 release to github/rubygems
+- 1.6.5-1.6.6 fix problem with lack of extension in incoming tif causing a problem when creating jp2
+- 1.6.7-1.6.8 tweaks to gemspec
 ==Notes
 
 1. The gem assumes that the user context in which it is executed has write access to the 'tmp' folder.
@@ -59,6 +59,11 @@ folder so they can be re-used and do not need to be extracted.
 3. 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 commonally occur in basic test TIFs that are black/white and have no profile, so beware during testing.
 
+==Deploy new gem
+
+gem build assembly-image.gemspec
+gem push assembly-image-1.6.8.gem # update version as needed
+
 ==Usage
 
 To use the JP2 creation method, you first instantiate the image object with an input image and then operate on it.
@@ -78,7 +83,7 @@ To generate documentation into the "doc" folder:
 
 	yard
 
-To keep a local server running with up to date code documentation that you can view in your browser:
+To keep a local server running with up to date code documentation that you can view in your browser at http://0.0.0.0:8808:
 
 	yard server --reload
 
@@ -137,3 +142,4 @@ To keep a local server running with up to date code documentation that you can v
    Mac users:
 
        brew install exiftool
+

data/Rakefile

@@ -1,8 +1,11 @@
 require "bundler/gem_tasks"
 
+require 'dlss/rake/dlss_release'
+Dlss::Release.new
+
 require 'rspec/core/rake_task'
 
 desc "Run specs"
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task :default => :spec

data/assembly-image.gemspec

@@ -20,11 +20,11 @@ Gem::Specification.new do |s|
   s.add_dependency 'uuidtools'
   s.add_dependency 'assembly-objectfile', ">= 1.6.4"
   s.add_dependency 'mini_exiftool', "~> 1.6"
-  s.add_dependency 'activesupport'
+  s.add_dependency 'activesupport', '>3'
   s.add_dependency 'nokogiri'
 
-  s.add_development_dependency "rspec", "~> 3.0"
+  s.add_development_dependency "rspec", "~> 2.6"
+  s.add_development_dependency "lyberteam-gems-devel", "> 1.0.0"
   s.add_development_dependency "yard"
-  s.add_development_dependency "rake"
   
-end
+end

data/lib/assembly-image/images.rb

@@ -1,16 +1,7 @@
-require 'logger'
 module Assembly
   
   # The Images class contains methods to operate on multiple images in batch.
   class Images
-    
-    def self.logger
-      @logger ||= Logger.new(STDERR)
-    end
-    
-    def self.logger= logger
-      @logger = logger
-    end
 
     # Pass in a source path and have exif color profile descriptions added to all images contained.
     # This is useful if your source TIFFs do not have color profile descriptions in the EXIF data, but you know what it should be.
@@ -36,13 +27,13 @@ module Assembly
       
       raise "Input path does not exist" unless File.directory?(source)
       
-      logger.debug "Source: #{source}"
+      puts "Source: #{source}"
 
       # iterate over input directory looking for tifs
       pattern = recursive ? "**/*.#{extension}" : "*.#{extension}*" 
       Dir.glob(File.join(source,pattern)).each do |file|
         img=Assembly::Image.new(file)
-        logger.debug "Processing #{file}"
+        puts "Processing #{file}"
         img.add_exif_profile_description(profile_name,force)
       end
       return "Complete"
@@ -74,8 +65,8 @@ module Assembly
         Dir.mkdir(output) unless File.directory?(output) # attemp to make output directory
         raise "Output path does not exist or could not be created" unless File.directory?(output) 
 
-        logger.debug "Source: #{source}"
-        logger.debug "Destination: #{output}"
+        puts "Source: #{source}"
+        puts "Destination: #{output}"
   
         pattern = recursive ? "**/*.#{extension}" : "*.#{extension}*" 
 
@@ -85,9 +76,9 @@ module Assembly
           output_img=File.join(output,File.basename(file,File.extname(file))+'.jp2') # output image gets same file name as source, but with a jp2 extension and in the correct output directory
           begin
             derivative_img=source_img.create_jp2(:overwrite=>overwrite,:output=>output_img)
-            logger.debug "Generated jp2 for #{File.basename(file)}"
+            puts "Generated jp2 for #{File.basename(file)}"
           rescue Exception => e
-            logger.debug "** Error for #{File.basename(file)}: #{e.message}"
+            puts "** Error for #{File.basename(file)}: #{e.message}"
           end
         end
         return 'Complete'

data/lib/assembly-image/version.rb

@@ -3,6 +3,6 @@ module Assembly
   # Main Image class
   class Image
     # Project version number    
-    VERSION = "1.6.7"
+    VERSION = "1.6.8"
   end
 end

data/spec/image_spec.rb

@@ -4,27 +4,27 @@ describe Assembly::Image do
 
   it "should not run if no input file is passed in" do
     @ai=Assembly::Image.new('')
-    expect{@ai.create_jp2}.to raise_error
+    lambda{@ai.create_jp2}.should raise_error
   end
   
   it "should indicate the default jp2 filename" do
     @ai = Assembly::Image.new(TEST_TIF_INPUT_FILE)
-    expect(@ai.jp2_filename).to eq TEST_TIF_INPUT_FILE.gsub('.tif','.jp2')
+    @ai.jp2_filename.should == TEST_TIF_INPUT_FILE.gsub('.tif','.jp2')
   end
 
   it "should indicate the default jp2 filename" do
     @ai = Assembly::Image.new("/path/to/a/file_with_no_extension")
-    expect(@ai.jp2_filename).to eq "/path/to/a/file_with_no_extension.jp2"
+    @ai.jp2_filename.should == "/path/to/a/file_with_no_extension.jp2"
   end
   
   it "should indicate the default DPG jp2 filename" do
     @ai = Assembly::Image.new(TEST_DPG_TIF_INPUT_FILE)
-    expect(@ai.dpg_jp2_filename).to eq TEST_DPG_TIF_INPUT_FILE.gsub('.tif','.jp2').gsub('_00_','_05_')
+    @ai.dpg_jp2_filename.should == TEST_DPG_TIF_INPUT_FILE.gsub('.tif','.jp2').gsub('_00_','_05_')
   end
 
   it "should indicate the default jp2 filename" do
     @ai = Assembly::Image.new("/path/to/a/file_with_no_00_extension")
-    expect(@ai.dpg_jp2_filename).to eq "/path/to/a/file_with_no_05_extension.jp2"
+    @ai.dpg_jp2_filename.should == "/path/to/a/file_with_no_05_extension.jp2"
   end
   
   it "should create jp2 when given an RGB tif" do
@@ -33,13 +33,13 @@ describe Assembly::Image do
     expect(File).to_not exist TEST_JP2_OUTPUT_FILE
     @ai = Assembly::Image.new(TEST_TIF_INPUT_FILE)
     result=@ai.create_jp2(:output => TEST_JP2_OUTPUT_FILE)
-    expect(result).to be_a_kind_of Assembly::Image
-    expect(result.path).to eq TEST_JP2_OUTPUT_FILE        
-    expect(TEST_JP2_OUTPUT_FILE).to be_a_jp2
-    expect(result.exif.colorspace).to eq "sRGB"
+    result.class.should be Assembly::Image
+    result.path.should == TEST_JP2_OUTPUT_FILE        
+    is_jp2?(TEST_JP2_OUTPUT_FILE).should be true
+    result.exif.colorspace.should == "sRGB"
     @jp2=Assembly::Image.new(TEST_JP2_OUTPUT_FILE)
-    expect(@jp2.height).to eq 100
-    expect(@jp2.width).to eq 100
+    @jp2.height.should == 100
+    @jp2.width.should == 100
   end
 
   it "should create grayscale jp2 when given a bitonal tif" do
@@ -47,10 +47,10 @@ describe Assembly::Image do
     expect(File).to exist TEST_TIF_INPUT_FILE
     expect(File).to_not exist TEST_JP2_OUTPUT_FILE
     @ai = Assembly::Image.new(TEST_TIF_INPUT_FILE)
-    expect(@ai).to have_color_profile
+    @ai.has_color_profile?.should be true
     result=@ai.create_jp2(:output => TEST_JP2_OUTPUT_FILE)
-    expect(TEST_JP2_OUTPUT_FILE).to be_a_jp2
-    expect(result.exif.colorspace).to eq "Grayscale"    
+    is_jp2?(TEST_JP2_OUTPUT_FILE).should be true
+    result.exif.colorspace.should == "Grayscale"    
   end
 
   it "should create color jp2 when given a color tif but bitonal image data (1 channels and 1 bits per pixel)" do
@@ -58,10 +58,10 @@ describe Assembly::Image do
     expect(File).to exist TEST_TIF_INPUT_FILE
     expect(File).to_not exist TEST_JP2_OUTPUT_FILE
     @ai = Assembly::Image.new(TEST_TIF_INPUT_FILE)
-    expect(@ai).to_not have_color_profile
+    @ai.has_color_profile?.should be false
     result=@ai.create_jp2(:output => TEST_JP2_OUTPUT_FILE)
-    expect(TEST_JP2_OUTPUT_FILE).to be_a_jp2
-    expect(result.exif.colorspace).to eq "sRGB"    
+    is_jp2?(TEST_JP2_OUTPUT_FILE).should be true
+    result.exif.colorspace.should == "sRGB"    
   end
 
   it "should create grayscale jp2 when given a graycale tif but with bitonal image data (1 channel and 1 bits per pixel)" do
@@ -69,10 +69,10 @@ describe Assembly::Image do
     expect(File).to exist TEST_TIF_INPUT_FILE
     expect(File).to_not exist TEST_JP2_OUTPUT_FILE
     @ai = Assembly::Image.new(TEST_TIF_INPUT_FILE)
-    expect(@ai).to_not have_color_profile
+    @ai.has_color_profile?.should be false
     result=@ai.create_jp2(:output => TEST_JP2_OUTPUT_FILE)
-    expect(TEST_JP2_OUTPUT_FILE).to be_a_jp2
-    expect(result.exif.colorspace).to eq "Grayscale"    
+    is_jp2?(TEST_JP2_OUTPUT_FILE).should be true
+    result.exif.colorspace.should == "Grayscale"    
   end
 
   it "should create color jp2 when given a color tif but with greyscale image data (1 channel and 8 bits per pixel)" do
@@ -80,10 +80,10 @@ describe Assembly::Image do
     expect(File).to exist TEST_TIF_INPUT_FILE
     expect(File).to_not exist TEST_JP2_OUTPUT_FILE
     @ai = Assembly::Image.new(TEST_TIF_INPUT_FILE)
-    expect(@ai).to_not have_color_profile
+    @ai.has_color_profile?.should be false
     result=@ai.create_jp2(:output => TEST_JP2_OUTPUT_FILE)
-    expect(TEST_JP2_OUTPUT_FILE).to be_a_jp2
-    expect(result.exif.colorspace).to eq "sRGB"    
+    is_jp2?(TEST_JP2_OUTPUT_FILE).should be true
+    result.exif.colorspace.should == "sRGB"    
   end
   
   it "should create a jp2 when the source image has no profile" do
@@ -91,11 +91,11 @@ describe Assembly::Image do
     expect(File).to exist TEST_TIF_INPUT_FILE
     expect(File).to_not exist TEST_JP2_OUTPUT_FILE
     @ai = Assembly::Image.new(TEST_TIF_INPUT_FILE)
-    expect(@ai).to_not have_color_profile
-    expect(@ai).to be_a_valid_image
-    expect(@ai).to be_jp2able
+    @ai.has_color_profile?.should be false
+    @ai.valid_image?.should be true
+    @ai.jp2able?.should be true
     @ai.create_jp2(:output => TEST_JP2_OUTPUT_FILE)
-    expect(TEST_JP2_OUTPUT_FILE).to be_a_jp2
+    is_jp2?(TEST_JP2_OUTPUT_FILE).should be true
   end
 
   it "should not run if the output file exists and you don't allow overwriting" do
@@ -104,23 +104,23 @@ describe Assembly::Image do
     expect(File).to exist TEST_TIF_INPUT_FILE
     expect(File).to exist TEST_JP2_OUTPUT_FILE
     @ai = Assembly::Image.new(TEST_TIF_INPUT_FILE)
-    expect{@ai.create_jp2(:output => TEST_JP2_OUTPUT_FILE)}.to raise_error(SecurityError)
+    lambda{@ai.create_jp2(:output => TEST_JP2_OUTPUT_FILE)}.should raise_error(SecurityError)
   end
 
   it "should get the correct image height and width" do
     generate_test_image(TEST_TIF_INPUT_FILE)
     @ai = Assembly::Image.new(TEST_TIF_INPUT_FILE)
-    expect(@ai.height).to eq 100
-    expect(@ai.width).to eq 100
+    @ai.height.should == 100
+    @ai.width.should == 100    
   end
   
   it "should not run if the input file is a jp2" do
     generate_test_image(TEST_JP2_OUTPUT_FILE)
     expect(File).to exist TEST_JP2_OUTPUT_FILE
     @ai = Assembly::Image.new(TEST_JP2_OUTPUT_FILE)
-    expect(@ai).to be_valid_image
-    expect(@ai).to_not be_jp2able
-    expect { @ai.create_jp2 }.to raise_error
+    @ai.valid_image?.should be true
+    @ai.jp2able?.should be false
+    lambda{@ai.create_jp2}.should raise_error
   end
 
   it "should run if you specify a bogus output profile, because this is not currently an option" do
@@ -128,10 +128,10 @@ describe Assembly::Image do
     expect(File).to exist TEST_TIF_INPUT_FILE
     @ai = Assembly::Image.new(TEST_TIF_INPUT_FILE)
     result=@ai.create_jp2(:output_profile=>'bogusness')
-    expect(result).to be_a_kind_of Assembly::Image
-    expect(result.path).to eq TEST_JP2_INPUT_FILE    
-    expect(TEST_JP2_INPUT_FILE).to be_a_jp2
-    expect(result.exif.colorspace).to eq "sRGB"     
+    result.class.should be Assembly::Image
+    result.path.should == TEST_JP2_INPUT_FILE    
+    is_jp2?(TEST_JP2_INPUT_FILE).should be true  
+    result.exif.colorspace.should == "sRGB"     
   end
 
   it "should not run if you specify a bogus tmp folder" do
@@ -140,7 +140,7 @@ describe Assembly::Image do
     expect(File).to exist TEST_TIF_INPUT_FILE
     expect(File).to_not exist bogus_folder
     @ai = Assembly::Image.new(TEST_TIF_INPUT_FILE)
-    expect { @ai.create_jp2(:tmp_folder=>bogus_folder) }.to raise_error
+    lambda{@ai.create_jp2(:tmp_folder=>bogus_folder)}.should raise_error
   end
 
   it "should create a jp2 and preserve the temporary file if specified" do
@@ -148,24 +148,24 @@ describe Assembly::Image do
     expect(File).to exist TEST_TIF_INPUT_FILE
     @ai = Assembly::Image.new(TEST_TIF_INPUT_FILE)
     result=@ai.create_jp2(:output => TEST_JP2_OUTPUT_FILE, :preserve_tmp_source=>true)
-    expect(result).to be_a_kind_of Assembly::Image
-    expect(result.path).to eq TEST_JP2_OUTPUT_FILE    
-    expect(TEST_JP2_OUTPUT_FILE).to be_a_jp2
-    expect(result.exif.colorspace).to eq "sRGB"    
-    expect(File.exists?(@ai.tmp_path)).to be true
+    result.class.should be Assembly::Image
+    result.path.should == TEST_JP2_OUTPUT_FILE    
+    is_jp2?(TEST_JP2_OUTPUT_FILE).should be true
+    result.exif.colorspace.should == "sRGB"    
+    File.exists?(@ai.tmp_path).should be true
   end
 
   it "should create jp2 of the same filename and in the same location as the input if no output file is specified, and should cleanup tmp file" do
     generate_test_image(TEST_TIF_INPUT_FILE)
     expect(File).to exist TEST_TIF_INPUT_FILE
-    expect(File.exists?(TEST_JP2_INPUT_FILE)).to be false
+    File.exists?(TEST_JP2_INPUT_FILE).should be false
     @ai = Assembly::Image.new(TEST_TIF_INPUT_FILE)
     result=@ai.create_jp2
-    expect(result).to be_a_kind_of Assembly::Image
-    expect(result.path).to eq TEST_JP2_INPUT_FILE
-    expect(TEST_JP2_INPUT_FILE).to be_a_jp2
-    expect(result.exif.colorspace).to eq "sRGB"
-    expect(File.exists?(@ai.tmp_path)).to be false    
+    result.class.should be Assembly::Image
+    result.path.should == TEST_JP2_INPUT_FILE
+    is_jp2?(TEST_JP2_INPUT_FILE).should be true
+    result.exif.colorspace.should == "sRGB"
+    File.exists?(@ai.tmp_path).should be false    
   end
 
   it "should create jp2 from input JPEG of the same filename and in the same location as the input if no output file is specified, and should cleanup tmp file" do
@@ -174,11 +174,11 @@ describe Assembly::Image do
     expect(File).to_not exist TEST_JP2_INPUT_FILE
     @ai = Assembly::Image.new(TEST_JPEG_INPUT_FILE)
     result=@ai.create_jp2
-    expect(result).to be_a_kind_of Assembly::Image
-    expect(result.path).to eq TEST_JP2_INPUT_FILE
-    expect(TEST_JP2_INPUT_FILE).to be_a_jp2
-    expect(result.exif.colorspace).to eq "sRGB"    
-    expect(File.exists?(@ai.tmp_path)).to be false    
+    result.class.should be Assembly::Image
+    result.path.should == TEST_JP2_INPUT_FILE
+    is_jp2?(TEST_JP2_INPUT_FILE).should be true
+    result.exif.colorspace.should == "sRGB"    
+    File.exists?(@ai.tmp_path).should be false    
   end
 
   it "should recreate jp2 if the output file exists and if you allow overwriting" do
@@ -188,10 +188,10 @@ describe Assembly::Image do
     expect(File).to exist TEST_JP2_OUTPUT_FILE
     @ai = Assembly::Image.new(TEST_TIF_INPUT_FILE)
     result=@ai.create_jp2(:output => TEST_JP2_OUTPUT_FILE,:overwrite => true)
-    expect(result).to be_a_kind_of Assembly::Image
-    expect(result.path).to eq TEST_JP2_OUTPUT_FILE 
-    expect(TEST_JP2_OUTPUT_FILE).to be_a_jp2
-    expect(result.exif.colorspace).to eq "sRGB"           
+    result.class.should be Assembly::Image
+    result.path.should == TEST_JP2_OUTPUT_FILE 
+    is_jp2?(TEST_JP2_OUTPUT_FILE).should be true
+    result.exif.colorspace.should == "sRGB"           
   end
 
   after(:each) do

data/spec/images_spec.rb

@@ -3,39 +3,39 @@ require 'spec_helper'
 describe Assembly::Images do
 
   it "should not run if no input folder is passed in" do
-    expect{Assembly::Images.batch_generate_jp2('')}.to raise_error
+    lambda{Assembly::Images.batch_generate_jp2('')}.should raise_error
   end
 
   it "should not run if a non-existent input folder is passed in" do
-    expect{Assembly::Images.batch_generate_jp2('/junk/path')}.to raise_error
+    lambda{Assembly::Images.batch_generate_jp2('/junk/path')}.should raise_error
   end
 
   it "should run and batch produe jp2s from input tiffs" do
     ['test1','test2','test3'].each {|image| generate_test_image(File.join(TEST_INPUT_DIR,"#{image}.tif")) }
     Assembly::Images.batch_generate_jp2(TEST_INPUT_DIR,:output=>TEST_OUTPUT_DIR)
-    expect(File.directory?(TEST_OUTPUT_DIR)).to be true
-    ['test1','test2','test3'].each {|image| expect(File.join(TEST_OUTPUT_DIR,"#{image}.jp2")).to be_a_jp2 }
+    File.directory?(TEST_OUTPUT_DIR).should be true
+    ['test1','test2','test3'].each {|image| is_jp2?(File.join(TEST_OUTPUT_DIR,"#{image}.jp2")).should be_true }
   end
 
   it "should run and batch add color profile descriptions input tiffs with no color profile descriptions" do
     ['test1','test2','test3'].each {|image| generate_test_image(File.join(TEST_INPUT_DIR,"#{image}.tif"),:profile=>'') }
-    ['test1','test2','test3'].each {|image| expect(Assembly::Image.new(File.join(TEST_INPUT_DIR,"#{image}.tif")).exif.profiledescription).to be nil}    
+    ['test1','test2','test3'].each {|image| Assembly::Image.new(File.join(TEST_INPUT_DIR,"#{image}.tif")).exif.profiledescription.should be nil}    
     Assembly::Images.batch_add_exif_profile_description(TEST_INPUT_DIR,'Adobe RGB 1998')
-    ['test1','test2','test3'].each {|image| expect(Assembly::Image.new(File.join(TEST_INPUT_DIR,"#{image}.tif")).exif.profiledescription).to eq 'Adobe RGB (1998)'}    
+    ['test1','test2','test3'].each {|image| Assembly::Image.new(File.join(TEST_INPUT_DIR,"#{image}.tif")).exif.profiledescription.should == 'Adobe RGB (1998)'}    
   end
   
   it "should run and batch add color profile descriptions input tiffs, forcing over existing color profile descriptions" do
     ['test1','test2','test3'].each {|image| generate_test_image(File.join(TEST_INPUT_DIR,"#{image}.tif")) }
-    ['test1','test2','test3'].each {|image| expect(Assembly::Image.new(File.join(TEST_INPUT_DIR,"#{image}.tif")).exif.profiledescription).to eq  'sRGB IEC61966-2.1'}    
+    ['test1','test2','test3'].each {|image| Assembly::Image.new(File.join(TEST_INPUT_DIR,"#{image}.tif")).exif.profiledescription.should == 'sRGB IEC61966-2.1'}    
     Assembly::Images.batch_add_exif_profile_description(TEST_INPUT_DIR,'Adobe RGB 1998',:force=>true) # force overwrite
-    ['test1','test2','test3'].each {|image| expect(Assembly::Image.new(File.join(TEST_INPUT_DIR,"#{image}.tif")).exif.profiledescription).to eq  'Adobe RGB (1998)'}    
+    ['test1','test2','test3'].each {|image| Assembly::Image.new(File.join(TEST_INPUT_DIR,"#{image}.tif")).exif.profiledescription.should == 'Adobe RGB (1998)'}    
   end
 
   it "should run and batch add color profile descriptions input tiffs, not overwriting existing color profile descriptions" do
     ['test1','test2','test3'].each {|image| generate_test_image(File.join(TEST_INPUT_DIR,"#{image}.tif")) }
-    ['test1','test2','test3'].each {|image| expect(Assembly::Image.new(File.join(TEST_INPUT_DIR,"#{image}.tif")).exif.profiledescription).to eq  'sRGB IEC61966-2.1'}    
+    ['test1','test2','test3'].each {|image| Assembly::Image.new(File.join(TEST_INPUT_DIR,"#{image}.tif")).exif.profiledescription.should == 'sRGB IEC61966-2.1'}    
     Assembly::Images.batch_add_exif_profile_description(TEST_INPUT_DIR,'Adobe RGB 1998') # do not force overwrite
-    ['test1','test2','test3'].each {|image| expect(Assembly::Image.new(File.join(TEST_INPUT_DIR,"#{image}.tif")).exif.profiledescription).to eq  'sRGB IEC61966-2.1'}    
+    ['test1','test2','test3'].each {|image| Assembly::Image.new(File.join(TEST_INPUT_DIR,"#{image}.tif")).exif.profiledescription.should == 'sRGB IEC61966-2.1'}    
   end
 
 

data/spec/spec_helper.rb

@@ -19,24 +19,19 @@ def generate_test_image(file,params={})
   create_command += " -profile " + File.join(Assembly::PATH_TO_IMAGE_GEM,'profiles',profile+'.icc') + " " unless profile == ''
   create_command += " -type #{image_type} " if image_type
   create_command += file
-  create_command += " 2>&1"
-  output = `#{create_command}`
-  unless $?.success?
-    raise "Failed to create test image #{file} (#{params}): \n#{output}"
-  end
+  system(create_command)
 end
 
 def remove_files(dir)
   Dir.foreach(dir) {|f| fn = File.join(dir, f); File.delete(fn) if !File.directory?(fn) && File.basename(fn) != '.empty'}
 end
 
-RSpec::Matchers.define :be_a_jp2 do
-  match do |actual|
-    if File.exists?(actual)
-      exif = MiniExiftool.new actual
-      exif['mimetype'] == 'image/jp2'
-    else
-      false
-    end
+# check the existence and mime_type of the supplied file and confirm if it's jp2
+def is_jp2?(file)
+  if File.exists?(file)
+    exif = MiniExiftool.new file
+    return exif['mimetype'] == 'image/jp2'
+  else
+    false
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: assembly-image
 version: !ruby/object:Gem::Version
-  version: 1.6.7
+  version: 1.6.8
 platform: ruby
 authors:
 - Peter Mangiafico
@@ -11,118 +11,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
   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: assembly-objectfile
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.4
 - !ruby/object:Gem::Dependency
   name: mini_exiftool
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>'
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>'
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   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: '3.0'
+        version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: lyberteam-gems-devel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>'
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>'
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: yard
   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'
 description: Contains classes to create derivative image files and perform other image
@@ -135,8 +135,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rvmrc.example"
+- .gitignore
+- .rvmrc.example
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -166,17 +166,17 @@ 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: []
 rubyforge_project: assembly-image
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Ruby immplementation of image services needed to prepare objects to be accessioned