active-fedora 11.0.0.rc7 → 11.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc7a3946a47ca155b5b2e9fa9f62514e4be440c8
-  data.tar.gz: c64e65c2107219cc400cbd66f586388fd0a3e6cc
+  metadata.gz: 1a3e4470dd33d72dc20a0794fd42e8a08d96363f
+  data.tar.gz: 9e7b438a6b8a23515de79c50b3f44dc2df2a6d3f
 SHA512:
-  metadata.gz: cd127fc65d51bcc2421d4be1693a5332ff4d14cdbea316fab935fb425b5527371fade8a5ee9c7d079119e613040dec9e35a71bfc29fdf7fac4a09287c1f49df3
-  data.tar.gz: 7781a22aa37f934c60bef92898d8c02cbd7cff702272e8f855b9f03b65179a602d2186ee43b4f58bc63fa3b750df40b5b6e6fb1bc781a941bc5b4029624e7330
+  metadata.gz: f86db04efd279c3412c1e57fa8449f7fbef3ac6cb83143314b573edaf559dfca3bc0bab762ada09c87c0f86759aea537f812bd194c3361f8adbea78385abbfe3
+  data.tar.gz: fd864a26944cc8e5ca33b313a1a2544dcfa965e46005a16c6a4833755f85e82ab349e36470347c02eef601b979213c3877c2691153a41c81429595337dc68ead

data/.gitignore

