ddr-models 2.4.12 → 2.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe3c3a2916bd8e30cc51399f093248fc985a1e15
-  data.tar.gz: d69c882f8ae41711e03e300fa5d8ace5289e969f
+  metadata.gz: 7e305b209128c60e1cf1a0231c117686f834f491
+  data.tar.gz: c4fa26a45ebf460c892c9e5770dc2b10f2a326db
 SHA512:
-  metadata.gz: e78d004f27dfba444dab593e87935a4ec38f20efcad6607ab6266f585e7306790bca55a079e7a7522f7b7cdc7cc737fdb468d1c146b4d198dcc53e19f3495890
-  data.tar.gz: b84791fba767c9599d84fba408f9b0e79bdcb268263aeea8644b32d716f171e2620d9f97f2e550002dff225b0a4991f05b12b73f67a26daf938ca6d4fffae5de
+  metadata.gz: ddd8c567e7ec34286dc13eba223a0dedb0b0db7773196b8cecbfa179c4e1c8cc44e6794692fd50deabf9afc37e116e6a35068b2b3fc6b13d525d6425c4201b76
+  data.tar.gz: a8139759bcd54585aa374f987598a8cdbfc27fabacb914ea841c980e271e384b1273ddd08d40c12f7724e3d836881435f9e09e40214dee42004f9a1ceff60c9d

data/ddr-models.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.add_dependency "cancancan", "~> 1.12"
   s.add_dependency "ddr-antivirus", "~> 2.1.1"
   s.add_dependency "virtus", "~> 1.0.5"
-  s.add_dependency "hashie", "~> 3.4.3"
+  s.add_dependency "hashie", "~> 3.4", "< 3.4.4"
 
   s.add_development_dependency "bundler", "~> 1.11"
   s.add_development_dependency "rake"

data/lib/ddr/index.rb

@@ -4,14 +4,12 @@ module Ddr
 
     autoload :AbstractQueryResult
     autoload :Connection
-    autoload :CSVOptions
     autoload :CSVQueryResult
     autoload :DocumentBuilder
     autoload :Field
     autoload :FieldAttribute
     autoload :Fields
     autoload :Filter
-    autoload :Filters
     autoload :LegacyLicenseFields
     autoload :Query
     autoload :QueryBuilder
@@ -19,7 +17,6 @@ module Ddr
     autoload :QueryParams
     autoload :QueryResult
     autoload :Response
-    autoload :SolrCSVOptions
     autoload :SortOrder
     autoload :UniqueKeyField
 

data/lib/ddr/index/abstract_query_result.rb

@@ -2,16 +2,15 @@ module Ddr::Index
   class AbstractQueryResult
     include Enumerable
 
-    attr_reader :query, :conn
+    attr_reader :query
     delegate :params, to: :query
 
     def initialize(query)
       @query = query.dup.freeze
-      @conn = Connection.new
     end
 
     def count
-      response = conn.select(params, rows: 0)
+      response = Connection.select(params, rows: 0)
       response.num_found
     end
 

data/lib/ddr/index/connection.rb

@@ -1,17 +1,36 @@
+require "rsolr"
+require "forwardable"
+
 module Ddr::Index
-  class Connection < SimpleDelegator
+  #
+  # Wraps an RSolr connection
+  #
+  class Connection
 
-    def initialize
-      super RSolr.connect(ActiveFedora.solr_config)
-    end
+    module Methods
+      extend Forwardable
 
-    def select(params, extra={})
-      Response.new get("select", params: params.merge(extra))
-    end
+      delegate [:get, :paginate] => :solr
+
+      def solr
+        RSolr.connect(ActiveFedora.solr_config)
+      end
 
-    def page(*args)
-      Response.new paginate(*args)
+      def select(params, extra={})
+        Response.new get("select", params: params.merge(extra))
+      end
+
+      def page(*args)
+        Response.new paginate(*args)
+      end
+
+      def count(params)
+        select(params, rows: 0).num_found
+      end
     end
 
+    extend Methods
+    include Methods
+
   end
 end

data/lib/ddr/index/csv_query_result.rb

@@ -3,65 +3,65 @@ require "csv"
 module Ddr::Index
   class CSVQueryResult < AbstractQueryResult
 
-    MAX_ROWS = 10**8
-    MV_SEP   = ";"
+    MAX_ROWS         = 10**8 # Just set to a really high number :)
+    CSV_MV_SEPARATOR = ";"
 
-    attr_reader :mv_sep
+    delegate :headers, :to_s, :to_csv, to: :table
 
-    delegate :read, :each, to: :csv
-
-    def initialize(query, mv_sep: MV_SEP)
-      super(query)
-      @mv_sep = mv_sep
+    def delete_empty_columns!
+      table.by_col!.delete_if { |c, vals| vals.all?(&:nil?) }
     end
 
-    def csv
-      CSV.new(data, csv_opts.to_h)
+    def each(&block)
+      table.by_row!.each(&block)
     end
 
-    def to_s
-      read.to_csv
+    def [](index_or_header)
+      table.by_col_or_row![index_or_header]
     end
 
-    def rows
-      query.rows || MAX_ROWS
+    def table
+      @table ||= CSV.parse(data, csv_opts)
     end
 
     def csv_opts
-      @csv_opts ||= CSVOptions.new(headers: csv_headers)
+      { headers:        csv_headers,
+        return_headers: false,
+        write_headers:  true,
+      }
     end
 
     def solr_csv_opts
-      @solr_csv_opts ||= SolrCSVOptions.new(col_sep: csv_opts.col_sep,
-                                            quote_char: csv_opts.quote_char,
-                                            header: solr_csv_header,
-                                            mv_sep: mv_sep,
-                                            rows: rows)
+      { "csv.mv.separator" => CSV_MV_SEPARATOR,
+        "csv.header"       => solr_csv_header?,
+        "rows"             => solr_csv_rows,
+        "wt"               => "csv",
+      }
     end
 
-    def headers
-      @headers ||= query.fields.map(&:heading)
+    def query_field_headings
+      query.fields.map { |f| f.respond_to?(:heading) ? f.heading : f.to_s }
     end
 
     def csv_headers
-      if headers.empty?
-        :first_row
-      else
-        headers
-      end
+      query.fields.empty? ? :first_row : query_field_headings
     end
 
-    def solr_csv_header
+    def solr_csv_header?
       csv_headers == :first_row
     end
 
+    def solr_csv_rows
+      query.rows || MAX_ROWS
+    end
+
     def solr_csv_params
-      params.merge solr_csv_opts.params
+      params.merge(solr_csv_opts)
     end
 
     def data
-      raw = conn.get("select", params: solr_csv_params)
-      raw.gsub(/\\#{mv_sep}/, mv_sep)
+      raw = Connection.get("select", params: solr_csv_params)
+      raw.gsub(/\\#{CSV_MV_SEPARATOR}/, CSV_MV_SEPARATOR)
     end
 
   end

data/lib/ddr/index/filter.rb

@@ -57,6 +57,16 @@ module Ddr::Index
         self.clauses << QueryClause.before_days(field, value)
         self
       end
+
+      def join(**args)
+        self.clauses << QueryClause.join(**args)
+        self
+      end
+
+      def regexp(field, value)
+        self.clauses << QueryClause.regexp(field, value)
+        self
+      end
     end
 
     module ClassMethods
@@ -68,16 +78,16 @@ module Ddr::Index
         model "Component", "Attachment", "Target"
       end
 
-      def is_governed_by(object_or_id)
-        term is_governed_by: internal_uri(object_or_id)
+      def is_governed_by(arg)
+        term is_governed_by: get_uri(arg)
       end
 
-      def is_member_of_collection(object_or_id)
-        term is_member_of_collection: internal_uri(object_or_id)
+      def is_member_of_collection(arg)
+        term is_member_of_collection: get_uri(arg)
       end
 
-      def is_part_of(object_or_id)
-        term is_part_of: internal_uri(object_or_id)
+      def is_part_of(arg)
+        term is_part_of: get_uri(arg)
       end
 
       def model(*models)
@@ -86,11 +96,14 @@ module Ddr::Index
 
       private
 
-      def internal_uri(object_or_id)
-        if object_or_id.respond_to?(:internal_uri)
-          object_or_id.internal_uri
+      def get_uri(arg)
+        case arg
+        when ActiveFedora::Base
+          arg.internal_uri
+        when String
+          arg.start_with?("info:fedora/") ? arg : "info:fedora/#{arg}"
         else
-          ActiveFedora::Base.internal_uri(object_or_id)
+          raise TypeError, "Argument must be a String or ActiveFedora::Base instance: #{arg.class}"
         end
       end
 

data/lib/ddr/index/query.rb

@@ -5,6 +5,7 @@ module Ddr::Index
   class Query
     include Virtus.model
     extend Forwardable
+    extend Deprecation
 
     attribute :q,       String
     attribute :fields,  Array[FieldAttribute], default: [ ]
@@ -12,9 +13,15 @@ module Ddr::Index
     attribute :sort,    Array[String],         default: [ ]
     attribute :rows,    Integer
 
-    delegate [:count, :docs, :pids, :each_pid, :all] => :result
+    delegate [:count, :docs, :ids, :each_id, :all] => :result
     delegate :params => :query_params
 
+    def self.build(*args, &block)
+      new.tap do |query|
+        query.build(*args, &block)
+      end
+    end
+
     def initialize(**args, &block)
       super(**args)
       if block_given?
@@ -31,12 +38,22 @@ module Ddr::Index
       URI.encode_www_form(params)
     end
 
+    def pids
+      Deprecation.warn(QueryResult, "`pids` is deprecated; use `ids` instead.")
+      ids
+    end
+
+    def each_pid(&block)
+      Deprecation.warn(QueryResult, "`each_pid` is deprecated; use `each_id` instead.")
+      each_id(&block)
+    end
+
     def result
       QueryResult.new(self)
     end
 
-    def csv(**opts)
-      CSVQueryResult.new(self, **opts)
+    def csv
+      CSVQueryResult.new(self)
     end
 
     def filter_clauses
@@ -47,10 +64,19 @@ module Ddr::Index
       QueryParams.new(self)
     end
 
-    def build(&block)
-      QueryBuilder.new(self, &block)
+    def build(*args, &block)
+      QueryBuilder.new(self, *args, &block)
       self
     end
 
+    def ==(other)
+      other.instance_of?(self.class) &&
+        other.q == self.q &&
+        other.fields == self.fields &&
+        other.filters == self.filters &&
+        other.rows == self.rows &&
+        other.sort == self.sort
+    end
+
   end
 end

data/lib/ddr/index/query_builder.rb

@@ -28,9 +28,6 @@ module Ddr::Index
   #
   #   See also: asc, order_by
   #
-  # id [doc_id]
-  #   For selecting a single document by ID.
-  #
   # filter [filter1], ...
   #   Adds filters to the query.
   #
@@ -48,6 +45,12 @@ module Ddr::Index
   # fields [field], ...
   #   Alias for: field
   #
+  # id [doc_id]
+  #   For selecting a single document by ID.
+  #
+  # join [from: {field1}, to: {field2}, where: {condition}]
+  #   Adds a Solr join clause (see https://wiki.apache.org/solr/Join)
+  #
   # limit [int]
   #   Limits the number of documents returned by the query.
   #
@@ -74,6 +77,11 @@ module Ddr::Index
   # raw [clause1], ...
   #   Adds a filter of "raw" query clauses (i.e., pre-constructed).
   #
+  # regexp [field], [regexp]
+  #   Adds a filter selecting documents where the field has a value
+  #     matching the regular expression.
+  #     Slashes (/) in the regexp will be escaped as required by Solr.
+  #
   # rows [int]
   #   Alias for: limit
   #
@@ -91,24 +99,12 @@ module Ddr::Index
   #
   class QueryBuilder
 
-    # Builds a Query object
-    # @yield [builder] a new QueryBuilder instance.
-    # @return [Query]
-    def self.build
-      Deprecation.warn(self,
-                       "`Ddr::Index::QueryBuilder.build` is deprecated and will be removed in ddr-models 3.0." \
-                       " Use `Ddr::Index::QueryBuilder.new` instead.")
-      builder = new
-      yield builder
-      builder.query
-    end
-
     attr_reader :query
 
-    def initialize(query = nil, &block)
-      @query = query || Query.new
+    def initialize(*args, &block)
+      @query = args.first.is_a?(Query) ? args.shift : Query.new
       if block_given?
-        instance_eval &block
+        instance_exec(*args, &block)
       end
     end
 
@@ -146,11 +142,6 @@ module Ddr::Index
     # @param orderings [Hash<Field, String>]
     # @return [QueryBuilder] self
     def order_by(*orderings)
-      unless orderings.first.is_a? Hash
-        Deprecation.warn(QueryBuilder, "`order_by` will require a hash of orderings in ddr-models 3.0.")
-        field, order = orderings
-        return order_by(field => order)
-      end
       query.sort += orderings.first.map { |field, order| SortOrder.new(field: field, order: order) }
       self
     end

data/lib/ddr/index/query_clause.rb

@@ -12,6 +12,7 @@ module Ddr::Index
     STANDARD_QUERY  = "%{field}:%{value}"
     NEGATIVE_QUERY  = "-%{field}:%{value}"
     DISJUNCTION     = "{!lucene q.op=OR df=%{field}}%{value}"
+    REGEXP_QUERY    = "%{field}:/%{value}/"
 
     values do
       attribute :field,       FieldAttribute
@@ -29,7 +30,6 @@ module Ddr::Index
     end
 
     class << self
-
       def quote(value)
         # Derived from Blacklight::Solr::SearchBuilderBehavior#solr_param_quote
         unless value =~ /\A[a-zA-Z0-9$_\-\^]+\z/
@@ -75,6 +75,16 @@ module Ddr::Index
         new(field: field, value: value, template: DISJUNCTION)
       end
 
+      # Builds a Solr join clause
+      # @see https://wiki.apache.org/solr/Join
+      def join(from:, to:, where:)
+        field, value = where.to_a.first
+        from_field = FieldAttribute.coerce(from)
+        to_field   = FieldAttribute.coerce(to)
+        template = "{!join from=#{from_field} to=#{to_field}}%{field}:%{value}"
+        new(field: field, value: value, template: template, quote_value: true)
+      end
+
       # Builds a query clause to filter where date field value is earlier than a date/time value.
       def before(field, value)
         new(field: field, value: "[* TO %s]" % Ddr::Utils.solr_date(value))
@@ -91,6 +101,11 @@ module Ddr::Index
         new(field: field, value: value, template: TERM_QUERY)
       end
 
+      # Builds a regular expression query clause
+      def regexp(field, value)
+        val = value.gsub(/\//, "\\/")
+        new(field: field, value: val, template: REGEXP_QUERY)
+      end
     end
 
   end

data/lib/ddr/index/query_result.rb

@@ -1,5 +1,6 @@
 module Ddr::Index
   class QueryResult < AbstractQueryResult
+    extend Deprecation
 
     PAGE_SIZE = 1000
 
@@ -14,7 +15,7 @@ module Ddr::Index
     end
 
     def each_unpaginated(&block)
-      conn.select(params).docs.each(&block)
+      Connection.select(params).docs.each(&block)
     end
 
     def each_paginated(&block)
@@ -22,15 +23,31 @@ module Ddr::Index
     end
 
     def pids
+      Deprecation.warn(QueryResult,
+                       "`pids` is deprecated; use `ids` instead." \
+                       " (called from #{caller.first})"
+                      )
+      ids
+    end
+
+    def ids
       Enumerator.new do |e|
         each do |doc|
-          e << doc[Fields::PID]
+          e << doc[Fields::ID]
         end
       end
     end
 
     def each_pid(&block)
-      pids.each(&block)
+      Deprecation.warn(QueryResult,
+                       "`each_pid` is deprecated; use `each_id` instead." \
+                       " (called from #{caller.first})"
+                      )
+      each_id(&block)
+    end
+
+    def each_id(&block)
+      ids.each(&block)
     end
 
     def docs
@@ -41,6 +58,21 @@ module Ddr::Index
       end
     end
 
+    def objects
+      Enumerator.new do |e|
+        each_id do |id|
+          e << ActiveFedora::Base.find(id)
+        end
+      end
+    end
+
+    def facet_fields
+      response = Connection.select(params, rows: 0)
+      response.facet_fields.each_with_object({}) do |(field, values), memo|
+        memo[field] = Hash[*values]
+      end
+    end
+
     def all
       to_a
     end
@@ -62,7 +94,7 @@ module Ddr::Index
     def page(num)
       page_params = params.dup
       page_size = page_params.delete(:rows) || PAGE_SIZE
-      response = conn.page num, page_size, "select", params: page_params
+      response = Connection.page(num, page_size, "select", params: page_params)
       response.docs
     end
 

data/lib/ddr/index/response.rb

@@ -1,12 +1,29 @@
+require "delegate"
+
 module Ddr::Index
+  #
+  # Wraps an index query response
+  #
   class Response < SimpleDelegator
 
     def docs
-      self["response"]["docs"]
+      response["docs"]
     end
 
     def num_found
-      self["response"]["numFound"].to_i
+      response["numFound"].to_i
+    end
+
+    def facet_counts
+      self["facet_counts"] || {}
+    end
+
+    def facet_fields
+      facet_counts["facet_fields"] || {}
+    end
+
+    def response
+      self["response"]
     end
 
   end

data/lib/ddr/models/solr_document.rb

@@ -12,8 +12,7 @@ module Ddr::Models
 
     module ClassMethods
       def find(pid_or_uri)
-        pid = pid_or_uri.sub(/\Ainfo:fedora\//, "")
-        query = Ddr::Index::QueryBuilder.build { |q| q.id(pid) }
+        query = Ddr::Index::Query.new { id pid_or_uri.sub(/\Ainfo:fedora\//, "") }
         if doc = query.docs.first
           return doc
         end

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "2.4.12"
+    VERSION = "2.4.13"
   end
 end

data/spec/index/csv_query_result_spec.rb

@@ -0,0 +1,44 @@
+module Ddr::Index
+  RSpec.describe CSVQueryResult do
+
+    subject { described_class.new(query) }
+
+    before do
+      Item.create(title: ["Testing 1"],
+                  identifier: ["test1"],
+                  description: ["The process of eliminating errors."])
+      Item.create(title: ["Testing 2"],
+                  identifier: ["test2"])
+      Item.create(title: ["Testing 3"])
+    end
+
+    let(:query) {
+      Ddr::Index::Query.new do
+        fields Ddr::Index::Fields::ID
+        fields Ddr::Index::Fields.descmd
+      end
+    }
+
+    specify {
+      expect(subject["title"]).to contain_exactly("Testing 1", "Testing 2", "Testing 3")
+      expect(subject["identifier"]).to contain_exactly("test1", "test2", nil)
+      expect(subject["description"]).to contain_exactly("The process of eliminating errors.", nil, nil)
+      expect(subject["creator"]).to contain_exactly(nil, nil, nil)
+      expect(subject.headers).to include("creator")
+      expect(subject.to_s).to match(/creator/)
+    }
+
+    describe "#delete_empty_columns!" do
+      specify {
+        subject.delete_empty_columns!
+        expect(subject["title"]).to contain_exactly("Testing 1", "Testing 2", "Testing 3")
+        expect(subject["identifier"]).to contain_exactly("test1", "test2", nil)
+        expect(subject["description"]).to contain_exactly("The process of eliminating errors.", nil, nil)
+        expect(subject["creator"]).to contain_exactly(nil, nil, nil)
+        expect(subject.headers).to contain_exactly("pid", "title", "identifier", "description")
+        expect(subject.to_s).not_to match(/creator/)
+      }
+    end
+
+  end
+end

data/spec/index/filter_spec.rb

@@ -37,6 +37,12 @@ module Ddr::Index
             are_expected.to eq([QueryClause.term(:is_governed_by, "info:fedora/test:1")])
           }
         end
+        describe "with a URI" do
+          subject { described_class.is_governed_by("info:fedora/test:1") }
+          its(:clauses) {
+            are_expected.to eq([QueryClause.term(:is_governed_by, "info:fedora/test:1")])
+          }
+        end
       end
       describe ".is_member_of_collection" do
         describe "with an object" do
@@ -51,6 +57,32 @@ module Ddr::Index
             are_expected.to eq([QueryClause.term(:is_member_of_collection, "info:fedora/test:1")])
           }
         end
+        describe "with a URI" do
+          subject { described_class.is_member_of_collection("info:fedora/test:1") }
+          its(:clauses) {
+            are_expected.to eq([QueryClause.term(:is_member_of_collection, "info:fedora/test:1")])
+          }
+        end
+      end
+      describe ".is_part_of" do
+        describe "with an object" do
+          subject { described_class.is_part_of(Item.new(pid: "test:1")) }
+          its(:clauses) {
+            are_expected.to eq([QueryClause.term(:is_part_of, "info:fedora/test:1")])
+          }
+        end
+        describe "with an ID" do
+          subject { described_class.is_part_of("test:1") }
+          its(:clauses) {
+            are_expected.to eq([QueryClause.term(:is_part_of, "info:fedora/test:1")])
+          }
+        end
+        describe "with a URI" do
+          subject { described_class.is_part_of("info:fedora/test:1") }
+          its(:clauses) {
+            are_expected.to eq([QueryClause.term(:is_part_of, "info:fedora/test:1")])
+          }
+        end
       end
       describe ".has_content" do
         subject { described_class.has_content }
@@ -107,6 +139,20 @@ module Ddr::Index
           are_expected.to eq([QueryClause.before("foo", DateTime.parse("Thu, 27 Aug 2015 17:42:34 -0400"))])
         }
       end
+      describe ".join" do
+        subject {
+          described_class.join(from: :id, to: :collection_uri, where: {admin_set: "dvs"})
+        }
+        its(:clauses) {
+          are_expected.to eq([QueryClause.join(from: :id, to: :collection_uri, where: {admin_set: "dvs"})])
+        }
+      end
+      describe ".regexp" do
+        subject { described_class.regexp("foo", "foo/bar.*") }
+        its(:clauses) {
+          are_expected.to eq([QueryClause.regexp("foo", "foo/bar.*")])
+        }
+      end
     end
 
     describe "API methods" do
@@ -166,6 +212,13 @@ module Ddr::Index
           expect(subject.clauses).to eq([QueryClause.before("foo", DateTime.parse("Thu, 27 Aug 2015 17:42:34 -0400"))])
         end
       end
+      describe "#join" do
+        it "adds a join query clause" do
+          subject.join(from: :id, to: :collection_uri, where: {admin_set: "dvs"})
+          expect(subject.clauses).to eq([QueryClause.join(from: :id, to: :collection_uri, where: {admin_set: "dvs"})])
+        end
+      end
+
     end
 
   end

data/spec/index/query_builder_spec.rb

@@ -1,6 +1,5 @@
 module Ddr::Index
   RSpec.describe QueryBuilder do
-
     describe "DSL" do
       describe "id" do
         subject { described_class.new { id "test:1" } }
@@ -95,6 +94,22 @@ module Ddr::Index
         subject { described_class.new { before_days "foo", 7 } }
         specify { expect(subject.query.filters).to eq [Filter.before_days("foo", 7)] }
       end
+      describe "join" do
+        subject {
+          described_class.new do
+            join from: :id, to: :collection_uri, where: {admin_set: "dvs"}
+          end
+        }
+        specify {
+          expect(subject.query.filters).to eq [Filter.join(from: :id, to: :collection_uri, where: {admin_set: "dvs"})]
+        }
+      end
+      describe "regexp" do
+        subject { described_class.new { regexp "foo", "foo/bar.*" } }
+        specify {
+          expect(subject.query.filters).to eq [Filter.regexp("foo", "foo/bar.*")]
+        }
+      end
     end
 
     describe "using static filters" do
@@ -112,5 +127,14 @@ module Ddr::Index
       end
     end
 
+    describe "passing local vars" do
+      let(:local_var) { double(bar: "bar") }
+      subject {
+        described_class.new(local_var) { |foo| asc foo.bar }
+      }
+      specify {
+        expect(subject.query.sort).to eq [SortOrder.asc("bar")]
+      }
+    end
   end
 end

data/spec/index/query_clause_spec.rb

@@ -52,6 +52,16 @@ module Ddr::Index
           its(:to_s) { is_expected.to eq "{!lucene q.op=OR df=foo}\"Jungle Fever\" bar" }
         end
       end
+      describe ".join" do
+        subject {
+          described_class.join(from: :id, to: :collection_uri, where: { admin_set: "dvs"})
+        }
+        its(:to_s) { is_expected.to eq "{!join from=id to=collection_uri_ssim}admin_set_ssi:dvs" }
+      end
+      describe ".regexp" do
+        subject { described_class.regexp("foo", "foo/bar.*") }
+        its(:to_s) { is_expected.to eq "foo:/foo\\/bar.*/" }
+      end
     end
 
   end

data/spec/index/query_spec.rb

@@ -1,20 +1,16 @@
 module Ddr::Index
   RSpec.describe Query do
-
-    describe "initialized with attributes" 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] }
-
+    describe ".build" do
+      let(:local1) { double(value: "foo:bar") }
+      let(:local2) { double(value: "foo") }
       subject {
-        described_class.new(q: "foo:bar",
-                            filters: [filter],
-                            fields: fields,
-                            sort: sort_order,
-                            rows: 50)
+        described_class.build(local1, local2) do |l1, l2|
+          q l1.value
+          where "spam"=>"eggs"
+          fields :id, "foo", "spam"
+          asc l2.value
+          limit 50
+        end
       }
 
       its(:to_s) {
@@ -25,7 +21,52 @@ module Ddr::Index
       }
     end
 
-    describe "initialized with a block" do
+    describe "initialization" do
+      describe "with attributes" 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],
+                              fields: fields,
+                              sort: sort_order,
+                              rows: 50)
+        }
+
+        its(:to_s) {
+          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: ["spam:eggs"], sort: "foo asc", rows: 50})
+        }
+      end
+
+      describe "with a block" do
+        subject {
+          described_class.new do
+            q "foo:bar"
+            where "spam"=>"eggs"
+            fields :id, "foo", "spam"
+            asc "foo"
+            limit 50
+          end
+        }
+
+        its(:to_s) {
+          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: ["spam:eggs"], sort: "foo asc", rows: 50})
+        }
+      end
+    end
+
+    describe "equality" do
       subject {
         described_class.new do
           q "foo:bar"
@@ -35,14 +76,16 @@ module Ddr::Index
           limit 50
         end
       }
-
-      its(:to_s) {
-        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: ["spam:eggs"], sort: "foo asc", rows: 50})
-      }
+      let(:other) do
+        described_class.new do
+          q "foo:bar"
+          where "spam"=>"eggs"
+          fields :id, "foo", "spam"
+          asc "foo"
+          limit 50
+        end
+      end
+      it { is_expected.to eq other }
     end
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 2.4.12
+  version: 2.4.13
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2016-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -227,14 +227,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.3
+        version: '3.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.3
+        version: '3.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.4.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -473,14 +479,12 @@ files:
 - lib/ddr/index.rb
 - lib/ddr/index/abstract_query_result.rb
 - lib/ddr/index/connection.rb
-- lib/ddr/index/csv_options.rb
 - 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/query.rb
 - lib/ddr/index/query_builder.rb
@@ -488,7 +492,6 @@ files:
 - lib/ddr/index/query_params.rb
 - lib/ddr/index/query_result.rb
 - lib/ddr/index/response.rb
-- lib/ddr/index/solr_csv_options.rb
 - lib/ddr/index/sort_order.rb
 - lib/ddr/index/unique_key_field.rb
 - lib/ddr/jobs.rb
@@ -647,6 +650,7 @@ files:
 - spec/fixtures/sample.pdf
 - spec/fixtures/target.png
 - spec/helpers/models_helper_spec.rb
+- spec/index/csv_query_result_spec.rb
 - spec/index/fields_spec.rb
 - spec/index/filter_spec.rb
 - spec/index/query_builder_spec.rb
@@ -823,6 +827,7 @@ test_files:
 - spec/fixtures/sample.pdf
 - spec/fixtures/target.png
 - spec/helpers/models_helper_spec.rb
+- spec/index/csv_query_result_spec.rb
 - spec/index/fields_spec.rb
 - spec/index/filter_spec.rb
 - spec/index/query_builder_spec.rb

data/lib/ddr/index/csv_options.rb

@@ -1,14 +0,0 @@
-require "csv"
-require "hashie"
-
-module Ddr::Index
-  class CSVOptions < Hashie::Dash
-
-    property :headers,        default: CSV::DEFAULT_OPTIONS[:headers]
-    property :return_headers, default: true
-    property :write_headers,  default: true
-    property :col_sep,        default: CSV::DEFAULT_OPTIONS[:col_sep]
-    property :quote_char,     default: CSV::DEFAULT_OPTIONS[:quote_char]
-
-  end
-end

data/lib/ddr/index/filters.rb

@@ -1,26 +0,0 @@
-module Ddr::Index
-  module Filters
-    extend Deprecation
-
-    def self.is_governed_by(pid)
-      Deprecation.warn(self,
-                       "`Ddr::Index:Filters.is_governed_by` is deprecated and will be removed in ddr-models 3.0." \
-                       " Use `Ddr::Index::Filter.is_governed_by` instead.")
-      Filter.is_governed_by(pid)
-    end
-
-    private
-
-    def self.const_missing(name)
-      if name == :HAS_CONTENT
-        Deprecation.warn(self,
-                         "`Ddr::Index::Filters::#{name}` is deprecated and will be removed in ddr-models 3.0." \
-                         " Use `Ddr::Index::Filter.has_content` instead.")
-        Filter.has_content
-      else
-        super
-      end
-    end
-
-  end
-end

data/lib/ddr/index/solr_csv_options.rb

@@ -1,18 +0,0 @@
-require "hashie"
-
-module Ddr::Index
-  class SolrCSVOptions < Hashie::Trash
-
-    property "csv.header",       from: :header,     default: false
-    property "csv.separator",    from: :col_sep,    default: ","
-    property "csv.encapsulator", from: :quote_char, default: '"'
-    property "csv.mv.separator", from: :mv_sep,     default: ","
-    property :wt,                default: "csv"
-    property :rows
-
-    def params
-      to_h.reject { |k, v| v.nil? }
-    end
-
-  end
-end