mrt-ingest 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d30e43c2e0b21873ca263108300477a4a2926fe2ab7edb72d3327900253e1ac
-  data.tar.gz: 73466ed8f6640a0756d13fcbe4c79f9a8f98f7db8518a2a9fa047bb77bc576ed
+  metadata.gz: b29f8fd2bc7331b638a034dc11c86726ebb3f1526a62cb2d8b71f471215110cb
+  data.tar.gz: f3797630caf8ebbda198e29590b85bdf4f01391b9d031472d5b3d950de9b836b
 SHA512:
-  metadata.gz: 85ef3dfa325d3f0bbdc705faa630b1c0e0bacd9436586ff753c74bd9d18db254b8c86c9bb363804b0b9853c259e513eab81f66065b17194ef4f18be9aed55c93
-  data.tar.gz: 6b0d2cf3d02703ccc7e715093dff00f8934a8499d519c8c0d64a039b0a57c230f284a8f57001cc06935715e1c9f1ea72a32b0b0034ab13b6efc1452dfcd2552f
+  metadata.gz: d1109ffa2df106b91e4fdef16a9b6fa2fa82305b34f56a5a189304c048490b8e56c868566f5fd2a7b64bdfdb243d65f54dd8625c059b5d1f743bd0f678af5f16
+  data.tar.gz: 9c669cbc0180ddeef7b71649cc349c804cf29dc351a140827db5a9d8a24f6a88b0889e978a7e9d48fb40522bd7c634c593e69d78d07e7692a0e2af043124525e

data/.gitignore

@@ -0,0 +1,208 @@
+###########################
+#### Custom ignores #######
+
+# Gemfile.lock should be checked in for apps, but not for libraries
+Gemfile.lock
+
+###########################
+#### Generated ignores ####
+
+#### joe made this: http://goel.io/joe
+
+#### ruby ####
+*.gem
+*.rbc
+/.config
+/coverage/
+/InstalledFiles
+/pkg/
+/spec/reports/
+/spec/examples.txt
+/test/tmp/
+/test/version_tmp/
+/tmp/
+
+# Used by dotenv library to load environment variables.
+# .env
+
+## Specific to RubyMotion:
+.dat*
+.repl_history
+build/
+*.bridgesupport
+build-iPhoneOS/
+build-iPhoneSimulator/
+
+## Specific to RubyMotion (use of CocoaPods):
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# vendor/Pods/
+
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+
+## Environment normalization:
+/.bundle/
+/vendor/bundle
+/lib/bundler/man/
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+# Gemfile.lock
+# .ruby-version
+# .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc
+
+
+#### macos ####
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+
+#### jetbrains ####
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+
+#### emacs ####
+# -*- mode: gitignore; -*-
+*~
+\#*\#
+/.emacs.desktop
+/.emacs.desktop.lock
+*.elc
+auto-save-list
+tramp
+.\#*
+
+# Org-mode
+.org-id-locations
+*_archive
+
+# flymake-mode
+*_flymake.*
+
+# eshell files
+/eshell/history
+/eshell/lastdir
+
+# elpa packages
+/elpa/
+
+# reftex files
+*.rel
+
+# AUCTeX auto folder
+/auto/
+
+# cask packages
+.cask/
+dist/
+
+# Flycheck
+flycheck_*.el
+
+# server auth directory
+/server/
+
+# projectiles files
+.projectile
+
+# directory configuration
+.dir-locals.el

data/.travis.yml

@@ -0,0 +1,2 @@
+language: ruby
+

data/Gemfile

@@ -3,9 +3,5 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in mrt-ingest.gemspec
 gemspec
 
-group :test do
-  gem "fakeweb"
-  gem "mocha"
-  gem "checkm", "0.0.6"
-  gem "shoulda"
-end
+# TODO: remove this (in favor of gemspec) once there's a 2.4-compatible release
+gem 'fakeweb', git: 'https://github.com/chrisk/fakeweb.git', ref: '2b08c1f'

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011, Regents of the University of California
+Copyright (c) 2011-2018, Regents of the University of California
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without 

