valkyrie 2.1.1 → 2.1.2

data/lib/valkyrie/persistence/solr/orm_converter.rb

@@ -48,7 +48,7 @@ module Valkyrie::Persistence::Solr
     # Construct a Time object from the datestamp for the resource creation date indexed in Solr
     # @return [Time]
     def created_at
-      DateTime.parse(solr_document.fetch("created_at_dtsi").to_s).utc
+      DateTime.parse(solr_document.fetch("created_at_dtsi").to_s).new_offset(0)
     end
 
     # Construct a Time object from the datestamp for the date of the last resource update indexed in Solr
@@ -445,7 +445,7 @@ module Valkyrie::Persistence::Solr
       # @return [Boolean]
       def self.handles?(value)
         return false unless value.to_s.start_with?("datetime-")
-        DateTime.iso8601(value.sub(/^datetime-/, '')).utc
+        DateTime.iso8601(value.sub(/^datetime-/, '')).new_offset(0)
       rescue
         false
       end
@@ -453,7 +453,7 @@ module Valkyrie::Persistence::Solr
       # Parses and casts the Solr field value into a UTC DateTime value
       # @return [Time]
       def result
-        DateTime.parse(value.sub(/^datetime-/, '')).utc
+        DateTime.parse(value.sub(/^datetime-/, '')).new_offset(0)
       end
     end
   end

data/lib/valkyrie/persistence/solr/queries/find_members_query.rb

@@ -27,7 +27,7 @@ module Valkyrie::Persistence::Solr::Queries
     # Results are ordered by the member IDs specified in the Valkyrie Resource attribute
     # @yield [Valkyrie::Resource]
     def each
-      return [] unless resource.id.present?
+      return [] if resource.id.blank?
       member_ids.map { |id| unordered_members.find { |member| member.id == id } }.reject(&:nil?).each do |member|
         yield member
       end

data/lib/valkyrie/persistence/solr/query_service.rb

@@ -97,19 +97,19 @@ module Valkyrie::Persistence::Solr
 
     private
 
-      # (see Valkyrie::Persistence::Memory::QueryService#validate_id)
-      def validate_id(id)
-        raise ArgumentError, 'id must be a Valkyrie::ID' unless id.is_a? Valkyrie::ID
-      end
+    # (see Valkyrie::Persistence::Memory::QueryService#validate_id)
+    def validate_id(id)
+      raise ArgumentError, 'id must be a Valkyrie::ID' unless id.is_a? Valkyrie::ID
+    end
 
-      # (see Valkyrie::Persistence::Memory::QueryService#ensure_persisted)
-      def ensure_persisted(resource)
-        raise ArgumentError, 'resource is not saved' unless resource.persisted?
-      end
+    # (see Valkyrie::Persistence::Memory::QueryService#ensure_persisted)
+    def ensure_persisted(resource)
+      raise ArgumentError, 'resource is not saved' unless resource.persisted?
+    end
 
-      # (see Valkyrie::Persistence::Memory::QueryService#ordered_property?)
-      def ordered_property?(resource:, property:)
-        resource.ordered_attribute?(property)
-      end
+    # (see Valkyrie::Persistence::Memory::QueryService#ordered_property?)
+    def ordered_property?(resource:, property:)
+      resource.ordered_attribute?(property)
+    end
   end
 end

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

@@ -194,9 +194,9 @@ RSpec.shared_examples 'a Valkyrie::Persister' do |*flags|
     reloaded = query_service.find_by(id: book.id)
 
     expect(reloaded.title.first.to_i).to eq(time1.to_i)
-    expect(reloaded.title.first.zone).to eq('UTC')
+    expect(reloaded.title.first.zone).to eq('+00:00')
     expect(reloaded.author.first.to_i).to eq(time2.to_i)
-    expect(reloaded.author.first.zone).to eq('UTC')
+    expect(reloaded.author.first.zone).to eq('+00:00')
     expect(reloaded.other_author.first).to eq "2019-01"
   end
 

data/lib/valkyrie/storage/fedora.rb

@@ -83,24 +83,24 @@ module Valkyrie::Storage
 
     private
 
-      # @return [IOProxy]
-      def response(id:)
-        response = connection.http.get(fedora_identifier(id: id))
-        raise Valkyrie::StorageAdapter::FileNotFound unless response.success?
-        IOProxy.new(response.body)
-      end
+    # @return [IOProxy]
+    def response(id:)
+      response = connection.http.get(fedora_identifier(id: id))
+      raise Valkyrie::StorageAdapter::FileNotFound unless response.success?
+      IOProxy.new(response.body)
+    end
 
-      def default_resource_uri_transformer
-        lambda do |resource, base_url|
-          id = CGI.escape(resource.id.to_s)
-          RDF::URI.new(base_url + id)
-        end
+    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 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
+    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_adapter.rb

@@ -106,20 +106,20 @@ module Valkyrie
 
       private
 
-        def tmp_file_name
-          id.to_s.tr(':/', '__')
-        end
+      def tmp_file_name
+        id.to_s.tr(':/', '__')
+      end
 
-        def tmp_file_path
-          ::File.join(Dir.tmpdir, tmp_file_name)
-        end
+      def tmp_file_path
+        ::File.join(Dir.tmpdir, tmp_file_name)
+      end
 
-        def tmp_file
-          @tmp_file ||= ::File.open(tmp_file_path, 'w+b') do |f|
-            IO.copy_stream(io, f)
-            f
-          end
+      def tmp_file
+        @tmp_file ||= ::File.open(tmp_file_path, 'w+b') do |f|
+          IO.copy_stream(io, f)
+          f
         end
+      end
     end
   end
 end

data/lib/valkyrie/version.rb

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

data/tasks/dev.rake

@@ -2,63 +2,26 @@
 
 namespace :server do
   desc "Start solr and fedora servers for testing"
-  task :test do
+  task :start do
     require 'rails'
-    require 'solr_wrapper'
-    require 'fcrepo_wrapper'
-    SolrWrapper.wrap(shared_solr_opts.merge(port: 8984, instance_dir: 'tmp/blacklight-core-test')) do |solr|
-      solr.with_collection(name: "blacklight-core-test", dir: Pathname.new(__dir__).join("..", "solr", "config").to_s) do
-        FcrepoWrapper.wrap(shared_fedora_opts.merge(port: 8988, fcrepo_home_dir: "tmp/fcrepo4-test-data", version: "4.7.5", instance_directory: "tmp/fcrepo4")) do |_fcrepo|
-          FcrepoWrapper::Instance.new(shared_fedora_opts.merge(port: 8998, fcrepo_home_dir: "tmp/fcrepo5-test-data", version: "5.1.0", instance_directory: "tmp/fcrepo5")).wrap do |_other_repo|
-            puts "Setup solr & Fedora"
-            loop do
-              sleep(1)
-            end
-          end
-        end
-      end
-    end
+    `lando start`
+    `bundle exec rake db:create`
+    `bundle exec rake db:migrate`
+    puts "Started Solr/Fedora/Postgres"
   end
 
   desc "Cleanup test servers"
-  task :clean_test do
+  task :clean do
     require 'rails'
-    require 'solr_wrapper'
-    require 'fcrepo_wrapper'
-    SolrWrapper.instance(shared_solr_opts.merge(port: 8984, instance_dir: 'tmp/blacklight-core-test')).remove_instance_dir!
-    FcrepoWrapper.default_instance(shared_fedora_opts.merge(port: 8988, fcrepo_home_dir: "tmp/fcrepo4-test-data", instance_directory: "tmp/fcrepo4")).remove_instance_dir!
-    FcrepoWrapper::Instance.new(shared_fedora_opts.merge(port: 8998, fcrepo_home_dir: "tmp/fcrepo5-test-data", instance_directory: "tmp/fcrepo5")).remove_instance_dir!
-    puts "Cleaned up test solr & fedora servers."
+    `lando destroy -y`
+    `lando start`
+    `bundle exec rake db:create`
+    `bundle exec rake db:migrate`
+    puts "Cleaned/Started Solr/Fedora/Postgres"
   end
 
-  desc "Start solr and fedora servers for development"
-  task :development do
-    require 'rails'
-    require 'solr_wrapper'
-    require 'fcrepo_wrapper'
-
-    SolrWrapper.wrap(shared_solr_opts.merge(port: 8983, instance_dir: 'tmp/blacklight-core')) do |solr|
-      solr.with_collection(name: "blacklight-core", dir: Pathname.new(__dir__).join("..", "solr", "config").to_s) do
-        FcrepoWrapper.wrap(shared_fedora_opts.merge(port: 8986, fcrepo_home_dir: "tmp/fcrepo4-dev-data", version: "4.7.5")) do |_fcrepo|
-          FcrepoWrapper::Instance.new(shared_fedora_opts.merge(port: 8996, fcrepo_home_dir: "tmp/fcrepo5-dev-data", version: "5.1.0")).wrap do |_fcrepo|
-            puts "Setup solr & Fedora"
-            loop do
-              sleep(1)
-            end
-          end
-        end
-      end
-    end
-  end
-
-  def shared_solr_opts
-    opts = { managed: true, verbose: true, persist: false, download_dir: "tmp" }
-    opts[:version] = ENV['SOLR_VERSION'] if ENV['SOLR_VERSION']
-    opts
-  end
-
-  def shared_fedora_opts
-    opts = { managed: true, verbose: true, enable_jms: false, download_dir: "tmp" }
-    opts
+  desc "Stop test servers"
+  task :stop do
+    `lando stop -y`
   end
 end

