sqlui 0.1.81 → 0.1.82

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fb042a1aacd5fc454eaaada78d8fb9b7f3d5ac0da3790345c7342edc01d6b78
-  data.tar.gz: 734bb0cb942c6e8e08b74f7242354d270f8ae65b94b5103455c532d461341b1a
+  metadata.gz: 2ea6baae4e715638e52392661dbae71c35028d29f13b44ab9c10392e7d784bbc
+  data.tar.gz: 55949e1df33c47a5a8833ce0e97894f8f958eaa7767bd76767231f47e91ae377
 SHA512:
-  metadata.gz: c51254fd5fd7f7cd0712408df40fc0a8f01ecc8c905ac77edf4ba43e6c6e6131154b7790f7bbe19424e6c478949b6d1718a10f9621016a2ee7cbff639f61fa0e
-  data.tar.gz: 9473c16718a7743eb93d95ee05d6c51fbc1c21086033f89953264eeaf7c769f593a61f306523d38f437895f9c22662857a5cd78d36ff352650be255342c8bb09
+  metadata.gz: abd1e5cf01a0afdd4b1f952c1ae7ffc41f0849836187a867199a975f40efdde0d35b9db719f2f6a6b71c7cf41ed04c3415c4508c1f77e15c6f9e4393e7b1d2a3
+  data.tar.gz: 79776d1afa3caffe7c9332702d18a0d8cb58f9e4427dd073808b805249f809d50c2cd5a32a96bcb866fa3f5d9ca92153773283b9d278bbf393ab73c42a240abb

data/.release-version

@@ -1 +1 @@
-0.1.81
+0.1.82

data/app/github/tree_client.rb

@@ -53,8 +53,8 @@ module Github
       latch = CountDownLatch.new(tree_size)
       response['tree'].each do |blob|
         TreeClient.thread_pool.post do
-          blob['content'] =
-            get_file_content_with_caching(owner: owner, repo: repo, path: blob['path'], ref: response['sha'])
+          blob_response = @client.get_with_caching(blob['url'], cache_for: DEFAULT_MAX_FILE_CACHE_AGE_SECONDS)
+          blob['content'] = Base64.decode64(blob_response['content'])
         ensure
           latch.count_down
         end
@@ -133,18 +133,5 @@ module Github
         }
       )
     end
-
-    private
-
-    # Returns the contents of the file at the specified path. Uses the cache.
-    def get_file_content_with_caching(owner:, repo:, path:, ref:)
-      check_non_empty_string(owner: owner, repo: repo, sha: ref, path: path)
-
-      response = @client.get_with_caching(
-        "https://api.github.com/repos/#{owner}/#{repo}/contents/#{path}?ref=#{ref}",
-        cache_for: DEFAULT_MAX_FILE_CACHE_AGE_SECONDS
-      )
-      Base64.decode64(response['content'])
-    end
   end
 end

data/app/server.rb

@@ -123,7 +123,6 @@ class Server < Sinatra::Base
         )
         # Prefetch all trees on startup. This should happen before the health endpoint is available.
         unless ENV.fetch('DISABLE_PREFETCH', '0') == '1'
-          Sqlui.logger.info 'prefetch'
           tree_client.get_tree(
             owner: saved_config.owner,
             repo: saved_config.repo,
@@ -379,7 +378,12 @@ class Server < Sinatra::Base
     return Github::Cache.new({}, logger: Sqlui.logger) unless ENV['USE_LOCAL_SAVED_FILES']
 
     paths = Dir.glob('sql/**/*.sql')
-    blobs = paths.map { |path| { 'path' => path, 'sha' => 'foo' } }
+    blobs = paths.map do |path|
+      {
+        'path' => path,
+        'url' => "https://api.github.com/repos/nicholasdower/sqlui/git/blobs/#{Base64.encode64(path)}"
+      }
+    end
     github_cache_hash = {
       'https://api.github.com/repos/nicholasdower/sqlui/git/trees/master?recursive=true' =>
         Github::Cache::Entry.new(
@@ -391,7 +395,7 @@ class Server < Sinatra::Base
         )
     }
     paths.each do |path|
-      github_cache_hash["https://api.github.com/repos/nicholasdower/sqlui/contents/#{path}?ref=foo"] =
+      github_cache_hash["https://api.github.com/repos/nicholasdower/sqlui/git/blobs/#{Base64.encode64(path)}"] =
         Github::Cache::Entry.new(
           {
             'content' => Base64.encode64(File.read(path))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlui
 version: !ruby/object:Gem::Version
-  version: 0.1.81
+  version: 0.1.82
 platform: ruby
 authors:
 - Nick Dower