libis-tools 0.9.19 → 0.9.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84e2ba68f4feadddd920416358116a88db072a3c
-  data.tar.gz: deea70214ee81612b8245552a78cbed501fa2033
+  metadata.gz: b02d1a5db6228befa73d14fb34880fc50c1c3205
+  data.tar.gz: 45cd0d340b39e2f585d0aeb25076b439132f2af7
 SHA512:
-  metadata.gz: 2ed8ec0e8fc72699698f20efd81eef387acf382f7b730839c256117fd03df39e508d0f5d655a5e1ce11266cad3d1eb3adb4c0da3001d3b1a9fd28142d6052dbd
-  data.tar.gz: db3f33e89f52053b28c1f84df50bbbc7f0833d024ce349b1eaf5d83fdccb51135ddbbacc5417b9a30b9c8c7d8b41a71bf384a891cd9a76ed0878ef38f50ac876
+  metadata.gz: 660ddb441d546e37e4170cd236853dcf5273063873dee76647a79ee9c6f0386a9fdb010c8a91f4e1ce175060278ddb6e0b3153c8ec67ef47ccc232c2beace443
+  data.tar.gz: 68d181a6f3c644f38561947f13dd138fb69973d12b3c213f0fee24b454f228e4840bdfec611ba1a8c1e9fc17b502faa31857fbd37ab4723745faec041e230436

data/lib/libis/tools/checksum.rb

@@ -29,19 +29,19 @@ module Libis
       #
       # @param [String] file_path_or_string path of the file to calculate the digest for
       def digest(file_path_or_string)
-        @hasher.file(file_path_or_string).digest!
+        hashit(file_path_or_string).digest!
       end
 
       # Calculate the hexadecimal digest of a file.
       # @param (see #digest)
       def hexdigest(file_path_or_string)
-        @hasher.file(file_path_or_string).hexdigest!
+        hashit(file_path_or_string).hexdigest!
       end
 
       # Calculate the base64 digest of a file.
       # @param (see #digest)
       def base64digest(file_path_or_string)
-        @hasher.file(file_path_or_string).base64digest!
+        hashit(file_path_or_string).base64digest!
       end
 
       # Calculate the binary digest of a file.
@@ -75,7 +75,12 @@ module Libis
       private
 
       def hashit(file_path_or_string)
-        @hasher.file(file_path_or_string)
+        if File.exist?(file_path_or_string)
+          @hasher.file(file_path_or_string)
+        else
+          @hasher.reset.update(file_path_or_string)
+        end
+        @hasher
       end
 
     end

data/lib/libis/tools/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Tools
-    VERSION = '0.9.19'
+    VERSION = '0.9.20'
   end
 end

data/spec/checksum_spec.rb

@@ -4,8 +4,6 @@ require 'libis/tools/checksum'
 
 describe 'Checksum' do
 
-  file = File.absolute_path(File.join(File.dirname(__FILE__), 'data', 'test.data'))
-
   def hex2base64(hexdigest)
     [[hexdigest].pack('H*')].pack('m0')
   end
@@ -14,118 +12,56 @@ describe 'Checksum' do
     [hexdigest].pack('H*')
   end
 
-  it 'should calculate MD5 checksum' do
-
-    checksum_type = :MD5
-    digest = 'fe249d8dd45a39793f315fb0734ffe2c'
-    expect(::Libis::Tools::Checksum.hexdigest(file, checksum_type)).to eq digest
-    expect(::Libis::Tools::Checksum.base64digest(file, checksum_type)).to eq hex2base64(digest)
-    expect(::Libis::Tools::Checksum.digest(file, checksum_type)).to eq hex2string(digest)
-
-    checksum = ::Libis::Tools::Checksum.new(checksum_type)
-
-    expect(checksum.hexdigest(file)).to eq digest
-    expect(checksum.base64digest(file)).to eq hex2base64(digest)
-    expect(checksum.digest(file)).to eq hex2string(digest)
-
-  end
-
-  it 'should calculate RMD160 checksum' do
-
-    unless defined? JRUBY_VERSION
-
-      checksum_type = :RMD160
-
-      digest = '17c9eaad9ccbaad0e030c2c5d60fd9d58255cc39'
-      expect(::Libis::Tools::Checksum.hexdigest(file, checksum_type)).to eq digest
-      expect(::Libis::Tools::Checksum.base64digest(file, checksum_type)).to eq hex2base64(digest)
-      expect(::Libis::Tools::Checksum.digest(file, checksum_type)).to eq hex2string(digest)
-
-      checksum = ::Libis::Tools::Checksum.new(checksum_type)
-
-      expect(checksum.hexdigest(file)).to eq digest
-      expect(checksum.base64digest(file)).to eq hex2base64(digest)
-      expect(checksum.digest(file)).to eq hex2string(digest)
-
-    end
-
-  end
-
-  it 'should calculate SHA1 checksum' do
-
-    checksum_type = :SHA1
-
-    digest = 'e8f322d186699807a98a0cefb5015acf1554f954'
-    expect(::Libis::Tools::Checksum.hexdigest(file, checksum_type)).to eq digest
-    expect(::Libis::Tools::Checksum.base64digest(file, checksum_type)).to eq hex2base64(digest)
-    expect(::Libis::Tools::Checksum.digest(file, checksum_type)).to eq hex2string(digest)
-
-    checksum = ::Libis::Tools::Checksum.new(checksum_type)
-
-    expect(checksum.hexdigest(file)).to eq digest
-    expect(checksum.base64digest(file)).to eq hex2base64(digest)
-    expect(checksum.digest(file)).to eq hex2string(digest)
-
-  end
-
-  it 'should calculate SHA256 checksum' do
-
-    checksum_type = :SHA256
-
-    digest = '2a742e643dd79427738bdc0ebd0d2837f998fe2101a964c2d5014905d331bbc4'
-    expect(::Libis::Tools::Checksum.hexdigest(file, checksum_type)).to eq digest
-    expect(::Libis::Tools::Checksum.base64digest(file, checksum_type)).to eq hex2base64(digest)
-    expect(::Libis::Tools::Checksum.digest(file, checksum_type)).to eq hex2string(digest)
+  it 'should not know how to calculate ABC checksum' do
 
