valkyrie 2.0.0.RC9 → 2.0.0.RC10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c96ae6a548480b0e75af468816f1a7fc968d79c6572c738f5d06de3ce6a06d2
-  data.tar.gz: f539f0893d3c0f5d86f75b7f8b53b593c5d8de184f6e41ba18da0320fa31c0dc
+  metadata.gz: 5dcf6397bc2f0966a08294cc83ae1eb2db2f2edf20cb1a2ad84f8ef18fd30174
+  data.tar.gz: 47dd8114e5c60f9fa46c0f2540c89034ea36a902725788f2b9d9fecf19c08c98
 SHA512:
-  metadata.gz: 44123f8e88d3a1e6336cd942235cf27231684c1f5970323818fa8a66141138555c3adf9c5587879212664a3dc7cc5c75dc3d4be4c745df236b02e1857cc1a26c
-  data.tar.gz: d417d2506a62da8364e24d94ecb398137a7f6e1e534eb57f447bed8886c8b5119eea08f6aebebd2df2ca1b48aca968d469b4c3b146239b5b40bfc173be2db27f
+  metadata.gz: 1f86188cce9d5800144be914d41fb179abf32409266736e5bf28a13ea3f877ddf38aa1d0d76952d0206a185c1e1f818ffb1d583a344ac8385d6b043938bb8de9
+  data.tar.gz: e08d62b44d62f3981bc51b7b0cb33ab3f4139f409b1ab4f4dd9dccff5e098923bee6e7a5c5a95241ae6f9b1a3ed12c89bb9a0fadf8077ad94661feac8d24e0e0

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

@@ -4,14 +4,17 @@ RSpec.shared_examples 'a Valkyrie::Resource' do
     raise 'resource_klass must be set with `let(:resource_klass)`' unless
       defined? resource_klass
   end
+  let(:meta_klass) do
+    Class.new(resource_klass)
+  end
   describe "#id" do
     it "can be set via instantiation and casts to a Valkyrie::ID" do
-      resource = resource_klass.new(id: "test")
+      resource = meta_klass.new(id: "test")
       expect(resource.id).to eq Valkyrie::ID.new("test")
     end
 
     it "is nil when not set" do
-      resource = resource_klass.new
+      resource = meta_klass.new
       expect(resource.id).to be_nil
     end
 
@@ -23,21 +26,21 @@ RSpec.shared_examples 'a Valkyrie::Resource' do
 
     describe "#has_attribute?" do
       it "returns true when it has a given attribute" do
-        resource = resource_klass.new
+        resource = meta_klass.new
         expect(resource.has_attribute?(:id)).to eq true
       end
     end
 
     describe "#fields" do
       it "returns a set of fields" do
-        expect(resource_klass).to respond_to(:fields).with(0).arguments
-        expect(resource_klass.fields).to include(:id)
+        expect(meta_klass).to respond_to(:fields).with(0).arguments
+        expect(meta_klass.fields).to include(:id)
       end
     end
 
     describe "#attributes" do
       it "returns a list of all set attributes" do
-        resource = resource_klass.new(id: "test")
+        resource = meta_klass.new(id: "test")
         expect(resource.attributes[:id].to_s).to eq "test"
       end
     end
@@ -45,8 +48,8 @@ RSpec.shared_examples 'a Valkyrie::Resource' do
 
   describe "#internal_resource" do
     it "is set to the resource's class on instantiation" do
-      resource = resource_klass.new
-      expect(resource.internal_resource).to eq resource_klass.to_s
+      resource = meta_klass.new
+      expect(resource.internal_resource).to eq meta_klass.to_s
     end
   end
 
@@ -70,97 +73,98 @@ RSpec.shared_examples 'a Valkyrie::Resource' do
 
   describe "#[]" do
     it "allows access to properties which are set" do
-      resource_klass.attribute :my_property unless resource_klass.schema.key?(:my_property)
-      resource = resource_klass.new
+      meta_klass.attribute :my_property unless meta_klass.schema.key?(:my_property)
+      resource = meta_klass.new
 
       resource.my_property = "test"
 
       expect(resource[:my_property]).to eq ["test"]
 
-      unset_key(resource_klass, :my_property)
+      unset_key(meta_klass, :my_property)
     end
     it "returns nil for non-existent properties" do
-      resource = resource_klass.new
+      resource = meta_klass.new
 
       expect(resource[:bad_property]).to eq nil
     end
     it "can be accessed via a string" do
-      resource_klass.attribute :other_property unless resource_klass.schema.key?(:other_property)
-      resource = resource_klass.new
+      meta_klass.attribute :other_property unless meta_klass.schema.key?(:other_property)
+      resource = meta_klass.new
 
       resource.other_property = "test"
 
       expect(resource["other_property"]).to eq ["test"]
 
-      unset_key(resource_klass, :other_property)
+      unset_key(meta_klass, :other_property)
     end
   end
 
-  def unset_key(resource_klass, property)
-    resource_klass.schema(Dry::Types::Schema.new(Hash, **resource_klass.schema.options, keys: resource_klass.schema.keys.select { |x| x.name != property }, meta: resource_klass.schema.meta))
-    resource_klass.instance_variable_set(:@attribute_names, nil)
-    resource_klass.allow_nonexistent_keys
+  def unset_key(meta_klass, property)
+    meta_klass.schema(Dry::Types::Schema.new(Hash, **meta_klass.schema.options, keys: meta_klass.schema.keys.select { |x| x.name != property }, meta: meta_klass.schema.meta))
+    meta_klass.instance_variable_set(:@attribute_names, nil)
+    meta_klass.allow_nonexistent_keys
   end
 
   describe "#set_value" do
     it "can set a value" do
-      resource_klass.attribute :set_value_property unless resource_klass.schema.key?(:set_value_property)
-      resource = resource_klass.new
+      meta_klass.attribute :set_value_property unless meta_klass.schema.key?(:set_value_property)
+      resource = meta_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"]
-      unset_key(resource_klass, :set_value_property)
+      unset_key(meta_klass, :set_value_property)
     end
   end
 
   describe ".new" do
     it "can set values with symbols" do
-      resource_klass.attribute :symbol_property unless resource_klass.schema.key?(:symbol_property)
+      meta_klass.attribute :symbol_property unless meta_klass.schema.key?(:symbol_property)
 
-      resource = resource_klass.new(symbol_property: "bla")
+      resource = meta_klass.new(symbol_property: "bla")
 
       expect(resource.symbol_property).to eq ["bla"]
-      unset_key(resource_klass, :symbol_property)
+      unset_key(meta_klass, :symbol_property)
     end
     it "can not set values with string properties" do
-      resource_klass.attribute :string_property unless resource_klass.schema.key?(:string_property)
+      meta_klass.attribute :string_property unless meta_klass.schema.key?(:string_property)
 
       resource = nil
       expect(resource).not_to respond_to :string_property
-      unset_key(resource_klass, :string_property)
+      unset_key(meta_klass, :string_property)
     end
   end
 
   describe "#attributes" do
     it "returns all defined attributs, including nil keys" do
-      resource_klass.attribute :bla unless resource_klass.schema.key?(:bla)
+      meta_klass.attribute :bla unless meta_klass.schema.key?(:bla)
 
-      resource = resource_klass.new
+      resource = meta_klass.new
 
       expect(resource.attributes).to be_frozen
       expect(resource.attributes).to have_key(:bla)
-      expect(resource.attributes[:internal_resource]).to eq resource_klass.to_s
+      expect(resource.attributes[:internal_resource]).to eq meta_klass.to_s
       expect { resource.attributes.dup[:internal_resource] = "bla" }.not_to output.to_stderr
 
-      unset_key(resource_klass, :bla)
-      resource = resource_klass.new
+      unset_key(meta_klass, :bla)
+      resource = meta_klass.new
       expect(resource.attributes).not_to have_key(:bla)
+      expect(resource.as_json).not_to have_key(:bla)
     end
   end
 
   describe "#__attributes__" do
     it "returns all defined attributes, but doesn't add nil keys" do
-      resource_klass.attribute :bla unless resource_klass.schema.key?(:bla)
+      meta_klass.attribute :bla unless meta_klass.schema.key?(:bla)
 
-      resource = resource_klass.new
+      resource = meta_klass.new
       expect(resource.__attributes__).to be_frozen
       expect(resource.__attributes__).not_to have_key :bla
       expect(resource.__attributes__).to have_key :internal_resource
 
-      unset_key(resource_klass, :bla)
+      unset_key(meta_klass, :bla)
     end
   end
 end

data/lib/valkyrie/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Valkyrie
-  VERSION = "2.0.0.RC9"
+  VERSION = "2.0.0.RC10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valkyrie
 version: !ruby/object:Gem::Version
-  version: 2.0.0.RC9
+  version: 2.0.0.RC10
 platform: ruby
 authors:
 - Trey Pendragon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-30 00:00:00.000000000 Z
+date: 2019-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct