valkyrie_active_fedora 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb3204d5ea81515a5c5d414acc6b5413dfa2f80f793abab6f05b607771968c24
-  data.tar.gz: 6544d26ef4518f6f9f97282fad146cf6b392257eea6a915f1115fc31184208b5
+  metadata.gz: 5e709de85b0b59a24e41e32aee09d7e9f74bcd2f2659e3d0f65f0df7101e55b9
+  data.tar.gz: 040bf354db71abc71e9642ed0a32706dbc356c1e745c50853920f68459768838
 SHA512:
-  metadata.gz: 8989d36fef448474e3de820eb6bb6aad5f9bada51ccb9663ebc349ae138b05252e4c30da8ed22b7cd56156a1ac8658b79fbe61d4084ec39b699b2182afe275a3
-  data.tar.gz: 1e3da26fff5f7a745b78888dc58a6090a25c2eddbd96c8f2cd0b9257fb3f5edb0241fe2d5362734602adb5eb5311ecf8ea65d956b9bfbd693921034533291d24
+  metadata.gz: acb5eb00f9d1601967c49f883390478d09c57a050b304cee177904d3c821416be8b010fa2aa508e12d7296724db79fc928377cbd9308f2cc63ab8d40ac0a7038
+  data.tar.gz: cd95a1245819eb9d05c624d8568b2d8a3d0dba6c44bc763ddae70be25f5518a56512f87ec6e766f9ac29e8810ff6171df83f73a31f01eb29c1be16c852be34bb

data/.rubocop.yml

@@ -19,8 +19,6 @@ Lint/HandleExceptions:
   Exclude:
     - 'spec/unit/**/*'
     - 'spec/integration/**/*'
-    - 'lib/active_fedora/cleaner.rb'
-    - 'lib/active_fedora/associations/builder/has_subresource.rb'
 
 Lint/AssignmentInCondition:
   Enabled: false
@@ -31,130 +29,9 @@ Metrics/LineLength:
 Metrics/AbcSize:
   Enabled: false
 
-Metrics/BlockNesting:
-  Exclude:
-    - 'lib/active_fedora/autosave_association.rb'
-    - 'lib/active_fedora/associations/has_many_association.rb'
-
-Metrics/CyclomaticComplexity:
-  Exclude:
-    - 'lib/active_fedora.rb'
-    - 'lib/active_fedora/core.rb'
-    - 'lib/active_fedora/reflection.rb'
-    - 'lib/active_fedora/relation/finder_methods.rb'
-    - 'lib/active_fedora/query_result_builder.rb'
-    - 'lib/active_fedora/nested_attributes.rb'
-    - 'lib/active_fedora/autosave_association.rb'
-    - 'lib/active_fedora/associations/has_many_association.rb'
-    - 'lib/active_fedora/associations/has_and_belongs_to_many_association.rb'
-    - 'lib/active_fedora/associations/builder/indirectly_contains.rb'
-    - 'lib/active_fedora/associations/builder/directly_contains_one.rb'
-    - 'lib/active_fedora/file_configurator.rb'
-    - 'lib/active_fedora/file.rb'
-    - 'lib/active_fedora/attribute_methods.rb'
-    - 'lib/active_fedora/scoping/named.rb'
-    - 'lib/active_fedora/indexing/field_mapper.rb'
-    - 'lib/active_fedora/indexing/suffix.rb'
-    - 'lib/active_fedora/inheritance.rb'
-
-Metrics/PerceivedComplexity:
-  Exclude:
-    - 'lib/active_fedora.rb'
-    - 'lib/active_fedora/relation/finder_methods.rb'
-    - 'lib/active_fedora/nested_attributes.rb'
-    - 'lib/active_fedora/file_configurator.rb'
-    - 'lib/active_fedora/autosave_association.rb'
-    - 'lib/active_fedora/associations/has_many_association.rb'
-    - 'lib/active_fedora/associations/has_and_belongs_to_many_association.rb'
-    - 'lib/active_fedora/associations/builder/indirectly_contains.rb'
-    - 'lib/active_fedora/associations/builder/directly_contains_one.rb'
-    - 'lib/active_fedora/associations/collection_association.rb'
-    - 'lib/active_fedora/attribute_methods.rb'
-    - 'lib/active_fedora/scoping/named.rb'
-    - 'lib/active_fedora/indexing/field_mapper.rb'
-    - 'lib/active_fedora/inheritance.rb'
-
-Metrics/ModuleLength:
-  Exclude:
-    - 'lib/active_fedora.rb'
-    - 'lib/active_fedora/relation/finder_methods.rb'
-    - 'lib/active_fedora/persistence.rb'
-    - 'lib/active_fedora/attributes.rb'
-    - 'lib/active_fedora/autosave_association.rb'
-    - 'lib/active_fedora/attached_files.rb'
-    - 'lib/active_fedora/nested_attributes.rb'
-
-Metrics/ClassLength:
-  Exclude:
-    - 'lib/active_fedora/rdf/fcrepo.rb'
-    - 'lib/active_fedora/file_configurator.rb'
-    - 'lib/active_fedora/file.rb'
-    - 'lib/active_fedora/associations/association.rb'
-    - 'lib/active_fedora/associations/builder/association.rb'
-    - 'lib/active_fedora/associations/collection_proxy.rb'
-    - 'lib/active_fedora/associations/collection_association.rb'
-    - 'lib/active_fedora/reflection.rb'
-    - 'lib/active_fedora/orders/ordered_list.rb'
-    - 'lib/active_fedora/solr_service.rb'
-    - 'lib/active_fedora/associations/orders_association.rb'
-
 Metrics/MethodLength:
   Enabled: false
 
-Naming/MethodName:
-  Exclude:
-    - 'lib/active_fedora/with_metadata.rb'
-
-Style/AndOr:
-  Exclude:
-    - 'lib/active_fedora/associations/has_many_association.rb'
-
-Naming/AccessorMethodName:
-  Exclude:
-    - 'lib/active_fedora/with_metadata/metadata_node.rb'
-    - 'lib/active_fedora/fedora_attributes.rb'
-    - 'lib/active_fedora/attribute_methods/dirty.rb'
-    - 'lib/active_fedora/associations/has_many_association.rb'
-    - 'lib/active_fedora/associations/association.rb'
-
-Naming/PredicateName:
-  Exclude:
-    - 'lib/active_fedora/attribute_methods.rb'
-    - 'lib/active_fedora/relation/finder_methods.rb'
-    - 'lib/active_fedora/versionable.rb'
-    - 'lib/active_fedora/reflection.rb'
-    - 'lib/active_fedora/pathing.rb'
-    - 'lib/active_fedora/nested_attributes.rb'
-    - 'lib/active_fedora/clean_connection.rb'
-    - 'lib/active_fedora/attributes.rb'
-    - 'lib/active_fedora/file/attributes.rb'
-    - 'lib/active_fedora/attached_files.rb'
-    - 'lib/active_fedora/associations.rb'
-    - 'lib/active_fedora/association_hash.rb'
-    - 'lib/active_fedora/aggregation/list_source.rb'
-    - 'lib/active_fedora/associations/builder/aggregation.rb'
-    - 'lib/active_fedora/indexing/suffix.rb'
-
-Style/GuardClause:
-  Exclude:
-    - 'lib/active_fedora/autosave_association.rb'
-
-Style/TrivialAccessors:
-  Exclude:
-    - 'lib/active_fedora/reflection.rb'
-    - 'lib/active_fedora/attributes/node_config.rb'
-    - 'lib/active_fedora/associations/directly_contains_one_association.rb'
-    - 'lib/active_fedora/associations/belongs_to_association.rb'
-    - 'lib/active_fedora/associations/association.rb'
-
-Style/EachWithObject:
-  Exclude:
-    - 'lib/active_fedora/relation/finder_methods.rb'
-
-Style/CaseEquality:
-  Exclude:
-    - 'lib/active_fedora/relation/finder_methods.rb'
-
 Style/BlockDelimiters:
   Exclude:
     - 'spec/**/*'
@@ -210,26 +87,11 @@ Style/SingleLineBlockParams:
 
 Style/ClassVars:
   Exclude:
-    - 'spec/unit/finder_methods_spec.rb'
     - 'spec/unit/base_spec.rb'
-    - 'spec/integration/indexing_spec.rb'
-    - 'lib/active_fedora/identifiable.rb'
 
 Style/SignalException:
   Enabled: false
 
-Naming/FileName:
-  Exclude:
-    - 'lib/active-fedora.rb'
-
-Style/ZeroLengthPredicate:
-  Exclude:
-    - 'lib/active_fedora/file/attributes.rb'
-
-Performance/RedundantMerge:
-  Exclude:
-    - 'lib/active_fedora/railtie.rb'
-
 Rails:
   Enabled: true
 
@@ -265,10 +127,6 @@ RSpec/DescribeClass:
   Exclude:
     - 'spec/integration/**/*'
 
-RSpec/DescribedClass:
-  Exclude:
-    - 'spec/unit/finder_methods_spec.rb'
-
 RSpec/NotToNot:
   Enabled: false
 

data/.solr_wrapper

@@ -2,5 +2,5 @@
 # version: 6.1.0
 port: 8985
 collection:
-  dir: lib/generators/active_fedora/config/solr/templates/solr/config/
+  dir: lib/generators/valkyrie_active_fedora/config/solr/templates/solr/config/
   name: hydra-test

data/lib/generators/valkyrie_active_fedora/config/USAGE

@@ -2,7 +2,7 @@ Description:
   Generate ActiveFedora config files
 
 Example:
-  rails generate active_fedora:config
+  rails generate valkyrie_active_fedora:config
 
   This will create:
     config/fedora.yml

data/lib/generators/valkyrie_active_fedora/config/config_generator.rb

@@ -1,10 +1,10 @@
 require 'rails/generators'
 
-module ActiveFedora
+module ValkyrieActiveFedora
   class ConfigGenerator < Rails::Generators::Base
     def generate_configs
-      generate('active_fedora:config:fedora')
-      generate('active_fedora:config:solr')
+      generate('valkyrie_active_fedora:config:fedora')
+      generate('valkyrie_active_fedora:config:solr')
     end
   end
 end

data/lib/generators/valkyrie_active_fedora/model/USAGE

@@ -2,7 +2,7 @@ Description:
   Generate a class that inherits from ActiveFedora::Base
 
 Example:
-  rails generate active_fedora:model Journal
+  rails generate valkyrie_active_fedora:model Journal
 
   This will create:
     app/models/journal.rb

data/lib/generators/valkyrie_active_fedora/model/templates/datastream.rb.erb

@@ -1,6 +1,6 @@
 # Generated via
-#  `rails generate active_fedora:model <%= class_name %>`
-class <%= class_name %>Metadata < ActiveFedora::OmDatastream
+#  `rails generate valkyrie_active_fedora:model <%= class_name %>`
+class <%= class_name %>Metadata < ValkyrieActiveFedora::OmDatastream
 
   # Define a terminology for parsing this XML document
   # See: https://github.com/samvera/om/wiki/Tame-your-XML-with-OM

data/lib/generators/valkyrie_active_fedora/model/templates/datastream_spec.rb.erb

@@ -1,5 +1,5 @@
 # Generated via
-#  `rails generate active_fedora:model <%= class_name %>`
+#  `rails generate valkyrie_active_fedora:model <%= class_name %>`
 require 'rails_helper'
 
 describe <%= class_name %>Metadata do

data/lib/generators/valkyrie_active_fedora/model/templates/model.rb.erb

@@ -1,6 +1,6 @@
 # Generated via
-#  `rails generate active_fedora:model <%= class_name %>`
-class <%= class_name %> < ActiveFedora::Base
+#  `rails generate valkyrie_active_fedora:model <%= class_name %>`
+class <%= class_name %> < ValkyrieActiveFedora::Base
   <% if options['datastream'] %>
   has_subresource :descMetadata, class_name: "<%= options['datastream'] %>"
   <% else %>

data/lib/generators/valkyrie_active_fedora/model/templates/model_spec.rb.erb

@@ -1,7 +1,7 @@
 # Generated via
-#  `rails generate active_fedora:model <%= class_name %>`
+#  `rails generate valkyrie_active_fedora:model <%= class_name %>`
 require 'rails_helper'
-require 'active_fedora/test_support'
+require 'valkyrie_active_fedora/test_support'
 
 describe <%= class_name %> do
   it_behaves_like 'An ActiveModel'

data/lib/tasks/valkyrie_active_fedora_dev.rake

@@ -2,7 +2,7 @@ APP_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../")
 
 require 'solr_wrapper'
 require 'fcrepo_wrapper'
-require 'active_fedora/rake_support'
+require 'valkyrie_active_fedora/rake_support'
 
 namespace :valkyrie_active_fedora do
   # Use yard to build docs
@@ -41,12 +41,23 @@ namespace :valkyrie_active_fedora do
     spec.rcov = true
   end
 
-  desc "CI build"
-  task :ci do
-    Rake::Task['valkyrie_active_fedora:rubocop'].invoke unless ENV['NO_RUBOCOP']
+  # desc "CI build"
+  # task :ci do
+  #   Rake::Task['valkyrie_active_fedora:rubocop'].invoke unless ENV['NO_RUBOCOP']
+  #   ENV['environment'] = "test"
+  #   with_test_server do
+  #     Rake::Task['valkyrie_active_fedora:coverage'].invoke
+  #   end
+  # end
+
+  task ci: [:rubocop] do
+    require 'solr_wrapper'   # necessary for rake_support to work
+    require 'fcrepo_wrapper' # necessary for rake_support to work
+    require 'active_fedora/rake_support'
+
     ENV['environment'] = "test"
     with_test_server do
-      Rake::Task['valkyrie_active_fedora:coverage'].invoke
+      Rake::Task['spec'].invoke
     end
   end
 

data/lib/valkyrie_active_fedora.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'valkyrie_active_fedora/engine'
 require 'valkyrie_active_fedora/version'
 
 module ValkyrieActiveFedora

data/lib/valkyrie_active_fedora/rake_support.rb

@@ -0,0 +1,45 @@
+require 'byebug'
+
+# Starts a fedora server and a solr server on a random port and then
+# yields the passed block
+def with_test_server(&block)
+  with_server('test', &block)
+end
+
+def with_server(environment)
+  return yield if ENV["#{environment}_SERVER_STARTED"]
+
+  ENV["#{environment}_SERVER_STARTED"] = 'true'
+
+  # setting port: nil assigns a random port.
+  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|
+    ENV["SOLR_#{environment.upcase}_PORT"] = solr.port.to_s
+    solr_config_path = File.join('solr', 'config')
+    # Check to see if configs exist in a path relative to the working directory
+    unless Dir.exist?(solr_config_path)
+      $stderr.puts "Solr configuration not found at #{solr_config_path}. Using ValkyrieActiveFedora defaults"
+      # Otherwise use the configs delivered with ValkyrieActiveFedora.
+byebug
+      solr_config_path = File.join(File.expand_path("../..", File.dirname(__FILE__)), 'lib', 'generators', 'valkyrie_active_fedora', 'config', 'solr', 'templates', 'solr', 'config')
+    end
+    solr.with_collection(name: "hydra-#{environment}", dir: solr_config_path) do
+      FcrepoWrapper.wrap(load_config(:fcrepo, environment, fcrepo_defaults)) do |fcrepo|
+        ENV["FCREPO_#{environment.upcase}_PORT"] = fcrepo.port.to_s
+        yield
+      end
+    end
+  end
+  ENV["#{environment}_SERVER_STARTED"] = 'false'
+end
+
+private
+
+def load_config(service, environment, defaults)
+  config_file = environment == 'test' ? "config/#{service}_wrapper_test.yml" : ".#{service}_wrapper"
+  return { config: config_file } if File.exist?(config_file)
+  defaults
+end

data/lib/valkyrie_active_fedora/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ValkyrieActiveFedora
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 ENV["environment"] ||= "test"
+ENV["RAILS_ENV"] ||= "test"
 
 require "bundler/setup"
 require 'simplecov'

data/spec/unit/base_spec.rb

@@ -33,4 +33,42 @@ describe ValkyrieActiveFedora::Base do
       expect(foo_history.valkyrie_resource).to eq nil
     end
   end
+
+  describe '#attributes_including_linked_ids' do
+    context 'for has_many and belongs_to relationships' do
+      before :all do
+        class Library < ValkyrieActiveFedora::Base
+          has_many :books
+        end
+        class Book < ValkyrieActiveFedora::Base
+          belongs_to :library, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
+        end
+      end
+
+      after :all do
+        Object.send(:remove_const, :Library)
+        Object.send(:remove_const, :Book)
+      end
+
+      let(:library1) { Library.create(id: 'lib1', books: [book1]) }
+      # let(:book1) { Book.create(id: 'bk1', library: library1) }
+      let(:book1) { Book.create(id: 'bk1') }
+
+      before do
+        book1.library = library1
+        book1.save
+      end
+
+      it "inserts ids of child objects into parent's attributes" do
+        expected_results = { "id"=>"lib1", "book_ids"=>["bk1"] }
+        # expect(library1.attributes_including_linked_ids).to eq expected_results
+        expect(library1.reload.attributes_including_linked_ids).to eq expected_results
+      end
+
+      it "inserts ids of parent objects into child's attributes" do
+        expected_results = { "id"=>"bk1", "library_id"=>"lib1" }
+        expect(book1.reload.attributes_including_linked_ids).to eq expected_results
+      end
+    end
+  end
 end

data/valkyrie_active_fedora.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   # http://guides.rubyonrails.org/maintenance_policy.html
   s.add_dependency 'rails', '~> 5.0' # Keep in sync with version supported by Hyrax
 
-  s.add_development_dependency 'active-fedora'
+  s.add_development_dependency 'active-fedora', '~> 11.0'
   s.add_development_dependency 'valkyrie'
 
   # s.add_development_dependency 'bixby', '~> 1.0.0' # rubocop styleguide

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: valkyrie_active_fedora
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - E. Lynette Rayle
@@ -28,16 +28,16 @@ dependencies:
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: valkyrie
   requirement: !ruby/object:Gem::Requirement
@@ -278,13 +278,12 @@ files:
 - lib/tasks/valkyrie_active_fedora_dev.rake
 - lib/valkyrie_active_fedora.rb
 - lib/valkyrie_active_fedora/base.rb
-- lib/valkyrie_active_fedora/engine.rb
+- lib/valkyrie_active_fedora/rake_support.rb
 - lib/valkyrie_active_fedora/version.rb
 - spec/.gitignore
 - spec/rails_helper.rb
 - spec/spec_helper.rb
 - spec/unit/base_spec.rb
-- tasks/valkyrie_active_fedora_dev.rake
 - valkyrie_active_fedora.gemspec
 homepage: http://github.com/samvera-labs/valkyrie_active_fedora
 licenses:

data/lib/valkyrie_active_fedora/engine.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-module ValkyrieActiveFedora
-  class Engine < ::Rails::Engine
-    isolate_namespace ValkyrieActiveFedora
-
-    require 'valkyrie_active_fedora'
-
-    # def self.engine_mount
-    #   ValkyrieActiveFedora::Engine.routes.find_script_name({})
-    # end
-  end
-end

data/tasks/valkyrie_active_fedora_dev.rake

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-require 'rspec/core/rake_task'
-require 'engine_cart/rake_task'
-require 'rubocop/rake_task'
-
-desc 'Run style checker'
-RuboCop::RakeTask.new(:rubocop) do |task|
-  task.fail_on_error = true
-end
-
-RSpec::Core::RakeTask.new(:spec)
-
-desc 'Generate the engine_cart and spin up test servers and run specs'
-task ci: ['rubocop', 'engine_cart:generate'] do
-  puts 'running continuous integration'
-  Rake::Task['spec_with_app_load'].invoke
-end