hydra-file_characterization 0.2.1 → 0.2.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: cff05141ecefe9beaec133587dda6bef344e10b7
+  data.tar.gz: 9479e89d684e59174fd1323e4ee1885495937a27
+SHA512:
+  metadata.gz: 2275213d1646d9ca4c346bcb22bec3df42e37bced35e984d65615c87796d37a91389d4bfb3b5f90f1dd90ce18c134bf548be2925825ebe65b168d8112eb0210d
+  data.tar.gz: f732e2aed7c2a5d5b39a11d8caa698f2e73fd8944eab7772b4acfe6cc8988fbef6c110de6db37c178a3b1f820017b67aab7f066982d43290c9313f89b3af5ab8

data/README.md

@@ -21,7 +21,7 @@ You can call a single characterizer…
 xml_string = Hydra::FileCharacterization.characterize(contents_of_a_file, 'file.rb', :fits)
 ```
 
-…for this particular call, you can specify custom fits path.
+…for this particular call, you can specify custom fits path…
 
 ```ruby
 xml_string = Hydra::FileCharacterization.characterize(contents_of_a_file, 'file.rb', :fits) do |config|
@@ -29,6 +29,14 @@ xml_string = Hydra::FileCharacterization.characterize(contents_of_a_file, 'file.
 end
 ```
 
+…or even make the path callable
+
+```ruby
+xml_string = Hydra::FileCharacterization.characterize(contents_of_a_file, 'file.rb', :fits) do |config|
+  config[:fits] = lambda {|filename| … }
+end
+```
+
 You can also call multiple characterizers at the same time.
 
 ```ruby

data/lib/hydra/file_characterization/characterizer.rb

@@ -18,6 +18,21 @@ module Hydra::FileCharacterization
       unless File.exists?(filename)
         raise Hydra::FileCharacterization::FileNotFoundError.new("File: #{filename} does not exist.")
       end
+
+      if tool_path.respond_to?(:call)
+        tool_path.call(filename)
+      else
+        internal_call
+      end
+    end
+
+    def tool_path
+      @tool_path || self.class.tool_path || (raise Hydra::FileCharacterization::UnspecifiedToolPathError.new(self.class))
+    end
+
+    protected
+
+    def internal_call
       stdin, stdout, stderr, wait_thr = popen3(command)
       begin
         out = stdout.read
@@ -32,12 +47,6 @@ module Hydra::FileCharacterization
       end
     end
 
-    def tool_path
-      @tool_path || self.class.tool_path || (raise Hydra::FileCharacterization::UnspecifiedToolPathError.new(self.class))
-    end
-
-    protected
-
     def command
       raise NotImplementedError, "Method #command should be overriden in child classes"
     end

data/lib/hydra/file_characterization/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module FileCharacterization
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

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

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'hydra/file_characterization/characterizer'
 
 module Hydra::FileCharacterization
   describe Characterizer do
@@ -14,25 +13,43 @@ module Hydra::FileCharacterization
       Hydra::FileCharacterization::Characterizer.tool_path = nil
     end
 
-    context 'with custom instance tool_path' do
-      let(:instance_tool_path) { '/arbitrary/path' }
-      let(:class_tool_path) { '/a_different/path' }
+    context 'call' do
+      context 'with missing file' do
+        let(:filename) { '/dev/path/to/bogus/file' }
+        it 'should raise FileNotFoundError' do
+          expect { subject.call }.to raise_error(FileNotFoundError)
+        end
+      end
 
-      its(:tool_path) { should eq instance_tool_path}
+      context 'with a callable tool path' do
+        let(:class_tool_path) { lambda { |filename| [filename, :output] }}
+        it 'should raise FileNotFoundError' do
+          expect(subject.call).to eq [filename, :output]
+        end
+      end
     end
 
-    context 'with custom class tool_path' do
-      let(:instance_tool_path) { nil }
-      let(:class_tool_path) { '/a_different/path' }
+    context 'tool_path' do
+      context 'with custom instance tool_path' do
+        let(:instance_tool_path) { '/arbitrary/path' }
+        let(:class_tool_path) { '/a_different/path' }
 
-      its(:tool_path) { should eq class_tool_path}
-    end
+        its(:tool_path) { should eq instance_tool_path}
+      end
+
+      context 'with custom class tool_path' do
+        let(:instance_tool_path) { nil }
+        let(:class_tool_path) { '/a_different/path' }
+
+        its(:tool_path) { should eq class_tool_path}
+      end
 
-    context 'without a specified tool_path' do
-      it 'should raise Hydra::FileCharacterization::UnspecifiedToolPathError' do
-        expect {
-          subject.tool_path
-        }.to raise_error(Hydra::FileCharacterization::UnspecifiedToolPathError)
+      context 'without a specified tool_path' do
+        it 'should raise Hydra::FileCharacterization::UnspecifiedToolPathError' do
+          expect {
+            subject.tool_path
+          }.to raise_error(Hydra::FileCharacterization::UnspecifiedToolPathError)
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -5,6 +5,11 @@
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 
+GEM_ROOT = File.expand_path("../../", __FILE__)
+$:.unshift File.join(GEM_ROOT, "lib")
+
+require 'hydra/file_characterization'
+
 module SpecSupport
   def fixture_file(filename)
     File.expand_path(File.join('../fixtures', filename), __FILE__)

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-file_characterization
 version: !ruby/object:Gem::Version
-  version: 0.2.1
-  prerelease: 
+  version: 0.2.2
 platform: ruby
 authors:
 - James Treacy
@@ -17,65 +16,57 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: To provide a wrapper for file characterization
@@ -122,27 +113,26 @@ files:
 homepage: https://github.com/projecthydra/hydra-file_characterization
 licenses:
 - APACHE2
+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: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: To provide a wrapper for file characterization
 test_files:
 - spec/fixtures/archive.zip
@@ -158,4 +148,3 @@ 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: