ddr-models 2.4.0.rc2 → 2.4.0.rc3

data/spec/index/filters_spec.rb

@@ -1,15 +1,32 @@
 module Ddr::Index
   RSpec.describe Filters do
 
-    describe "HAS_CONTENT" do
-      subject { Filters::HAS_CONTENT }
-      its(:clauses) { is_expected.to eq(["active_fedora_model_ssi:(Component OR Attachment OR Target)"]) }
-    end
-
     describe "class methods" do
-      describe "is_governed_by(pid)" do
-        subject { Filters.is_governed_by("test:1") }
-        its(:clauses) { is_expected.to eq(["{!term f=is_governed_by_ssim}info:fedora/test:1"]) }
+      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
 

data/spec/index/queries_spec.rb

@@ -0,0 +1,21 @@
+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_builder_spec.rb

@@ -0,0 +1,95 @@
+module Ddr::Index
+  RSpec.describe QueryBuilder do
+
+    describe "DSL" do
+      describe "id" do
+        subject { described_class.new { id "test:1" } }
+        specify {
+          expect(subject.query.rows).to eq 1
+          expect(subject.query.q).to eq "{!term f=id}test:1"
+        }
+      end
+
+      describe "q" do
+        subject { described_class.new { q "foo:bar" } }
+        specify { expect(subject.query.q).to eq "foo:bar" }
+      end
+
+      describe "asc" do
+        subject { described_class.new { asc "foo" } }
+        specify { expect(subject.query.sort).to eq [SortOrder.new(field: "foo", order: "asc")] }
+      end
+
+      describe "desc" do
+        subject { described_class.new { desc "foo" } }
+        specify { expect(subject.query.sort).to eq [SortOrder.new(field: "foo", order: "desc")] }
+      end
+
+      describe "filter" do
+        subject { described_class.new { filter Filter.where("foo"=>"bar") } }
+        specify { expect(subject.query.filters).to eq [Filter.where("foo"=>"bar")] }
+      end
+
+      describe "field" do
+        subject { described_class.new { field "foo", "bar" } }
+        specify { expect(subject.query.fields).to include("foo", "bar") }
+      end
+
+      describe "fields" do
+        subject { described_class.new { fields "foo", "bar" } }
+        specify { expect(subject.query.fields).to include("foo", "bar") }
+      end
+
+      describe "sort" do
+        subject { described_class.new { sort "foo"=>"asc", "bar"=>"desc" } }
+        specify { expect(subject.query.sort).to eq [SortOrder.new(field: "foo", order: "asc"), SortOrder.new(field: "bar", order: "desc")] }
+      end
+
+      describe "order_by" do
+        subject { described_class.new { order_by "foo"=>"asc", "bar"=>"desc" } }
+        specify { expect(subject.query.sort).to eq [SortOrder.new(field: "foo", order: "asc"), SortOrder.new(field: "bar", order: "desc")] }
+      end
+
+      describe "limit" do
+        subject { described_class.new { limit 5 } }
+        specify { expect(subject.query.rows).to eq 5 }
+      end
+
+      describe "rows" do
+        subject { described_class.new { rows 5 } }
+        specify { expect(subject.query.rows).to eq 5 }
+      end
+
+      describe "raw" do
+        subject { described_class.new { raw "foo:bar" } }
+        specify { expect(subject.query.filters).to eq [Filter.raw("foo:bar")] }
+      end
+
+      describe "where" do
+        subject { described_class.new { where "foo"=>"bar" } }
+        specify { expect(subject.query.filters).to eq [Filter.where("foo"=>"bar")] }
+      end
+
+      describe "absent" do
+        subject { described_class.new { absent "foo" } }
+        specify { expect(subject.query.filters).to eq [Filter.absent("foo")] }
+      end
+
+      describe "present" do
+        subject { described_class.new { present "foo" } }
+        specify { expect(subject.query.filters).to eq [Filter.present("foo")] }
+      end
+
+      describe "before" do
+        subject { described_class.new { before "foo", DateTime.parse("2015-12-14T20:40:06Z") } }
+        specify { expect(subject.query.filters).to eq [Filter.before("foo", DateTime.parse("2015-12-14T20:40:06Z"))] }
+      end
+
+      describe "before_days" do
+        subject { described_class.new { before_days "foo", 7 } }
+        specify { expect(subject.query.filters).to eq [Filter.before_days("foo", 7)] }
+      end
+    end
+
+  end
+end

data/spec/index/query_clause_spec.rb

@@ -0,0 +1,46 @@
+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" }
+      end
+      describe ".id" do
+        subject { QueryClause.id("test:1") }
+        it { 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" }
+      end
+      describe ".present" do
+        subject { QueryClause.present("foo") }
+        it { is_expected.to eq "foo:[* TO *]" }
+      end
+      describe ".absent" do
+        subject { QueryClause.absent("foo") }
+        it { 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)" }
+      end
+      describe ".before" do
+
+      end
+      describe ".before_days" do
+        subject { QueryClause.before_days("foo", 5) }
+        it { is_expected.to eq "foo:[* TO NOW-5DAYS]" }
+      end
+      describe ".term" do
+
+      end
+    end
+
+  end
+end

data/spec/index/query_spec.rb

@@ -1,19 +1,23 @@
 module Ddr::Index
   RSpec.describe Query do
-
-    subject do
-      QueryBuilder.build do |query|
-        query
-          .q("foo:bar")
-          .where("spam"=>"eggs")
-          .fields("id", "foo", "spam")
-          .limit(50)
-      end
-    end
-
-    its(:to_s) { is_expected.to eq("q=foo%3Abar&fq=%7B%21term+f%3Dspam%7Deggs&fl=id%2Cfoo%2Cspam&rows=50") }
-
-    its(:params) { is_expected.to eq({q: "foo:bar", fl: "id,foo,spam", fq: ["{!term f=spam}eggs"], rows: 50}) }
-
+    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=%7B%21term+f%3Dspam%7Deggs&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})
+    }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 2.4.0.rc2
+  version: 2.4.0.rc3
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -213,6 +213,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.1
+- !ruby/object:Gem::Dependency
+  name: virtus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -355,6 +369,7 @@ files:
 - config/initializers/active_fedora_datastream.rb
 - config/initializers/devise.rb
 - config/initializers/subscriptions.rb
+- config/locales/ddr-models.en.yml
 - config/routes.rb
 - db/migrate/20141021233359_create_events.rb
 - db/migrate/20141021234156_create_minted_ids.rb
@@ -455,12 +470,15 @@ files:
 - 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
 - lib/ddr/jobs.rb
 - lib/ddr/jobs/fits_file_characterization.rb
@@ -615,8 +633,12 @@ files:
 - spec/fixtures/sample.pdf
 - spec/fixtures/target.png
 - 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
@@ -786,8 +808,12 @@ test_files:
 - spec/fixtures/sample.pdf
 - spec/fixtures/target.png
 - 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