active-fedora 10.0.0 → 10.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1467d74478a1ea4aa80bcb17add4c7f34b798af7
-  data.tar.gz: 5e15c3f279e391f4acf2fd0c87a5554e0df65c7d
+  metadata.gz: 0da32a629ca0c04a5d83095d550ff267d2f53167
+  data.tar.gz: 7a68b6ee0c5231ae10e9f1c93d3cac54427ff322
 SHA512:
-  metadata.gz: c65e10a31bc1b766e4837eabfa198a3fe873b3ba93963d46edaaf0efb16c509f7091752336bf4608ea7e2fbccab5f899644777bb187585f1f197560b963b52b3
-  data.tar.gz: 03dcfbf9f6c33829ac0235a5108985b29a62cbbe8b9782a24cee195f7962749010c4d75559f2f7e9ffade94f5acaeb58474465a021c43c25e2b370e1ba7d80cd
+  metadata.gz: 1b11aa699b0ac03ed5b4a33727e7544fc74f3e027a19487bb6774334e029814030a8099b67dc6f6bb1fdf4cd0af9690bf166ac883337f4503de9c05274877eef
+  data.tar.gz: abadc23ff5e3f8646c991e6f3b1ac8c1367f12d8b73fea9e66d0fc98c8d8d9a1ef3d6171c78beee1d887dc49f3956b76052bb2cee101763448031f374684f07f

data/lib/active_fedora/file.rb

@@ -160,14 +160,6 @@ module ActiveFedora
     end
     private_class_method :relation
 
-    protected
-
-      # The string to prefix all solr fields with. Override this method if you want
-      # a prefix other than the default
-      def prefix(path)
-        path ? "#{path.underscore}__" : ''
-      end
-
     private
 
       def create_or_update(*options)

data/lib/active_fedora/nom_datastream.rb

@@ -3,12 +3,18 @@ require "nom"
 module ActiveFedora
   class NomDatastream < File
     include Datastreams::NokogiriDatastreams
+    extend Deprecation
 
     def self.set_terminology(options = {}, &block)
       @terminology_options = options || {}
       @terminology = block
     end
 
+    def initialize(*args)
+      super
+      Deprecation.warn(NomDatastream, "NomDatastream is deprecated and will be removed in ActiveFedora 11")
+    end
+
     class << self
       attr_reader :terminology_options
     end

data/lib/active_fedora/om_datastream.rb

@@ -12,10 +12,16 @@ module ActiveFedora
     include OM::XML::Document
     include OM::XML::TerminologyBasedSolrizer # this adds support for calling .to_solr
     include Datastreams::NokogiriDatastreams
+    extend Deprecation
 
     alias om_term_values term_values unless method_defined?(:om_term_values)
     alias om_update_values update_values unless method_defined?(:om_update_values)
 
+    def initialize(*args)
+      super
+      Deprecation.warn(OmDatastream, "OmDatastream is deprecated and will be removed in ActiveFedora 11")
+    end
+
     def default_mime_type
       'text/xml'
     end
@@ -33,28 +39,6 @@ module ActiveFedora
       solr_doc.merge super({}).each_with_object({}) { |(key, value), new| new[[prefix, key].join] = value }
     end
 
-    # ** Experimental **
-    # @return [Boolean] true if either the key for name exists in solr or if its string value exists
-    # @param [String] name Name of key to look for
-    # @param [Solr::Document] solr_doc Solr doc to query
-    def has_solr_name?(name, solr_doc = {})
-      !solr_doc[name].nil? || !solr_doc[name.to_s].nil?
-    end
-
-    # ** Experimental **
-    # @return true if the term_pointer contains an index
-    # ====Example:
-    #     [:image, {:title_set=>1}, :title] return true
-    #     [:image, :title_set, :title]      return false
-    def is_hierarchical_term_pointer?(*term_pointer)
-      if term_pointer.length > 1
-        term_pointer.each do |pointer|
-          return true if pointer.is_a?(Hash)
-        end
-      end
-      false
-    end
-
     # Update field values within the current datastream using {#update_values}, which is a wrapper for {http://rdoc.info/gems/om/1.2.4/OM/XML/TermValueOperators#update_values-instance_method OM::TermValueOperators#update_values}
     # Ignores any fields from params that this datastream's Terminology doesn't recognize
     #
@@ -122,5 +106,13 @@ module ActiveFedora
       result = om_update_values(params)
       result
     end
+
+    protected
+
+      # The string to prefix all solr fields with. Override this method if you want
+      # a prefix other than the default
+      def prefix(path)
+        path ? "#{path.underscore}__" : ''
+      end
   end
 end

data/lib/active_fedora/rdf.rb

@@ -4,7 +4,6 @@ module ActiveFedora
     autoload :DatastreamIndexing
     autoload :Fcrepo
     autoload :IndexingService
-    autoload :Identifiable
     autoload :Persistence
     autoload :ProjectHydra
     autoload :FieldMap

data/lib/active_fedora/rdf/datastream_indexing.rb

@@ -39,5 +39,11 @@ module ActiveFedora::RDF
       def apply_prefix(name, file_path)
         prefix(file_path) + name.to_s
       end
+
+      # The string to prefix all solr fields with. Override this method if you want
+      # a prefix other than the default
+      def prefix(path)
+        path ? "#{path.underscore}__" : ''
+      end
   end
 end

data/lib/active_fedora/rdf/ntriples_rdf_datastream.rb

@@ -5,5 +5,9 @@ module ActiveFedora
     def serialization_format
       :ntriples
     end
+
+    def deprecation_warning
+      Deprecation.warn(NtriplesRDFDatastream, "NtriplesRDFDatastream is deprecated and will be removed in ActiveFedora 11", caller(2))
+    end
   end
 end

data/lib/active_fedora/rdf/rdf_datastream.rb

@@ -4,8 +4,17 @@ module ActiveFedora
     include RDF::DatastreamIndexing
     include ActiveTriples::Properties
     include ActiveTriples::Reflection
+    extend Deprecation
 
     delegate :rdf_subject, :set_value, :get_values, :attributes=, to: :resource
+    def initialize(*args)
+      super
+      deprecation_warning
+    end
+
+    def deprecation_warning
+      Deprecation.warn(RDFDatastream, "RDFDatastream is deprecated and will be removed in ActiveFedora 11", caller(2))
+    end
 
     class << self
       def rdf_subject(&block)

data/lib/active_fedora/relation/finder_methods.rb

@@ -255,13 +255,13 @@ module ActiveFedora
       # @param [Hash<Symbol,String>] conditions
       # @return [Array<String>]
       def create_query_from_hash(conditions)
-        conditions.map { |key, value| condition_to_clauses(key, value) }.compact
+        conditions.map { |key, value| condition_to_clauses(key, value, ' OR ') }.compact
       end
 
       # @param [Symbol] key
       # @param [String] value
-      def condition_to_clauses(key, value)
-        SolrQueryBuilder.construct_query([[field_name_for(key), value]])
+      def condition_to_clauses(key, value, join_with = SolrQueryBuilder.default_join_with)
+        SolrQueryBuilder.construct_query([[field_name_for(key), value]], join_with)
       end
 
       # If the key is a property name, turn it into a solr field

data/lib/active_fedora/scoping/named.rb

@@ -13,6 +13,7 @@ module ActiveFedora
         #
         #   fruits = Fruit.all
         #   fruits = fruits.where(color: 'red') if options[:red_only]
+        #   fruits = fruits.where(size: ['big', 'little']) # gets big or little fruit
         #   fruits = fruits.limit(10) if limited?
         #
         # You can define a scope that applies to all finders using

data/lib/active_fedora/solr_query_builder.rb

@@ -19,7 +19,7 @@ module ActiveFedora
       #   # => _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 [[Book._reflect_on_association(:library), "foo/bar/baz"]]
-      def construct_query_for_rel(field_pairs, join_with = ' AND ')
+      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)
       end
@@ -31,8 +31,15 @@ module ActiveFedora
       # @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 = ' AND ')
-        pairs_to_clauses(field_pairs).join(join_with)
+      def construct_query(field_pairs, join_with = default_join_with)
+        clauses = pairs_to_clauses(field_pairs)
+        return "" if clauses.count == 0
+        return clauses.first if clauses.count == 1
+        "(#{clauses.join(join_with)})"
+      end
+
+      def default_join_with
+        ' AND '
       end
 
       private

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "10.0.0".freeze
+  VERSION = "10.1.0.rc1".freeze
 end

data/lib/tasks/active_fedora_dev.rake

@@ -41,14 +41,6 @@ namespace :active_fedora do
     spec.rcov = true
   end
 
