ddr-models 2.4.0.rc4 → 2.4.0.rc5

data/spec/index/query_clause_spec.rb

@@ -2,43 +2,51 @@ module Ddr::Index
   RSpec.describe QueryClause do
 
     describe "class methods" do
-      describe ".build" do
-        subject { QueryClause.build("foo", "bar") }
-        it { is_expected.to eq "foo:bar" }
-      end
       describe ".unique_key" do
-        subject { QueryClause.unique_key("test:1") }
-        it { is_expected.to eq "{!term f=id}test:1" }
+        subject { described_class.unique_key("test:1") }
+        its(:to_s) { is_expected.to eq "{!term f=id}test:1" }
       end
       describe ".id" do
-        subject { QueryClause.id("test:1") }
-        it { is_expected.to eq "{!term f=id}test:1" }
+        subject { described_class.id("test:1") }
+        its(:to_s) { is_expected.to eq "{!term f=id}test:1" }
       end
       describe ".negative" do
-        subject { QueryClause.negative("foo", "bar") }
-        it { is_expected.to eq "-foo:bar" }
+        subject { described_class.negative("foo", "Jungle Fever") }
+        its(:to_s) { is_expected.to eq "-foo:\"Jungle Fever\"" }
       end
       describe ".present" do
-        subject { QueryClause.present("foo") }
-        it { is_expected.to eq "foo:[* TO *]" }
+        subject { described_class.present("foo") }
+        its(:to_s) { is_expected.to eq "foo:[* TO *]" }
       end
       describe ".absent" do
-        subject { QueryClause.absent("foo") }
-        it { is_expected.to eq "-foo:[* TO *]" }
+        subject { described_class.absent("foo") }
+        its(:to_s) { is_expected.to eq "-foo:[* TO *]" }
       end
-      describe ".or_values" do
-        subject { QueryClause.or_values("foo", ["bar", "baz"]) }
-        it { is_expected.to eq "foo:(bar OR baz)" }
+      describe ".disjunction" do
+        subject { described_class.disjunction("foo", ["Jungle Fever", "bar"]) }
+        its(:to_s) { is_expected.to eq "{!lucene q.op=OR df=foo}\"Jungle Fever\" bar" }
       end
       describe ".before" do
-
+        subject { described_class.before("foo", DateTime.parse("2015-12-14T20:40:06Z")) }
+        its(:to_s) { is_expected.to eq "foo:[* TO 2015-12-14T20:40:06Z]" }
       end
       describe ".before_days" do
-        subject { QueryClause.before_days("foo", 5) }
-        it { is_expected.to eq "foo:[* TO NOW-5DAYS]" }
+        subject { described_class.before_days("foo", 5) }
+        its(:to_s) { is_expected.to eq "foo:[* TO NOW-5DAYS]" }
       end
       describe ".term" do
-
+        subject { described_class.term("foo", "bar") }
+        its(:to_s) { is_expected.to eq "{!term f=foo}bar" }
+      end
+      describe ".where" do
+        describe "when the value is a string" do
+          subject { described_class.where("foo", "Jungle Fever") }
+          its(:to_s) { is_expected.to eq "foo:\"Jungle Fever\"" }
+        end
+        describe "when the value is an array" do
+          subject { described_class.where("foo", ["Jungle Fever", "bar"]) }
+          its(:to_s) { is_expected.to eq "{!lucene q.op=OR df=foo}\"Jungle Fever\" bar" }
+        end
       end
     end
 

data/spec/index/query_spec.rb

@@ -1,23 +1,26 @@
 module Ddr::Index
   RSpec.describe Query do
+
     let(:id) { UniqueKeyField.instance }
     let(:foo) { Field.new("foo") }
     let(:spam) { Field.new("spam") }
     let(:filter) { Filter.where(spam=>"eggs") }
     let(:sort_order) { SortOrder.new(field: foo, order: "asc") }
     let(:fields) { [id, foo, spam] }
+
     subject {
       described_class.new(q: "foo:bar",
-                          filters: filter,
+                          filters: [filter],
                           fields: fields,
                           sort: sort_order,
                           rows: 50)
     }
+
     its(:to_s) {
-      is_expected.to eq "q=foo%3Abar&fq=%7B%21term+f%3Dspam%7Deggs&fl=id%2Cfoo%2Cspam&sort=foo+asc&rows=50"
+      is_expected.to eq "q=foo%3Abar&fq=spam%3Aeggs&fl=id%2Cfoo%2Cspam&sort=foo+asc&rows=50"
     }
     its(:params) {
-      is_expected.to eq({q: "foo:bar", fl: "id,foo,spam", fq: ["{!term f=spam}eggs"], sort: "foo asc", rows: 50})
+      is_expected.to eq({q: "foo:bar", fl: "id,foo,spam", fq: ["spam:eggs"], sort: "foo asc", rows: 50})
     }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 2.4.0.rc4
+  version: 2.4.0.rc5
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -233,14 +233,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -466,17 +466,16 @@ files:
 - lib/ddr/index/csv_query_result.rb
 - lib/ddr/index/document_builder.rb
 - lib/ddr/index/field.rb
+- lib/ddr/index/field_attribute.rb
 - lib/ddr/index/fields.rb
 - lib/ddr/index/filter.rb
 - lib/ddr/index/filters.rb
 - lib/ddr/index/legacy_license_fields.rb
-- lib/ddr/index/queries.rb
 - lib/ddr/index/query.rb
 - lib/ddr/index/query_builder.rb
 - lib/ddr/index/query_clause.rb
 - lib/ddr/index/query_params.rb
 - lib/ddr/index/query_result.rb
-- lib/ddr/index/query_value.rb
 - lib/ddr/index/response.rb
 - lib/ddr/index/sort_order.rb
 - lib/ddr/index/unique_key_field.rb
@@ -635,12 +634,9 @@ files:
 - spec/helpers/models_helper_spec.rb
 - spec/index/fields_spec.rb
 - spec/index/filter_spec.rb
-- spec/index/filters_spec.rb
-- spec/index/queries_spec.rb
 - spec/index/query_builder_spec.rb
 - spec/index/query_clause_spec.rb
 - spec/index/query_spec.rb
-- spec/index/query_value_spec.rb
 - spec/jobs/fits_file_characterization_spec.rb
 - spec/jobs/fixity_check_spec.rb
 - spec/jobs/job_spec.rb
@@ -810,12 +806,9 @@ test_files:
 - spec/helpers/models_helper_spec.rb
 - spec/index/fields_spec.rb
 - spec/index/filter_spec.rb
-- spec/index/filters_spec.rb
-- spec/index/queries_spec.rb
 - spec/index/query_builder_spec.rb
 - spec/index/query_clause_spec.rb
 - spec/index/query_spec.rb
-- spec/index/query_value_spec.rb
 - spec/jobs/fits_file_characterization_spec.rb
 - spec/jobs/fixity_check_spec.rb
 - spec/jobs/job_spec.rb

data/lib/ddr/index/queries.rb

@@ -1,20 +0,0 @@
-module Ddr::Index
-  module Queries
-
-    # Returns a query for a single index document.
-    # @param doc_id [String] the index document id
-    # @return [Query] the query
-    def self.id(doc_id)
-      builder = QueryBuilder.new { id doc_id }
-      builder.query
-    end
-
-    # Returns a query for the index document for an object.
-    # @param obj [ActiveFedora::Base] the object
-    # @return [Query] the query
-    def self.object(obj)
-      id(obj.pid)
-    end
-
-  end
-end

data/lib/ddr/index/query_value.rb

@@ -1,24 +0,0 @@
-module Ddr::Index
-  class QueryValue
-
-    class << self
-      # Returns an escaped query value
-      # @param value [String] the unescaped value
-      # @return [String] the escaped value
-      def build(value)
-        RSolr.solr_escape(value)
-      end
-
-      # Builds an escaped query value for use in filtering on a field for any value in the list of values
-      # @param values [Enumerable<String>]
-      # @return [String] query value
-      def or_values(values)
-        unless values.is_a?(::Enumerable) && values.present?
-          raise ArgumentError, "`#{self.name}.or_values` requires a non-empty enumerable of strings."
-        end
-        "(%s)" % values.map { |value| build(value) }.join(" OR ")
-      end
-    end
-
-  end
-end

data/spec/index/filters_spec.rb

@@ -1,34 +0,0 @@
-module Ddr::Index
-  RSpec.describe Filters do
-
-    describe "class methods" do
-      describe ".is_governed_by" do
-        describe "with an object" do
-          subject { Filters.is_governed_by(Item.new(pid: "test:1")) }
-          its(:clauses) { is_expected.to eq(["{!term f=is_governed_by_ssim}info:fedora/test:1"]) }
-        end
-        describe "with an ID" do
-          subject { Filters.is_governed_by("test:1") }
-          its(:clauses) { is_expected.to eq(["{!term f=is_governed_by_ssim}info:fedora/test:1"]) }
-        end
-      end
-
-      describe ".is_member_of_collection" do
-        describe "with an object" do
-          subject { Filters.is_member_of_collection(Item.new(pid: "test:1")) }
-          its(:clauses) { is_expected.to eq(["{!term f=is_member_of_collection_ssim}info:fedora/test:1"]) }
-        end
-        describe "with an ID" do
-          subject { Filters.is_member_of_collection("test:1") }
-          its(:clauses) { is_expected.to eq(["{!term f=is_member_of_collection_ssim}info:fedora/test:1"]) }
-        end
-      end
-
-      describe ".has_content" do
-        subject { Filters.has_content }
-        its(:clauses) { is_expected.to eq(["active_fedora_model_ssi:(Component OR Attachment OR Target)"]) }
-      end
-    end
-
-  end
-end

data/spec/index/queries_spec.rb

@@ -1,21 +0,0 @@
-module Ddr::Index
-  RSpec.describe Queries do
-
-    describe "module methods" do
-      let(:obj) { FactoryGirl.create(:item) }
-
-      describe ".id" do
-        specify {
-          expect(Queries.id(obj.pid).pids.to_a).to eq [obj.pid]
-        }
-      end
-
-      describe ".object" do
-        specify {
-          expect(Queries.object(obj).pids.to_a).to eq [obj.pid]
-        }
-      end
-    end
-
-  end
-end

data/spec/index/query_value_spec.rb

@@ -1,33 +0,0 @@
-module Ddr::Index
-  RSpec.describe QueryValue do
-
-    describe ".or_values" do
-      describe "when argument is nil" do
-        it "raises an exception" do
-          expect { described_class.or_values(nil) }.to raise_error(ArgumentError)
-        end
-      end
-      describe "when argument is empty" do
-        it "raises an exception" do
-          expect { described_class.or_values([]) }.to raise_error(ArgumentError)
-        end
-      end
-      describe "when argument is not enumerable" do
-        it "raises an exception" do
-          expect { described_class.or_values("foo") }.to raise_error(ArgumentError)
-        end
-      end
-      describe "when argument size == 1" do
-        it "returns the first value, escaped" do
-          expect(described_class.or_values(["foo:bar"])).to eq("(foo\\:bar)")
-        end
-      end
-      describe "when argument size > 1" do
-        it "return the escaped values OR'd together in parentheses" do
-          expect(described_class.or_values(["foo:bar", "spam:eggs"])).to eq("(foo\\:bar OR spam\\:eggs)")
-        end
-      end
-    end
-
-  end
-end