valkyrie_active_fedora 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54848b48285fd7c6f58904ef9fc15f0212d821cd60a4a8ef8bea8ff4fe59f033
-  data.tar.gz: c9fe09360d043b77bdc4ff1adaca5b5067977fa94506dec478cdc8e07b6412b8
+  metadata.gz: 885464a34b9b81470d0c6034123acda3e27a4e5e32ba37f2208b46cef831fa4b
+  data.tar.gz: d8b18e50e14aba21712e0723fd7421c0f5a68919ad5af0ec1a5c8f75fba96123
 SHA512:
-  metadata.gz: 2a538ce35a5654b121ac922b661c92de1e46a458aad672557742c4a63f4a51d7a08a25eba5a84536c40696a18bd34f061c5259194c47193b2cf5ccc821796b1d
-  data.tar.gz: 78aaeb00c90dd158b9da980320eb46fa22e4a39dd5b06514c700a7bdb2f2880251c3fe4da71489fc7434b80750c002b7fede92a8ddb6610c1f3397012145bef2
+  metadata.gz: 876b6f2e261d12c5168f215050f7db0b4f56ec602b42ff850acd1a229b4ea0a1a955c9df5145560fa9c026812b7c3f1cea8a1be03c911a863edbeaa7056560c5
+  data.tar.gz: 2894ecd314aad31b25bf63f82ec71ea7f972c3173c702a50ec8ef1d53aa9e8e012e1666061f8c484d58e0ccbd410677573105a759beb45e2e59581efa66d26aa

data/.rubocop_todo.yml

@@ -18,3 +18,13 @@ Style/PercentLiteralDelimiters:
 # URISchemes: http, https
 Metrics/LineLength:
   Max: 82
+
+RSpec/ExampleLength:
+  Max: 9
+  Exclude:
+    - 'spec/**_spec.rb'
+
+## DO NOT MERGE THIS UNCOMMENTED!  To allow byebug when debugging, uncomment the following.
+#Lint/Debugger:
+#  Exclude:
+#    - '**/*'

data/lib/valkyrie_active_fedora/rake_support.rb

@@ -10,8 +10,8 @@ def with_server(environment)
   ENV["#{environment}_SERVER_STARTED"] = 'true'
 
   # setting port: nil assigns a random port.
-  solr_defaults = { port: 8983, verbose: true, managed: true }
-  fcrepo_defaults = { port: 8984, verbose: true, managed: true,
+  solr_defaults = { port: nil, verbose: true, managed: true }
+  fcrepo_defaults = { port: nil, verbose: true, managed: true,
                       enable_jms: false, fcrepo_home_dir: "tmp/fcrepo4-#{environment}-data" }
 
   SolrWrapper.wrap(load_config(:solr, environment, solr_defaults)) do |solr|

data/lib/valkyrie_active_fedora/resource_factory.rb

@@ -39,23 +39,14 @@ module ValkyrieActiveFedora
           active_fedora_local.send(:properties).each_key do |property_name|
             attribute property_name.to_sym, ::Valkyrie::Types::String
           end
+          active_fedora_local.linked_id_keys.each do |linked_property_name|
+            attribute linked_property_name.to_sym, ::Valkyrie::Types::Set.of(::Valkyrie::Types::ID)
+          end
         end
       end
 
-      klass.new(id: active_fedora_object.id, **active_fedora_object.attributes.symbolize_keys)
+      klass.new(id: active_fedora_object.id, **active_fedora_object.attributes_including_linked_ids.symbolize_keys)
     end
-
-    # private
-    #
-    #   def attributes_including_linked_ids
-    #     local_attributes = attributes.dup
-    #     reflections.keys.each do |key|
-    #       id_method = "#{key.to_s.singularize}_ids"
-    #       next unless self.respond_to? id_method
-    #       local_attributes.merge!(id_method => self.send(id_method)).with_indifferent_access
-    #     end
-    #     local_attributes
-    #   end
   end
   # rubocop:enable Style/ClassVars
 end

data/lib/valkyrie_active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ValkyrieActiveFedora
-  VERSION = '0.0.4'.freeze
+  VERSION = '0.0.5'.freeze
 end

data/spec/unit/resource_factory_spec.rb

@@ -5,27 +5,26 @@ RSpec.describe ValkyrieActiveFedora::ResourceFactory do
   subject(:factory) { described_class.new(active_fedora_object: book) }
 
   class BookWithPages < ValkyrieActiveFedora::Base
-    # has_many :pages
+    has_many :pages
     property :title, predicate: ::RDF::Vocab::DC.title
     property :contributor, predicate: ::RDF::Vocab::DC.contributor
     property :description, predicate: ::RDF::Vocab::DC.description
   end
-  # class Page < ValkyrieActiveFedora::Base
-  #   belongs_to :book_with_pages, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
-  # end
+  class Page < ValkyrieActiveFedora::Base
+    belongs_to :book_with_pages, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
+  end
 
   let(:id)          { 'moomin123' }
   let(:book)        { BookWithPages.new(id: id, **attributes) }
-  # let(:page1)       { Page.new(id: 'pg1') }
-  # let(:page2)       { Page.new(id: 'pg2') }
+  let(:page1)       { Page.new(id: 'pg1') }
+  let(:page2)       { Page.new(id: 'pg2') }
 
   let(:attributes) do
     {
-      title: ['fake title'],
+      title: ['fake title', 'fake title 2'],
       contributor: ['user1'],
-      description: ['a description']
-      # description: ['a description'],
-      # pages: [page1, page2]
+      description: ['a description'],
+      pages: [page1, page2]
     }
   end
 
@@ -57,8 +56,11 @@ RSpec.describe ValkyrieActiveFedora::ResourceFactory do
         .to have_attributes title: book.title,
                             contributor: book.contributor,
                             description: book.description
-      #                      description: book.description,
-      #                      page_ids: [page1.id, page2.id]
+      expect_ids_to_match(factory.build.page_ids, ['pg1', 'pg2'])
     end
   end
+
+  def expect_ids_to_match(valkyrie_ids, expected_ids)
+    expect(valkyrie_ids.map(&:id)).to match_array expected_ids
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: valkyrie_active_fedora
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - E. Lynette Rayle