assembly-objectfile 1.6.4 → 1.6.5

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ODY4NDJjOTlmMjZjYzIyMTMyNGRiODQ2MTU1MmU2NjZkNTM0YWYyMw==
+  data.tar.gz: !binary |-
+    YjJkNThkMTEwOTBmMWVkOTNiZGVkMjg4YTg1ZjIxMmM2NTQ1M2I1ZA==
+SHA512:
+  metadata.gz: !binary |-
+    MGZhYmM4MjVhYmVlMDEzMjNlMTY1NzJhYWNiMzIxN2JhMTBmYmJkNDVjNTlj
+    NDEyMTNmOTA4MDY5NmZiYjE1MWFjODBlM2Y2ZjY4NGM5NjNkZmQ1Yzk3N2E0
+    Y2JmYTk1OTgxNmQwM2E5ZGZmMWM1NTIwNGExMDBkOTMzNmU4ZDA=
+  data.tar.gz: !binary |-
+    NGI1MTllMTUwYzdiNWNhM2I1YWFjMjRhY2ZhNGViNTMzMjVkYzk3NjJkZDNk
+    Mjg2NDFjYTUxYTRlOGE2ZDliNTQyYmI3ZWY3ZGJjZjY1ZTYxODNjZGMyMmU4
+    ZGIyZGUzOTRlYTZmOGEwZGJmMTE4NDQ1YjlkMmM5N2VhMWYzMTI=

data/README.rdoc

@@ -66,6 +66,7 @@ content type specific operations (such as jp2 generation).
 - 1.6.2 Added APLv2 artifacts
 - 1.6.3 Integrate with TravisCI
 - 1.6.4 Try and solve UTF-8 encoding issues with exif data in images
+- 1.6.5 Just use mime-types extension by default to compute mimetype to prevent calling to shell all the time (and avoid potential memory problems).  A new method allows you to call out to shell if you really want to.
 
 ==Usage
 
@@ -81,7 +82,7 @@ The gem currently has methods for:
 ==Releasing the gem
 
 gem build assembly-objectfile.gemspec
-gem push assembly-objectfile-x.y.z.gem  # replace x-y-z with the version number
+gem push assembly-objectfile-x.y.z.gem  # replace x-y-z with the version number, you'll need a ruby gems account to do this
  
 ==Generate documentation
 To generate documentation into the "doc" folder:

data/assembly-objectfile.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'nokogiri'
   # s.add_dependency 'activesupport'
 
+  s.add_development_dependency 'rake'
   s.add_development_dependency 'json'
   s.add_development_dependency "rspec", "~> 2.6"
   # s.add_development_dependency "lyberteam-gems-devel", "> 1.0.0"

data/lib/assembly-objectfile/object_fileable.rb

@@ -113,7 +113,7 @@ module Assembly
     def exif
       check_for_file unless @exif
       begin
-        @exif ||= MiniExiftool.new(@path,:convert_encoding=>true)
+        @exif ||= MiniExiftool.new(@path,replace_invalid_chars: '?')
       rescue
         @exif = nil
       end
@@ -142,8 +142,8 @@ module Assembly
       check_for_file unless @sha1
       @sha1 ||= Digest::SHA1.file(path).hexdigest
     end
-    
-    # Returns mimetype information for the current file (only on unix based systems).
+
+    # Returns mimetype information for the current file based on file extension or exif data (if available)
     #
     # @return [string] mime type for supplied file
     #
@@ -151,14 +151,34 @@ module Assembly
     #   source_file=Assembly::ObjectFile.new('/input/path_to_file.txt')
     #   puts source_file.mimetype # gives 'text/plain'
     def mimetype
-      check_for_file unless @mimetype
       if @mimetype.nil? # if we haven't computed it yet once for this object, try and get the mimetype
-        @mimetype = `file --mime-type "#{@path}"`.gsub(/\n/,"").split(':')[1].strip # first try and get the mimetype from the unix file command
-        @mimetype = exif.mimetype if (!Assembly::TRUSTED_MIMETYPES.include?(@mimetype) && !exif.nil? && !exif.mimetype.nil?)  # if it's not a "trusted" mimetype and there is exif data; get the mimetype from the exif
+        if (!exif.nil? && !exif.mimetype.nil?)  # try and get the mimetype from the exif data if it exists
+          @mimetype = exif.mimetype
+        else # otherwise get it from the mime-types gem (using the file extension) assuming we can find, if not, return blank     
+          mimetype = MIME::Types.type_for(@path).first
+          @mimetype= mimetype ? mimetype.content_type : ''
+        end
       end
       return @mimetype 
     end
 
+    
+    # Returns mimetype information for the current file based on unix file system command or exif data (if available).
+    #
+    # @return [string] mime type for supplied file
+    #
+    # Example:
+    #   source_file=Assembly::ObjectFile.new('/input/path_to_file.txt')
+    #   puts source_file.file_mimetype # gives 'text/plain'
+    def file_mimetype
+      check_for_file unless @file_mimetype
+      if @file_mimetype.nil? # if we haven't computed it yet once for this object, try and get the mimetype
+        @file_mimetype = `file --mime-type "#{@path}"`.gsub(/\n/,"").split(':')[1].strip # first try and get the mimetype from the unix file command
+        @file_mimetype = exif.mimetype if (!Assembly::TRUSTED_MIMETYPES.include?(@file_mimetype) && !exif.nil? && !exif.mimetype.nil?)  # if it's not a "trusted" mimetype and there is exif data; get the mimetype from the exif
+      end
+      return @file_mimetype 
+    end
+
     # Returns encoding information for the current file (only on unix based systems).
     #
     # @return [string] encoding for supplied file

data/lib/assembly-objectfile/version.rb

@@ -3,7 +3,7 @@ module Assembly
   
   class ObjectFile
     # Project version number    
-    VERSION = "1.6.4"
+    VERSION = "1.6.5"
   end
 
 end

data/spec/object_file_spec.rb

@@ -23,11 +23,12 @@ describe Assembly::ObjectFile do
     @ai.image?.should == true
     @ai.exif.should_not be nil
     @ai.mimetype.should == 'image/tiff'
+    @ai.file_mimetype.should == 'image/tiff'
     @ai.object_type.should == :image
     @ai.valid_image?.should == true
     @ai.jp2able?.should == true
   end
-
+  
   it "should tell us information about the input file" do
     @ai = Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE)
     @ai.filename.should == "test.tif"
@@ -118,7 +119,7 @@ describe Assembly::ObjectFile do
     File.exists?(non_image_file).should be true
     @ai = Assembly::ObjectFile.new(non_image_file)
     @ai.image?.should == false
-    @ai.object_type.should == :text    
+    @ai.object_type.should == :other    
     @ai.valid_image?.should == false    
   end
 
@@ -132,6 +133,7 @@ describe Assembly::ObjectFile do
     File.exists?(TEST_TIF_INPUT_FILE).should be true
     @ai = Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE)
     @ai.mimetype.should == 'image/tiff'
+    @ai.file_mimetype.should == 'image/tiff'
     @ai.encoding.should == 'binary'
   end
         

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: assembly-objectfile
 version: !ruby/object:Gem::Version
-  version: 1.6.4
-  prerelease: 
+  version: 1.6.5
 platform: ruby
 authors:
 - Peter Mangiafico
@@ -12,12 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_exiftool
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -25,7 +23,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -33,7 +30,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,7 +37,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -49,7 +44,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -57,7 +51,20 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  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
@@ -65,7 +72,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -73,7 +79,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -81,7 +86,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -89,7 +93,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -97,7 +100,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -105,7 +107,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -177,27 +178,26 @@ files:
 homepage: https://github.com/sul-dlss/assembly-objectfile
 licenses:
 - ALv2
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: assembly-objectfile
-rubygems_version: 1.8.28
+rubygems_version: 2.4.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby immplementation of file services needed to prepare objects to be accessioned
   in SULAIR digital library
 test_files: