Merge pull request #136 from samvera-labs/instances

Make adapters into instances
samvera · Jul 12, 2017 · d31891a · d31891a
2 parents c44c598 + e665794
commit d31891a
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 14 deletions.
diff --git a/config/initializers/valkyrie.rb b/config/initializers/valkyrie.rb
@@ -2,12 +2,12 @@
 require 'valkyrie'
 Rails.application.config.to_prepare do
   Valkyrie::Adapter.register(
-    Valkyrie::Persistence::Postgres::Adapter,
+    Valkyrie::Persistence::Postgres::Adapter.new,
     :postgres
   )
 
   Valkyrie::Adapter.register(
-    Valkyrie::Persistence::ActiveFedora::Adapter,
+    Valkyrie::Persistence::ActiveFedora::Adapter.new,
     :fedora
   )
 

diff --git a/lib/valkyrie/persistence/active_fedora/adapter.rb b/lib/valkyrie/persistence/active_fedora/adapter.rb
@@ -2,11 +2,13 @@
 module Valkyrie::Persistence
   module ActiveFedora
     class Adapter
-      def self.persister
+      # @return [Class] {Valkyrie::Persistence::ActiveFedora::Persister}
+      def persister
         Valkyrie::Persistence::ActiveFedora::Persister
       end
 
-      def self.query_service
+      # @return [Class] {Valkyrie::Persistence::ActiveFedora::QueryService}
+      def query_service
         Valkyrie::Persistence::ActiveFedora::QueryService
       end
     end

diff --git a/lib/valkyrie/persistence/active_fedora/persister.rb b/lib/valkyrie/persistence/active_fedora/persister.rb
@@ -18,8 +18,9 @@ def delete(model:)
         instance(model).delete
       end
 
+      # @return [Valkyrie::Persistence::ActiveFedora::Adapter]
       def adapter
-        Valkyrie::Persistence::ActiveFedora::Adapter
+        Valkyrie::Persistence::ActiveFedora::Adapter.new
       end
 
       def instance(model)

diff --git a/spec/valkyrie/persistence/active_fedora/adapter_spec.rb b/spec/valkyrie/persistence/active_fedora/adapter_spec.rb
@@ -3,6 +3,6 @@
 require 'valkyrie/specs/shared_specs'
 
 RSpec.describe Valkyrie::Persistence::ActiveFedora::Adapter do
-  let(:adapter) { described_class }
+  let(:adapter) { described_class.new }
   it_behaves_like "a Valkyrie::Adapter"
 end
diff --git a/spec/valkyrie/persistence/active_fedora/query_service_spec.rb b/spec/valkyrie/persistence/active_fedora/query_service_spec.rb
@@ -3,7 +3,7 @@
 require 'valkyrie/specs/shared_specs'
 
 RSpec.describe Valkyrie::Persistence::ActiveFedora::QueryService do
-  let(:adapter) { Valkyrie::Persistence::ActiveFedora::Adapter }
+  let(:adapter) { Valkyrie::Persistence::ActiveFedora::Adapter.new }
   let(:persister) { adapter.persister }
   let(:query_service) { adapter.query_service }
   it_behaves_like "a Valkyrie query provider"

diff --git a/valkyrie/lib/valkyrie/persistence/postgres/adapter.rb b/valkyrie/lib/valkyrie/persistence/postgres/adapter.rb
@@ -4,12 +4,12 @@
 module Valkyrie::Persistence::Postgres
   class Adapter
     # @return [Class] {Valkyrie::Persistence::Postgres::Persister}
-    def self.persister
+    def persister
       Valkyrie::Persistence::Postgres::Persister
     end
 
     # @return [Class] {Valkyrie::Persistence::Postgres::QueryService}
-    def self.query_service
+    def query_service
       Valkyrie::Persistence::Postgres::QueryService
     end
   end

diff --git a/valkyrie/lib/valkyrie/persistence/postgres/persister.rb b/valkyrie/lib/valkyrie/persistence/postgres/persister.rb
@@ -28,9 +28,9 @@ def sync_object(model)
         ::Valkyrie::Persistence::Postgres::ORMSyncer.new(model: model)
       end
 
-      # @return [Class] {Valkyrie::Persistence::Postgres::Adapter}
+      # @return [Valkyrie::Persistence::Postgres::Adapter]
       def adapter
-        Valkyrie::Persistence::Postgres::Adapter
+        Valkyrie::Persistence::Postgres::Adapter.new
       end
     end
 

diff --git a/valkyrie/spec/valkyrie/persistence/postgres/adapter_spec.rb b/valkyrie/spec/valkyrie/persistence/postgres/adapter_spec.rb
@@ -3,6 +3,6 @@
 require 'valkyrie/specs/shared_specs'
 
 RSpec.describe Valkyrie::Persistence::Postgres::Adapter do
-  let(:adapter) { described_class }
+  let(:adapter) { described_class.new }
   it_behaves_like "a Valkyrie::Adapter"
 end
diff --git a/valkyrie/spec/valkyrie/persistence/postgres/queries/find_members_query_spec.rb b/valkyrie/spec/valkyrie/persistence/postgres/queries/find_members_query_spec.rb
@@ -34,7 +34,7 @@ class Page < Valkyrie::Model
     end
 
     def persister
-      Valkyrie::Persistence::Postgres::Adapter.persister
+      Valkyrie::Persistence::Postgres::Adapter.new.persister
     end
   end
 end
diff --git a/valkyrie/spec/valkyrie/persistence/postgres/query_service_spec.rb b/valkyrie/spec/valkyrie/persistence/postgres/query_service_spec.rb
@@ -3,6 +3,6 @@
 require 'valkyrie/specs/shared_specs'
 
 RSpec.describe Valkyrie::Persistence::Postgres::QueryService do
-  let(:adapter) { Valkyrie::Persistence::Postgres::Adapter }
+  let(:adapter) { Valkyrie::Persistence::Postgres::Adapter.new }
   it_behaves_like "a Valkyrie query provider"
 end