From f97263ce4b39b64e9438d42c717dc7ecb4998c01 Mon Sep 17 00:00:00 2001 From: Ben Rexin Date: Fri, 17 Jan 2025 21:34:32 +0100 Subject: [PATCH 1/7] chore: remove colognerb --- config/whitelabel.yml | 47 ------------------------------------------- 1 file changed, 47 deletions(-) diff --git a/config/whitelabel.yml b/config/whitelabel.yml index a9402b11..0fc718dc 100644 --- a/config/whitelabel.yml +++ b/config/whitelabel.yml @@ -40,53 +40,6 @@ :twitter: cocoaheads_hh tld: de coc: http://rubyberlin.github.io/code-of-conduct -- !ruby/object:Usergroup - label_id: cologne - canonical_url: https://www.colognerb.de - status: enabled - default_locale: de - country: Deutschland - recurring: third wednesday - email: colognerb@googlegroups.com - twitter: colognerb - organizers: - - jkwebs - location: - :zoom: 12 - :lat: 50.941231 - :long: 6.957092 - default_time_zone: Europe/Berlin - imprint: - :address: "An der Bottmühle 5\n50678 Köln" - :contributors: - - :name: Jakob Hilden - :email: jakob@railslove.com - - :name: Marco Schaden - :email: hello@donschado.de - - :name: Railslove GmbH - :email: http://railslove.com - other_usergroups: - - :name: Cologne.js - :url: http://colognejs.de/ - :twitter: cgnjs - - :name: DevHouse Friday - :url: http://devhousefriday.org/ - :twitter: devhousefriday - - :name: NoSQL User Group Cologne - :url: http://www.nosql-cologne.org/ - :twitter: nosqlcgn - - :name: pyCologne - :url: http://wiki.python.de/pycologne/ - :twitter: pycologne - - :name: hacken.in - :url: http://hacken.in/ - tld: de - coc: http://rubyberlin.github.io/code-of-conduct - custom_recurring: true - domains: - - colognerb.de - google_group: colognerb - slackin_url: https://colognerb.fly.dev/slackin.js - !ruby/object:Usergroup label_id: saar default_locale: de From 69baf863708de5b7627cb416288fb8bcd106fcf2 Mon Sep 17 00:00:00 2001 From: Ben Rexin Date: Tue, 21 Jan 2025 22:59:53 +0100 Subject: [PATCH 2/7] fix: remove cologne reference form location spec --- spec/models/location_spec.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spec/models/location_spec.rb b/spec/models/location_spec.rb index 0aee0693..c239376f 100644 --- a/spec/models/location_spec.rb +++ b/spec/models/location_spec.rb @@ -3,7 +3,6 @@ describe Location do before do @location = create(:location, name: 'Test-Location', street: 'Schanzenstr.', house_number: '85', zip: '20357', city: 'Hamburg') - @other_location = create(:location, label: 'cologne') @es_location = create(:location, label: 'madridrb') @virtual_location = create(:virtual_location, label: 'madridrb') end @@ -29,7 +28,7 @@ hamburg_locations = Location.all expect(hamburg_locations).to have(1).elements expect(hamburg_locations.first).to eql(@location) - expect(Location.unscoped.size).to be(4) + expect(Location.unscoped.size).to be(3) end end From 5c7ed5c94333450aaaa544fc884e984f3c974139 Mon Sep 17 00:00:00 2001 From: Ben Rexin Date: Tue, 21 Jan 2025 23:05:38 +0100 Subject: [PATCH 3/7] fix: replace global usergroup with temporary to remove colognerb reference --- spec/helpers/external_link_helper_spec.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spec/helpers/external_link_helper_spec.rb b/spec/helpers/external_link_helper_spec.rb index 581def6a..b15a1cf3 100644 --- a/spec/helpers/external_link_helper_spec.rb +++ b/spec/helpers/external_link_helper_spec.rb @@ -42,9 +42,11 @@ end describe '#mailing_list_url' do + let(:colognerb) { Usergroup.from_name('colognerb').tap { _1.recurring = 'thrid wednesday' } } + it 'creates an url' do expect(helper.mailing_list_url).to eql('https://groups.google.com/group/rubyonrails-ug-germany') - Whitelabel.with_label(Whitelabel.label_for('cologne')) do + Whitelabel.with_label(colognerb) do expect(helper.mailing_list_url).to eql('https://groups.google.com/group/colognerb') end end From 8c2fb729bbab3445d6d75a30c065b18b3e0488a0 Mon Sep 17 00:00:00 2001 From: Ben Rexin Date: Wed, 22 Jan 2025 08:59:07 +0100 Subject: [PATCH 4/7] fix: replace global usergroup with temporary to remove colognerb reference --- spec/models/usergroup_spec.rb | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/spec/models/usergroup_spec.rb b/spec/models/usergroup_spec.rb index 92ee4382..545b770d 100644 --- a/spec/models/usergroup_spec.rb +++ b/spec/models/usergroup_spec.rb @@ -4,7 +4,7 @@ let(:every_second_wednesday) { Usergroup.new.tap { |it| it.recurring = 'second wednesday 18:30' } } let(:every_last_wednesday) { Usergroup.new.tap { |it| it.recurring = 'last wednesday 18:30' } } let(:rughh) { Whitelabel.label_for('hamburg') } - let(:colognerb) { Whitelabel.label_for('cologne') } + let(:colognerb) { Usergroup.from_name('cologne').tap { _1.recurring = 'third wednesday 20:00' } } context 'parsing of recurring' do context 'as string' do @@ -78,13 +78,6 @@ end end - describe '#custom_recurring' do - specify do - expect(colognerb.custom_recurring).to be true - expect(rughh.custom_recurring).to be_nil - end - end - describe '#localized_custom_recurrence' do context 'no custom recurring' do it 'returns nil' do @@ -93,22 +86,15 @@ end context 'with custom recurring' do - specify 'de' do - I18n.with_locale(:de) do - expect(colognerb.localized_custom_recurrence).to eql 'jeweils am 3. Mittwoch in jedem 2. Monat (Januar, März, Mai, Juli, September, November) um 19:00 Uhr' - end + before do + rughh.custom_recurring = true end - specify 'en' do - I18n.with_locale(:en) do - expect(colognerb.localized_custom_recurrence).to eql 'every 3rd Wednesday in every second month (January, March, May, July, September, November) at 7:00 p.m.' - end - end - specify 'es' do - I18n.with_locale(:es) do - expect(colognerb.localized_custom_recurrence).to eql '3er Miércoles de Enero, Marzo, Mayo, Julio, Septiembre y Noviembre, a las 19.00' - end + specify 'de' do + allow(I18n).to receive(:tw).with('custom_recurrence').and_return("custom_recurrence") + + expect(rughh.localized_custom_recurrence).to eql 'custom_recurrence' end context 'translation for locale is missing (> es)' do @@ -116,8 +102,8 @@ I18n.with_locale(:es) do default_translation = 'jeweils am 3. Mittwoch in jedem 2. Monat (Januar, März, Mai, Juli, September, November) um 19:00 Uhr' allow(I18n).to receive(:tw).with('custom_recurrence').and_return('n/a') - allow(I18n).to receive(:tw).with('custom_recurrence', locale: colognerb.default_locale).and_return(default_translation) - expect(colognerb.localized_custom_recurrence).to eql default_translation + allow(I18n).to receive(:tw).with('custom_recurrence', locale: rughh.default_locale).and_return(default_translation) + expect(rughh.localized_custom_recurrence).to eql default_translation end end end From 5c3a93bfb09ceb014a534fe5f907705e09402af0 Mon Sep 17 00:00:00 2001 From: Ben Rexin Date: Wed, 22 Jan 2025 08:59:29 +0100 Subject: [PATCH 5/7] fix: replace global usergroup with temporary to remove colognerb reference --- spec/requests/whitelabel_spec.rb | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/spec/requests/whitelabel_spec.rb b/spec/requests/whitelabel_spec.rb index aeaa3208..a7dd4ee6 100644 --- a/spec/requests/whitelabel_spec.rb +++ b/spec/requests/whitelabel_spec.rb @@ -1,6 +1,23 @@ require 'spec_helper' describe 'Whitelabel' do + let(:hamburg) { Usergroup.from_name("hamburg") } + let(:berlin) { Usergroup.from_name("berlin") } + let(:tokio) { Usergroup.from_name("tokio") } + + around do |example| + whitelabel_backup = Whitelabel.labels + Whitelabel.labels = [ + hamburg, + berlin, + tokio + ] + example.run + ensure + Whitelabel.labels = whitelabel_backup + end + + context 'GET label page with non existing subdomain' do it 'does not do an endless redirect but halts' do host! 'www.onruby.test' @@ -18,11 +35,11 @@ context 'GET page with custom domain' do it 'shows the label' do - host! 'www.colognerb.de' + host! 'www.tokio.de' get root_url expect(response).to be_a_successful - expect(Whitelabel[:label_id]).to eql('cologne') + expect(Whitelabel[:label_id]).to eql(tokio.label_id) end end end From 5b737458b7d75a7d0a1df034326439087fa0157d Mon Sep 17 00:00:00 2001 From: Ben Rexin Date: Wed, 22 Jan 2025 09:02:12 +0100 Subject: [PATCH 6/7] refa: just a little bit of rubocop happiness --- spec/models/usergroup_spec.rb | 3 +-- spec/requests/whitelabel_spec.rb | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/spec/models/usergroup_spec.rb b/spec/models/usergroup_spec.rb index 545b770d..1c32ecc2 100644 --- a/spec/models/usergroup_spec.rb +++ b/spec/models/usergroup_spec.rb @@ -90,9 +90,8 @@ rughh.custom_recurring = true end - specify 'de' do - allow(I18n).to receive(:tw).with('custom_recurrence').and_return("custom_recurrence") + allow(I18n).to receive(:tw).with('custom_recurrence').and_return('custom_recurrence') expect(rughh.localized_custom_recurrence).to eql 'custom_recurrence' end diff --git a/spec/requests/whitelabel_spec.rb b/spec/requests/whitelabel_spec.rb index a7dd4ee6..f2a1f321 100644 --- a/spec/requests/whitelabel_spec.rb +++ b/spec/requests/whitelabel_spec.rb @@ -1,9 +1,9 @@ require 'spec_helper' describe 'Whitelabel' do - let(:hamburg) { Usergroup.from_name("hamburg") } - let(:berlin) { Usergroup.from_name("berlin") } - let(:tokio) { Usergroup.from_name("tokio") } + let(:hamburg) { Usergroup.from_name('hamburg') } + let(:berlin) { Usergroup.from_name('berlin') } + let(:tokio) { Usergroup.from_name('tokio') } around do |example| whitelabel_backup = Whitelabel.labels @@ -17,7 +17,6 @@ Whitelabel.labels = whitelabel_backup end - context 'GET label page with non existing subdomain' do it 'does not do an endless redirect but halts' do host! 'www.onruby.test' From 6ad703ba7104d0e09d659e28155bfabebc901f14 Mon Sep 17 00:00:00 2001 From: Ben Rexin Date: Wed, 22 Jan 2025 09:22:16 +0100 Subject: [PATCH 7/7] chore: remove cologne assets too --- app/assets/images/labels/cologne.ico | Bin 32988 -> 0 bytes app/assets/images/labels/cologne.png | Bin 19760 -> 0 bytes app/assets/javascripts/labels/cologne.js | 32 ------------ app/assets/stylesheets/labels/cologne.sass | 48 ------------------ .../stylesheets/labels/cologne/_colors.sass | 12 ----- .../labels/cologne/_dimensions.sass | 7 --- config/locales/de.label.yml | 7 --- config/locales/en.label.yml | 7 --- config/locales/es.label.yml | 7 --- config/locales/pl.label.yml | 7 --- 10 files changed, 127 deletions(-) delete mode 100644 app/assets/images/labels/cologne.ico delete mode 100644 app/assets/images/labels/cologne.png delete mode 100644 app/assets/javascripts/labels/cologne.js delete mode 100644 app/assets/stylesheets/labels/cologne.sass delete mode 100644 app/assets/stylesheets/labels/cologne/_colors.sass delete mode 100644 app/assets/stylesheets/labels/cologne/_dimensions.sass diff --git a/app/assets/images/labels/cologne.ico b/app/assets/images/labels/cologne.ico deleted file mode 100644 index cad99c250ab250941cbb2f8a988909e381330d4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32988 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℞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 diff --git a/app/assets/images/labels/cologne.png b/app/assets/images/labels/cologne.png deleted file mode 100644 index 4d5da98f81299810fabe7759f98990dfdf659c5c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19760 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 Dco&3A diff --git a/app/assets/javascripts/labels/cologne.js b/app/assets/javascripts/labels/cologne.js deleted file mode 100644 index 75cd742c..00000000 --- a/app/assets/javascripts/labels/cologne.js +++ /dev/null @@ -1,32 +0,0 @@ -/* - * decaffeinate suggestions: - * DS102: Remove unnecessary code created because of implicit returns - * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md - */ -const CGN = { - ratio: 0, - // header animation - showKoelsch() { - $("header h1").text("Kölsch.rb"); - return $("header h2").text("De Kölsche Ruby Jecke"); - }, - - showCologne() { - $("header h1").text("Cologne.rb"); - return $("header h2").text("Ruby User Group Cologne"); - } -}; - -$(document).ready(function() { - // assign header animation listeners - $("#title").mouseover(CGN.showKoelsch).mouseout(CGN.showCologne); - // append custom markup for gem beer glas - $(".main").append("
refill?"); - // animate gem beer glas - CGN.beer_height = $("#gem").height(); - return $(window).scroll(function() { - CGN.ratio = $(window).scrollTop() / ($(document).height() - $(window).height()); - $("#beer").height((1 - CGN.ratio) * CGN.beer_height); - return $("#refill").css("opacity", CGN.ratio); - }); -}); diff --git a/app/assets/stylesheets/labels/cologne.sass b/app/assets/stylesheets/labels/cologne.sass deleted file mode 100644 index 8a24cb34..00000000 --- a/app/assets/stylesheets/labels/cologne.sass +++ /dev/null @@ -1,48 +0,0 @@ -@import "cologne/colors" -@import "cologne/dimensions" - -header - #title - &:hover - color: $red !important - single-text-shadow: $dark-text-color, 1px, 1px, 2px - - #logo - margin-left: 1em - margin-top: -0.25em - -a:hover - color: $red - -#gem - width: 149px - height: 449px - position: fixed !important - bottom: 180px - left: 20px - z-index: 90 - img - z-index: 95 - #beer - position: absolute - bottom: 0px - width: 149px - height: 449px - background: image-url("labels/cologne/gem-glas-full.png") left bottom no-repeat - z-index: 96 - -#refill - position: fixed !important - bottom: 140px - left: 70px - text-decoration: none - font-size: 2em - z-index: 90 - opacity: 0 - a:hover - text-shadow: 0px 0px 1px $dark-grey - color: $red - -@media (max-width: 1400px) - #gem, #beer, #refill - display: none diff --git a/app/assets/stylesheets/labels/cologne/_colors.sass b/app/assets/stylesheets/labels/cologne/_colors.sass deleted file mode 100644 index 754bd4f9..00000000 --- a/app/assets/stylesheets/labels/cologne/_colors.sass +++ /dev/null @@ -1,12 +0,0 @@ -$red: #de1f26 -$black: black -$white: white - -$light-grey: #999 -$dark-grey: #444444 - -$light-gold: #dfc07d -$dark-gold: #cda85a - -$light-text-color: $white -$dark-text-color: $dark-grey diff --git a/app/assets/stylesheets/labels/cologne/_dimensions.sass b/app/assets/stylesheets/labels/cologne/_dimensions.sass deleted file mode 100644 index fae8ef29..00000000 --- a/app/assets/stylesheets/labels/cologne/_dimensions.sass +++ /dev/null @@ -1,7 +0,0 @@ -$content-width: 780px -$ipad-width: 620px -$iphone-width: 380px - -$padding: 20px - -$margin: 30px \ No newline at end of file diff --git a/config/locales/de.label.yml b/config/locales/de.label.yml index 6b751113..65c819a6 100644 --- a/config/locales/de.label.yml +++ b/config/locales/de.label.yml @@ -19,13 +19,6 @@ de: title: RUG::B subtitle: Ruby User Group Berlin meta_desc: RUG::B—Ruby User Group Berlin - cologne: - city: Köln - name: Kölsch.rb - title: Cologne.rb - subtitle: Ruby User Group Cologne - meta_desc: Ruby / Rails User Group Cologne - custom_recurrence: "jeweils am 3. Mittwoch in jedem 2. Monat (Januar, März, Mai, Juli, September, November) um 19:00 Uhr" saar: city: Saarland name: RUGSaar diff --git a/config/locales/en.label.yml b/config/locales/en.label.yml index 20c2cb9c..9c78844c 100644 --- a/config/locales/en.label.yml +++ b/config/locales/en.label.yml @@ -19,13 +19,6 @@ en: title: RUG::B subtitle: Ruby User Group Berlin meta_desc: RUG::B—Ruby User Group Berlin - cologne: - city: Köln - name: Kölsch.rb - title: Cologne.rb - subtitle: Ruby User Group Cologne - meta_desc: Ruby / Rails User Group Cologne - custom_recurrence: "every 3rd Wednesday in every second month (January, March, May, July, September, November) at 7:00 p.m." saar: city: Saarland name: RUGSaar diff --git a/config/locales/es.label.yml b/config/locales/es.label.yml index 8e9cd56c..34184d73 100644 --- a/config/locales/es.label.yml +++ b/config/locales/es.label.yml @@ -19,13 +19,6 @@ es: title: RUG::B subtitle: Ruby User Group Berlin meta_desc: RUG::B—Ruby User Group Berlin - cologne: - city: Colonia - name: Kölsch.rb - title: Cologne.rb - subtitle: Ruby User Group Cologne - meta_desc: Ruby / Rails User Group Cologne - custom_recurrence: 3er Miércoles de Enero, Marzo, Mayo, Julio, Septiembre y Noviembre, a las 19.00 saar: city: Saarland name: RUGSaar diff --git a/config/locales/pl.label.yml b/config/locales/pl.label.yml index 7f8982a3..f747a12f 100644 --- a/config/locales/pl.label.yml +++ b/config/locales/pl.label.yml @@ -19,13 +19,6 @@ pl: title: RUG::B subtitle: Ruby User Group Berlin meta_desc: RUG::B—Ruby User Group Berlin - cologne: - city: Köln - name: Kölsch.rb - title: Cologne.rb - subtitle: Ruby User Group Cologne - meta_desc: Ruby / Rails User Group Cologne - custom_recurrence: "w trzecią środę nieparzystych miesięcy (styczeń, marzec, maj, lipiec, wrzesień, listopad) o 19:00" saar: city: Saarland name: RUGSaar