Merge branch 'master' into indico

Author: kennethrioja

Gemfile

@@ -34,6 +34,7 @@ gem 'kt-paperclip'
 gem 'linkeddata'
 gem 'maxmind-db'
 gem 'money-rails'
+gem 'oai'
 gem 'omniauth_openid_connect'
 gem 'omniauth-rails_csrf_protection'
 gem 'pg'

Gemfile.lock

@@ -398,6 +398,11 @@ GEM
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     numerizer (0.1.1)
+    oai (1.3.0)
+      builder (>= 3.1.0)
+      faraday (< 3)
+      faraday-follow_redirects (>= 0.3.0, < 2)
+      rexml
     omniauth (2.1.1)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
@@ -853,6 +858,7 @@ DEPENDENCIES
   minitest
   minitest-reporters
   money-rails
+  oai
   omniauth-rails_csrf_protection
   omniauth_openid_connect
   pg

app/assets/images/ORCID-iD_icon_unauth_vector.svg

@@ -48,7 +48,7 @@ def handle_error(status_code = 500, message = nil)
     status_code = status_code.to_i
     @message = message
     respond_to do |format|
-      format.html  { render 'static/error', status: status_code }
+      format.html { render 'static/error', status: status_code }
       format.json { render json: { error: { message: message, code: status_code } }, status: status_code }
       format.json_api { render json: { error: { message: message, code: status_code } }, status: status_code }
       format.any { head status_code }

app/assets/images/ORCID-iD_icon_vector.svg

@@ -38,7 +38,7 @@ def get_resource
       if name.end_with?('_id')
         c = name.chomp('_id').classify.constantize rescue NameError
         if c.method_defined?(:collaborations)
-          @resource = c.friendly.find(value)
+          @resource = c.respond_to?(:friendly) ? c.friendly.find(value) : c.find(value)
         end
       end
     end

app/assets/images/elixir/biofair-logo.png

@@ -67,6 +67,7 @@ def show
       format.json
       format.json_api { render json: @event }
       format.ics { send_data @event.to_ical, type: 'text/calendar', disposition: 'attachment', filename: "#{@event.slug}.ics" }
+      format.jsonld { render plain: @bioschemas.first.to_json }
     end
   end