Merge 2d8f4ea into 6ae6fd9

.ruby-version

@@ -1 +1 @@
-2.2.3
+2.3.8

.travis.yml

@@ -12,10 +12,10 @@ notifications:
   email:
     - travis-notifications@fairmondo.de
 before_install:
-  - curl -k -L -o elasticsearch-1.3.4.tar.gz https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.3.4.tar.gz
-  - tar -zxvf elasticsearch-1.3.4.tar.gz
-  - ./elasticsearch-1.3.4/bin/plugin -install bundle -url http://xbib.org/repository/org/xbib/elasticsearch/plugin/elasticsearch-plugin-bundle/1.4.0.6/elasticsearch-plugin-bundle-1.4.0.6-plugin.zip
-  - ./elasticsearch-1.3.4/bin/elasticsearch 1> /dev/null 2> /dev/null &
+  - curl -k -L -o elasticsearch.tar.gz https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.4.0.tar.gz
+  - tar -zxvf elasticsearch.tar.gz
+  - ./elasticsearch-5.4.0/bin/elasticsearch-plugin install http://xbib.org/repository/org/xbib/elasticsearch/plugin/elasticsearch-plugin-bundle/5.4.0.0/elasticsearch-plugin-bundle-5.4.0.0-plugin.zip
+  - ./elasticsearch-5.4.0/bin/elasticsearch 1> /dev/null &
   - cp config/secrets.yml.example config/secrets.yml
 addons:
   apt:

Gemfile.lock

@@ -343,7 +343,7 @@ GEM
       addressable (~> 2.3)
     letter_opener (1.3.0)
       launchy (~> 2.2)
-    libv8 (3.16.14.7)
+    libv8 (3.16.14.19)
     listen (2.9.0)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
@@ -543,7 +543,7 @@ GEM
     redis (3.3.0)
     redis-namespace (1.5.2)
       redis (~> 3.0, >= 3.0.4)
-    ref (1.0.5)
+    ref (2.0.0)
     remotipart (1.2.1)
     require_all (1.3.2)
     responders (1.1.2)
@@ -650,8 +650,8 @@ GEM
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     terminal-table (1.4.5)
-    therubyracer (0.12.1)
-      libv8 (~> 3.16.14.0)
+    therubyracer (0.12.3)
+      libv8 (~> 3.16.14.15)
       ref
     therubyrhino (2.0.4)
       therubyrhino_jar (>= 1.7.3)
@@ -830,4 +830,4 @@ DEPENDENCIES
   wiselinks
 
 BUNDLED WITH
-   1.16.1
+   1.17.3

README.rdoc

@@ -88,6 +88,12 @@ Make sure you install <em>2.2.2</em>. and not <em>ruby 1.9.3-p392</em>.
    gem update --system
    bundle
 
+* (Mac) libv8 issues with Mac osx catalina
+
+   brew install v8@3.15
+   bundle config build.libv8 --with-system-v8
+   bundle config build.therubyracer --with-v8-dir=$(brew --prefix v8@3.15)
+   bundle install
 
 === Testing
 
@@ -146,10 +152,10 @@ Hint: When a vim window opened after you typed "git commit" without a commit mes
 
 To make the search available in your local environment you have to install Elasticsearch:
 
-    curl -k -L -o elasticsearch-1.3.4.tar.gz https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.3.4.tar.gz
-    tar -zxvf elasticsearch-1.3.4.tar.gz
-    ./elasticsearch-1.3.4/bin/plugin -install bundle -url http://xbib.org/repository/org/xbib/elasticsearch/plugin/elasticsearch-plugin-bundle/1.4.0.6/elasticsearch-plugin-bundle-1.4.0.6-plugin.zip
-    ./elasticsearch-1.3.4/bin/elasticsearch
+    curl -k -L -o elasticsearch.tar.gz https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.4.0.tar.gz
+    tar -zxvf elasticsearch.tar.gz
+    ./elasticsearch-5.4.0/bin/elasticsearch-plugin install http://xbib.org/repository/org/xbib/elasticsearch/plugin/elasticsearch-plugin-bundle/5.4.0.0/elasticsearch-plugin-bundle-5.4.0.0-plugin.zip
+    ./elasticsearch-5.4.0/bin/elasticsearch
 
 Links for Elasticsearch:
 http://www.elasticsearch.org

app/controllers/toolbox_controller.rb

@@ -23,13 +23,6 @@ def confirm
     end
   end
 
-  def rss
-    @items = acquire_feed_items
-    respond_to do |format|
-      format.html { render layout: false }
-    end
-  end
-
   # A site that's sole purpose is to reload the browser. Only useful for AJAX requests
   def reload
     render layout: false
@@ -62,24 +55,4 @@ def newsletter_status
 
     render json: { subscribed: is_subscribed }
   end
-
-  private
-
-  def acquire_feed_items
-    begin
-      Timeout.timeout(10) do # 10 second timeout
-        #OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:ssl_version] = 'SSLv23' # See comment to http://stackoverflow.com/q/20169301/409087
-        # TODO Set /etc/ssl/certs as sll_ca_folder to remove this hack
-        #feed = open 'https://info.fairmondo.de/?feed=rss', ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE
-        #OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:ssl_version] = 'SSLv23'
-
-        # Get feed vial http as SSL is currently not in place.
-        feed = open 'http://info.fairmondo.de/feed/'
-        rss = RSS::Parser.parse(feed.read, false)
-        rss.items.first(3)
-      end
-    rescue Timeout::Error
-      nil
-    end
-  end
 end