Merge branch 'main' into add-global_club_id-to-dojo-model

Author: yasulab

.github/workflows/daily.yml

@@ -0,0 +1,66 @@
+name: Daily Workflow
+
+on:
+  schedule:
+    # 毎朝 9:00 JST
+    - cron: '0 0 * * *'
+  # Allows you to run this workflow manually from the Actions tab
+  # https://docs.github.com/en/actions/managing-workflow-runs/manually-running-a-workflow
+  workflow_dispatch:
+
+jobs:
+  daily:
+    runs-on: ubuntu-latest
+    outputs:
+      FOUND_NEWS: ${{ steps.check_news.outputs.FOUND_NEWS }}
+
+    steps:
+    - name: ☑️ Checkout code
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 2
+
+    - name: 💎 Setup Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        bundler-cache: true
+
+    - name: 📰 Run news:fetch task
+      run: bin/rails news:fetch
+
+    - name: 🆙 Commit updated news.yml
+      id: check_news
+      run: |
+        git config user.name  "Yohei Yasukawa"
+        git config user.email "[email protected]"
+        git checkout main
+        git add db/news.yml
+        if ! git diff --cached --quiet; then
+          git commit -m '🤖 Upsert db/news.yml'
+          git push origin main
+          echo "🆕 Found news in db/news.yml"
+          echo "FOUND_NEWS=true"  >> $GITHUB_OUTPUT
+        else
+          echo "✅ No news in db/news.yml"
+          echo "FOUND_NEWS=false" >> $GITHUB_OUTPUT
+        fi
+
+  deploy:
+    needs: daily
+    if: ${{ needs.daily.outputs.FOUND_NEWS == 'true' }}
+    # TODO: ubuntu-latest image needs to install heroku CLI to deploy.
+    # https://github.com/AkhileshNS/heroku-deploy/issues/188
+    runs-on: ubuntu-22.04
+    
+    steps:
+    - name: ☑️ Checkout code
+      uses: actions/checkout@v4
+      with:
+        ref: main
+    
+    - name: 🚀 Deploy to Heroku
+      uses: akhileshns/[email protected]
+      with:
+        heroku_api_key:  ${{ secrets.HEROKU_API_KEY  }}
+        heroku_app_name: ${{ secrets.HEROKU_APP_NAME }}
+        heroku_email:    ${{ secrets.HEROKU_EMAIL    }}

.github/workflows/fetch_news.yml

@@ -1,6 +1,6 @@
 # 行動規範 - Code of Conduct
 
-[一般社団法人 CoderDojo Japan](https://coderdojo.jp/about-coderdojo-japan) は、次の行動規範にしたがって [GitHub 上の各種リポジトリ](https://github.com/coderdojo-japan)を運営しています。
+[一般社団法人 CoderDojo Japan](https://coderdojo.jp/about) は、次の行動規範にしたがって [GitHub 上の各種リポジトリ](https://github.com/coderdojo-japan)を運営しています。
 
 コントリビューター行動規範 - CoderDojo Japan   
 https://coderdojo.jp/conduct

CODE_OF_CONDUCT.md

@@ -286,7 +286,7 @@ GEM
       get_process_mem (>= 0.2)
       puma (>= 2.7)
     racc (1.8.1)
-    rack (3.1.16)
+    rack (3.1.18)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
     rack-host-redirect (1.3.0)
@@ -356,7 +356,7 @@ GEM
       io-console (~> 0.5)
     reverse_markdown (3.0.0)
       nokogiri
-    rexml (3.4.1)
+    rexml (3.4.2)
     rinku (2.0.6)
     rspec-core (3.13.4)
       rspec-support (~> 3.13.0)

Gemfile.lock

@@ -42,4 +42,4 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 Check out README's LICENSE (ライセンス) section in GitHub:   
 https://github.com/coderdojo-japan/coderdojo.jp#5-license
 
-Copyright © [一般社団法人 CoderDojo Japan](https://coderdojo.jp/about-coderdojo-japan)
+Copyright © [一般社団法人 CoderDojo Japan](https://coderdojo.jp/about)

LICENSE.md

@@ -273,7 +273,7 @@ We use `SCRIVITO_TENANT` and `SCRIVITO_API_KEY` keys in production, but they are
 This web application is developed with many other brilliant works! :sparkling_heart:
 You can check out them and our works with associated licenses from [LICENSE.md](https://github.com/coderdojo-japan/coderdojo.jp/blob/main/LICENSE.md). :wink:
 
-Copyright © [一般社団法人 CoderDojo Japan](https://coderdojo.jp/about-coderdojo-japan) ([@coderdojo-japan](https://github.com/coderdojo-japan)).
+Copyright © [一般社団法人 CoderDojo Japan](https://coderdojo.jp/about) ([@coderdojo-japan](https://github.com/coderdojo-japan)).
 
 <br>
 

README.md

@@ -50,7 +50,7 @@ def convert_shownote(content)
     content.gsub!(Podcast::TIMESTAMP_REGEX) do
         original_t = $1
         parts = original_t.split(':')
-        
+
         # タイムスタンプをh:m:s形式に変換
         if parts.size == 3
           # 00:00:00 形式
@@ -64,7 +64,7 @@ def convert_shownote(content)
           # それ以外（通常は来ないはず）
           t = original_t
         end
-        
+
         "- [#{original_t}](https://youtu.be/#{youtube_id}?t=#{t})   "
     end
   end

app/assets/images/dojocon-japan-2025.png

@@ -20,7 +20,8 @@ def last
   end
 
   def initialize(filename)
-    @filename = filename
+    # ActiveStorage::Filename を使用してファイル名をサニタイズ
+    @filename = ActiveStorage::Filename.new(filename).sanitized
   end
 
   def path
@@ -56,7 +57,6 @@ def url
   end
 
   def exist?
-    return false if path.include? "\u0000"
     Document.all.map(&:filename).include?(filename)
   end