fixtest(github-ingestor): tests now pass and corrected CodeQL error

Author: kennethrioja

lib/ingestors/github_ingestor.rb

@@ -62,39 +62,43 @@ def read(source_url)
 
     private
 
-    # Takes a github.{com|io} url and returns its api.google.com url
+    # Takes a github.{com|io} url and returns its api.github.com url
     def to_github_api(url)
       uri = URI(url)
-      return nil unless uri.host =~ /(\.|\A)(github\.com|github\.io)\Z/i
-
-      if uri.host.end_with?('github.io')
-        github_api_from_io(uri)
-      elsif uri.host.end_with?('github.com')
-        github_api_from_com(uri)
+      parts = uri.path.split('/') # 'example.com/foo/bar' will have path == '/foo/bar', so three parts
+
+      # http(s)://github.com/<username>/<repo> is the strict way to pass
+      if uri.host&.downcase == 'github.com' && parts.size == 3
+        github_api_from_com(parts)
+      # http(s)://<username>.github.io/<repo> is the strict way to pass
+      elsif uri.host&.downcase&.end_with?('.github.io') && (uri.host.count('.') == 2) && parts.size >= 2
+        github_api_from_io(uri, parts)
       end
     end
 
-    def github_api_from_io(uri)
-      parts = uri.path.split('/')
+    def github_api_from_com(parts)
+      "#{GITHUB_API_BASE}/#{parts[1]}/#{parts[2]}"
+    end
+
+    def github_api_from_io(uri, parts)
       repo  = parts[1]
       owner = uri.host.split('.').first
       "#{GITHUB_API_BASE}/#{owner}/#{repo}"
     end
 
-    def github_api_from_com(uri)
-      parts = uri.path.split('/')
-      "#{GITHUB_API_BASE}/#{parts[1]}/#{parts[2]}"
-    end
-
     # Fetch cached data or opens webpage/api and cache it
     # I chose to cache because GitHub limits up to 60 requests per hour for unauthenticated user
     # https://docs.github.com/en/rest/using-the-rest-api/rate-limits-for-the-rest-api?apiVersion=2022-11-28#primary-rate-limit-for-unauthenticated-users
     # One GitHub URL equals to 4 GitHub API requests.
     # key: string key for the cache
     # ttl: time-to-live in seconds (default 7 days)
     def get_or_set_cache(key, url)
+      content = open_url(url)
+      return unless content
+
+      data = JSON.parse(content.read)
       Rails.cache.fetch(key, expires_in: TTL) do
-        JSON.parse(open_url(url).read)
+        data
       end
     rescue StandardError => e
       @messages << "#{self.class.name} get_or_set_cache failed for #{url}, #{e.message}"

test/unit/ingestors/github_ingestor_test.rb

@@ -43,11 +43,15 @@ class GithubIngestorTest < ActiveSupport::TestCase # rubocop:disable Metrics/Cla
     # HTML
     html = File.read(Rails.root.join('test/fixtures/files/ingestion/github/mock.html'))
     @doc = Nokogiri::HTML(html)
+
+    # config cache working here
+    @old_cache_store = Rails.cache
+    Rails.cache = ActiveSupport::Cache::MemoryStore.new
   end
 
   teardown do
     reset_timezone
-    Rails.cache.clear
+    Rails.cache = @old_cache_store
   end
 
   test 'should read sitemap.txt composed of github.com and github.io but avoid keeping the non-github URLs' do
@@ -120,8 +124,6 @@ class GithubIngestorTest < ActiveSupport::TestCase # rubocop:disable Metrics/Cla
 
   test 'should cache github repo metadata' do
     cache = 'github_ingestor_api.github.com_repos_hsf-training_cpluspluscourse'
-    # Clear it before test to avoid false positives
-    Rails.cache.delete(cache)
 
     @ingestor.read('https://github.com/hsf-training/cpluspluscourse')
 
@@ -341,4 +343,4 @@ def webmock(url, filename)
     file = Rails.root.join('test', 'fixtures', 'files', 'ingestion', filename)
     WebMock.stub_request(:get, url).to_return(status: 200, headers: {}, body: file.read)
   end
-end
+end