Binaergewitter · fliiiix · Mar 7, 2024 · Jan 6, 2024 · Jan 6, 2024 · Jan 6, 2024
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -8,7 +8,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2.1
+          ruby-version: 3.3.0
           bundler-cache: true
       - run: bundle install
       - run: bundle exec rake TESTOPTS=-v

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.2.1
+FROM ruby:3.3.0
 ADD . /src
 WORKDIR /src
 

diff --git a/Dockerfile.fly b/Dockerfile.fly
@@ -1,4 +1,4 @@
-ARG RUBY_VERSION=3.2.1-jemalloc
+ARG RUBY_VERSION=3.3.0-jemalloc
 FROM quay.io/evl.ms/fullstaq-ruby:${RUBY_VERSION}-slim
 ADD . /src
 WORKDIR /src

diff --git a/Gemfile b/Gemfile
@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-ruby "3.2.1"
+ruby "3.3.0"
 
 gem "rake"
 gem "serious", :path => './serious'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -3,29 +3,35 @@ PATH
   specs:
     serious (0.4.0)
       builder (>= 2.1.2)
-      commonmarker (>= 1.0.0.pre7)
+      commonmarker (>= 1.0.0)
       excon (>= 0.49.0)
       sinatra (>= 1.0.0)
       stupider_formatter (>= 0.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.5)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.6)
     builder (3.2.4)
     coderay (1.1.3)
-    commonmarker (1.0.0.pre12-x86_64-linux)
-    crack (0.4.5)
+    commonmarker (1.0.4-aarch64-linux)
+    commonmarker (1.0.4-arm64-darwin)
+    commonmarker (1.0.4-x86_64-darwin)
+    commonmarker (1.0.4-x86_64-linux)
+    crack (1.0.0)
+      bigdecimal
       rexml
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    excon (0.105.0)
+    excon (0.109.0)
     feedvalidator (0.2.2)
     ffi (1.16.3)
-    hashdiff (1.0.1)
+    hashdiff (1.1.0)
     json (2.7.1)
-    listen (3.8.0)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mustermann (3.0.0)
@@ -35,39 +41,46 @@ GEM
     public_suffix (5.0.4)
     puma (6.4.2)
       nio4r (~> 2.0)
-    rack (2.2.8)
-    rack-protection (3.1.0)
-      rack (~> 2.2, >= 2.2.4)
+    rack (3.0.9.1)
+    rack-protection (4.0.0)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0, < 4)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
     rack-test (2.1.0)
       rack (>= 1.3)
     rake (13.1.0)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdiscount (2.2.7.1)
+    rdiscount (2.2.7.3)
     rerun (0.14.0)
       listen (~> 3.0)
     rexml (3.2.6)
     ruby2_keywords (0.0.5)
-    sinatra (3.1.0)
+    sinatra (4.0.0)
       mustermann (~> 3.0)
-      rack (~> 2.2, >= 2.2.4)
-      rack-protection (= 3.1.0)
+      rack (>= 3.0.0, < 4)
+      rack-protection (= 4.0.0)
+      rack-session (>= 2.0.0, < 3)
       tilt (~> 2.0)
     stupider_formatter (0.3.0)
       coderay (>= 0.9.0)
       rdiscount (>= 1.5.0)
-    test-unit (3.6.1)
+    test-unit (3.6.2)
       power_assert
     tilt (2.3.0)
     typhoeus (1.4.1)
       ethon (>= 0.9.0)
-    webmock (3.19.1)
+    webmock (3.23.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
+  aarch64-linux
+  arm64-darwin
+  x86_64-darwin
   x86_64-linux
 
 DEPENDENCIES
@@ -83,7 +96,7 @@ DEPENDENCIES
   webmock
 
 RUBY VERSION
-   ruby 3.2.1p31
+   ruby 3.3.0p0
 
 BUNDLED WITH
-   2.4.7
+   2.5.4
diff --git a/config.ru b/config.ru
@@ -8,8 +8,6 @@ Serious.set :url, 'http://blog.binaergewitter.de'
 Serious.set :description, 'Ein Podcast, der sich mit dem Web, Technologie und Open Source Software auseinander setzt.'
 Serious.set :isso, true
 
-Serious.set :flattr_id, 'mrop97'
-
 # 6 hours of caching. Will be purged by git push on heroku. Clients might cache longer.
 Serious.set :cache_timeout, 21600
 Serious.set :items_in_feed, 50

diff --git a/serious/lib/serious.rb b/serious/lib/serious.rb
@@ -126,23 +126,6 @@ def render_isso(title)
       render :erb, :"_isso", :locals => { :title => title }, :layout => false
     end
 
-    def render_flattr(article=nil)
-      if article.nil?
-        options = {
-          :url => Serious.url,
-          :title => Serious.title,
-          :description => Serious.description
-        }
-      else
-        options = {
-          :url => "#{Serious.url}/blog#{article.url}",
-          :title => article.title,
-          :description => article.automatic_summary
-        }
-      end
-      render :erb, :"_flattr", :locals => options, :layout => false
-    end
-
     def render_article(article, summary_only=false)
       render :erb, :'_article', :locals => { :article => article, :summary_only => summary_only }, :layout => !summary_only
     end
@@ -373,5 +356,4 @@ def is_live?
 Serious.set :date_format, "%B %o %Y"
 Serious.set :disqus, false
 Serious.set :google_analytics, false
-Serious.set :flattr, false
 Serious.set :feed_url, '/rss.xml'
diff --git a/serious/lib/site/public/css/iconfont/demo.html b/serious/lib/site/public/css/iconfont/demo.html
@@ -13,6 +13,20 @@ <h1 class="mhmm mvm"><span class="fgc1">Font Name:</span> bgt <small class="fgc1
     </div>
     <div class="clearfix mhl ptl">
         <h1 class="mvm mtn fgc1">Grid Size: Unknown</h1>
+        <div class="glyph fs1">
+            <div class="clearfix bshadow0 pbs">
+                <span class="icon-patreon"></span>
+                <span class="mls"> icon-patreon</span>
+            </div>
+            <fieldset class="fs0 size1of1 clearfix hidden-false">
+                <input type="text" readonly value="e902" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#xe902;" class="unitRight size1of2 talign-right" />
+            </fieldset>
+            <div class="fs0 bshadow0 clearfix hidden-false">
+                <span class="unit pvs fgc1">liga: </span>
+                <input type="text" readonly value="" class="liga unitRight" />
+            </div>
+        </div>
         <div class="glyph fs1">
             <div class="clearfix bshadow0 pbs">
                 <span class="icon-mastodon"></span>
@@ -22,7 +36,7 @@ <h1 class="mvm mtn fgc1">Grid Size: Unknown</h1>
                 <input type="text" readonly value="e900" class="unit size1of2" />
                 <input type="text" maxlength="1" readonly value="&#xe900;" class="unitRight size1of2 talign-right" />
             </fieldset>
-            <div class="fs0 bshadow0 clearfix hidden-true">
+            <div class="fs0 bshadow0 clearfix hidden-false">
                 <span class="unit pvs fgc1">liga: </span>
                 <input type="text" readonly value="" class="liga unitRight" />
             </div>
@@ -36,7 +50,7 @@ <h1 class="mvm mtn fgc1">Grid Size: Unknown</h1>
                 <input type="text" readonly value="e901" class="unit size1of2" />
                 <input type="text" maxlength="1" readonly value="&#xe901;" class="unitRight size1of2 talign-right" />
             </fieldset>
-            <div class="fs0 bshadow0 clearfix hidden-true">
+            <div class="fs0 bshadow0 clearfix hidden-false">
                 <span class="unit pvs fgc1">liga: </span>
                 <input type="text" readonly value="" class="liga unitRight" />
             </div>
@@ -53,7 +67,7 @@ <h1 class="mvm mtn fgc1">Grid Size: 14</h1>
                 <input type="text" readonly value="f09e" class="unit size1of2" />
                 <input type="text" maxlength="1" readonly value="&#xf09e;" class="unitRight size1of2 talign-right" />
             </fieldset>
-            <div class="fs0 bshadow0 clearfix hidden-true">
+            <div class="fs0 bshadow0 clearfix hidden-false">
                 <span class="unit pvs fgc1">liga: </span>
                 <input type="text" readonly value="" class="liga unitRight" />
             </div>
@@ -67,7 +81,7 @@ <h1 class="mvm mtn fgc1">Grid Size: 14</h1>
                 <input type="text" readonly value="f09e" class="unit size1of2" />
                 <input type="text" maxlength="1" readonly value="&#xf09e;" class="unitRight size1of2 talign-right" />
             </fieldset>
-            <div class="fs0 bshadow0 clearfix hidden-true">
+            <div class="fs0 bshadow0 clearfix hidden-false">
                 <span class="unit pvs fgc1">liga: </span>
                 <input type="text" readonly value="" class="liga unitRight" />
             </div>
@@ -84,7 +98,7 @@ <h1 class="mvm mtn fgc1">Grid Size: 16</h1>
                 <input type="text" readonly value="ea96" class="unit size1of2" />
                 <input type="text" maxlength="1" readonly value="&#xea96;" class="unitRight size1of2 talign-right" />
             </fieldset>
-            <div class="fs0 bshadow0 clearfix hidden-true">
+            <div class="fs0 bshadow0 clearfix hidden-false">
                 <span class="unit pvs fgc1">liga: </span>
                 <input type="text" readonly value="twitter, brand16" class="liga unitRight" />
             </div>
@@ -98,25 +112,11 @@ <h1 class="mvm mtn fgc1">Grid Size: 16</h1>
                 <input type="text" readonly value="eab0" class="unit size1of2" />
                 <input type="text" maxlength="1" readonly value="&#xeab0;" class="unitRight size1of2 talign-right" />
             </fieldset>
-            <div class="fs0 bshadow0 clearfix hidden-true">
+            <div class="fs0 bshadow0 clearfix hidden-false">
                 <span class="unit pvs fgc1">liga: </span>
                 <input type="text" readonly value="github, brand40" class="liga unitRight" />
             </div>
         </div>
-        <div class="glyph fs3">
-            <div class="clearfix bshadow0 pbs">
-                <span class="icon-flattr"></span>
-                <span class="mls"> icon-flattr</span>
-            </div>
-            <fieldset class="fs0 size1of1 clearfix hidden-false">
-                <input type="text" readonly value="ead5" class="unit size1of2" />
-                <input type="text" maxlength="1" readonly value="&#xead5;" class="unitRight size1of2 talign-right" />
-            </fieldset>
-            <div class="fs0 bshadow0 clearfix hidden-true">
-                <span class="unit pvs fgc1">liga: </span>
-                <input type="text" readonly value="flattr, brand76" class="liga unitRight" />
-            </div>
-        </div>
     </div>
 
     <!--[if gt IE 8]><!-->
@@ -128,15 +128,15 @@ <h1>Font Test Drive</h1>
             px
         </label>
         <input id="testText" type="text" class="phl size1of1 mvl"
-        placeholder="Type some text to test..." value=""/>
-        <div id="testDrive" class="icon-" style="font-family: bgt">&nbsp;
+        placeholder="Type some text to test..." value="twitter brand16 github brand40"/>
+        <div id="testDrive" class="icon-" style="font-family: bgt">twitter brand16 github brand40&nbsp;
         </div>
     </div>
     <!--<![endif]-->
     <div class="bgc1 clearfix">
         <p class="mhl">Generated by <a href="https://icomoon.io/app">IcoMoon</a></p>
     </div>
-
+    <script src="liga.js"></script>
     <script src="demo-files/demo.js"></script>
 </body>
 </html>