valkyrie 2.0.0.RC7 → 2.0.0.RC8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e035ce1a5ecfcf72ef4934d014e66f9d9ab26c312a1de286c72d84228d98b369
-  data.tar.gz: 46c4902f29cd8536991d248a14eb80fbafdf5c66fa5a7d56b392cd4696a21e9d
+  metadata.gz: 1242297f1c266e9f2ac26d998acc53d5336b40f8a5eba9af2fb48700264a7354
+  data.tar.gz: 3f3e3f76fad663011aec778d5834d209160fe6c1327e23fdb6fa54548e999229
 SHA512:
-  metadata.gz: 933808a7a1a329191d34c903c700b5f6a010fc45d1387af3d1cb74332ddf3624d98693b43a94e943c8ecc70fd363adbcd6b60a4262ded2c11e808639d284d41d
-  data.tar.gz: 846a9707b4c1782b7d0983f921f6461bfe4d58688850986b719bab08969c96d7efc49989ba4d436d12db3ddaa215f9dc8c7ee5c2581b1dec6023e66961aec719
+  metadata.gz: 33acf17faa1554a6a3b493f9df4c64b8e4ce006d8f83c2c032057805ecb59e08465cb9a197f92231ef96a4e4f1c64eb9f1a727c4049d66f792f228c466d6bfc9
+  data.tar.gz: a2bd7732e83f4f81ab394e62429c78929a515faf5bc4715cdf9b6afd6881f9fb01091e9dcfe1f7f656e5d7f36cb1e4a0f189f6bb67dd363e4c9f7fcde9eaea69

data/CHANGELOG.md

@@ -70,7 +70,21 @@ involved for their contributions in the last year:
 [stkenny](https://github.com/stkenny)
 [tpendragon](https://github.com/tpendragon)
 
-# 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
 
@@ -88,7 +102,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
 
@@ -101,7 +115,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
 
@@ -148,7 +162,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
 
@@ -159,7 +173,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
 
@@ -203,7 +217,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/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: 5)
@@ -29,17 +30,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)))
@@ -68,6 +74,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]
@@ -77,19 +90,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 = "2.0.0.RC7"
+  VERSION = "2.0.0.RC8"
 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)/})
@@ -33,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rdf-vocab'
   spec.add_dependency 'disposable', '~> 0.4.5'
 
-  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: 2.0.0.RC7
+  version: 2.0.0.RC8
 platform: ruby
 authors:
 - Trey Pendragon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2019-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -196,16 +196,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
@@ -552,7 +558,7 @@ files:
 - tasks/docker.rake
 - valkyrie.gemspec
 - valkyrie_logo.png
-homepage: 
+homepage: https://github.com/samvera/valkyrie
 licenses: []
 metadata: {}
 post_install_message: