hydra-file_characterization 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4919a2449be3e3a6127fdc17a5f8552e3b64821
-  data.tar.gz: 1ab2ab15d03a9e4ddfd83b15e2f78a2be5548d86
+  metadata.gz: 998550a6f8a8090fa8e735b3d863f8b8da45fa26
+  data.tar.gz: aeedc6fcecc36f7ce17e07dcc4479709971ca30e
 SHA512:
-  metadata.gz: d5494b689812d74a60ecca77216cc31302b8da2694635ee59be8b5b98c844bb936bd86a7ae3b09901375cc441c795ff7389b9209c36d41daaa5ba039e00cd6dd
-  data.tar.gz: 5e828f94c57282b40fd42a6bdaaf7e30a74e8e3d85871ec3eef8e43f444fefb9eeca6a0946629a061078715f291e5dd22bdb8abd85bfa5f7c9bc900cddd107e8
+  metadata.gz: 42f80b2cdde8ff05833dee837dadba37770fd27a91ddefcdd6c1b90563b05c9d737f7bd0274a4dfe7a3ef05b8c0ab057db626ea72cadc3a27d4d8036dabbc217
+  data.tar.gz: e9bc81ce59caf0702fb8d762d4881341635793dadc6ad46e4dae08464bc8f0ea89ec1bb0c6bd1cf3c5ea52aca6f820415a18ca8f97a741d98014733702d3e5fc

data/lib/hydra/file_characterization.rb

@@ -42,6 +42,9 @@ module Hydra
     # @example With an open file
     #   fits_xml, ffprobe_xml = Hydra::FileCharacterization.characterize(File.open('foo.mkv'), :fits, :ffprobe)
     #
+    # @example With an open file and a filename
+    #   fits_xml, ffprobe_xml = Hydra::FileCharacterization.characterize(File.open('foo.mkv'), 'my_movie.mkv', :fits, :ffprobe)
+    #
     # @param [String] content - The contents of the original file
     # @param [String] filename - The original file's filename; Some
     #   characterization tools take hints from the file names
@@ -82,7 +85,7 @@ module Hydra
       # @return [String, File], [String], [Array]
       def self.extract_arguments(args)
         content = args.shift
-        filename = if content.is_a? File
+        filename = if content.is_a?(File) && !args[0].is_a?(String)
           File.basename(content.path)
         else
            args.shift

data/lib/hydra/file_characterization/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module FileCharacterization
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/spec/lib/hydra/file_characterization_spec.rb

@@ -61,11 +61,22 @@ module Hydra
 
       describe "for a file on disk" do
         let(:file) { File.open(fixture_file('brendan_behan.jpeg')) }
-        subject { Hydra::FileCharacterization.characterize(file, tool_names) }
+        describe "without path specified" do
+          subject { Hydra::FileCharacterization.characterize(file, tool_names) }
 
-        describe 'for fits' do
-          let(:tool_names) { [:fits] }
-          it { should match(/#{'<identity format="JPEG File Interchange Format" mimetype="image/jpeg"'}/) }
+          describe 'for fits' do
+            let(:tool_names) { [:fits] }
+            it { should match(/#{'<identity format="JPEG File Interchange Format" mimetype="image/jpeg"'}/) }
+          end
+        end
+        describe "with path specified" do
+          let(:file) { File.open(fixture_file('brendan_behan.jpeg')) }
+          subject { Hydra::FileCharacterization.characterize(file, 'Brendan.jpg', tool_names) }
+
+          describe 'for fits' do
+            let(:tool_names) { [:fits] }
+            it { should match(/#{'<identity format="JPEG File Interchange Format" mimetype="image/jpeg"'}/) }
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-file_characterization
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - James Treacy
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: To provide a wrapper for file characterization
@@ -148,3 +148,4 @@ test_files:
 - spec/lib/hydra/file_characterization/to_temp_file_spec.rb
 - spec/lib/hydra/file_characterization_spec.rb
 - spec/spec_helper.rb
+has_rdoc: