krikri 0.5.0 → 0.5.1

data/spec/internal/solr_conf/schema.xml

@@ -506,72 +506,72 @@ v         currently supported on types that are sorted internally as strings
 
    <field name="type" type="string" indexed="false" stored="false" multiValued="true" />
 
-   <field name="dataProvider_id" type="string" indexed="true" stored="true" multiValued="false" />
-   <field name="dataProvider_type" type="string" indexed="false" stored="false" />
-   <field name="dataProvider_name" type="string" indexed="true" stored="true" multiValued="false" />
-   <field name="dataProvider_providedLabel" type="string" indexed="true" stored="true" multiValued="false" />
+   <field name="dataProvider_id" type="string" indexed="true" stored="true" multiValued="true" />
+   <field name="dataProvider_type" type="string" indexed="false" stored="false" multiValued="true" />
+   <field name="dataProvider_name" type="string" indexed="true" stored="true" multiValued="true" />
+   <field name="dataProvider_providedLabel" type="string" indexed="true" stored="true" multiValued="true" />
 
    <field name="hasView_id" type="string" indexed="true" stored="true" multiValued="true" />
-   <field name="hasView_type" type="string" indexed="false" stored="false" />
+   <field name="hasView_type" type="string" indexed="false" stored="false" multiValued="true" />
    <field name="hasView_format" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="hasView_rights" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="hasView_rightsStatement_id" type="string" indexed="true" stored="true" multiValued="true" />
 
-   <field name="intermediateProvider_id" type="string" indexed="true" stored="true" multiValued="false" />
-   <field name="intermediateProvider_type" type="string" indexed="false" stored="false" />
-   <field name="intermediateProvider_name" type="string" indexed="true" stored="true" multiValued="false" />
-   <field name="intermediateProvider_providedLabel" type="string" indexed="true" stored="true" multiValued="false" />
+   <field name="intermediateProvider_id" type="string" indexed="true" stored="true" multiValued="true" />
+   <field name="intermediateProvider_type" type="string" indexed="false" stored="false" multiValued="true" />
+   <field name="intermediateProvider_name" type="string" indexed="true" stored="true" multiValued="true" />
+   <field name="intermediateProvider_providedLabel" type="string" indexed="true" stored="true" multiValued="true" />
 
-   <field name="isShownAt_id" type="string" indexed="true" stored="true" multiValued="false" />
-   <field name="isShownAt_type" type="string" indexed="false" stored="false" />
+   <field name="isShownAt_id" type="string" indexed="true" stored="true" multiValued="true" />
+   <field name="isShownAt_type" type="string" indexed="false" stored="false" multiValued="true" />
    <field name="isShownAt_format" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="isShownAt_rights" type="string" indexed="true" stored="true" multiValued="true" />
-   <field name="isShownAt_rightsStatement_id" type="string" indexed="true" stored="true" multiValued="false" />
+   <field name="isShownAt_rightsStatement_id" type="string" indexed="true" stored="true" multiValued="true" />
 
-   <field name="object_id" type="string" indexed="true" stored="true" multiValued="false" />
-   <field name="object_type" type="string" indexed="false" stored="false" />
+   <field name="object_id" type="string" indexed="true" stored="true" multiValued="true" />
+   <field name="object_type" type="string" indexed="false" stored="false" multiValued="true" />
    <field name="object_format" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="object_rights" type="string" indexed="true" stored="true" multiValued="true" />
-   <field name="object_rightsStatement_id" type="string" indexed="true" stored="true" multiValued="false" />
+   <field name="object_rightsStatement_id" type="string" indexed="true" stored="true" multiValued="true" />
 
-   <field name="originalRecord" type="string" indexed="true" stored="true" multiValued="false" />
+   <field name="originalRecord" type="string" indexed="true" stored="true" multiValued="true" />
 
-   <field name="preview_id" type="string" indexed="true" stored="true" multiValued="false" />
-   <field name="preview_type" type="string" indexed="false" stored="false" />
+   <field name="preview_id" type="string" indexed="true" stored="true" multiValued="true" />
+   <field name="preview_type" type="string" indexed="false" stored="false" multiValued="true" />
    <field name="preview_format" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="preview_rights" type="string" indexed="true" stored="true" multiValued="true" />
-   <field name="preview_rightsStatement_id" type="string" indexed="true" stored="true" multiValued="false" />
+   <field name="preview_rightsStatement_id" type="string" indexed="true" stored="true" multiValued="true" />
 
-   <field name="provider_id" type="string" indexed="true" stored="true" multiValued="false" />
-   <field name="provider_type" type="string" indexed="false" stored="false" />
-   <field name="provider_name" type="string" indexed="true" stored="true" multiValued="false" />
-   <field name="provider_providedLabel" type="string" indexed="true" stored="true" multiValued="false" />
+   <field name="provider_id" type="string" indexed="true" stored="true" multiValued="true" />
+   <field name="provider_type" type="string" indexed="false" stored="false" multiValued="true" />
+   <field name="provider_name" type="string" indexed="true" stored="true" multiValued="true" />
+   <field name="provider_providedLabel" type="string" indexed="true" stored="true" multiValued="true" />
 
-   <field name="rightsStatement_id" type="string" indexed="true" stored="true" multiValued="false" />
+   <field name="rightsStatement_id" type="string" indexed="true" stored="true" multiValued="true" />
 
-   <field name="sourceResource_id" type="string" indexed="true" stored="true" multiValued="false"/>
-   <field name="sourceResource_type" type="string" indexed="false" stored="false" />
+   <field name="sourceResource_id" type="string" indexed="true" stored="true" multiValued="true"/>
+   <field name="sourceResource_type" type="string" indexed="false" stored="false" multiValued="true" />
    <field name="sourceResource_alternative" type="string" indexed="true" stored="true" multiValued="true" />
 
    <field name="sourceResource_collection_id" type="string" indexed="true" stored="true" multiValued="true" />
-   <field name="sourceResource_collection_type" type="string" indexed="false" stored="false" />
+   <field name="sourceResource_collection_type" type="string" indexed="false" stored="false" multiValued="true" />
    <field name="sourceResource_collection_providedLabel" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="sourceResource_collection_title" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="sourceResource_collection_description" type="text" indexed="true" stored="true" multiValued="true" />
 
    <field name="sourceResource_contributor_id" type="string" indexed="true" stored="true" multiValued="true" />
-   <field name="sourceResource_contributor_type" type="string" indexed="false" stored="false" />
+   <field name="sourceResource_contributor_type" type="string" indexed="false" stored="false" multiValued="true" />
    <field name="sourceResource_contributor_name" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="sourceResource_contributor_providedLabel" type="string" indexed="true" stored="true" multiValued="true" />
 
    <field name="sourceResource_creator_id" type="string" indexed="true" stored="true" multiValued="true" />
-   <field name="sourceResource_creator_type" type="string" indexed="false" stored="false" />
+   <field name="sourceResource_creator_type" type="string" indexed="false" stored="false" multiValued="true" />
    <field name="sourceResource_creator_name" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="sourceResource_creator_providedLabel" type="string" indexed="true" stored="true" multiValued="true" />
 
    <!-- TODO: Change date_begin and date_end type to "date" assuming they have been correctly formatted -->
    <field name="sourceResource_date_id" type="string" indexed="true" stored="true" multiValued="true" />
-   <field name="sourceResource_date_type" type="string" indexed="false" stored="false" />
+   <field name="sourceResource_date_type" type="string" indexed="false" stored="false" multiValued="true" />
    <field name="sourceResource_date_begin" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="sourceResource_date_end" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="sourceResource_date_providedLabel" type="string" indexed="true" stored="true" multiValued="true" />
@@ -591,7 +591,7 @@ v         currently supported on types that are sorted internally as strings
    <field name="sourceResource_genre_type" type="string" indexed="true" stored="true" multiValued="true" />
 
    <field name="sourceResource_publisher_id" type="string" indexed="true" stored="true" multiValued="true" />
-   <field name="sourceResource_publisher_type" type="string" indexed="false" stored="false" />
+   <field name="sourceResource_publisher_type" type="string" indexed="false" stored="false" multiValued="true" />
    <field name="sourceResource_publisher_name" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="sourceResource_publisher_providedLabel" type="string" indexed="true" stored="true" multiValued="true" />
 
@@ -602,12 +602,12 @@ v         currently supported on types that are sorted internally as strings
    <field name="sourceResource_rightsHolder" type="string" indexed="true" stored="true" multiValued="true" />
 
    <field name="sourceResource_rightsHolder_id" type="string" indexed="true" stored="true" multiValued="true" />
-   <field name="sourceResource_rightsHolder_type" type="string" indexed="false" stored="false" />
+   <field name="sourceResource_rightsHolder_type" type="string" indexed="false" stored="false" multiValued="true" />
    <field name="sourceResource_rightsHolder_name" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="sourceResource_rightsHolder_providedLabel" type="string" indexed="true" stored="true" multiValued="true" />
 
    <field name="sourceResource_spatial_id" type="string" indexed="true" stored="true" multiValued="true" />
-   <field name="sourceResource_spatial_type" type="string" indexed="false" stored="false" />
+   <field name="sourceResource_spatial_type" type="string" indexed="false" stored="false" multiValued="true" />
    <field name="sourceResource_spatial_exactMatch" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="sourceResource_spatial_countryCode" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="sourceResource_spatial_parentFeature_id" type="string" indexed="true" stored="true" multiValued="true" />
@@ -618,10 +618,10 @@ v         currently supported on types that are sorted internally as strings
    <field name="sourceResource_spatial_providedLabel" type="string" indexed="true" stored="true" multiValued="true" />
 
    <field name="sourceResource_specType_id" type="string" indexed="true" stored="true" multiValued="true" />
-   <field name="sourceResource_specType_type" type="string" indexed="false" stored="false" />
+   <field name="sourceResource_specType_type" type="string" indexed="false" stored="false" multiValued="true" />
 
    <field name="sourceResource_subject_id" type="string" indexed="true" stored="true" multiValued="true" />
-   <field name="sourceResource_subject_type" type="string" indexed="false" stored="false" />
+   <field name="sourceResource_subject_type" type="string" indexed="false" stored="false" multiValued="true" />
    <field name="sourceResource_subject_name" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="sourceResource_subject_providedLabel" type="string" indexed="true" stored="true" multiValued="true" />
 
@@ -629,7 +629,7 @@ v         currently supported on types that are sorted internally as strings
    <field name="sourceResource_title" type="string" indexed="true" stored="true" multiValued="true" />
 
    <field name="sourceResource_type_id" type="string" indexed="true" stored="true" multiValued="true" />
-   <field name="sourceResource_type_type" type="string" indexed="false" stored="false" />
+   <field name="sourceResource_type_type" type="string" indexed="false" stored="false" multiValued="true" />
    <field name="sourceResource_type_providedLabel" type="string" indexed="true" stored="true" multiValued="true" />
 
    <!-- Dynamic field definitions.  If a field name is not found, dynamicFields

data/spec/lib/krikri/job_spec.rb

@@ -32,8 +32,16 @@ describe Krikri::Job do
       described_class.run(agent, activity_uri)
     end
 
-    it 'defaults activity to nil' do
-      expect(agent).to receive(:run).with(nil).and_return(true)
+    it 'passes with no args if no activity given' do
+      expect(agent).to receive(:run).with(no_args).and_return(true)
+      described_class.run(agent)
+    end
+
+    it 'passes with no args if no agent accepts no args' do
+      arity_zero = Proc.new {}
+      allow(agent).to receive(:method).with(:run).and_return(arity_zero)
+
+      expect(agent).to receive(:run).with(no_args).and_return(true)
       described_class.run(agent)
     end
   end

data/spec/support/shared_examples/software_agent.rb

@@ -28,6 +28,12 @@ shared_examples 'a software agent' do |args|
     it { expect(subject.agent_name).to be_a String }
   end
 
+  describe '#run' do
+    it 'accepts one or no arguments' do
+      expect(subject.method(:run).arity).to satisfy { |v| v == -1 || v == 0 }
+    end
+  end
+
   describe '#enqueue' do
     let(:queue_name) { described_class.queue_name.to_s }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: krikri
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Audrey Altman
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-03 00:00:00.000000000 Z
+date: 2015-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -518,10 +518,10 @@ files:
 - spec/internal/config/secrets.yml
 - spec/internal/config/solr.yml
 - spec/internal/db/development.sqlite3
-- spec/internal/db/migrate/20150403220331_devise_create_users.rb
-- spec/internal/db/migrate/20150403220354_create_searches.blacklight.rb
-- spec/internal/db/migrate/20150403220355_create_bookmarks.blacklight.rb
-- spec/internal/db/migrate/20150403220356_add_polymorphic_type_to_bookmarks.blacklight.rb
+- spec/internal/db/migrate/20150404234057_devise_create_users.rb
+- spec/internal/db/migrate/20150404234124_create_searches.blacklight.rb
+- spec/internal/db/migrate/20150404234125_create_bookmarks.blacklight.rb
+- spec/internal/db/migrate/20150404234126_add_polymorphic_type_to_bookmarks.blacklight.rb
 - spec/internal/db/schema.rb
 - spec/internal/db/seeds.rb
 - spec/internal/db/test.sqlite3
@@ -851,10 +851,10 @@ test_files:
 - spec/internal/config/solr.yml
 - spec/internal/config.ru
 - spec/internal/db/development.sqlite3
-- spec/internal/db/migrate/20150403220331_devise_create_users.rb
-- spec/internal/db/migrate/20150403220354_create_searches.blacklight.rb
-- spec/internal/db/migrate/20150403220355_create_bookmarks.blacklight.rb
-- spec/internal/db/migrate/20150403220356_add_polymorphic_type_to_bookmarks.blacklight.rb
+- spec/internal/db/migrate/20150404234057_devise_create_users.rb
+- spec/internal/db/migrate/20150404234124_create_searches.blacklight.rb
+- spec/internal/db/migrate/20150404234125_create_bookmarks.blacklight.rb
+- spec/internal/db/migrate/20150404234126_add_polymorphic_type_to_bookmarks.blacklight.rb
 - spec/internal/db/schema.rb
 - spec/internal/db/seeds.rb
 - spec/internal/db/test.sqlite3