data/lib/mrt/ingest/iobject.rb

@@ -18,7 +18,7 @@ module Mrt
         @mime_type = options[:mime_type]
         @size = options[:size]
         # @prefetch = options[:prefetch] || false
-        @prefetch = false
+        @prefetch = false # TODO: remove prefetch code
 
         case where
         when File, Tempfile

data/mrt-ingest.gemspec

@@ -1,9 +1,8 @@
-# -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "mrt-ingest"
-  s.version     = "0.0.3"
+  s.version     = "0.0.4"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Mark Reyes", "David Moles"]
   s.email       = ["mark.reyes@ucop.edu", "david.moles@ucop.edu"]
@@ -12,8 +11,17 @@ Gem::Specification.new do |s|
   s.description = %q{A client for the Merritt ingest system. More details available from https://github.com/CDLUC3/mrt-doc/wiki}
   s.license     = "BSD-3-Clause"
 
-  s.add_dependency "json", "~> 1.5", ">=1.5.0"
-  s.add_dependency "rest-client", "~> 1.6", ">=1.6.0"
+  s.add_dependency "json", "~> 2.0"
+  s.add_dependency "rest-client", "~> 2.0"
+
+  s.add_development_dependency "bundler", '~> 1.16'
+  s.add_development_dependency "checkm", "0.0.6"
+  # TODO: put this back in once there's a 2.4-compatible release
+  # s.add_development_dependency "fakeweb"
+  s.add_development_dependency "mocha", '~> 1.7'
+  s.add_development_dependency "rake", '~> 12.0'
+  s.add_development_dependency "shoulda", '~> 3.6'
+  s.add_development_dependency "test-unit", '~> 3.2'
 
   s.files         = `git ls-files -z`.split("\x0")
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})

data/test/test_client.rb

@@ -3,6 +3,7 @@
 
 require 'rubygems'
 
+require 'test/unit'
 require 'checkm'
 require 'fakeweb'
 require 'mocha'

data/test/test_iobject.rb

@@ -3,6 +3,7 @@
 
 require 'rubygems'
 
+require 'test/unit'
 require 'checkm'
 require 'fakeweb'
 require 'mocha'
@@ -57,6 +58,18 @@ class TestIObject < Test::Unit::TestCase
     end
   end
 
+  context "an iobject with local ID" do
+    setup do
+      @local_id = '10.1098/rstl.1665.0007'
+      @iobject = Mrt::Ingest::IObject.new(local_identifier: @local_id)
+    end
+
+    should "include that local ID in the resuest" do
+      request = @iobject.mk_request("profile", "submitter")
+      assert_equal(@local_id, request.local_identifier)
+    end
+  end
+
   context "an iobject" do
     setup do
       @iobject = Mrt::Ingest::IObject.new
@@ -66,15 +79,16 @@ class TestIObject < Test::Unit::TestCase
       @iobject.add_component(URI.parse("http://example.org/file"))
     end
 
-    should "be able to add a URI component with prefetching, served locally" do
-      @iobject.add_component(URI.parse("http://example.org/"), :prefetch=>true)
-      manifest = parse_object_manifest(@iobject)
-      manifest.entries.each do |entry|
-        # check that all files are served locally
-        uri = URI.parse(entry.values[0])
-        assert_equal(Socket.gethostname, uri.host)
-      end
-    end
+    # TODO: remove prefetch code
+    # should "be able to add a URI component with prefetching, served locally" do
+    #   @iobject.add_component(URI.parse("http://example.org/"), :prefetch=>true)
+    #   manifest = parse_object_manifest(@iobject)
+    #   manifest.entries.each do |entry|
+    #     # check that all files are served locally
+    #     uri = URI.parse(entry.values[0])
+    #     assert_equal(Socket.gethostname, uri.host)
+    #   end
+    # end
 
     should "not be able to add a non-URI component" do
       assert_raise(Mrt::Ingest::IngestException) do

