valkyrie 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1bbec50b7c38ae5d7237b14c02a79d642beeaf0c01c24584626ba2fc3c779b7
-  data.tar.gz: 700e8fddc49bde6d7e7d02a0f22e23c2fd4ee7d2a349f35bfd27e83fc16a7bcf
+  metadata.gz: 2d82ceafa985dc327a594ad39da9f4feb343579e6330ae7f30a6fd7894471083
+  data.tar.gz: 56f54340890de9a799588b47eb4fb3ee6f400d598db03c7bf97d4163d128d831
 SHA512:
-  metadata.gz: e4b898b35816e9a16e53fa2e8ecfb0ec239693a9f5806b9f56e32a4c129aab298faaa25dbea40d0ff57d98995a80d613d351953042721a450480871646bdaa14
-  data.tar.gz: 1af95775fc3424cf09237045c2e26406ab0f4736a1ecfb4454f6628d329fd8743a9cad24179587e9212517c5839bd8eb28349e2cf668125efefc5485f72c1314
+  metadata.gz: 2676a955ae6333f4c9b82a4f2a0e131bb235e4cdef8b05951bdfb787ac1218a9e2da410a476928482824b909a12ade0f2d6e2074915c3738922ca4f3a8004337
+  data.tar.gz: 67a8b919a2ce033240db9d8b507140f84a8c49edfbf7283f205a41a7a09d2ba99940e5c465f0959cc27ce707e52d68b5e2d04a0f67376f482ae560c4713608ee

data/.circleci/config.yml

@@ -2,7 +2,6 @@
 version: 2.1
 jobs:
   build:
-    machine: true
     parameters:
       gemfile:
         description: "Gemfile to run"
@@ -12,32 +11,42 @@ jobs:
         description: "Ruby version"
         default: "2.6.5"
         type: "string"
+    docker:
+      - image: circleci/ruby:<< parameters.ruby >>-node-browsers
+        environment:
+          RAILS_ENV: test
+      - image: postgres:10.6-alpine
+        environment:
+          POSTGRES_USER: postgres
+          POSTGRES_DB: Valkyrie_gem_test
+          POSTGRES_HOST_AUTH_METHOD: trust
+      - image: samvera/fcrepo4:4.7.5
+        environment:
+          CATALINA_OPTS: "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC"
+          JAVA_OPTIONS: "-Djetty.http.port=8988"
+      - image: samvera/fcrepo4:5.1.0
+        environment:
+          CATALINA_OPTS: "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC"
+          JAVA_OPTIONS: "-Djetty.http.port=8998 -Dfcrepo.dynamic.jms.port=61618 -Dfcrepo.dynamic.stomp.port=61614"
+      - image: solr:7.7-alpine
+        command: bin/solr -cloud -noprompt -f -p 8994
     environment:
       BUNDLE_GEMFILE: << parameters.gemfile >>
+      POSTGRES_PORT: 5432
     steps:
       - checkout
       - run:
-          name: Set ruby version to << parameters.ruby >>
-          command: |
-            rvm install << parameters.ruby >>
-            echo . $(rvm << parameters.ruby >> do rvm env --path) >> $BASH_ENV
-      - run: 
-          shell: /bin/bash -l
-          name: Uninstall global Bundler
-          command: |
-            rvm use << parameters.ruby >>
-            rvm gemset use global
-            gem uninstall bundler -x
-            echo Uninstalled
+          name: Wait for solr
+          command: dockerize -wait tcp://localhost:8994 -timeout 1m
       - run:
-          name: Install Docker Compose
+          name: Load config into solr
           command: |
-            curl -L https://github.com/docker/compose/releases/download/1.19.0/docker-compose-`uname -s`-`uname -m` > ~/docker-compose
-            chmod +x ~/docker-compose
-            sudo mv ~/docker-compose /usr/local/bin/docker-compose
-      - run:
-          name: Update bundler
-          command: gem install bundler -v 1.17.2
+            cd solr/config
+            zip -1 -r solr_config.zip ./*
+            curl -H "Content-type:application/octet-stream" --data-binary @solr_config.zip "http://localhost:8994/solr/admin/configs?action=UPLOAD&name=valkyrie"
+            curl -H 'Content-type: application/json' http://localhost:8994/api/collections/ -d '{create: {name: valkyrie-core-test, config: valkyrie, numShards: 1}}'
+      # Install Bundler
+      - run: gem install bundler -v '~> 2.0'
       - restore_cache:
          keys:
            - bundle-{{ checksum "<< parameters.gemfile >>" }}-{{ checksum "valkyrie.gemspec" }}-<< parameters.ruby >>-6
@@ -57,9 +66,12 @@ jobs:
       - run:
           name: Run Rubocop
           command: bundle exec rake rubocop
+      - run:
+          name: Set up database
+          command: bundle exec rake db:migrate
       - run:
           name: Run Specs
-          command: bundle exec rake docker:spec
+          command: bundle exec rspec spec
       - store_artifacts:
           path: coverage
           destination: coverage
@@ -87,10 +99,6 @@ workflows:
           gemfile: "gemfiles/activerecord_5_2.gemfile"
           ruby: 2.5.7
           name: "Ruby2-5_Rails5-2"
-      - build:
-          gemfile: "gemfiles/activerecord_5_2.gemfile"
-          ruby: 2.4.9
-          name: "Ruby2-4_Rails5-2"
   nightly:
     triggers:
       - schedule:
@@ -120,7 +128,3 @@ workflows:
           gemfile: "gemfiles/activerecord_5_2.gemfile"
           ruby: 2.5.7
           name: "Ruby2-5_Rails5-2"
-      - build:
-          gemfile: "gemfiles/activerecord_5_2.gemfile"
-          ruby: 2.4.9
-          name: "Ruby2-4_Rails5-2"

data/.lando.yml

@@ -0,0 +1,40 @@
+name: valkyrie
+app_mount: false
+services:
+  valkyrie_test_solr_7:
+    app_mount: false
+    type: solr:7
+    portforward: 8994
+    core: valkyrie-core-test
+    config:
+      dir: solr/config
+  valkyrie_database:
+    app_mount: false
+    type: postgres:10
+    portforward: 5433
+  valkyrie_fedora_4:
+    type: compose
+    app_mount: false
+    volumes:
+      fedora4:
+    services:
+      image: samvera/fcrepo4:4.7.5
+      command: /fedora-entrypoint.sh
+      volumes:
+      - fedora4:/data
+      ports:
+      - 8988:8080
+    portforward: true
+  valkyrie_fedora_5:
+    type: compose
+    app_mount: false
+    volumes:
+      fedora5:
+    services:
+      image: samvera/fcrepo4:5.1.0
+      command: /fedora-entrypoint.sh
+      volumes:
+      - fedora5:/data
+      ports:
+      - 8998:8080
+    portforward: true

data/.rubocop.yml

@@ -4,7 +4,6 @@ inherit_gem:
   bixby: bixby_default.yml
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: 2.3
   Exclude:
     - 'bin/*'
     - 'db/schema.rb'
@@ -26,6 +25,10 @@ RSpec/MultipleExpectations:
   Enabled: false
 Rails/TimeZone:
   Enabled: false
+Rails/RakeEnvironment:
+  Enabled: false
+Rails/ApplicationRecord:
+  Enabled: false
 Naming/PredicateName:
   Exclude:
     - "lib/valkyrie/resource.rb"

data/.tool-versions

@@ -1 +1 @@
-ruby 2.5.1
+ruby 2.6.6

data/CHANGELOG.md

@@ -1,3 +1,29 @@
+# v2.1.2 2020-03-12
+
+## Changes since last release
+
+* Tighten reform dependency
+  [tpendragon](https://github.com/tpendragon)
+* Loosen RDF Dependency
+  [no-reply](https://github.com/no-reply)
+* Update development ruby version in .tool-versions
+  [hackartisan](https://github.com/hackartisan)
+* Use Lando for development
+  [tpendragon](https://github.com/tpendragon)
+* Deprecate Blacklist in favor of Denylist.
+  [jeremyf](https://github.com/jeremyf)
+* Make DateTime handling in Fedora/Solr persisters consistent with others.
+  [hcayless](https://github.com/hcayless)
+* Add open-ended Rake support.
+  [no-reply](https://github.com/no-reply)
+
+Additional thanks to the following for code review and issue reports leading to
+this release:
+
+[cjcolvar](https://github.com/cjcolvar)
+[escowles](https://github.com/escowles)
+[jeremyf](https://github.com/jeremyf)
+
 # v2.1.1 2020-03-12
 
 ## Changes since last release

data/README.md

@@ -252,53 +252,25 @@ config.  If Fedora requires auth, you can also include that in the URL, e.g.:
 
 ## Installing a Development environment
 
-### With Docker
-The development and test stacks use fully contained virtual volumes and bind all services to different ports,
-so they can be running at the same time without issue.
-
-#### External Requirements
-* [Docker](https://store.docker.com/search?offering=community&type=edition) version >= 17.09.0
-
-### Dependency Setup (Mac OSX)
-1. `brew install docker`
-1. `brew install docker-machine`
-1. `brew install docker-compose`
-
-### Starting Docker (Mac OSX)
-1. `docker-machine create default`
-1. `docker-machine start default`
-1. `eval "$(docker-machine env)"`
-
-#### Starting the development mode dependencies
-1. Start Solr, Fedora, and PostgreSQL with `rake docker:dev:daemon` (or `rake docker:dev:up` in a separate
-   shell to run them in the foreground)
-1. Run `rake db:create db:migrate` to initialize the database
-1. Develop!
-1. Run `rake docker:dev:down` to stop the server stack
-   * Development servers maintain data between runs. To clean them out, run `rake docker:dev:clean`
-
-#### To run the test suite with all dependencies in one go
-1. `rake docker:spec`
-
-#### To run the test suite manually
-1. Start Solr, Fedora, and PostgreSQL with `rake docker:test:daemon` (or `rake docker:test:up` in a separate
-   shell to run them in the foreground)
-1. Run `rake db:create db:migrate` to initialize the database
-1. Run the gem's RSpec test suite with `rspec spec` or `rake`
-1. Run `rake docker:test:down` to stop the server stack
-   * The test stack cleans up after itself on exit.
-
-### Without Docker
-
-#### External Requirements
-* PostgreSQL with the uuid-ossp extension.
-  * Note: Enabling uuid-ossp requires database superuser privileges.
-    * From `psql`: `alter user [username] with superuser;`
-
-#### To run the test suite
-1. Start Solr and Fedora servers for testing with `rake server:test`
-1. Run `rake db:create` (First time only)
-1. Run `rake db:migrate`
+For ease of development we use Lando to abstract away some complications of
+using Docker containers for development.
+
+### Running Tests
+
+1. Install the latest released > 3.0 version of Lando from [here](https://github.com/lando/lando/releases).
+2. `bundle install`
+3. `bundle exec rake server:start`
+4. `bundle exec rspec spec`
+
+### Cleaning Data
+
+1. `bundle exec rake server:clean`
+
+### Stopping Servers
+
+1. `bundle exec rake server:stop`
+
+You can also run `lando poweroff` from anywhere.
 
 ## Acknowledgments
 

data/Rakefile

@@ -6,7 +6,6 @@ require 'config/database_connection'
 require 'active_record'
 require 'rubocop/rake_task'
 load 'tasks/dev.rake'
-load 'tasks/docker.rake'
 
 RSpec::Core::RakeTask.new(:spec)
 
@@ -37,8 +36,12 @@ namespace :db do
 
   desc 'Create the database from db/config.yml for the current DATABASE_ENV'
   task create: :configure_connection do
-    database = ActiveRecord::Tasks::PostgreSQLDatabaseTasks.new(@config)
-    database.create
+    begin
+      database = ActiveRecord::Tasks::PostgreSQLDatabaseTasks.new(@config)
+      database.create
+    rescue
+      puts "Database already exists."
+    end
     puts "Database created"
   end
 
@@ -51,25 +54,23 @@ namespace :db do
 
   desc 'Migrate the database (options: VERSION=x, VERBOSE=false).'
   task migrate: :configure_connection do
-    begin
-      verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
-      version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
-      scope   = ENV['SCOPE']
-      verbose_was = ActiveRecord::Migration.verbose
-      ActiveRecord::Migration.verbose = verbose
-      if ActiveRecord::Migrator.respond_to?(:migrate)
-        ActiveRecord::Migrator.migrate(MIGRATIONS_DIR, version) do |migration|
-          scope.blank? || scope == migration.scope
-        end
-      else
-        ActiveRecord::Base.connection.migration_context.migrate(version) do |migration|
-          scope.blank? || scope == migration.scope
-        end
+    verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
+    version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
+    scope   = ENV['SCOPE']
+    verbose_was = ActiveRecord::Migration.verbose
+    ActiveRecord::Migration.verbose = verbose
+    if ActiveRecord::Migrator.respond_to?(:migrate)
+      ActiveRecord::Migrator.migrate(MIGRATIONS_DIR, version) do |migration|
+        scope.blank? || scope == migration.scope
+      end
+    else
+      ActiveRecord::Base.connection.migration_context.migrate(version) do |migration|
+        scope.blank? || scope == migration.scope
       end
-      ActiveRecord::Base.clear_cache!
-    ensure
-      ActiveRecord::Migration.verbose = verbose_was
     end
+    ActiveRecord::Base.clear_cache!
+  ensure
+    ActiveRecord::Migration.verbose = verbose_was
   end
 
   namespace :schema do

data/db/config.yml

@@ -1,4 +1,3 @@
-<% local = File.exist?('/tmp/.s.PGSQL.5432') && File.stat('/tmp/.s.PGSQL.5432').socket? %>
 default: &default
   adapter: postgresql
   encoding: utf8
@@ -6,22 +5,16 @@ default: &default
   pool: <%= Integer(ENV.fetch("DB_POOL", 5)) %>
   reaping_frequency: <%= Integer(ENV.fetch("DB_REAPING_FREQUENCY", 10)) %>
   timeout: 5000
-  <% unless local %>
   host: localhost
-  username: docker
-  password: d0ck3r
-  <% end %>
+  username: postgres
+  password: 
 
 development:
   <<: *default
   database: Valkyrie_gem_development
-  <% unless local %>
   port: 5433
-  <% end %>
 
 test:
   <<: *default
   database: Valkyrie_gem_test
-  <% unless local %>
-  port: 5434
-  <% end %>
+  port: <%= ENV["POSTGRES_PORT"] || 5433 %>

data/lib/generators/valkyrie/resource_generator.rb

@@ -21,7 +21,7 @@ class Valkyrie::ResourceGenerator < Rails::Generators::NamedBase
 
   private
 
-    def rspec_installed?
-      defined?(RSpec) && defined?(RSpec::Rails)
-    end
+  def rspec_installed?
+    defined?(RSpec) && defined?(RSpec::Rails)
+  end
 end

data/lib/valkyrie.rb

@@ -119,19 +119,19 @@ module Valkyrie
 
     private
 
-      def defaults
-        {
-          resource_class_resolver: method(:default_resource_class_resolver)
-        }
-      end
-
-      # String constantize is a "by convention" factory. This works, but assumes
-      # the ruby class once used to persist is the model used to now reify.
-      #
-      # @param [String] class_name
-      def default_resource_class_resolver(class_name)
-        class_name.constantize
-      end
+    def defaults
+      {
+        resource_class_resolver: method(:default_resource_class_resolver)
+      }
+    end
+
+    # String constantize is a "by convention" factory. This works, but assumes
+    # the ruby class once used to persist is the model used to now reify.
+    #
+    # @param [String] class_name
+    def default_resource_class_resolver(class_name)
+      class_name.constantize
+    end
   end
 
   module_function :config, :logger, :logger=, :config_root_path, :environment, :config_file, :config_hash

data/lib/valkyrie/change_set.rb

@@ -104,8 +104,8 @@ module Valkyrie
 
     private
 
-      def field(field_name)
-        self.class.definitions.fetch(field_name.to_s)
-      end
+    def field(field_name)
+      self.class.definitions.fetch(field_name.to_s)
+    end
   end
 end

data/lib/valkyrie/id.rb

@@ -32,22 +32,22 @@ module Valkyrie
 
     protected
 
-      def default_equality(other)
-        output = (other.class == self.class && other.state == state)
-        return output if output == true
-        if output == false && string_equality(other) && Valkyrie.config.id_string_equality.nil?
-          warn "[DEPRECATION] Valkyrie::IDs will always be equal to their string counterparts in 3.0.0. " \
-            "To silence this message, please either compare IDs or set Valkyrie.config.id_string_equality = true."
-        end
-        false
+    def default_equality(other)
+      output = (other.class == self.class && other.state == state)
+      return output if output == true
+      if output == false && string_equality(other) && Valkyrie.config.id_string_equality.nil?
+        warn "[DEPRECATION] Valkyrie::IDs will always be equal to their string counterparts in 3.0.0. " \
+          "To silence this message, please either compare IDs or set Valkyrie.config.id_string_equality = true."
       end
+      false
+    end
 
-      def string_equality(other)
-        other == to_str
-      end
+    def string_equality(other)
+      other == to_str
+    end
 
-      def state
-        [@id]
-      end
+    def state
+      [@id]
+    end
   end
 end