Merge branch 'master' into feature/osci_scraper

app/helpers/collections_helper.rb

@@ -22,6 +22,6 @@ def item_order_badge(collection_item)
   end
 
   def item_comment(collection_item)
-    content_tag(:blockquote, collection_item.comment, class: 'collection-item-comment')
+    content_tag(:blockquote, collection_item.comment, class: 'collection-item-comment') unless collection_item&.comment.blank?
   end
 end

app/views/content_providers/partials/_content_provider_sidebar.html.erb

@@ -1,8 +1,10 @@
-<h4 class="nav-heading">Type</h4>
-<div class="nav-block">
-  <%= content_provider.content_provider_type %>
-</div>
-<% unless content_provider.keywords.blank? %>
+<% unless TeSS::Config.feature['content_providers_disabled'].include?('type') %>
+  <h4 class="nav-heading">Type</h4>
+  <div class="nav-block">
+    <%= content_provider.content_provider_type %>
+  </div>
+<% end %>
+<% unless content_provider.keywords.blank? || TeSS::Config.feature['content_providers_disabled'].include?('keywords') %>
   <h4 class="nav-heading">Keywords</h4>
   <div class="nav-block">
     <%= content_provider.keywords.join(', ') %>
@@ -21,7 +23,7 @@
     </p>
   </div>
 <% end %>
-<% unless @content_provider.contact.blank? %>
+<% unless @content_provider.contact.blank? || TeSS::Config.feature['content_providers_disabled'].include?('contact') %>
   <h4 class="nav-heading">Contact</h4>
   <div class="nav-block">
     <%= content_provider.contact %>
@@ -33,11 +35,13 @@
 
 <%= render partial: 'content_providers/partials/twitter_card',
            locals: { content_provider: @content_provider } %>
-<h4 class="nav-heading">Owner</h4>
-<div class="nav-block">
-  <%= link_to content_provider.user.name, content_provider.user %>
-</div>
-<% if content_provider.editors.any? %>
+<% unless TeSS::Config.feature['content_providers_disabled'].include?('owner') %>
+  <h4 class="nav-heading">Owner</h4>
+  <div class="nav-block">
+    <%= link_to content_provider.user.name, content_provider.user %>
+  </div>
+<% end %>
+<% unless !content_provider.editors.any? || TeSS::Config.feature['content_providers_disabled'].include?('editors') %>
   <h4 class="nav-heading"><%= ContentProvider.human_attribute_name(:editors) %></h4>
   <% content_provider.editors.each do |editor| %>
     <div class="nav-block">

config/tess.example.yml

@@ -76,6 +76,7 @@ default: &default
     #  other_types, subsets, syllabus, approved_editors address_finder
     disabled: ['ardc_fields_of_research', 'other_types', 'subsets', 'syllabus', 'approved_editors']
     materials_disabled: []
+    content_providers_disabled: []
   restrict_content_provider_selection: false
   user_ingestion_methods: ['bioschemas']
   placeholder:

lib/ingestors/dcc_ingestor.rb

@@ -0,0 +1,52 @@
+require 'open-uri'
+require 'csv'
+require 'nokogiri'
+
+module Ingestors
+  class DccIngestor < Ingestor
+    def self.config
+      {
+        key: 'dcc_event',
+        title: 'DCC Events API',
+        category: :events
+      }
+    end
+
+    def read(url)
+      begin
+        process_dcc(url)
+      rescue Exception => e
+        @messages << "#{self.class.name} failed with: #{e.message}"
+      end
+
+      # finished
+      nil
+    end
+
+    private
+
+    def process_dcc(url)
+      event_page = Nokogiri::HTML5.parse(open_url(url.to_s, raise: true)).css("div[class='archive__content grid']")[0].css("div[class='column span-4-sm span-8-md span-6-lg']")
+      event_page.each do |event_data|
+        event = OpenStruct.new
+
+        event.url = event_data.css("h2[class='post-item__title h5']")[0].css("a")[0].get_attribute('href')
+        event.title = event_data.css("h2[class='post-item__title h5']")[0].css("a")[0].text.strip
+
+        start_str = event_data.css("ul[class='post-item__meta']")[0].css("li")[0].text.strip.split('—')
+        event.start = Time.zone.parse(start_str[0])
+        event.end = Time.zone.parse(start_str[0]).beginning_of_day + Time.zone.parse(start_str[1]).seconds_since_midnight.seconds
+
+        event.venue = event_data.css("ul[class='post-item__meta']")[0].css("li")[1].text.strip
+
+        event.source = 'DCC'
+        event.timezone = 'Amsterdam'
+        event.set_default_times
+
+        add_event(event)
+      rescue Exception => e
+        @messages << "Extract event fields failed with: #{e.message}"
+      end
+    end
+  end
+end

lib/ingestors/ingestor_factory.rb

@@ -28,6 +28,7 @@ def self.ingestors
         Ingestors::OdisseiIngestor,
         Ingestors::RstIngestor,
         Ingestors::OsciIngestor,
+        Ingestors::DccIngestor
       ]
     end
 

test/controllers/content_providers_controller_test.rb

@@ -498,4 +498,35 @@ class ContentProvidersControllerTest < ActionController::TestCase
     assert_select '.masonry-brick .markdown-description strong', count: 1
     assert_select '.masonry-brick .markdown-description p'
   end
+
+  test 'should hide disabled fields' do
+    sign_in users(:regular_user)
+    @content_provider.add_editor(users(:another_regular_user))
+    assert @content_provider.update(keywords: ['Science'])
+
+    get :show, params: { id: @content_provider }
+    assert_response :success
+    assert_select '#sidebar' do
+      assert_select '.nav-heading', text: 'Type', count: 1
+      assert_select '.nav-heading', text: 'ELIXIR node', count: 1
+      assert_select '.nav-heading', text: 'Keywords', count: 1
+      assert_select '.nav-heading', text: 'Contact', count: 1
+      assert_select '.nav-heading', text: 'Owner', count: 1
+      assert_select '.nav-heading', text: 'Editors', count: 1
+    end
+
+    with_settings(feature: { nodes: false,
+                             content_providers_disabled: ['type', 'keywords', 'contact', 'owner', 'editors'] }) do
+      get :show, params: { id: @content_provider }
+      assert_response :success
+      assert_select '#sidebar' do
+        assert_select '.nav-heading', text: 'Type', count: 0
+        assert_select '.nav-heading', text: 'ELIXIR node', count: 0
+        assert_select '.nav-heading', text: 'Keywords', count: 0
+        assert_select '.nav-heading', text: 'Contact', count: 0
+        assert_select '.nav-heading', text: 'Owner', count: 0
+        assert_select '.nav-heading', text: 'Editors', count: 0
+      end
+    end
+  end
 end

test/unit/ingestors/dcc_ingestor.rb

@@ -0,0 +1,58 @@
+require 'test_helper'
+
+class DccIngestorTest < ActiveSupport::TestCase
+  setup do
+    @user = users(:regular_user)
+    @content_provider = content_providers(:another_portal_provider)
+    mock_ingestions
+    mock_timezone # System time zone should not affect test result
+  end
+
+  teardown do
+    reset_timezone
+  end
+
+  test 'can ingest events from dcc' do
+    source = @content_provider.sources.build(
+      url: 'https://dcc-po.nl/agenda/',
+      method: 'dcc',
+      enabled: true
+    )
+
+    ingestor = Ingestors::DccIngestor.new
+
+    # check event doesn't
+    new_title = "DCC-PO dag"
+    new_url = 'https://dcc-po.nl/agenda/dcc-po-dag/'
+    refute Event.where(title: new_title, url: new_url).any?
+
+    # run task
+    assert_difference 'Event.count', 1 do
+      freeze_time(2019) do
+        VCR.use_cassette("ingestors/dcc") do
+          ingestor.read(source.url)
+          ingestor.write(@user, @content_provider)
+        end
+      end
+    end
+
+    assert_equal 1, ingestor.events.count
+    assert ingestor.materials.empty?
+    assert_equal 1, ingestor.stats[:events][:added]
+    assert_equal 0, ingestor.stats[:events][:updated]
+    assert_equal 0, ingestor.stats[:events][:rejected]
+
+    # check event does exist
+    event = Event.where(title: new_title, url: new_url).first
+    assert event
+    assert_equal new_title, event.title
+    assert_equal new_url, event.url
+
+    # check other fields
+    assert_equal 'DCC', event.source
+    assert_equal 'Amsterdam', event.timezone
+    assert_equal Time.zone.parse('Mon, 09 Oct 2019 10:00:00.000000000 UTC +00:00'), event.start
+    assert_equal Time.zone.parse('Mon, 09 Oct 2019 16:30:00.000000000 UTC +00:00'), event.end
+    assert_equal 'Domstad, Utrecht', event.venue
+  end
+end