@@ -15,3 +15,4 @@ bin
 gemfiles/*.gemfile.lock
 /fcrepo4-data
 /fcrepo4-test-data
+/spec/examples.txt

data/.rubocop.yml

@@ -1,3 +1,5 @@
+require: rubocop-rspec
+
 inherit_from:
 - .rubocop_todo.yml
 
@@ -45,7 +47,6 @@ Metrics/CyclomaticComplexity:
     - 'lib/active_fedora/associations/builder/directly_contains_one.rb'
     - 'lib/active_fedora/file_configurator.rb'
     - 'lib/active_fedora/file.rb'
-    - 'lib/active_fedora/datastreams/nokogiri_datastreams.rb'
     - 'lib/active_fedora/attribute_methods.rb'
     - 'lib/active_fedora/scoping/named.rb'
     - 'lib/active_fedora/inheritance.rb'
@@ -56,7 +57,6 @@ Metrics/PerceivedComplexity:
     - 'lib/active_fedora/relation/finder_methods.rb'
     - 'lib/active_fedora/nested_attributes.rb'
     - 'lib/active_fedora/file_configurator.rb'
-    - 'lib/active_fedora/datastreams/nokogiri_datastreams.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'
@@ -79,10 +79,7 @@ Metrics/ModuleLength:
 
 Metrics/ClassLength:
   Exclude:
-    - 'spec/samples/hydra-mods_article_datastream.rb'
-    - 'lib/active_fedora/rdf/rdf_datastream.rb'
     - 'lib/active_fedora/rdf/fcrepo.rb'
-    - 'lib/active_fedora/qualified_dublin_core_datastream.rb'
     - 'lib/active_fedora/file_configurator.rb'
     - 'lib/active_fedora/file.rb'
     - 'lib/active_fedora/associations/association.rb'
@@ -121,7 +118,6 @@ Style/PredicateName:
     - 'lib/active_fedora/versionable.rb'
     - 'lib/active_fedora/reflection.rb'
     - 'lib/active_fedora/pathing.rb'
-    - 'lib/active_fedora/om_datastream.rb'
     - 'lib/active_fedora/nested_attributes.rb'
     - 'lib/active_fedora/clean_connection.rb'
     - 'lib/active_fedora/attributes.rb'
@@ -219,7 +215,6 @@ Style/SignalException:
 Style/FileName:
   Exclude:
     - 'lib/active-fedora.rb'
-    - 'spec/samples/hydra-mods_article_datastream.rb'
 
 Style/ZeroLengthPredicate:
   Exclude:

data/.rubocop_todo.yml

@@ -1,24 +1,55 @@
 require: rubocop-rspec
+
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-07-29 08:55:51 -0500 using RuboCop version 0.42.0.
+# on 2016-08-25 16:34:38 -0700 using RuboCop version 0.42.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 133
+# Offense count: 116
 # Configuration parameters: Max.
 RSpec/ExampleLength:
   Enabled: false
 
-# Offense count: 58
-# Configuration parameters: IgnoreSymbolicNames.
-RSpec/VerifiedDoubles:
+# Offense count: 40
+RSpec/LeadingSubject:
   Enabled: false
 
-# Offense count: 2
-Style/MethodMissing:
+# Offense count: 15
+RSpec/LetSetup:
+  Exclude:
+    - 'spec/integration/collection_association_spec.rb'
+    - 'spec/integration/delete_all_spec.rb'
+    - 'spec/integration/has_many_associations_spec.rb'
+    - 'spec/integration/nested_attribute_spec.rb'
+    - 'spec/integration/persistence_spec.rb'
+    - 'spec/unit/has_and_belongs_to_many_association_spec.rb'
+
+# Offense count: 1
+RSpec/MessageChain:
   Exclude:
-    - 'lib/active_fedora/nom_datastream.rb'
-    - 'lib/active_fedora/relation/delegation.rb'
+    - 'spec/unit/file_spec.rb'
+
+# Offense count: 218
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: allow, expect
+RSpec/MessageExpectation:
+  Enabled: false
+
+# Offense count: 238
+RSpec/MultipleExpectations:
+  Max: 8
+
+# Offense count: 394
+# Configuration parameters: MaxNesting.
+RSpec/NestedGroups:
+  Enabled: false
+
+# Offense count: 94
+RSpec/SubjectStub:
+  Enabled: false
+
+RSpec/VerifiedDoubles:
+  Enabled: false

data/active-fedora.gemspec

@@ -14,11 +14,11 @@ Gem::Specification.new do |s|
   s.license = "APACHE2"
   s.required_ruby_version = '~> 2.0'
 
-  s.add_dependency 'rsolr', '~> 1.0', '>= 1.0.10'
+  s.add_dependency 'rsolr', '~> 1.1', '>= 1.1.2'
   s.add_dependency 'solrizer', '~> 3.4'
   s.add_dependency "activesupport", '>= 4.2.4', '< 6'
   s.add_dependency "activemodel", '>= 4.2', '< 6'
-  s.add_dependency "active-triples", '~> 0.10.0'
+  s.add_dependency "active-triples", '~> 0.11.0'
   s.add_dependency "deprecation"
   s.add_dependency "ldp", '~> 0.6.0'
 

data/lib/active_fedora/associations/collection_association.rb

@@ -291,7 +291,7 @@ module ActiveFedora
         def construct_query
           @solr_query ||= begin
             clauses = { find_reflection => @owner.id }
-            clauses[:has_model] = @reflection.class_name.constantize.to_class_uri if @reflection.class_name && @reflection.class_name != 'ActiveFedora::Base'
+            clauses[:has_model] = @reflection.klass.to_rdf_representation if @reflection.klass != ActiveFedora::Base
             ActiveFedora::SolrQueryBuilder.construct_query_for_rel(clauses)
           end
         end

data/lib/active_fedora/associations/contained_finder.rb

@@ -29,7 +29,7 @@ module ActiveFedora::Associations
     private
 
       def matching_ids(record)
-        IDComposite.new(proxy_ids(record) & contained_ids, repository.translate_uri_to_id)
+        IDComposite.new(proxy_ids(record) & contained_ids.to_a, repository.translate_uri_to_id)
       end
 
       def proxy_ids(record)
@@ -40,7 +40,7 @@ module ActiveFedora::Associations
       # a slow fedora call
       def relation_subjects(record)
         query = ActiveFedora::SolrQueryBuilder.construct_query_for_rel(
-          [[:has_model, proxy_class.to_class_uri], [:proxyFor, record.id]]
+          [[:has_model, proxy_class.to_rdf_representation], [:proxyFor, record.id]]
         )
         ActiveFedora::SolrService.query(query, fl: 'id').map(&:rdf_uri)
       end

data/lib/active_fedora/change_set.rb

@@ -23,8 +23,12 @@ module ActiveFedora
           result[predicate] = graph.query(subject: object.rdf_subject, predicate: predicate)
         elsif object.class.properties.keys.include?(key)
           predicate = graph.reflections.reflect_on_property(key).predicate
-          result[predicate] = graph.query(subject: object.rdf_subject, predicate: predicate)
-          result[predicate] = child_graphs(result[predicate].objects) << result[predicate]
+          results = graph.query(subject: object.rdf_subject, predicate: predicate)
+          new_graph = child_graphs(results.map(&:object))
+          results.each do |res|
+            new_graph << res
+          end
+          result[predicate] = new_graph
         elsif key == 'type'.freeze
           # working around https://github.com/ActiveTriples/ActiveTriples/issues/122
           predicate = ::RDF.type

data/lib/active_fedora/core.rb

@@ -96,13 +96,14 @@ module ActiveFedora
 
     protected
 
-      # This can be overriden to assert a different model
-      # It's normally called once in the lifecycle, by #create#
+      # This method is normally called once in the lifecycle, by #create#
       def assert_content_model
-        self.has_model = self.class.to_s
+        self.has_model = self.class.to_rdf_representation
       end
 
       module ClassMethods
+        extend Deprecation
+
         def generated_association_methods
           @generated_association_methods ||= begin
             mod = const_set(:GeneratedAssociationMethods, Module.new)
@@ -111,13 +112,23 @@ module ActiveFedora
           end
         end
 
-        # Returns a suitable uri object for :has_model
-        # Should reverse Model#from_class_uri
-        # TODO this is a poorly named method
-        def to_class_uri(_attrs = {})
+        # Returns a suitable string representation for :has_model
+        # Override this method if you want to change how this class
+        # is represented in RDF.
+        def to_rdf_representation
           name
         end
 
+        # Returns a suitable string representation for :has_model
+        # @deprecated use to_rdf_representation instead
+        def to_class_uri(attrs = nil)
+          if attrs
+            Deprecation.warn ActiveFedora::Core, "to_class_uri no longer acceps an argument"
+          end
+          to_rdf_representation
+        end
+        deprecation_deprecate to_class_uri: "use 'to_rdf_representation()' instead"
+
         private
 
           def relation

data/lib/active_fedora/fedora_attributes.rb

@@ -43,7 +43,7 @@ module ActiveFedora
       # Appending the graph at the end is necessary because adding it as the
       # parent leaves behind triples not related to the ldp_source's rdf
       # subject.
-      @resource ||= self.class.resource_class.new(@ldp_source.graph.rdf_subject, data: @ldp_source.graph.send(:graph).data)
+      @resource ||= self.class.resource_class.new(@ldp_source.graph.rdf_subject, data: @ldp_source.graph.graph.data)
     end
 
     # You can set the URI to use for the rdf_label on ClassMethods.rdf_label, then on

data/lib/active_fedora/indexing_service.rb

@@ -15,10 +15,6 @@ module ActiveFedora
       @object = obj
     end
 
-    def self.profile_solr_name
-      @profile_solr_name ||= ActiveFedora.index_field_mapper.solr_name("object_profile", :displayable)
-    end
-
     def self.create_time_solr_name
       @create_time_solr_name ||= ActiveFedora.index_field_mapper.solr_name('system_create', :stored_sortable, type: :date)
     end

data/lib/active_fedora/orders/ordered_list.rb

@@ -13,8 +13,8 @@ module ActiveFedora
       # @param [::RDF::URI] head_subject URI of head node in list.
       # @param [::RDF::URI] tail_subject URI of tail node in list.
       def initialize(graph, head_subject, tail_subject)
-        @graph = if graph.respond_to?(:graph, true)
-                   graph.send(:graph).data
+        @graph = if graph.respond_to?(:graph)
+                   graph.graph.data
                  else
                    graph
                  end

data/lib/active_fedora/relation/delegation.rb

@@ -29,5 +29,9 @@ module ActiveFedora
           super
         end
       end
+
+      def respond_to_missing?(method, *args)
+        array_delegable?(method) || super
+      end
   end
 end

data/lib/active_fedora/solr_hit.rb

@@ -55,9 +55,5 @@ module ActiveFedora
       def classifier
         ActiveFedora.model_mapper.classifier(document)
       end
-
-      def profile_json
-        Array(document[ActiveFedora::IndexingService.profile_solr_name]).first
-      end
   end
 end

data/lib/active_fedora/solr_query_builder.rb

@@ -11,28 +11,29 @@ module ActiveFedora
         "{!terms f=#{ActiveFedora.id_field}}#{ids.join(',')}"
       end
 
-      # Create a query with a clause for each key, value
+      # Create a raw query with a clause for each key, value
       # @param [Hash, Array<Array<String>>] field_pairs key is the predicate, value is the target_uri
       # @param [String] join_with ('AND') the value we're joining the clauses with
       # @example
-      #   construct_query_for_rel [[:has_model, "info:fedora/afmodel:ComplexCollection"], [:has_model, "info:fedora/afmodel:ActiveFedora_Base"]], 'OR'
-      #   # => _query_:"{!field f=has_model_ssim}info:fedora/afmodel:ComplexCollection" OR _query_:"{!field f=has_model_ssim}info:fedora/afmodel:ActiveFedora_Base"
+      #   construct_query_for_rel [[:has_model, "ComplexCollection"], [:has_model, "ActiveFedora_Base"]], 'OR'
+      #   # => _query_:"{!raw f=has_model_ssim}ComplexCollection" OR _query_:"{!raw f=has_model_ssim}ActiveFedora_Base"
       #
       #   construct_query_for_rel [[Book._reflect_on_association(:library), "foo/bar/baz"]]
       def construct_query_for_rel(field_pairs, join_with = default_join_with)
         field_pairs = field_pairs.to_a if field_pairs.is_a? Hash
-        construct_query(property_values_to_solr(field_pairs), join_with)
+        construct_query(property_values_to_solr(field_pairs), join_with, 'raw'.freeze)
       end
 
       # Construct a solr query from a list of pairs (e.g. [field name, values])
       # @param [Array<Array>] field_pairs a list of pairs of property name and values
       # @param [String] join_with ('AND') the value we're joining the clauses with
+      # @param [String] type ('field') The type of query to run. Either 'raw' or 'field'
       # @return [String] a solr query
       # @example
       #   construct_query([['library_id_ssim', '123'], ['owner_ssim', 'Fred']])
       #   # => "_query_:\"{!field f=library_id_ssim}123\" AND _query_:\"{!field f=owner_ssim}Fred\""
-      def construct_query(field_pairs, join_with = default_join_with)
-        clauses = pairs_to_clauses(field_pairs)
+      def construct_query(field_pairs, join_with = default_join_with, type = 'field'.freeze)
+        clauses = pairs_to_clauses(field_pairs, type)
         return "" if clauses.count.zero?
         return clauses.first if clauses.count == 1
         "(#{clauses.join(join_with)})"
@@ -45,22 +46,24 @@ module ActiveFedora
       private
 
         # @param [Array<Array>] pairs a list of (key, value) pairs. The value itself may
+        # @param [String] type  The type of query to run. Either 'raw' or 'field'
         # @return [Array] a list of solr clauses
-        def pairs_to_clauses(pairs)
+        def pairs_to_clauses(pairs, type)
           pairs.flat_map do |field, value|
-            condition_to_clauses(field, value)
+            condition_to_clauses(field, value, type)
           end
         end
 
         # @param [String] field
         # @param [String, Array<String>] values
+        # @param [String] type The type of query to run. Either 'raw' or 'field'
         # @return [Array<String>]
-        def condition_to_clauses(field, values)
+        def condition_to_clauses(field, values, type)
           values = Array(values)
           values << nil if values.empty?
           values.map do |value|
             if value.present?
-              field_query(field, value)
+              query_clause(type, field, value)
             else
               # Check that the field is not present. In SQL: "WHERE field IS NULL"
               "-#{field}:[* TO *]"
@@ -93,10 +96,11 @@ module ActiveFedora
         end
 
         # Create a raw query clause suitable for sending to solr as an fq element
+        # @param [String] type The type of query to run. Either 'raw' or 'field'
         # @param [String] key
         # @param [String] value
-        def field_query(key, value)
-          "_query_:\"{!field f=#{key}}#{value.gsub('"', '\"')}\""
+        def query_clause(type, key, value)
+          "_query_:\"{!#{type} f=#{key}}#{value.gsub('"', '\"')}\""
         end
     end
   end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "11.0.0.rc7".freeze
+  VERSION = "11.0.0".freeze
 end

data/spec/config_helper.rb

@@ -1,5 +1,5 @@
 def mock_yaml(hash, path)
-  mock_file = double(path.split("/")[-1])
+  mock_file = instance_double(File, path.split("/")[-1])
   allow(File).to receive(:exist?).with(path).and_return(true)
   allow(File).to receive(:open).with(path).and_return(mock_file)
   allow(Psych).to receive(:load).and_return(hash)

data/spec/integration/autosave_association_spec.rb

@@ -12,7 +12,7 @@ describe ActiveFedora::Base do
   subject(:relationship) { MockAFBaseRelationship.new }
 
   context '#changed_for_autosave?' do
-    before(:each) do
+    before do
       expect(relationship).to receive(:new_record?).and_return(false)
       expect(relationship).to receive(:changed?).and_return(false)
       expect(relationship).to receive(:marked_for_destruction?).and_return(false)

data/spec/integration/base_spec.rb

@@ -145,7 +145,7 @@ describe ActiveFedora::Base do
       let(:conditions) { { foo: "bar" } }
       context "and at least one object matches the conditions" do
         it "returns true" do
-          allow(ActiveFedora::SolrService).to receive(:query) { [double("solr document")] }
+          allow(ActiveFedora::SolrService).to receive(:query) { [instance_double(RSolr::HashWithResponse)] }
           expect(described_class.exists?(conditions)).to be true
         end
       end

data/spec/integration/file_spec.rb

@@ -131,7 +131,7 @@ describe ActiveFedora::File do
       end
 
       describe "streaming the response" do
-        let(:stream_reader) { double }
+        let(:stream_reader) { instance_double(IO) }
         it "streams the response" do
           expect(stream_reader).to receive(:read).at_least(:once)
           test_object.attached_files[path].stream.each { |buff| stream_reader.read(buff) }

data/spec/integration/indexing_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 describe ActiveFedora::Base do
   describe "descendant_uris" do
-    before :each do
+    before do
       ids.each do |id|
         described_class.create id: id
       end

data/spec/integration/query_result_builder_spec.rb

@@ -13,7 +13,7 @@ describe ActiveFedora::QueryResultBuilder do
     let(:test_object) { ActiveFedora::Base.create }
     let(:foo_object) { FooObject.create }
 
-    after(:each) do
+    after do
       Object.send(:remove_const, :FooObject)
     end
 

data/spec/integration/relation_delegation_spec.rb

@@ -36,9 +36,7 @@ describe ActiveFedora::Base do
     end
 
     it "has each" do
-      t = double
-      expect(t).to receive(:foo).twice
-      peanuts.each { t.foo }
+      expect(peanuts.each.to_a.length).to eq 2
     end
 
     it "has all?" do