valkyrie 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: f665fe8da6906565cf3773a62c028e0528d62074c50fd109bbd6dd438196f4fb
-  data.tar.gz: f0db72ec609cfa390a1cdaef4e03d8dd0834c25e51cbac8845a061dda7458281
+SHA1:
+  metadata.gz: 548ddef374169cdcc984f7990ec0fb0d8b89502a
+  data.tar.gz: 2ca99fe44d1cc2733eecb1b55c7f2ef100bcbe03
 SHA512:
-  metadata.gz: 797105358eece5769534d6c62cfd6599d1d3ceeb66e36b0a9ded3750f266fae69d57ec0e8929cc33b579066e7ecad862a249510c1fac551093723cfdbe66a711
-  data.tar.gz: 96ac6d47efa9dc4d00235ac4e0ffb00a63141f13ab89bc622bc0a7bd6161200df7622e6e03419840b3ae003a3f53b045ca8e33737c72ddd00e419e66927aafc0
+  metadata.gz: bce389d966f1728e132f9167e871e44e1a9f2ad595e309a4c995be1eecc58e9fde87235d909823b0be65a6af46d682f8758ad2553c5e39d34cd3dd8da17a5a00
+  data.tar.gz: 6cfdfffce9c65714d45489a7b1aa63c8062c96d24ca45b28036278ddb24b69dd96ce7497e0f03e058eee5e446e1d12b88f10cf081c27bb592c5f76cf4ef4e8e8

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

@@ -44,25 +44,3 @@ services:
       interval: 30s
       timeout: 5s
       retries: 3
-  solr_index:
-    image: solr:7.2-alpine
-    ports:
-    - 8987:8983
-    volumes:
-    - solr_index:/opt/solr/server/solr/mycores
-    - "../../solr:/solr_config"
-    entrypoint:
-    - docker-entrypoint.sh
-    - solr-precreate
-    - hydra-dev
-    - "/solr_config/config"
-    healthcheck:
-      test:
-      - CMD
-      - wget
-      - "-O"
-      - "/dev/null"
-      - http://localhost:8983/solr/
-      interval: 30s
-      timeout: 5s
-      retries: 3

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

@@ -44,25 +44,3 @@ services:
       interval: 30s
       timeout: 5s
       retries: 3
-  solr_index:
-    image: solr:7.2-alpine
-    ports:
-    - 8985:8983
-    volumes:
-    - solr_index:/opt/solr/server/solr/mycores
-    - "../../solr:/solr_config"
-    entrypoint:
-    - docker-entrypoint.sh
-    - solr-precreate
-    - hydra-test
-    - "/solr_config/config"
-    healthcheck:
-      test:
-      - CMD
-      - wget
-      - "-O"
-      - "/dev/null"
-      - http://localhost:8983/solr/
-      interval: 30s
-      timeout: 5s
-      retries: 3

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# v1.3.0 2018-12-03
+
+## Changes since last release
+
+* Add deprecations for known methods changing in 2.0
+* Add `set_value` method.
+
 # v1.2.2 2018-10-05
 
 ## Changes since last release

data/README.md

@@ -2,6 +2,8 @@
 
 Valkyrie is a gem for enabling multiple backends for storage of files and metadata in Samvera.
 
+![Valkyrie Logo](valkyrie_logo.png)
+
 [![CircleCI](https://circleci.com/gh/samvera-labs/valkyrie.svg?style=svg)](https://circleci.com/gh/samvera-labs/valkyrie)
 [![Coverage Status](https://coveralls.io/repos/github/samvera-labs/valkyrie/badge.svg?branch=master)](https://coveralls.io/github/samvera-labs/valkyrie?branch=master)
 [![Stories in Ready](https://badge.waffle.io/samvera-labs/valkyrie.png?label=ready&title=Ready)](https://waffle.io/samvera-labs/valkyrie)

data/lib/valkyrie/persistence/fedora/persister/model_converter.rb

@@ -296,7 +296,7 @@ module Valkyrie::Persistence::Fedora
         # @param [Object] value
         # @return [Boolean]
         def self.handles?(value)
-          value.is_a?(Property) && value.value.is_a?(Hash) && value.value[:internal_resource]
+          value.is_a?(Property) && (value.value.is_a?(Hash) || value.value.is_a?(Valkyrie::Resource)) && value.value[:internal_resource]
         end
 
         # Generate a new parent graph containing the child graph generated from the ModelConverter::Property objects

data/lib/valkyrie/persistence/fedora/persister.rb

@@ -165,7 +165,7 @@ module Valkyrie::Persistence::Fedora
       # @return [Valkyrie::Persistence::OptimisticLockToken]
       def native_lock_token(resource)
         return unless resource.optimistic_locking_enabled?
-        resource[Valkyrie::Persistence::Attributes::OPTIMISTIC_LOCK].find { |lock_token| lock_token.adapter_id == "native-#{adapter.id}" }
+        resource[Valkyrie::Persistence::Attributes::OPTIMISTIC_LOCK].find { |lock_token| lock_token.adapter_id.to_s == "native-#{adapter.id}" }
       end
 
       # Set Fedora request headers:

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

@@ -36,7 +36,7 @@ module Valkyrie::Persistence::Memory
     def find_by_alternate_identifier(alternate_identifier:)
       alternate_identifier = Valkyrie::ID.new(alternate_identifier.to_s) if alternate_identifier.is_a?(String)
       validate_id(alternate_identifier)
-      cache.select { |_key, resource| resource['alternate_ids'].include?(alternate_identifier) }.values.first || raise(::Valkyrie::Persistence::ObjectNotFoundError)
+      cache.select { |_key, resource| resource[:alternate_ids].include?(alternate_identifier) }.values.first || raise(::Valkyrie::Persistence::ObjectNotFoundError)
     end
 
     # Get a batch of resources by ID.
@@ -113,11 +113,7 @@ module Valkyrie::Persistence::Memory
     def find_inverse_references_by(resource:, property:)
       ensure_persisted(resource)
       find_all.select do |obj|
-        begin
-          Array.wrap(obj[property]).include?(resource.id)
-        rescue
-          false
-        end
+        Array.wrap(obj[property]).include?(resource.id)
       end
     end
 

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

@@ -222,7 +222,7 @@ module Valkyrie::Persistence::Solr
         # @param [Object] value
         # @return [Boolean]
         def self.handles?(value)
-          value.value.is_a?(Hash)
+          value.value.is_a?(Hash) || value.value.is_a?(Valkyrie::Resource)
         end
 
         # Constructs a SolrRow object for a Property with a Hash value

data/lib/valkyrie/resource.rb

@@ -34,6 +34,17 @@ module Valkyrie
       schema.keys.without(:new_record)
     end
 
+    def self.new(attributes = default_attributes)
+      if attributes.is_a?(Hash) && attributes.keys.map(&:class).uniq.include?(String)
+        warn "[DEPRECATION] Instantiating a Valkyrie::Resource with strings as keys has " \
+             "been deprecated and will be removed in the next major release. " \
+             "Please use symbols instead." \
+             "Called from #{Gem.location_of_caller.join(':')}"
+        attributes = attributes.symbolize_keys
+      end
+      super
+    end
+
     # Define an attribute. Attributes are used to describe resources.
     # @param name [Symbol]
     # @param type [Dry::Types::Type]
@@ -86,9 +97,55 @@ module Valkyrie
       self.class.optimistic_locking_enabled?
     end
 
+    class DeprecatedHashWrite < Hash
+      def []=(_k, _v)
+        if @soft_frozen
+          warn "[DEPRECATION] Writing directly to attributes has been deprecated." \
+            " Please use #set_value(k, v) instead or #dup first." \
+            " In the next major version, this hash will be frozen. \n" \
+            "Called from #{Gem.location_of_caller.join(':')}"
+        end
+        super
+      end
+
+      def delete(*_args)
+        if @soft_frozen
+          warn "[DEPRECATION] Writing directly to attributes has been deprecated." \
+            " Please use #set_value(k, v) instead or #dup first." \
+            " In the next major version, this hash will be frozen. \n" \
+            "Called from #{Gem.location_of_caller.join(':')}"
+        end
+        super
+      end
+
+      def delete_if(*_args)
+        if @soft_frozen
+          warn "[DEPRECATION] Writing directly to attributes has been deprecated." \
+            " Please use #set_value(k, v) instead or #dup first." \
+            " In the next major version, this hash will be frozen. \n" \
+            "Called from #{Gem.location_of_caller.join(':')}"
+        end
+        super
+      end
+
+      def soft_freeze!
+        @soft_frozen = true
+        self
+      end
+
+      def soft_thaw!
+        @soft_frozen = false
+        self
+      end
+
+      def dup
+        super.soft_thaw!
+      end
+    end
+
     # @return [Hash] Hash of attributes
     def attributes
-      to_h
+      DeprecatedHashWrite.new.merge(to_h).soft_freeze!
     end
 
     # @param name [Symbol] Attribute name
@@ -106,7 +163,7 @@ module Valkyrie
 
     # @return [Boolean]
     def persisted?
-      @new_record == false
+      new_record == false
     end
 
     def to_key
@@ -133,5 +190,22 @@ module Valkyrie
     def human_readable_type
       self.class.human_readable_type
     end
+
+    ##
+    # Return an attribute's value.
+    # @param name [#to_sym] the name of the attribute to read
+    def [](name)
+      super(name.to_sym)
+    rescue NoMethodError
+      nil
+    end
+
+    ##
+    # Set an attribute's value.
+    # @param key [#to_sym] the name of the attribute to set
+    # @param value [] the value to set key to.
+    def set_value(key, value)
+      instance_variable_set(:"@#{key}", self.class.schema[key.to_sym].call(value))
+    end
   end
 end

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

@@ -9,4 +9,9 @@ RSpec.shared_examples 'a Valkyrie::StorageAdapter::File' do
   it { is_expected.to respond_to(:read) }
   it { is_expected.to respond_to(:rewind) }
   it { is_expected.to respond_to(:id) }
+  describe "#disk_path" do
+    it "returns an existing disk path" do
+      expect(File.exist?(file.disk_path)).to eq true
+    end
+  end
 end

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

@@ -67,4 +67,81 @@ RSpec.shared_examples 'a Valkyrie::Resource' do
       expect(my_custom_resource.human_readable_type).to eq "My Custom Resource"
     end
   end
+
+  describe "#[]" do
+    it "allows access to properties which are set" do
+      resource_klass.attribute :my_property
+      resource = resource_klass.new
+
+      resource.my_property = "test"
+
+      expect(resource[:my_property]).to eq ["test"]
+      resource_klass.schema.delete(:my_property)
+    end
+    it "returns nil for non-existent properties" do
+      resource = resource_klass.new
+
+      expect(resource[:bad_property]).to eq nil
+    end
+    it "can be accessed via a string" do
+      resource_klass.attribute :other_property
+      resource = resource_klass.new
+
+      resource.other_property = "test"
+
+      expect(resource["other_property"]).to eq ["test"]
+      resource_klass.schema.delete(:other_property)
+    end
+  end
+
+  describe "#set_value" do
+    it "can set a value" do
+      resource_klass.attribute :set_value_property
+      resource = resource_klass.new
+
+      resource.set_value(:set_value_property, "test")
+
+      expect(resource.set_value_property).to eq ["test"]
+      resource.set_value("set_value_property", "testing")
+      expect(resource.set_value_property).to eq ["testing"]
+      resource_klass.schema.delete(:set_value_property)
+    end
+  end
+
+  describe ".new" do
+    it "can set values with symbols" do
+      resource_klass.attribute :symbol_property
+
+      resource = resource_klass.new(symbol_property: "bla")
+
+      expect(resource.symbol_property).to eq ["bla"]
+      resource_klass.schema.delete(:symbol_property)
+    end
+    it "can set values with string properties, but will throw a deprecation error" do
+      resource_klass.attribute :string_property
+
+      resource = nil
+      expect { resource = resource_klass.new("string_property" => "bla") }.to output(/\[DEPRECATION\]/).to_stderr
+
+      expect(resource.string_property).to eq ["bla"]
+      resource_klass.schema.delete(:string_property)
+    end
+  end
+
+  describe "#attributes" do
+    it "returns all defined attributs, including nil keys" do
+      resource_klass.attribute :bla
+
+      resource = resource_klass.new
+
+      expect(resource.attributes).to have_key(:bla)
+      expect(resource.attributes[:internal_resource]).to eq resource_klass.to_s
+      expect { resource.attributes[:internal_resource] = "bla" }.to output(/\[DEPRECATION\]/).to_stderr
+      expect { resource.attributes.delete_if { true } }.to output(/\[DEPRECATION\]/).to_stderr
+      expect { resource.attributes.delete(:internal_resource) }.to output(/\[DEPRECATION\]/).to_stderr
+      expect { resource.attributes.dup[:internal_resource] = "bla" }.not_to output.to_stderr
+
+      resource_klass.schema.delete(:bla)
+    end
+  end
 end

data/lib/valkyrie/types.rb

@@ -98,5 +98,21 @@ module Valkyrie
     SingleValuedString = Valkyrie::Types::String.constructor do |value|
       ::Array.wrap(value).first.to_s
     end
+    Valkyrie::Types::Integer = Dry::Types["int"]
+    Valkyrie::Types::Coercible::Integer = Dry::Types["coercible.int"]
+    Int = Dry::Types["int"].constructor do |value|
+      warn "[DEPRECATION] Valkyrie::Types::Int has been renamed in dry-types and this " \
+           "reference will be removed in the next major version of Valkyrie. Please use " \
+           "Valkyrie::Types::Integer instead. " \
+           "Called from #{Gem.location_of_caller.join(':')}"
+      Dry::Types["int"][value]
+    end
+    Coercible::Int = Dry::Types["coercible.int"].constructor do |value|
+      warn "[DEPRECATION] Valkyrie::Types::Coercible::Int has been renamed in dry-types and this " \
+           "reference will be removed in the next major version of Valkyrie. Please use " \
+           "Valkyrie::Types::Coercible::Integer instead. " \
+           "Called from #{Gem.location_of_caller.join(':')}"
+      Dry::Types["coercible.int"][value]
+    end
   end
 end

data/lib/valkyrie/version.rb

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

data/tasks/dev.rake

@@ -7,14 +7,10 @@ namespace :server do
     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
-        SolrWrapper.wrap(shared_solr_opts.merge(port: 8985, instance_dir: 'tmp/hydra-test')) do |solr2|
-          solr2.with_collection(name: "hydra-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")) do |_fcrepo|
-              puts "Setup two solr servers & Fedora"
-              loop do
-                sleep(1)
-              end
-            end
+        FcrepoWrapper.wrap(shared_fedora_opts.merge(port: 8988, fcrepo_home_dir: "tmp/fcrepo4-test-data")) do |_fcrepo|
+          puts "Setup solr & fedora."
+          loop do
+            sleep(1)
           end
         end
       end
@@ -26,7 +22,6 @@ namespace :server do
     require 'solr_wrapper'
     require 'fcrepo_wrapper'
     SolrWrapper.instance(shared_solr_opts.merge(port: 8984, instance_dir: 'tmp/blacklight-core-test')).remove_instance_dir!
-    SolrWrapper.instance(shared_solr_opts.merge(port: 8985, instance_dir: 'tmp/hydra-test')).remove_instance_dir!
     FcrepoWrapper.default_instance(shared_fedora_opts.merge(port: 8988, fcrepo_home_dir: "tmp/fcrepo4-test-data")).remove_instance_dir!
     puts "Cleaned up test solr & fedora servers."
   end
@@ -38,14 +33,10 @@ namespace :server do
 
     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
-        SolrWrapper.wrap(shared_solr_opts.merge(port: 8987, instance_dir: 'tmp/hydra-dev')) do |solr2|
-          solr2.with_collection(name: "hydra-dev", dir: Pathname.new(__dir__).join("..", "solr", "config").to_s) do
-            FcrepoWrapper.wrap(shared_fedora_opts.merge(port: 8986, fcrepo_home_dir: "fcrepo4-dev-data")) do |_fcrepo|
-              puts "Setup two solr servers & Fedora"
-              loop do
-                sleep(1)
-              end
-            end
+        FcrepoWrapper.wrap(shared_fedora_opts.merge(port: 8986, fcrepo_home_dir: "fcrepo4-dev-data")) do |_fcrepo|
+          puts "Setup Solr & Fedora"
+          loop do
+            sleep(1)
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valkyrie
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Trey Pendragon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-05 00:00:00.000000000 Z
+date: 2018-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -570,6 +570,7 @@ files:
 - tasks/dev.rake
 - tasks/docker.rake
 - valkyrie.gemspec
+- valkyrie_logo.png
 homepage: 
 licenses: []
 metadata: {}
@@ -589,7 +590,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: An ORM using the Data Mapper pattern, specifically built to solve Digital