krikri 0.7.2 → 0.7.3

data/spec/lib/krikri/harvesters/oai_harvester_spec.rb

@@ -188,6 +188,20 @@ EOM
                    :headers => {})
     end
 
+    it 'produces valid xml' do
+      expect do
+        Nokogiri::XML(subject.records.first.content) do |config|
+          config.options = Nokogiri::XML::ParseOptions::STRICT
+        end
+      end.not_to raise_error
+    end
+
+    it 'produces has oai namespace and header' do
+      expect(Nokogiri::XML(subject.records.first.content)
+              .xpath('//xmlns:header'))
+        .not_to be_empty
+    end
+
     it 'retries timed out requests' do
       expect_any_instance_of(Faraday::Adapter::NetHttp)
         .to receive(:perform_request).at_least(4).times
@@ -411,25 +425,6 @@ EOM
       end
     end
 
-    describe '#record_xml' do
-      let(:oai_record) { OAI::Record.new('') }
-
-      it 'produces valid xml' do
-        expect do
-          Nokogiri::XML(subject.send(:record_xml, oai_record)) do |config|
-            config.options = Nokogiri::XML::ParseOptions::STRICT
-          end
-        end.not_to raise_error
-      end
-
-      it 'sets header status' do
-        allow(oai_record.header).to receive(:status).and_return('deleted')
-        node = Nokogiri::XML(subject.send(:record_xml, oai_record))
-               .at_css('header')
-        expect(node['status']).to eq 'deleted'
-      end
-    end
-
     describe 'concat_enum' do
       it 'concatenates enums' do
         expect(subject.concat_enum([(1..10), (100..110)]).to_a)

data/spec/lib/krikri/parser_value_array_spec.rb

@@ -238,18 +238,61 @@ describe Krikri::Parser::ValueArray do
     end
   end
 
-  describe '#match_attribute' do
+  shared_context 'with attributes' do
     before do
       values.each { |val| allow(val).to receive(:attribute?).and_return(false) }
-    end
 
-    it 'selects values by their attributes' do
       allow(values[0]).to receive(:attribute?).with(:type).and_return(true)
       allow(values[0]).to receive(:type).and_return('Moomin')
       allow(values[1]).to receive(:attribute?).with(:type).and_return(true)
       allow(values[1]).to receive(:type).and_return('mummi')
-      expect(subject.match_attribute(:type, 'moomin'))
+    end
+  end
+
+  describe '#match_attribute' do
+    include_context 'with attributes'
+
+    it 'selects values by presence of attributes' do
+      expect(subject.match_attribute(:type))
+        .to contain_exactly(values[0], values[1])
+    end
+
+    it 'selects values by attribute values matching other' do
+      expect(subject.match_attribute(:type, 'Moomin'))
         .to contain_exactly(values[0])
     end
+
+    it 'selects according to a given block' do
+      expect(subject.match_attribute(:type) { |v| v.starts_with?('mu') })
+        .to contain_exactly(values[1])
+    end
+
+    it 'selects according to a given block and comparison to other' do
+      expect(subject.match_attribute(:type, 'moomin') { |v| v.downcase })
+        .to contain_exactly(values[0])
+    end
+  end
+
+  describe '#reject_attribute' do
+    include_context 'with attributes'
+
+    it 'rejects values by presence of attributes' do
+      expect(subject.reject_attribute(:type)).to contain_exactly(values[2])
+    end
+
+    it 'selects values by attribute values matching other' do
+      expect(subject.reject_attribute(:type, 'Moomin'))
+        .to contain_exactly(values[1], values[2])
+    end
+
+    it 'selects according to a given block' do
+      expect(subject.reject_attribute(:type) { |v| v.starts_with?('mu') })
+        .to contain_exactly(values[0], values[2])
+    end
+
+    it 'selects according to a given block and comparison to other' do
+      expect(subject.reject_attribute(:type, 'moomin') { |v| v.downcase })
+        .to contain_exactly(values[1], values[2])
+    end
   end
 end

data/spec/lib/krikri/search_index_spec.rb

@@ -117,6 +117,7 @@ describe Krikri::QASearchIndex do
         subject.commit
         aggregation.set_subject!('http://api.dp.la/item/123')
         aggregation.provider << build(:krikri_provider, rdf_subject: 'snork')
+          .agent
         subject.add aggregation.to_jsonld['@graph'][0]
         subject.commit
       end

data/spec/models/provider_spec.rb

@@ -1,32 +1,41 @@
 require 'spec_helper'
-require 'rdf/isomorphic'
-
-module RDF
-  module Isomorphic
-    alias_method :==, :isomorphic_with?
-  end
-end
 
 describe Krikri::Provider do
-  let(:local_name) { '123' }
+  it_behaves_like 'ActiveModel'
 
-  let(:provider) do
-    provider = Krikri::Provider.new(local_name)
-    provider.providedLabel = "moomin"
-    provider
-  end
+  let(:provider_base) { Krikri::Settings.prov.provider_base }
+  let(:id) { '123' }
+  let(:rdf_subject) { provider_base + id }
+  let(:name) { 'Snork Maiden Archives' }
 
   let(:agg) do
-    a = build(:aggregation, :provider => provider)
-    a.set_subject! 'moomin'
-    a
+    p = DPLA::MAP::Agent.new(RDF::URI(provider_base) / id)
+    p.label = name
+    build(:aggregation, :provider => p)
+  end
+
+  let(:bnode) do
+    p = DPLA::MAP::Agent.new
+    build(:aggregation, :provider => p)
+  end
+
+  shared_context 'indexed in Solr' do
+    before do
+      clear_search_index
+      indexer = Krikri::QASearchIndex.new
+      indexer.add agg.to_jsonld['@graph'].first
+      indexer.commit
+    end
+
+    after do
+      clear_search_index
+    end
   end
 
-  shared_context 'with indexed item' do
+  shared_context 'bnode indexed in Solr' do
     before do
-      agg.save
       indexer = Krikri::QASearchIndex.new
-      indexer.add(agg.to_jsonld['@graph'].first)
+      indexer.add bnode.to_jsonld['@graph'].first
       indexer.commit
     end
 
@@ -37,90 +46,120 @@ describe Krikri::Provider do
     end
   end
 
-  describe '.all' do
+  describe '#initialize' do
+
+    it 'sets given attributes' do
+      expect(described_class.new({ rdf_subject: rdf_subject }).rdf_subject)
+        .to eq rdf_subject
+    end
+  end
+
+  describe '#all' do
     it 'with no items is empty' do
       expect(described_class.all).to be_empty
     end
 
-    context 'with item' do
-      include_context 'with indexed item'
+    context 'with valid item' do
+      include_context 'indexed in Solr'
 
-      it 'returns all items' do
-        # todo: ActiveTriples::Resource equality needs work
+      it 'returns valid item' do
         expect(described_class.all.map(&:rdf_subject))
-          .to contain_exactly provider.rdf_subject
+          .to contain_exactly rdf_subject
       end
-    end
 
-    context 'with bnode provider' do
-      include_context 'with indexed item'
+      it 'assigns :name Providers' do
+        expect(described_class.all.map(&:name))
+          .to include name
+      end
+    end
 
-      let(:provider) { DPLA::MAP::Agent.new }
+    context 'with bnode' do
+      include_context 'bnode indexed in Solr'
 
-      it 'ignores bnodes' do
+      it 'ingnores bnode' do
         expect(described_class.all).to be_empty
       end
     end
   end
 
-  describe '.find' do
-    include_context 'with indexed item'
+  describe '#find' do
 
-    it 'finds the provider' do
-      expect(described_class.find(local_name)).to eq provider
+    it 'returns nil if item not found' do
+      expect(described_class.find(id)).to eq nil
     end
 
-    it 'populates graph' do
-      expect(described_class.find(local_name).count)
-        .to eq provider.count
-    end
+    context 'with item' do
+      include_context 'indexed in Solr'
 
-    it 'returns property values' do
-      expect(described_class.find(local_name).providedLabel)
-        .to eq provider.providedLabel
+      it 'finds the provider with a given :id' do
+        expect(described_class.find(id).name).to eq name
+      end
+
+      it 'finds the provider with a given :rdf_subject' do
+        expect(described_class.find(rdf_subject).name).to eq name
+      end
     end
   end
 
-  describe '#records' do
-    include_context 'with indexed item'
+  describe '#base_uri' do
 
-    it 'gives the record' do
-      # @todo fix once {ActiveTriples::RDFSource} equality is figured out
-      expect(provider.records.map(&:rdf_subject))
-        .to contain_exactly agg.rdf_subject
+    it 'adds trailing "/" to provider_base if missing' do
+      allow(Krikri::Settings).to receive_message_chain('prov.provider_base')
+        .and_return 'http://example.com/abc'
+      expect(described_class.base_uri).to eq('http://example.com/abc/')
     end
   end
 
   describe '#id' do
-    it 'gives a valid id for initializing resource' do
-      expect(Krikri::Provider.new(provider.id).rdf_subject)
-        .to eq provider.rdf_subject
+
+    it 'returns an :id parsed from :rdf_subject' do
+      expect(described_class.new({ rdf_subject: rdf_subject }).id).to eq id
     end
 
-    it 'does not include the base uri' do
-      expect(provider.id).not_to include provider.base_uri
+    it 'returns nil without valid :rdf_subject' do
+      expect(described_class.new.id).to eq nil
     end
   end
 
-  describe '#provider_name' do
-    it 'gives prefLabel if present' do
-      provider.label = 'littly my'
-      expect(provider.provider_name).to eq provider.label.first
+  describe '#name' do
+    include_context 'indexed in Solr'
+
+    it 'returns an :name corresponding to the indexed :rdf_subject' do
+      expect(described_class.new({ rdf_subject: rdf_subject }).name).to eq name
     end
 
-    it 'with multiple labels gives just one' do
-      provider.label = ['little my', 'snork']
-      expect(provider.provider_name).to eq provider.label.first
+    it 'returns nil without valid :rdf_subject' do
+      expect(described_class.new.name).to eq nil
     end
+  end
+
+  describe '#agent' do
+    include_context 'indexed in Solr'
 
-    it 'gives providedLabel if no prefLabel present' do
-      expect(provider.provider_name).to eq provider.providedLabel.first
+    it 'returns a DPLA::MAP::Agent object' do
+      expect(described_class.find(rdf_subject).agent)
+        .to be_a DPLA::MAP::Agent
     end
 
-    it 'gives `#id` with with no labels' do
-      provider.label = nil
-      provider.providedLabel = nil
-      expect(provider.provider_name).to eq provider.id
+    it 'assigns :rdf_subject to agent' do
+      agent = (described_class.find(rdf_subject).agent)
+      expect(agent.rdf_subject.to_s).to eq rdf_subject
+    end
+
+    it 'assigns :name to agent' do
+      agent = (described_class.find(rdf_subject).agent)
+      expect(agent.label.first).to eq name
+    end
+
+    it 'returns nil without valid :rdf_subject' do
+      expect(described_class.new.agent).to eq nil
+    end
+  end
+
+  describe '#valid_rdf_subject?' do
+    it 'recognizes bnodes' do
+      provider = Krikri::Provider.new({ rdf_subject: '_:b1' })
+      expect(provider.valid_rdf_subject?).to eq false
     end
   end
 end

data/spec/models/qa_report_spec.rb

@@ -4,9 +4,11 @@ describe Krikri::QAReport do
 
   subject { described_class.new(:provider => provider.id.to_s) }
 
+  let(:provider_base) { Krikri::Provider.base_uri }
+
   let(:provider) do
     agent = build(:agent)
-    agent.set_subject! 'http://example.org/moomin'
+    agent.set_subject!(provider_base + 'moomin')
     agent
   end
 
@@ -50,8 +52,8 @@ describe Krikri::QAReport do
   end
 
   describe '#build_provider' do
-    it 'gives a provider' do
-      expect(subject.build_provider).to be_a Krikri::Provider
+    it 'gives a DPLA::MAP::Agent' do
+      expect(subject.build_provider).to be_a DPLA::MAP::Agent
     end
 
     it 'gives provider with correct uri' do

data/spec/models/validation_report_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Krikri::ValidationReport do
-  describe `#all` do
+  describe '#all' do
     it 'returns facet for each required field' do
       count = described_class::REQUIRED_FIELDS.count
       facet_field_const = Blacklight::SolrResponse::Facets::FacetField
@@ -23,7 +23,7 @@ describe Krikri::ValidationReport do
     end
   end
 
-  describe `#find` do
+  describe '#find' do
     it 'gives a blacklight solr response' do
       expect(subject.find('sourceResource_title'))
         .to be_a Blacklight::SolrResponse

data/spec/support/shared_contexts/indexed_item.rb

@@ -15,17 +15,15 @@ shared_context 'with indexed item' do
   let(:records) { [agg] }
 
   let(:agg) do
-    a = build(:aggregation)
-    a.provider = provider
-    a.set_subject! 'moomin'
-    a
-  end
+    provider_agent = provider.agent
+    provider_agent.label = provider.name
 
-  let(:provider) do
-    build(:krikri_provider,
-          rdf_subject: 'moomin_valley',
-          label: 'moomin valley')
+    aggregation = build(:aggregation, provider: provider_agent)
+    aggregation.set_subject! 'moomin'
+    aggregation
   end
+
+  let(:provider) { build(:krikri_provider) }
 end
 
 shared_context 'with missing values' do
@@ -33,14 +31,22 @@ shared_context 'with missing values' do
     let(:records) { [agg, empty, empty_new_provider] }
 
     let(:empty) do
-      aggregation = build(:aggregation, provider: provider, sourceResource: nil)
+      provider_agent = provider.agent
+      provider_agent.label = provider.name
+
+      aggregation = build(:aggregation, 
+                          provider: provider_agent, 
+                          sourceResource: nil)
       aggregation.set_subject! 'empty'
       aggregation
     end
 
     let(:empty_new_provider) do
+      provider_agent = build(:krikri_provider, 
+                             rdf_subject: 'http://example.com/fake').agent
+
       aggregation = build(:aggregation,
-                          provider: RDF::URI('http://example.com/fake'),
+                          provider: provider_agent,
                           sourceResource: nil)
       aggregation.set_subject! 'empty_new_provider'
       aggregation

data/spec/support/shared_examples/active_model_lint.rb

@@ -0,0 +1,14 @@
+shared_examples 'ActiveModel' do
+  include ActiveModel::Lint::Tests
+
+  # to_s is to support ruby-1.9
+  ActiveModel::Lint::Tests.public_instance_methods.map{|m| m.to_s}.grep(/^test/).each do |m|
+    example m.gsub('_',' ') do
+      send m
+    end
+  end
+
+  def model
+    subject
+  end
+end