preservation 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37837b8796fc9b31c0c135b966de5837fd99aba9
-  data.tar.gz: eb8bd1f506a30b8035b18d541c9fabc84c67fe29
+  metadata.gz: a6efcc684837cbf6bac7115145709ee5b566a235
+  data.tar.gz: 7fd819b11289942989c00eb6575479551565a01c
 SHA512:
-  metadata.gz: 5d1f1e0ea0408952329524d1653da892eeb61f1ab1a3ef4847ee4520b0255c464f7a18c3969f5f3c96b5e0ae69d1b05ae22ea63eb91ced76c75288d7527cd52c
-  data.tar.gz: b559abab2a467dacb0cb8afcd531b9cea7c8415ce3b08c7b653d4711631bf4c30ef40d992e806150b83c17664d3fbe7ec734cc80de2011e3032021643924d06f
+  metadata.gz: cc61f57e033bc225bf111e726011a422a29a46a3c0078e3cb6e0c66043abd4c0873e3dcd50fa4e37ffa73e272bafad5dd1d4943b5ee0bc0161d4b1a6fa731f72
+  data.tar.gz: c053938ddc860d3cec69eeb4d509428938c803c8c806b0b80294623158af82074fc10a170ff19fbca9c2c1cbed5c79a8f1b99de98e3f000d8a88f04fb7a83547

data/CHANGELOG.md

@@ -4,7 +4,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
-## 0.2.0 - 2016-09-17
+## 0.2.1 - 2016-09-26
+### Fixed
+- Reporting - handling nulls in database.
+- Reporting - namespace for hex/bin conversion.
+
+## 0.2.0 - 2016-09-18
 ### Changed
 - Singular uuid rather than an array of uuids as parameter for transfer preparation.
 - Modules, classes and API.

data/README.md

@@ -1,4 +1,4 @@
-# Preservation [![Gem Version](https://badge.fury.io/rb/preservation.svg)](https://badge.fury.io/rb/preservation) [![GitPitch](https://gitpitch.com/assets/badge.svg)](https://gitpitch.com/lulibrary/preservation/master?grs=github&t=sky)
+# Preservation [![Gem Version](https://badge.fury.io/rb/preservation.svg)](https://badge.fury.io/rb/preservation) [![GitPitch](https://gitpitch.com/assets/badge.svg)](https://gitpitch.com/lulibrary/preservation)
 
 Extraction and Transformation for Loading by Archivematica's Automation Tools.
 

data/lib/preservation/report/transfer.rb

@@ -19,28 +19,10 @@ module Preservation
 
         query = "SELECT id, uuid, hex(path) as hex_path, unit_type, status, microservice, current FROM unit WHERE status #{status_presence} ?"
 
-        # Archivematica stores path as BLOB, so need to convert path to Hex, to search for it
-        # and use hex function in DB query
         records = []
         db.results_as_hash = true
         db.execute( query, [ status_to_find ] ) do |row|
-          id = row['id']
-          uuid = row['uuid']
-          bin_path = Preservation::Conversion.hex_to_bin row['hex_path']
-          unit_type = row['unit_type']
-          status = row['status']
-          microservice = row['microservice']
-          current = row['current']
-          o = {}
-          o['path'] = bin_path if !bin_path.empty?
-          o['unit_type'] = unit_type if !unit_type.empty?
-          o['status'] = status if !status.empty?
-          o['microservice'] = microservice if !microservice.empty?
-          o['current'] = current if current
-          o['id'] = id if id
-          o['uuid'] = uuid if !uuid.empty?
-
-          records << o
+          records << row_to_hash(row)
         end
 
         records
@@ -52,25 +34,10 @@ module Preservation
       def self.current
         query = "SELECT id, uuid, hex(path) as hex_path, unit_type, status, microservice, current FROM unit WHERE current = 1"
 
-        # Archivematica stores path as BLOB, so need to convert path to Hex, to search for it
-        # and use hex function in DB query
         o = {}
         db.results_as_hash = true
         db.execute( query ) do |row|
-          id = row['id']
-          uuid = row['uuid']
-          bin_path = hex_to_bin row['hex_path']
-          unit_type = row['unit_type']
-          status = row['status']
-          microservice = row['microservice']
-          current = row['current']
-          o['path'] = bin_path if !bin_path.empty?
-          o['unit_type'] = unit_type if !unit_type.empty?
-          o['status'] = status if !status.empty?
-          o['microservice'] = microservice if !microservice.empty?
-          o['current'] = current if current
-          o['id'] = id if id
-          o['uuid'] = uuid if !uuid.empty?
+          o = row_to_hash(row)
         end
         o
       end
@@ -159,6 +126,27 @@ module Preservation
         Preservation::Report::Database.db_connection Preservation.db_path
       end
 
+      def self.row_to_hash(row)
+        id = row['id']
+        uuid = row['uuid']
+        # Archivematica stores path as BLOB, so need to convert path to Hex, to search for it
+        # and use hex function in DB query
+        bin_path = Preservation::Conversion.hex_to_bin row['hex_path']
+        unit_type = row['unit_type']
+        status = row['status']
+        microservice = row['microservice']
+        current = row['current']
+        o = {}
+        o['path'] = bin_path if !bin_path.nil? && !bin_path.empty?
+        o['unit_type'] = unit_type if !unit_type.nil? && !unit_type.empty?
+        o['status'] = status if !status.nil? && !status.empty?
+        o['microservice'] = microservice if !microservice.nil? && !microservice.empty?
+        o['current'] = current if current
+        o['id'] = id if id
+        o['uuid'] = uuid if !uuid.nil? && !uuid.empty?
+        o
+      end
+
     end
 
   end

data/lib/preservation/version.rb

@@ -1,5 +1,5 @@
 module Preservation
   # Semantic version number
   #
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/preservation.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'free_disk_space', '~> 1.0'
   spec.add_runtime_dependency 'puree', '~> 0.17'
-  spec.add_runtime_dependency'sqlite3', '~> 1.3'
+  spec.add_runtime_dependency 'sqlite3', '~> 1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: preservation
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Adrian Albin-Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-17 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: free_disk_space