data/test/test_request.rb

@@ -3,6 +3,7 @@
 
 require 'rubygems'
 
+require 'test/unit'
 require 'fakeweb'
 require 'mocha'
 require 'mrt/ingest'

data/test/test_response.rb

@@ -3,6 +3,7 @@
 
 require 'rubygems'
 
+require 'test/unit'
 require 'fakeweb'
 require 'mocha'
 require 'mrt/ingest'
@@ -12,38 +13,38 @@ class TestResponse < Test::Unit::TestCase
   RESPONSE_JSON = <<EOS
 {
 
-    "batchState": {
-        "batchID":"bid-8c0fa0c2-f3d7-4deb-bd49-f953f6752b59",
-        "updateFlag":false,
-        "targetQueue":"example.org:2181",
-        "batchStatus":"QUEUED",
-        "userAgent":"egh/Erik Hetzner",
-        "submissionDate":"2011-08-31T15:40:26-07:00",
-        "targetQueueNode":"/ingest.example.1",
-        "batchProfile": {
-            "owner":"ark:/99999/fk4tt4wsh",
-            "creationDate":"2010-01-19T13:28:14-08:00",
-            "targetStorage": {
-                "storageLink":"http://example.org:35121",
-                "nodeID":10
+    "bat:batchState": {
+        "bat:batchID":"bid-8c0fa0c2-f3d7-4deb-bd49-f953f6752b59",
+        "bat:updateFlag":false,
+        "bat:targetQueue":"example.org:2181",
+        "bat:batchStatus":"QUEUED",
+        "bat:userAgent":"egh/Erik Hetzner",
+        "bat:submissionDate":"2011-08-31T15:40:26-07:00",
+        "bat:targetQueueNode":"/ingest.example.1",
+        "bat:batchProfile": {
+            "bat:owner":"ark:/99999/fk4tt4wsh",
+            "bat:creationDate":"2010-01-19T13:28:14-08:00",
+            "bat:targetStorage": {
+                "bat:storageLink":"http://example.org:35121",
+                "bat:nodeID":10
             },
-            "objectType":"MRT-curatorial",
-            "modificationDate":"2010-01-26T23:28:14-08:00",
-            "aggregateType":"",
-            "objectMinterURL":"https://example.org/ezid/shoulder/ark:/99999/fk4",
-            "collection": {
+            "bat:objectType":"MRT-curatorial",
+            "bat:modificationDate":"2010-01-26T23:28:14-08:00",
+            "bat:aggregateType":"",
+            "bat:objectMinterURL":"https://example.org/ezid/shoulder/ark:/99999/fk4",
+            "bat:collection": {
             },
-            "profileID":"merritt_content",
-            "profileDescription":"Merritt demo content",
-            "fixityURL":"http://example.org:33143",
-            "contactsEmail": {
-                "notification": {
-                    "contactEmail":"erik.hetzner@example.org"
+            "bat:profileID":"merritt_content",
+            "bat:profileDescription":"Merritt demo content",
+            "bat:fixityURL":"http://example.org:33143",
+            "bat:contactsEmail": {
+                "bat:notification": {
+                    "bat:contactEmail":"erik.hetzner@example.org"
                 }
             },
-            "identifierScheme":"ARK",
-            "identifierNamespace":"99999",
-            "objectRole":"MRT-content"
+            "bat:identifierScheme":"ARK",
+            "bat:identifierNamespace":"99999",
+            "bat:objectRole":"MRT-content"
         }
     }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mrt-ingest
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Mark Reyes
@@ -17,40 +17,112 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ">="
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ">="
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.16'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: checkm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.6
+- !ruby/object:Gem::Dependency
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ">="
+        version: '1.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
-  type: :runtime
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ">="
+        version: '12.0'
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '3.2'
 description: A client for the Merritt ingest system. More details available from https://github.com/CDLUC3/mrt-doc/wiki
 email:
 - mark.reyes@ucop.edu
@@ -59,7 +131,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - ".hgignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README