hydra-file_characterization 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cff05141ecefe9beaec133587dda6bef344e10b7
-  data.tar.gz: 9479e89d684e59174fd1323e4ee1885495937a27
+  metadata.gz: 81aa30a5af29b1bb419e67d30f0273faa4f7cd1a
+  data.tar.gz: 998e940542884ba96698b9bb4e03e8c06e9cabbc
 SHA512:
-  metadata.gz: 2275213d1646d9ca4c346bcb22bec3df42e37bced35e984d65615c87796d37a91389d4bfb3b5f90f1dd90ce18c134bf548be2925825ebe65b168d8112eb0210d
-  data.tar.gz: f732e2aed7c2a5d5b39a11d8caa698f2e73fd8944eab7772b4acfe6cc8988fbef6c110de6db37c178a3b1f820017b67aab7f066982d43290c9313f89b3af5ab8
+  metadata.gz: df13ebfc40df2ac4a9c6a8fac0319f1049459fbb65e47309738e6dbf0abf99a6e3641b31b5d6801cb55f33e14ae96f962d9bcd3f9d90f24719dcf0a5d6914246
+  data.tar.gz: e7466aa4a460b3e7ac62a06b21864ab7e4487fb23b46e99b4a11f34fc1dbf38d820e2745ba9656deb449f329378b6ab2e05ffff0eb17bd6ccc6e4ce04e65d04b

data/README.md

@@ -1,5 +1,7 @@
 # hydra-file_chracterization
 
+[![Gem Version](https://badge.fury.io/rb/hydra-file_characterization.png)](http://badge.fury.io/rb/hydra-file_characterization)
+
 Hydra::FileCharacterization as (extracted from Sufia and Hydra::Derivatives)
 
 ## Purpose
@@ -29,7 +31,7 @@ xml_string = Hydra::FileCharacterization.characterize(contents_of_a_file, 'file.
 end
 ```
 
-…or even make the path callable
+…or even make the path callable…
 
 ```ruby
 xml_string = Hydra::FileCharacterization.characterize(contents_of_a_file, 'file.rb', :fits) do |config|
@@ -37,6 +39,14 @@ xml_string = Hydra::FileCharacterization.characterize(contents_of_a_file, 'file.
 end
 ```
 
+…or even create your custom characterizer on the file…
+
+```ruby
+xml_string = Hydra::FileCharacterization.characterize(contents_of_a_file, 'file.rb', :my_characterizer) do |config|
+  config[:my_characterizer] = lambda {|filename| … }
+end
+```
+
 You can also call multiple characterizers at the same time.
 
 ```ruby

data/lib/hydra/file_characterization.rb

@@ -32,6 +32,11 @@ module Hydra
     #   end
     #
     # @example
+    #   xml_string = Hydra::FileCharacterization.characterize(contents_of_a_file, 'file.rb', :fits) do |config|
+    #     config[:fits] = lambda {|filename| … }
+    #   end
+    #
+    # @example
     #   fits_xml, ffprobe_xml = Hydra::FileCharacterization.characterize(contents_of_a_file, 'file.rb', :fits, :ffprobe)
     #
     # @param [String] content - The contents of the original file

data/lib/hydra/file_characterization/characterizers.rb

@@ -16,9 +16,13 @@ module Hydra::FileCharacterization
     tool_name.to_s.gsub(/(?:^|_)([a-z])/) { $1.upcase }
   end
 
-  def characterize_with(tool_name, *args)
-    tool_obj = characterizer(tool_name).new(*args)
-    tool_obj.call
+  def characterize_with(tool_name, path_to_file, path_to_tool)
+    if path_to_tool.respond_to?(:call)
+      path_to_tool.call(path_to_file)
+    else
+      tool_obj = characterizer(tool_name).new(path_to_file, path_to_tool)
+      tool_obj.call
+    end
   end
 
 end

data/lib/hydra/file_characterization/version.rb

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

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

@@ -15,5 +15,28 @@ module Hydra::FileCharacterization
       it { should eq(Characterizers::Ffprobe) }
     end
 
+    context '.characterize_with' do
+      let(:tool_name) { :fits }
+      let(:filename) { __FILE__ }
+      let(:tool_path) { nil }
+      subject { Hydra::FileCharacterization.characterize_with(tool_name, filename, tool_path) }
+
+      context 'with callable tool_path and missing tool name' do
+        let(:tool_path) { lambda {|filename| [filename, :tool_path]} }
+        let(:tool_name) { :chunky_salsa }
+        it { should eq [filename, :tool_path] }
+      end
+
+      context 'with missing tool name and non-callable tool_path' do
+        let(:tool_name) { :chunky_salsa }
+        let(:tool_path) { '/path' }
+        it 'should raise exception' do
+          expect {
+            subject
+          }.to raise_error(ToolNotFoundError)
+        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.2
+  version: 0.2.3
 platform: ruby
 authors:
 - James Treacy