-    checksum = ::Libis::Tools::Checksum.new(checksum_type)
+    checksum_type = :ABC
 
-    expect(checksum.hexdigest(file)).to eq digest
-    expect(checksum.base64digest(file)).to eq hex2base64(digest)
-    expect(checksum.digest(file)).to eq hex2string(digest)
+    expect {
+      ::Libis::Tools::Checksum.hexdigest('abc', checksum_type)
+    }.to raise_error(RuntimeError, "Checksum type 'ABC' not supported.")
 
   end
 
-  it 'should calculate SHA384 checksum' do
-
-    checksum_type = :SHA384
+  let(:filename) { File.join(File.dirname(__FILE__), 'data', 'test.data') }
 
-    digest = '71083b74394f49db6149ad9147103f7693ec823183750ce32a2215bbd7ee5e75212e2d794243c7e76c7318a4ddcf9a56'
-    expect(::Libis::Tools::Checksum.hexdigest(file, checksum_type)).to eq digest
-    expect(::Libis::Tools::Checksum.base64digest(file, checksum_type)).to eq hex2base64(digest)
-    expect(::Libis::Tools::Checksum.digest(file, checksum_type)).to eq hex2string(digest)
-
-    checksum = ::Libis::Tools::Checksum.new(checksum_type)
-
-    expect(checksum.hexdigest(file)).to eq digest
-    expect(checksum.base64digest(file)).to eq hex2base64(digest)
-    expect(checksum.digest(file)).to eq hex2string(digest)
+  CHECKSUM_RESULTS = {
+      MD5: 'fe249d8dd45a39793f315fb0734ffe2c',
+      SHA1: 'e8f322d186699807a98a0cefb5015acf1554f954',
+      SHA256: '2a742e643dd79427738bdc0ebd0d2837f998fe2101a964c2d5014905d331bbc4',
+      SHA384: '71083b74394f49db6149ad9147103f7693ec823183750ce32a2215bbd7ee5e75212e2d794243c7e76c7318a4ddcf9a56',
+      SHA512: '10964f5272729c2670ccad67754284fb06cca1387270c184c2edbcd032700548297916c8e109a10e019c25b86c646e95a3456c465f83d571502889f97b483e6f'
+  }
 
+  # noinspection RubyResolve
+  unless defined? JRUBY_VERSION
+    CHECKSUM_RESULTS[:RMD160] = '17c9eaad9ccbaad0e030c2c5d60fd9d58255cc39'
   end
 
-  it 'should calculate SHA512 checksum' do
-
-    checksum_type = :SHA512
+  filename = File.join(File.dirname(__FILE__), 'data', 'test.data')
+  file = File.absolute_path(filename)
+  string = File.read(filename)
+  SUBJECTS = {
+      string: string,
+      file: file
+  }
 
-    digest = '10964f5272729c2670ccad67754284fb06cca1387270c184c2edbcd032700548297916c8e109a10e019c25b86c646e95a3456c465f83d571502889f97b483e6f'
-    expect(::Libis::Tools::Checksum.hexdigest(file, checksum_type)).to eq digest
-    expect(::Libis::Tools::Checksum.base64digest(file, checksum_type)).to eq hex2base64(digest)
-    expect(::Libis::Tools::Checksum.digest(file, checksum_type)).to eq hex2string(digest)
+  CHECKSUM_RESULTS.each do |checksum_type, digest|
 
-    checksum = ::Libis::Tools::Checksum.new(checksum_type)
+    SUBJECTS.each do |subject_type, subject|
 
-    expect(checksum.hexdigest(file)).to eq digest
-    expect(checksum.base64digest(file)).to eq hex2base64(digest)
-    expect(checksum.digest(file)).to eq hex2string(digest)
-
-  end
+      it "should calculate #{checksum_type} from #{subject_type}" do
+        expect(::Libis::Tools::Checksum.hexdigest(subject, checksum_type)).to eq digest
+        expect(::Libis::Tools::Checksum.base64digest(subject, checksum_type)).to eq hex2base64(digest)
+        expect(::Libis::Tools::Checksum.digest(subject, checksum_type)).to eq hex2string(digest)
 
-  it 'should not know how to calculate ABC checksum' do
+        checksum = ::Libis::Tools::Checksum.new(checksum_type)
 
-    checksum_type = :ABC
+        expect(checksum.hexdigest(subject)).to eq digest
+        expect(checksum.base64digest(subject)).to eq hex2base64(digest)
+        expect(checksum.digest(subject)).to eq hex2string(digest)
+      end
 
-    expect {
-      ::Libis::Tools::Checksum.hexdigest(file, checksum_type)
-    }.to raise_error(RuntimeError, "Checksum type 'ABC' not supported.")
+    end
 
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-tools
 version: !ruby/object:Gem::Version
-  version: 0.9.19
+  version: 0.9.20
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler