valkyrie 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a009fdb760bb925b92e9ade5096b39dae461c754816df543314850a012f7a656
-  data.tar.gz: f26925e5eb0dc7df138f81dc89ad6bb5c4444ea556ac8fedde7d73bd3e76b69e
+  metadata.gz: 5ac665913c03a2c8fcfe74541f13ec24fce4985a12d8ddff1491e3416f9ef9d9
+  data.tar.gz: d95b257f4408f318db357f023982c9bc7463ba3b3efcab698737e447dbf04966
 SHA512:
-  metadata.gz: 6cef97cbaa3a6ecb12cfb78626d2ed5fea0d8f433ad07a4cc5a6fb145c7346447959af98456e1f620f24203924d9dd2763b8a31b0804776971182d80fd1eb23a
-  data.tar.gz: 2bdaffa5595d88b6da9c66f64f4e64a52b1af10ae24706d40357ed9ccad5b2a49209a2a8e9f263268b719133db90383205ce910b166074c681ffbec8011498cb
+  metadata.gz: 465b81cf5749139e46148e2afbbc37b01636d57dbb5e940d576c1127ea8da22a57024887fc72be442e4c796e464ce70e88318a7d1302c7b182777265cf1d154c
+  data.tar.gz: 657348cdac69a4acf09874036f4adfd7250917e48d4a1a423f40e937affdae2be4da5366ae0f36cd43f8eaa4f14791bdd95bf7ae985fb20231fcbde4ce42eeb8

data/.circleci/config.yml

@@ -10,7 +10,7 @@ jobs:
         type: "string"
       ruby:
         description: "Ruby version"
-        default: "2.6.2"
+        default: "2.6.3"
         type: "string"
     environment:
       BUNDLE_GEMFILE: << parameters.gemfile >>
@@ -69,11 +69,11 @@ workflows:
     jobs:
       - build:
           gemfile: "gemfiles/activerecord_5_2.gemfile"
-          ruby: 2.6.2
+          ruby: 2.6.3
           name: "Ruby2-6_Rails5-2"
       - build:
           gemfile: "gemfiles/activerecord_5_1.gemfile"
-          ruby: 2.6.2
+          ruby: 2.6.3
           name: "Ruby2-6_Rails5-1"
       - build:
           gemfile: "gemfiles/activerecord_5_2.gemfile"
@@ -85,11 +85,11 @@ workflows:
           name: "Ruby2-5_Rails5-1"
       - build:
           gemfile: "gemfiles/activerecord_5_2.gemfile"
-          ruby: 2.4.5
+          ruby: 2.4.6
           name: "Ruby2-4_Rails5-2"
       - build:
           gemfile: "gemfiles/activerecord_5_1.gemfile"
-          ruby: 2.4.5
+          ruby: 2.4.6
           name: "Ruby2-4_Rails5-1"
   nightly:
     triggers:
@@ -102,11 +102,11 @@ workflows:
     jobs:
       - build:
           gemfile: "gemfiles/activerecord_5_2.gemfile"
-          ruby: 2.6.2
+          ruby: 2.6.3
           name: "Ruby2-6_Rails5-2"
       - build:
           gemfile: "gemfiles/activerecord_5_1.gemfile"
-          ruby: 2.6.2
+          ruby: 2.6.3
           name: "Ruby2-6_Rails5-1"
       - build:
           gemfile: "gemfiles/activerecord_5_2.gemfile"
@@ -118,9 +118,9 @@ workflows:
           name: "Ruby2-5_Rails5-1"
       - build:
           gemfile: "gemfiles/activerecord_5_2.gemfile"
-          ruby: 2.4.5
+          ruby: 2.4.6
           name: "Ruby2-4_Rails5-2"
       - build:
           gemfile: "gemfiles/activerecord_5_1.gemfile"
-          ruby: 2.4.5
+          ruby: 2.4.6
           name: "Ruby2-4_Rails5-1"

data/CHANGELOG.md

@@ -1,4 +1,18 @@
-# v1.6.0 2018-04-17
+# v1.7.0 2019-05-29
+
+## Changes since last release
+
+* Permit storage adapters to have arbitrary arguments to #upload.
+  [jrgriffiniii](https://github.com/jrgriffiniii)
+* Storage adapters can now all upload regular IO objects.
+  [tpendragon](https://github.com/tpendragon)
+* Fedora Storage Adapter has a configurable `resource_uri_transformer` for going
+  from a `Resource` to a Fedora path.
+  [elrayle](https://github.com/elrayle)
+* Improve Gem metadata and allow Bundler 2
+  [jcoyne](https://github.com/jcoyne)
+
+# v1.6.0 2019-04-17
 
 ## Changes since last release
 
@@ -16,7 +30,7 @@ this release:
 [escowles](https://github.com/escowles)
 [no-reply](https://github.com/no-reply)
 
-# v1.5.1 2018-02-08
+# v1.5.1 2019-02-08
 
 ## Changes since last release
 
@@ -29,7 +43,7 @@ this release:
 [cjcolvar](https://github.com/cjcolvar)
 [escowles](https://github.com/escowles)
 
-# v1.5.0 2018-02-06
+# v1.5.0 2019-02-06
 
 ## Changes since last release
 
@@ -76,7 +90,7 @@ this release:
 [no-reply](https://github.com/no-reply)
 [revgum](https://github.com/revgum)
 
-# v1.5.0 RC2 2018-02-01
+# v1.5.0 RC2 2019-02-01
 
 ## Changes since last release
 
@@ -87,7 +101,7 @@ Additional thanks to the following for code review:
 
 [mjgiarlo](https://github.com/mjgiarlo)
 
-# v1.5.0 RC1 2018-02-01
+# v1.5.0 RC1 2019-02-01
 
 ## Changes since last release
 
@@ -131,7 +145,7 @@ this release:
 [no-reply](https://github.com/no-reply)
 [revgum](https://github.com/revgum)
 
-# v1.4.0 2018-01-08
+# v1.4.0 2019-01-08
 
 ## Changes since last release.
 

data/README.md

@@ -17,7 +17,7 @@ Jump in: [![Slack Status](http://slack.samvera.org/badge.svg)](http://slack.samv
 ## Primary Contacts
 
 ### Product Owner
-[Carolyn Cole](https://github.com/cam156)
+[Katherine Lynch](https://github.com/kelynch)
 
 ### Technical Lead
 [Trey Pendragon](https://github.com/tpendragon)

data/lib/valkyrie/specs/shared_specs/storage_adapter.rb

@@ -17,11 +17,24 @@ RSpec.shared_examples 'a Valkyrie::StorageAdapter' do
   it { is_expected.to respond_to(:delete).with_keywords(:id) }
   it { is_expected.to respond_to(:upload).with_keywords(:file, :resource, :original_filename) }
 
+  it "can upload a file which is just an IO" do
+    io_file = Tempfile.new('temp_io')
+    io_file.write File.read(ROOT_PATH.join("spec", "fixtures", "files", "example.tif"))
+    io_file.rewind
+    sha1 = Digest::SHA1.file(io_file).to_s
+
+    resource = Valkyrie::Specs::CustomResource.new(id: SecureRandom.uuid)
+
+    expect(uploaded_file = storage_adapter.upload(file: io_file, original_filename: 'foo.jpg', resource: resource, fake_upload_argument: true)).to be_kind_of Valkyrie::StorageAdapter::File
+
+    expect(uploaded_file.valid?(digests: { sha1: sha1 })).to be true
+  end
+
   it "can upload, validate, re-fetch, and delete a file" do
     resource = Valkyrie::Specs::CustomResource.new(id: "test")
     sha1 = Digest::SHA1.file(file).to_s
     size = file.size
-    expect(uploaded_file = storage_adapter.upload(file: file, original_filename: 'foo.jpg', resource: resource)).to be_kind_of Valkyrie::StorageAdapter::File
+    expect(uploaded_file = storage_adapter.upload(file: file, original_filename: 'foo.jpg', resource: resource, fake_upload_argument: true)).to be_kind_of Valkyrie::StorageAdapter::File
 
     expect(uploaded_file).to respond_to(:checksum).with_keywords(:digests)
     expect(uploaded_file).to respond_to(:valid?).with_keywords(:size, :digests)

data/lib/valkyrie/storage/disk.rb

@@ -12,8 +12,9 @@ module Valkyrie::Storage
     # @param file [IO]
     # @param original_filename [String]
     # @param resource [Valkyrie::Resource]
+    # @param _extra_arguments [Hash] additional arguments which may be passed to other adapters
     # @return [Valkyrie::StorageAdapter::File]
-    def upload(file:, original_filename:, resource: nil)
+    def upload(file:, original_filename:, resource: nil, **_extra_arguments)
       new_path = path_generator.generate(resource: resource, file: file, original_filename: original_filename)
       FileUtils.mkdir_p(new_path.parent)
       file_mover.call(file.path, new_path)

data/lib/valkyrie/storage/fedora.rb

@@ -4,6 +4,7 @@ module Valkyrie::Storage
   class Fedora
     attr_reader :connection, :base_path, :fedora_version
     PROTOCOL = 'fedora://'
+    SLASH = '/'
 
     # @param [Ldp::Client] connection
     def initialize(connection:, base_path: "/", fedora_version: 4)
@@ -31,17 +32,22 @@ module Valkyrie::Storage
     # @param file [IO]
     # @param original_filename [String]
     # @param resource [Valkyrie::Resource]
+    # @param content_type [String] content type of file (e.g. 'image/tiff') (default='application/octet-stream')
+    # @param resource_uri_transformer [Lambda] transforms the resource's id (e.g. 'DDS78RK') into a uri (optional)
+    # @param extra_arguments [Hash] additional arguments which may be passed to other adapters
     # @return [Valkyrie::StorageAdapter::StreamFile]
-    def upload(file:, original_filename:, resource:)
-      identifier = id_to_uri(resource.id) + '/original'
+    def upload(file:, original_filename:, resource:, content_type: "application/octet-stream", # rubocop:disable Metrics/ParameterLists
+               resource_uri_transformer: default_resource_uri_transformer, **_extra_arguments)
+      identifier = resource_uri_transformer.call(resource, base_url) + '/original'
       sha1 = fedora_version == 5 ? "sha" : "sha1"
       connection.http.put do |request|
         request.url identifier
-        request.headers['Content-Type'] = file.content_type
+        request.headers['Content-Type'] = content_type
+        request.headers['Content-Length'] = file.length.to_s
         request.headers['Content-Disposition'] = "attachment; filename=\"#{original_filename}\""
         request.headers['digest'] = "#{sha1}=#{Digest::SHA1.file(file)}"
         request.headers['link'] = "<http://www.w3.org/ns/ldp#NonRDFSource>; rel=\"type\""
-        io = Faraday::UploadIO.new(file.tempfile.path, file.content_type)
+        io = Faraday::UploadIO.new(file, content_type, original_filename)
         request.body = io
       end
       find_by(id: Valkyrie::ID.new(identifier.to_s.sub(/^.+\/\//, PROTOCOL)))
@@ -70,6 +76,13 @@ module Valkyrie::Storage
     end
     private_constant :IOProxy
 
+    # Translate the Valkrie ID into a URL for the fedora file
+    # @return [RDF::URI]
+    def fedora_identifier(id:)
+      identifier = id.to_s.sub(PROTOCOL, "#{connection.http.scheme}://")
+      RDF::URI(identifier)
+    end
+
     private
 
       # @return [IOProxy]
@@ -79,19 +92,17 @@ module Valkyrie::Storage
         IOProxy.new(response.body)
       end
 
-      # Translate the Valkrie ID into a URL for the fedora file
-      # @return [RDF::URI]
-      def fedora_identifier(id:)
-        identifier = id.to_s.sub(PROTOCOL, "#{connection.http.scheme}://")
-        RDF::URI(identifier)
-      end
-
-      def id_to_uri(id)
-        RDF::URI("#{connection_prefix}/#{CGI.escape(id.to_s)}")
+      def default_resource_uri_transformer
+        lambda do |resource, base_url|
+          id = CGI.escape(resource.id.to_s)
+          RDF::URI.new(base_url + id)
+        end
       end
 
-      def connection_prefix
-        "#{connection.http.url_prefix}/#{base_path}"
+      def base_url
+        pre_divider = base_path.starts_with?(SLASH) ? '' : SLASH
+        post_divider = base_path.ends_with?(SLASH) ? '' : SLASH
+        "#{connection.http.url_prefix}#{pre_divider}#{base_path}#{post_divider}"
       end
   end
 end

data/lib/valkyrie/storage/memory.rb

@@ -13,8 +13,9 @@ module Valkyrie::Storage
     # @param file [IO]
     # @param original_filename [String]
     # @param resource [Valkyrie::Resource]
+    # @param _extra_arguments [Hash] additional arguments which may be passed to other adapters
     # @return [Valkyrie::StorageAdapter::StreamFile]
-    def upload(file:, original_filename:, resource: nil)
+    def upload(file:, original_filename:, resource: nil, **_extra_arguments)
       identifier = Valkyrie::ID.new("memory://#{resource.id}")
       cache[identifier] = Valkyrie::StorageAdapter::StreamFile.new(id: identifier, io: file)
     end

data/lib/valkyrie/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Valkyrie
-  VERSION = "1.6.0"
+  VERSION = "1.7.0"
 end

data/valkyrie.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["tpendragon@princeton.edu"]
 
   spec.summary       = 'An ORM using the Data Mapper pattern, specifically built to solve Digital Repository use cases.'
+  spec.homepage      = "https://github.com/samvera/valkyrie"
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -35,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'json'
   spec.add_dependency 'ldp'
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", "> 1.16.0", "< 3"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valkyrie
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Trey Pendragon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-17 00:00:00.000000000 Z
+date: 2019-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -224,16 +224,22 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 1.16.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 1.16.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -592,7 +598,7 @@ files:
 - tasks/docker.rake
 - valkyrie.gemspec
 - valkyrie_logo.png
-homepage: 
+homepage: https://github.com/samvera/valkyrie
 licenses: []
 metadata: {}
 post_install_message: