krikri 0.12.0 → 0.12.1

data/spec/lib/krikri/mapper_agent_spec.rb

@@ -7,11 +7,11 @@ describe Krikri::Mapper::Agent do
     create(:krikri_harvest_activity)
   end
 
-  harvest_gen_uri_str = 'http://example.org/ldp/activity/2'
-  mapping_gen_uri_str = 'http://example.org/ldp/activity/3'
+  harvest_gen_uri = Krikri::Activity.base_uri / 2
+  mapping_gen_uri = Krikri::Activity.base_uri / 3
 
   # This must be defined with `let' as a macro.  See below.
-  let(:opts) { {name: :agent_map, generator_uri: harvest_gen_uri_str} }
+  let(:opts) { { name: :agent_map, generator_uri: harvest_gen_uri } }
 
   # This can not be a macro, because it has to be passed as an argument to
   # `it_behaves_like', which is interpreted at compile time.  It should be the
@@ -25,7 +25,7 @@ describe Krikri::Mapper::Agent do
   # macro), then `subject' will not instantiate an object with the same options
   # when it's invoked repeatedly.
   # 
-  behaves_opts = {name: :agent_map, generator_uri: harvest_gen_uri_str}
+  behaves_opts = {name: :agent_map, generator_uri: harvest_gen_uri}
   it_behaves_like 'a software agent', behaves_opts
 
   subject { described_class.new(opts) }
@@ -35,10 +35,10 @@ describe Krikri::Mapper::Agent do
   # generator_uri matches what Krikri::Activity will construct as the
   # uri, given its value of #rdf_subject, in #aggregations_as_json
   # See 'provenance queries' shared context.  
-  let(:generator_uri) { harvest_gen_uri_str }
+  let(:generator_uri) { harvest_gen_uri }
 
   # activity_uri is the URI of the mapping activity
-  let(:activity_uri) { mapping_gen_uri_str }
+  let(:activity_uri) { mapping_gen_uri }
 
   let(:mapping_name) { :agent_map }
   let(:opts) { { name: mapping_name, generator_uri: generator_uri } }
@@ -85,9 +85,10 @@ describe Krikri::Mapper::Agent do
 
     context 'with mapped records returned' do
       before do
-        expect(Krikri::Mapper).to receive(:map)
-                                   .with(mapping_name, subject.generator_activity.entities)
-                                   .and_return(generated_records)
+        expect(Krikri::Mapper)
+          .to receive(:map)
+               .with(mapping_name, subject.generator_activity.entities)
+               .and_return(generated_records)
       end
 
       it 'calls mapper' do

data/spec/lib/krikri/search_index_spec.rb

@@ -133,8 +133,6 @@ describe Krikri::QASearchIndex do
       let(:aggregation) { build(:aggregation) }
 
       before do
-        subject.delete_by_query('id:*')
-        subject.commit
         aggregation.set_subject!('http://api.dp.la/item/123')
         aggregation.provider << build(:krikri_provider, rdf_subject: 'snork')
           .agent
@@ -142,10 +140,7 @@ describe Krikri::QASearchIndex do
         subject.commit
       end
 
-      after do
-        subject.delete_by_query('id:*')
-        subject.commit
-      end
+      after { clear_search_index }
 
       it 'posts DPLA MAP JSON to solr' do
         response = solr.get('select', :params => { :q => '' })['response']
@@ -165,6 +160,8 @@ describe Krikri::QASearchIndex do
   describe '#update_from_activity' do
     include_context 'provenance queries'
     include_context 'entities query'
+    
+    after { clear_search_index }
 
     # This is not totally realistic because we're indexing the records from a
     # mapping activity, instead of an enrichment activity, but we can change

data/spec/models/activity_spec.rb

@@ -14,6 +14,38 @@ end
 describe Krikri::Activity, type: :model do
   subject { create(:krikri_activity) }
 
+  describe `.base_uri` do
+    it 'returns an RDF::URI' do
+      expect(described_class.base_uri).to be_a RDF::URI
+    end
+  end
+
+  describe `.from_uri` do
+    it 'initializes from RDF::URI' do
+      expect(described_class.from_uri(subject.rdf_subject)).to eq subject
+    end
+
+    it 'initializes from string containing uri' do
+      expect(described_class.from_uri(subject.rdf_subject.to_s)).to eq subject
+    end
+
+    it 'raises error for inapproprate uri' do
+      bad_uri = "http://example.com/nonsense/#{subject.id}"
+
+      expect { described_class.from_uri(bad_uri) }
+        .to raise_error "Cannot find #{described_class} from " \
+                        "URI: #{bad_uri}; the requested uri does not match " \
+                        "#{described_class.base_uri}"
+    end
+
+    it 'raises error for wrong id' do
+      bad_uri = subject.rdf_subject.to_s.gsub(subject.id.to_s, '1001')
+
+      expect { described_class.from_uri(bad_uri) }
+        .to raise_error ActiveRecord::RecordNotFound
+    end
+  end
+
   describe '#save' do
     subject { build(:krikri_activity_with_long_opts) }
 

data/spec/models/dpla/map/aggregation_spec.rb

@@ -3,6 +3,15 @@ require 'spec_helper'
 describe DPLA::MAP::Aggregation do
   it_behaves_like 'an LDP RDFSource'
 
+  let(:empty_or) { [] }
+  let(:blanknode_or) { [RDF::Node.new] }
+  let(:empty_msg) do
+    "#{subject.dpla_id} has an empty originalRecord"
+  end
+  let(:blanknode_msg) do
+    "#{subject.dpla_id} has a blank node for its originalRecord"
+  end
+
   include_context 'clear repository'
 
   describe '#mint_uri!' do
@@ -24,19 +33,24 @@ describe DPLA::MAP::Aggregation do
       end
     end
 
-    shared_examples 'random hash' do
-      it 'mints random hash' do
-        expect(SecureRandom).to receive(:hex).and_return('abcd1234')
-        subject.mint_id!
-        expect(subject.rdf_subject)
-          .to eq RDF::URI(subject.class.base_uri) / 'abcd1234'
+    context 'when originalRecord is empty' do
+      before do
+        allow(subject).to receive(:originalRecord).and_return(empty_or)
+      end
+
+      it 'raises a NameError' do
+        expect { subject.mint_id! }.to raise_error(NameError, empty_msg)
       end
     end
 
-    context 'without originalRecord' do
-      include_examples 'sets to seed'
-      include_examples 'random hash'
-      include_examples 'sets fragment URI for sourceResource'
+    context 'when originalRecord returns a blank node' do
+      before do
+        allow(subject).to receive(:originalRecord).and_return(blanknode_or)
+      end
+
+      it 'raises a NameError' do
+        expect { subject.mint_id! }.to raise_error(NameError, blanknode_msg)
+      end
     end
 
     context 'with originalRecord' do
@@ -58,14 +72,6 @@ describe DPLA::MAP::Aggregation do
           .to eq RDF::URI(subject.class.base_uri) / local_name
       end
 
-      context 'as a bnode' do
-        before do
-          subject.originalRecord = RDF::Node.new
-        end
-
-        include_examples 'random hash'
-      end
-
       context 'with more than one originalRecord' do
         before { subject.originalRecord << RDF::Node.new }
 
@@ -115,9 +121,22 @@ describe DPLA::MAP::Aggregation do
       end
     end
 
-    context 'without original record' do
-      it 'raises an error' do
-        expect { subject.original_record }.to raise_error NameError
+    context 'when originalRecord is empty' do
+      before do
+        allow(subject).to receive(:originalRecord).and_return(empty_or)
+      end
+      it 'raises a NameError' do
+        expect { subject.original_record }.to raise_error(NameError, empty_msg)
+      end
+    end
+
+    context 'when originalRecord returns a blank node' do
+      before do
+        allow(subject).to receive(:originalRecord).and_return(blanknode_or)
+      end
+      it 'raises a NameError' do
+        expect { subject.original_record }
+          .to raise_error(NameError, blanknode_msg)
       end
     end
   end

data/spec/models/provider_spec.rb

@@ -21,15 +21,12 @@ describe Krikri::Provider do
 
   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
+    after { clear_search_index }
   end
 
   shared_context 'bnode indexed in Solr' do
@@ -39,11 +36,7 @@ describe Krikri::Provider do
       indexer.commit
     end
 
-    after do
-      indexer = Krikri::QASearchIndex.new
-      indexer.delete_by_query(['*:*'])
-      indexer.commit
-    end
+    after { clear_search_index }
   end
 
   describe '#initialize' do

data/spec/spec_helper.rb

@@ -26,7 +26,7 @@ Rails.backtrace_cleaner.remove_silencers!
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
-WebMock.disable_net_connect!(:allow_localhost => true)
+WebMock.disable_net_connect!(:allow_localhost => true, allow: 'codeclimate.com')
 
 RSpec.configure do |config|
   config.color = true
@@ -62,6 +62,5 @@ RSpec.configure do |config|
   config.after(:suite) do
     clear_repository
     clear_search_index
-    WebMock.disable_net_connect!(:allow => 'codeclimate.com')
   end
 end

data/spec/support/shared_contexts/indexed_item.rb

@@ -8,9 +8,7 @@ shared_context 'with indexed item' do
     indexer.commit
   end
 
-  after do
-    clear_search_index
-  end
+  after { clear_search_index }
 
   let(:records) { [agg] }
 

data/spec/support/shared_examples/software_agent.rb

@@ -1,6 +1,6 @@
 
 shared_examples 'a software agent' do |args|
-  subject { described_class.new(args) }
+  subject { args.nil? ? described_class.new : described_class.new(args) }
   let(:agent_class) { described_class }
 
   it 'represents its agent name as the correct string, as a class' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: krikri
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Audrey Altman
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -608,16 +608,15 @@ files:
 - spec/internal/config/secrets.yml
 - spec/internal/config/solr.yml
 - spec/internal/db/development.sqlite3
-- spec/internal/db/migrate/20160304151204_devise_create_users.rb
-- spec/internal/db/migrate/20160304151247_create_searches.blacklight.rb
-- spec/internal/db/migrate/20160304151248_create_bookmarks.blacklight.rb
-- spec/internal/db/migrate/20160304151249_add_polymorphic_type_to_bookmarks.blacklight.rb
+- spec/internal/db/migrate/20160226160200_devise_create_users.rb
+- spec/internal/db/migrate/20160226160226_create_searches.blacklight.rb
+- spec/internal/db/migrate/20160226160227_create_bookmarks.blacklight.rb
+- spec/internal/db/migrate/20160226160228_add_polymorphic_type_to_bookmarks.blacklight.rb
 - spec/internal/db/schema.rb
 - spec/internal/db/seeds.rb
 - spec/internal/db/test.sqlite3
 - spec/internal/lib/generators/test_app_generator.rb
 - spec/internal/log/development.log
-- spec/internal/log/test.log
 - spec/internal/public/404.html
 - spec/internal/public/422.html
 - spec/internal/public/500.html
@@ -753,7 +752,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Rails engine for metadata aggregation, enhancement, and quality control.
@@ -814,10 +813,10 @@ test_files:
 - spec/internal/config/solr.yml
 - spec/internal/config.ru
 - spec/internal/db/development.sqlite3
-- spec/internal/db/migrate/20160304151204_devise_create_users.rb
-- spec/internal/db/migrate/20160304151247_create_searches.blacklight.rb
-- spec/internal/db/migrate/20160304151248_create_bookmarks.blacklight.rb
-- spec/internal/db/migrate/20160304151249_add_polymorphic_type_to_bookmarks.blacklight.rb
+- spec/internal/db/migrate/20160226160200_devise_create_users.rb
+- spec/internal/db/migrate/20160226160226_create_searches.blacklight.rb
+- spec/internal/db/migrate/20160226160227_create_bookmarks.blacklight.rb
+- spec/internal/db/migrate/20160226160228_add_polymorphic_type_to_bookmarks.blacklight.rb
 - spec/internal/db/schema.rb
 - spec/internal/db/seeds.rb
 - spec/internal/db/test.sqlite3
@@ -825,7 +824,6 @@ test_files:
 - spec/internal/Gemfile.lock
 - spec/internal/lib/generators/test_app_generator.rb
 - spec/internal/log/development.log
-- spec/internal/log/test.log
 - spec/internal/public/404.html
 - spec/internal/public/422.html
 - spec/internal/public/500.html
@@ -943,4 +941,3 @@ test_files:
 - spec/views/krikri/records/index.html.erb_spec.rb
 - spec/views/krikri/records/show.html.erb_spec.rb
 - spec/views/krikri/reports/index.html.erb_spec.rb
-has_rdoc: