hydra-file_characterization 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f06158f27d8f23bf343080bfc2d180db0027fbf3
-  data.tar.gz: ba88fb9630837746d4a039e1d9ce62ad98d1311e
+  metadata.gz: d6204254cf414cf91d235b4945f6aca5fd7f91be
+  data.tar.gz: 66cf0f285dc7d271e6729efb31d168739dd7318b
 SHA512:
-  metadata.gz: c0753ac59e9409cb56fdbbcce950637f4f09ce976fcf25067c23d5f552b5fa9ae6d0565170e82aa8e085cd9ba29a7419a0e85dacab31d0525d3fb52c3b3e1141
-  data.tar.gz: 0199b35addc4f239b3f3c5f938ad8bdd24a58d2bf92cff33ef65a49e6803afbb4aa49fffd7d59d1c8b656e02a423dd601987896722e2f5bb2a0a457dbb9098d1
+  metadata.gz: 372c0590a3108dfe0d11850e606caabfdd095a910b9254f5a7259e67cf96c0c943a8a965fc9fc07e1ccfa32a83c0a8fde50b08075dbc85f23c1798ded75ae453
+  data.tar.gz: 88ef7cfa899b8b0537f1550732936898d9e9e162f117e609c731ad135e5e177d0d67f00f811c3838fc92200229bdb8c3f43153d4683a5208ab96e71020b2011e

data/lib/hydra/file_characterization.rb

@@ -60,7 +60,7 @@ module Hydra
       tool_names = Array(tool_names).flatten.compact
       custom_paths = {}
       yield(custom_paths) if block_given?
-      FileCharacterization::ToTempFile.open(content, filename) do |f|
+      FileCharacterization::ToTempFile.open(filename, content) do |f|
         tool_names.each do |tool_name|
           tool_outputs << FileCharacterization.characterize_with(tool_name, f.path, custom_paths[tool_name])
         end

data/lib/hydra/file_characterization/to_temp_file.rb

@@ -5,40 +5,32 @@ module Hydra::FileCharacterization
   class ToTempFile
     include Open3
 
-    def self.open(*args, &block)
-      new(*args).call(&block)
+    def self.open(filename, data, &block)
+      new(filename).call(data, &block)
     end
 
-    attr_reader :data, :filename
+    attr_reader :filename
 
-    def initialize(data, filename)
-      self.data = data
+    def initialize(filename)
       @filename = filename
     end
 
-    def call
+    def call(data)
       f = Tempfile.new([File.basename(filename),File.extname(filename)])
       begin
-        f.binmode
-        f.write(data)
+        if data.respond_to? :read
+          f.write(data.read)
+        else
+          f.write(data)
+        end
         f.rewind
         yield(f)
       ensure
+        data.rewind if data.respond_to? :rewind
         f.close
         f.unlink
       end
-
     end
 
-    protected
-
-    def data=(value)
-      if value.respond_to?(:read)
-        @data = value.read
-        value.rewind if value.respond_to?(:rewind)
-      else
-        @data = value
-      end
-    end
   end
-end
+end

data/lib/hydra/file_characterization/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module FileCharacterization
-    VERSION = "0.2.6"
+    VERSION = "0.2.7"
   end
 end

data/spec/lib/hydra/file_characterization/to_temp_file_spec.rb

@@ -11,7 +11,7 @@ module Hydra::FileCharacterization
     describe '.open' do
       subject { ToTempFile }
       it 'creates a tempfile then unlinks it' do
-        subject.open(content, filename) do |temp_file|
+        subject.open(filename, content) do |temp_file|
           @temp_file = temp_file
           expect(File.exist?(@temp_file.path)).to eq true
           expect(File.extname(@temp_file.path)).to include '.rb'
@@ -21,16 +21,29 @@ module Hydra::FileCharacterization
     end
 
     describe 'instance' do
-      subject { ToTempFile.new(content, filename) }
+      subject { ToTempFile.new(filename) }
       it 'create a tempfile that exists' do
-        subject.call do |temp_file|
+        subject.call(content) do |temp_file|
+          temp_file.rewind
+          expect(temp_file.read).to eq(content)
           @temp_file = temp_file
           expect(File.exist?(@temp_file.path)).to eq true
           expect(File.extname(@temp_file.path)).to include '.rb'
         end
         expect(@temp_file.path).to eq nil
       end
+
+      context 'with file handle' do
+        let(:filename) { __FILE__ }
+        let(:content) { File.open(__FILE__, 'rb') }
+        it 'works' do
+          subject.call(content) do |temp_file|
+            temp_file.rewind
+            expect(temp_file.read).to eq File.read(__FILE__)
+          end
+        end
+      end
     end
 
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-file_characterization
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - James Treacy