-  desc "Copies the default SOLR config for the bundled Testing Server"
-  task :configure_jetty do
-    FileList['lib/generators/active_fedora/config/solr/templates/solr_conf/conf/*'].each do |f|
-      cp("#{f}", 'jetty/solr/development-core/conf/', :verbose => true)
-      cp("#{f}", 'jetty/solr/test-core/conf/', :verbose => true)
-    end
-  end
-
   desc "CI build"
   task :ci do
     ENV['environment'] = "test"

data/spec/integration/scoped_query_spec.rb

@@ -65,6 +65,7 @@ describe ActiveFedora::Querying do
         field = ActiveFedora.index_field_mapper.solr_name('foo', type: :string)
         expect(ModelIntegrationSpec::Basic.where(field => 'Beta')).to eq [test_instance1]
         expect(ModelIntegrationSpec::Basic.where('foo' => 'Beta')).to eq [test_instance1]
+        expect(ModelIntegrationSpec::Basic.where('foo' => ['Beta', 'Alpha'])).to eq [test_instance1, test_instance2]
       end
       it "orders" do
         expect(ModelIntegrationSpec::Basic.order(ActiveFedora.index_field_mapper.solr_name('foo', :sortable) + ' asc')).to eq [test_instance2, test_instance1, test_instance3]

data/spec/spec_helper.rb

@@ -37,6 +37,12 @@ restore_spec_configuration
 
 require 'active_fedora/cleaner'
 RSpec.configure do |config|
+  config.before(:suite) do
+    ActiveFedora::RDFDatastream.deprecation_behavior = :silence
+    ActiveFedora::NtriplesRDFDatastream.deprecation_behavior = :silence
+    ActiveFedora::OmDatastream.deprecation_behavior = :silence
+    ActiveFedora::NomDatastream.deprecation_behavior = :silence
+  end
   # Stub out test stuff.
   config.before(:each) do
     begin

data/spec/unit/finder_methods_spec.rb

@@ -51,8 +51,8 @@ describe ActiveFedora::FinderMethods do
 
     context "when value is an array" do
       let(:value) { ['one', 'four'] }
-      it { is_expected.to eq "_query_:\"{!field f=library_id}one\" AND " \
-                             "_query_:\"{!field f=library_id}four\"" }
+      it { is_expected.to eq "(_query_:\"{!field f=library_id}one\" AND " \
+                             "_query_:\"{!field f=library_id}four\")" }
     end
   end
 

data/spec/unit/om_datastream_spec.rb

@@ -256,37 +256,6 @@ describe ActiveFedora::OmDatastream do
     end
   end
 
-  describe '.has_solr_name?' do
-    let(:name0_role0) { ActiveFedora.index_field_mapper.solr_name("desc_metadata__name_0_role_0_roleTerm", type: :string) }
-    let(:name1_role1) { ActiveFedora.index_field_mapper.solr_name("desc_metadata__name_1_role_1_roleTerm", type: :string) }
-    let(:solr_doc) do
-      { "id" => "mods_article1",
-        ActiveFedora.index_field_mapper.solr_name("desc_metadata__name_role_roleTerm", type: :string) => ["creator", "submitter", "teacher"],
-        ActiveFedora.index_field_mapper.solr_name("desc_metadata__name_0_role", type: :string) => "\r\ncreator\r\nsubmitter\r\n",
-        ActiveFedora.index_field_mapper.solr_name("desc_metadata__name_1_role", type: :string) => "\r\n teacher \r\n",
-        name0_role0 => "creator",
-        ActiveFedora.index_field_mapper.solr_name("desc_metadata__name_0_role_1_roleTerm", type: :string) => "submitter",
-        ActiveFedora.index_field_mapper.solr_name("desc_metadata__name_1_role_0_roleTerm", type: :string) => ["teacher"] }
-    end
-
-    it "returns true if the given key exists in the solr document passed in" do
-      expect(subject).to have_solr_name(name0_role0, solr_doc)
-      expect(subject).to have_solr_name(name0_role0.to_sym, solr_doc)
-      expect(subject).to_not have_solr_name(name1_role1, solr_doc)
-      # if not doc passed in should be new empty solr doc and always return false
-      expect(subject).to_not have_solr_name(name0_role0)
-    end
-  end
-
-  describe '.is_hierarchical_term_pointer?' do
-    it "returns true only if the pointer passed in is an array that contains a hash" do
-      expect(subject.is_hierarchical_term_pointer?(*[:image, { tag1: 1 }, :tag2])).to be true
-      expect(subject.is_hierarchical_term_pointer?(*[:image, :tag1, { tag2: 1 }])).to be true
-      expect(subject.is_hierarchical_term_pointer?(*[:image, :tag1, :tag2])).to be false
-      expect(subject.is_hierarchical_term_pointer?(nil)).to be false
-    end
-  end
-
   describe '.update_values' do
     subject { described_class.new }
 

data/spec/unit/query_spec.rb

@@ -79,8 +79,8 @@ describe ActiveFedora::Base do
     let(:solr) { ActiveFedora::SolrService.instance.conn }
     let(:expected_query) { "#{model_query} AND " \
                            "_query_:\"{!field f=foo}bar\" AND " \
-                           "_query_:\"{!field f=baz}quix\" AND " \
-                           "_query_:\"{!field f=baz}quack\"" }
+                           "(_query_:\"{!field f=baz}quix\" OR " \
+                           "_query_:\"{!field f=baz}quack\")" }
     let(:expected_params) { { params: { sort: [sort_query], fl: 'id', q: expected_query, qt: 'standard' } } }
     let(:expected_sort_params) { { params: { sort: ["title_t desc"], fl: 'id', q: expected_query, qt: 'standard' } } }
     let(:mock_docs) { [{ "id" => "changeme:30" }, { "id" => "changeme:22" }] }
@@ -138,8 +138,8 @@ describe ActiveFedora::Base do
       let(:solr) { ActiveFedora::SolrService.instance.conn }
       let(:expected_query) { "#{model_query} AND " \
                              "_query_:\"{!field f=foo}bar\" AND " \
-                             "_query_:\"{!field f=baz}quix\" AND " \
-                             "_query_:\"{!field f=baz}quack\"" }
+                             "(_query_:\"{!field f=baz}quix\" OR " \
+                             "_query_:\"{!field f=baz}quack\")" }
       let(:expected_params) { { params: { sort: [sort_query], fl: 'id', q: expected_query, qt: 'standard' } } }
       let(:mock_docs) { [{ "id" => "changeme-30" }, { "id" => "changeme-22" }] }
 
@@ -159,8 +159,8 @@ describe ActiveFedora::Base do
       let(:solr) { ActiveFedora::SolrService.instance.conn }
       let(:expected_query) { "#{model_query} AND " \
                              "_query_:\"{!field f=foo}bar\" AND " \
-                             "_query_:\"{!field f=baz}quix\" AND " \
-                             "_query_:\"{!field f=baz}quack\"" }
+                             "(_query_:\"{!field f=baz}quix\" OR " \
+                             "_query_:\"{!field f=baz}quack\")" }
       let(:expected_params) { { params: { sort: [sort_query], fl: 'id', q: expected_query, qt: 'standard' } } }
       let(:mock_docs) { double('docs') }
 
@@ -254,8 +254,8 @@ describe ActiveFedora::Base do
     context "with a hash of conditions" do
       let(:expected_query) { "#{model_query} AND " \
                              "_query_:\"{!field f=foo}bar\" AND " \
-                             "_query_:\"{!field f=baz}quix\" AND " \
-                             "_query_:\"{!field f=baz}quack\"" }
+                             "(_query_:\"{!field f=baz}quix\" OR " \
+                             "_query_:\"{!field f=baz}quack\")" }
       let(:conditions) { { foo: 'bar', baz: ['quix', 'quack'] } }
 
       it "makes a query to solr and returns the results" do
@@ -266,8 +266,8 @@ describe ActiveFedora::Base do
     context "with quotes in the params" do
       let(:expected_query) { "#{model_query} AND " \
                              "_query_:\"{!field f=foo}9\\\" Nails\" AND " \
-                             "_query_:\"{!field f=baz}7\\\" version\" AND " \
-                             "_query_:\"{!field f=baz}quack\"" }
+                             "(_query_:\"{!field f=baz}7\\\" version\" OR " \
+                             "_query_:\"{!field f=baz}quack\")" }
       let(:conditions) { { foo: '9" Nails', baz: ['7" version', 'quack'] } }
 
       it "escapes quotes" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 10.0.0
+  version: 10.1.0.rc1
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-08 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -772,9 +772,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1