data/valkyrie.gemspec

@@ -24,10 +24,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'draper'
   spec.add_dependency 'activemodel'
   spec.add_dependency 'dry-types', '~> 1.0'
-  spec.add_dependency 'rdf', '~> 3.0.10'
+  spec.add_dependency 'rdf', '~> 3.0', '>= 3.0.10'
   spec.add_dependency 'activesupport'
   spec.add_dependency 'railties' # To use generators and engines
-  spec.add_dependency 'reform'
+  spec.add_dependency 'reform', '~> 2.2'
   spec.add_dependency 'reform-rails'
   spec.add_dependency 'json-ld'
   spec.add_dependency 'json'
@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'faraday', '< 1.0'
 
   spec.add_development_dependency "bundler", "> 1.16.0", "< 3"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 10"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "webmock"
@@ -47,7 +47,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'yard'
   spec.add_development_dependency 'solr_wrapper'
   spec.add_development_dependency 'fcrepo_wrapper'
-  spec.add_development_dependency 'docker-stack', '~> 0.2.6'
   spec.add_development_dependency 'timecop'
   spec.add_development_dependency 'appraisal'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valkyrie
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Trey Pendragon
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-03-12 00:00:00.000000000 Z
+date: 2021-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -71,6 +71,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.10
   type: :runtime
@@ -78,6 +81,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.10
 - !ruby/object:Gem::Dependency
@@ -112,16 +118,16 @@ dependencies:
   name: reform
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: reform-rails
   requirement: !ruby/object:Gem::Requirement
@@ -230,16 +236,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -380,20 +386,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: docker-stack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.6
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -422,7 +414,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - tpendragon@princeton.edu
 executables: []
@@ -431,9 +423,8 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".ctags"
-- ".docker-stack/valkyrie-development/docker-compose.yml"
-- ".docker-stack/valkyrie-test/docker-compose.yml"
 - ".gitignore"
+- ".lando.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -569,13 +560,12 @@ files:
 - solr/config/xslt/luke.xsl
 - solr/solr.xml
 - tasks/dev.rake
-- tasks/docker.rake
 - valkyrie.gemspec
 - valkyrie_logo.png
 homepage: https://github.com/samvera/valkyrie
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -590,9 +580,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: An ORM using the Data Mapper pattern, specifically built to solve Digital
   Repository use cases.

data/.docker-stack/valkyrie-development/docker-compose.yml

@@ -1,53 +0,0 @@
----
-version: '3.4'
-volumes:
-  fedora4:
-  fedora5:
-  db:
-  solr_repo:
-  solr_index:
-services:
-  fedora4:
-    image: samvera/fcrepo4:4.7.5
-    volumes:
-    - fedora4:/data
-    ports:
-    - 8986:8080
-  fedora5:
-    image: samvera/fcrepo4:5.1.0
-    volumes:
-    - fedora5:/data
-    ports:
-    - 8996:8080
-  db:
-    image: healthcheck/postgres:alpine
-    volumes:
-    - db:/data
-    environment:
-    - PGDATA=/data
-    - POSTGRES_USER=docker
-    - POSTGRES_PASSWORD=d0ck3r
-    ports:
-    - 5433:5432
-  solr_repo:
-    image: solr:7.2-alpine
-    ports:
-    - 8983:8983
-    volumes:
-    - solr_repo:/opt/solr/server/solr/mycores
-    - "../../solr:/solr_config"
-    entrypoint:
-    - docker-entrypoint.sh
-    - solr-precreate
-    - blacklight-core
-    - "/solr_config/config"
-    healthcheck:
-      test:
-      - CMD
-      - wget
-      - "-O"
-      - "/dev/null"
-      - http://localhost:8983/solr/
-      interval: 30s
-      timeout: 5s
-      retries: 3