discourse_theme 0.7.4 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47b628418ce66dfc84cec377019bb57e6ab82a82d681acda24d5d69c4a20f64c
-  data.tar.gz: 7bc2abbb64c101c59dc282f8cd24d340ca22a08ed805b4bd82d392f3a4358007
+  metadata.gz: 0e35e35e07bf23d22d711e479ed3568c98e72605c66c4ca4001483210b34c582
+  data.tar.gz: 62558986574bbec90b1ac204b0d3209607b61c446e4283f1d4f06433e8526b91
 SHA512:
-  metadata.gz: 323c310d872c6c0efad7f2044404d3e53c754da50fbcba764cc52f32349f54c31a95ff7cb1dc756603dcd20215afb5801b5ab3c7654ec40962a67b725294983c
-  data.tar.gz: 1be9095c46371db3ab45dcd090e49d3a8f09185d06da44b8f3421579255882acc1a2952d75a1f7078e3369fdf08e64f277a3a460018ec6aa0f86e4507c4bd8e7
+  metadata.gz: 89e48b2369ccb4a573cbecdd4b8ab8eb2de7f1eca593e7e3546e5361870d337e03e302797ba4cc348bd7e0fdda5e5841bfd3c523aa1333bd1dda31e6e3ade558
+  data.tar.gz: 8d03a0c13e592886dbe17874b46c385e5c83d0cfcbf96c2ecbf7a1f694f5290092fb4ea27d4de92bb20f75eef9de4c0176b2684647c9e1cbd7e8f73c81242e5b

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [0.7.6] - 2023-09-16
+
+### Fixed
+
+- Remove trailing slash when storing URL (#25)

data/lib/discourse_theme/client.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 module DiscourseTheme
   class Client
-    THEME_CREATOR_REGEX = /^https:\/\/(theme-creator\.discourse\.org|discourse\.theme-creator\.io)$/i
+    THEME_CREATOR_REGEX =
+      %r{^https://(theme-creator\.discourse\.org|discourse\.theme-creator\.io)$}i
 
     attr_reader :url
 
@@ -23,17 +24,17 @@ module DiscourseTheme
 
     # From https://github.com/discourse/discourse/blob/main/lib/version.rb
     def self.has_needed_version?(current, needed)
-      current_split = current.split('.')
-      needed_split = needed.split('.')
+      current_split = current.split(".")
+      needed_split = needed.split(".")
 
       (0..[current_split.size, needed_split.size].max).each do |idx|
-        current_str = current_split[idx] || ''
+        current_str = current_split[idx] || ""
 
-        c0 = (needed_split[idx] || '').sub('beta', '').to_i
-        c1 = (current_str || '').sub('beta', '').to_i
+        c0 = (needed_split[idx] || "").sub("beta", "").to_i
+        c1 = (current_str || "").sub("beta", "").to_i
 
         # beta is less than stable
-        return false if current_str.include?('beta') && (c0 == 0) && (c1 > 0)
+        return false if current_str.include?("beta") && (c0 == 0) && (c1 > 0)
 
         return true if c1 > c0
         return false if c0 > c1
@@ -43,12 +44,7 @@ module DiscourseTheme
     end
 
     def get_themes_list
-      endpoint = root +
-        if @is_theme_creator
-          "/user_themes.json"
-        else
-          "/admin/customize/themes.json"
-        end
+      endpoint = root + (@is_theme_creator ? "/user_themes.json" : "/admin/customize/themes.json")
 
       response = request(Net::HTTP::Get.new(endpoint), never_404: true)
       json = JSON.parse(response.body)
@@ -56,12 +52,9 @@ module DiscourseTheme
     end
 
     def get_raw_theme_export(id)
-      endpoint = root +
-        if @is_theme_creator
-          "/user_themes/#{id}/export"
-        else
-          "/admin/customize/themes/#{id}/export"
-        end
+      endpoint =
+        root +
+          (@is_theme_creator ? "/user_themes/#{id}/export" : "/admin/customize/themes/#{id}/export")
 
       response = request(Net::HTTP::Get.new endpoint)
       raise "Error downloading theme: #{response.code}" unless response.code.to_i == 200
@@ -70,32 +63,24 @@ module DiscourseTheme
     end
 
     def update_theme(id, args)
-      endpoint = root +
-        if @is_theme_creator
-          "/user_themes/#{id}"
-        else
-          "/admin/themes/#{id}"
-        end
+      endpoint = root + (@is_theme_creator ? "/user_themes/#{id}" : "/admin/themes/#{id}")
 
-      put = Net::HTTP::Put.new(endpoint, 'Content-Type' => 'application/json')
+      put = Net::HTTP::Put.new(endpoint, "Content-Type" => "application/json")
       put.body = args.to_json
       request(put)
     end
 
     def upload_full_theme(tgz, theme_id:, components:)
-      endpoint = root +
-        if @is_theme_creator
-          "/user_themes/import.json"
-        else
-          "/admin/themes/import.json"
-        end
-
-      post = Net::HTTP::Post::Multipart.new(
-        endpoint,
-        "theme_id" => theme_id,
-        "components" => components,
-        "bundle" => UploadIO.new(tgz, "application/tar+gzip", "bundle.tar.gz")
-      )
+      endpoint =
+        root + (@is_theme_creator ? "/user_themes/import.json" : "/admin/themes/import.json")
+
+      post =
+        Net::HTTP::Post::Multipart.new(
+          endpoint,
+          "theme_id" => theme_id,
+          "components" => components,
+          "bundle" => UploadIO.new(tgz, "application/tar+gzip", "bundle.tar.gz"),
+        )
       request(post)
     end
 
@@ -112,7 +97,7 @@ module DiscourseTheme
       # confuse AWS albs
       parsed.user = nil
       parsed.password = nil
-      parsed
+      parsed.to_s
     end
 
     def is_theme_creator
@@ -132,14 +117,21 @@ module DiscourseTheme
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = URI::HTTPS === uri
       add_headers(request)
-      http.request(request).tap do |response|
-        if response.code == '404' && never_404
-          raise DiscourseTheme::ThemeError.new "Error: Incorrect site URL, or API key does not have the correct privileges"
-        elsif !['200', '201'].include?(response.code)
-          errors = JSON.parse(response.body)["errors"].join(', ') rescue nil
-          raise DiscourseTheme::ThemeError.new "Error #{response.code} for #{request.path.split("?")[0]}#{(": " + errors) if errors}"
+      http
+        .request(request)
+        .tap do |response|
+          if response.code == "404" && never_404
+            raise DiscourseTheme::ThemeError.new "Error: Incorrect site URL, or API key does not have the correct privileges"
+          elsif !%w[200 201].include?(response.code)
+            errors =
+              begin
+                JSON.parse(response.body)["errors"].join(", ")
+              rescue StandardError
+                nil
+              end
+            raise DiscourseTheme::ThemeError.new "Error #{response.code} for #{request.path.split("?")[0]}#{(": " + errors) if errors}"
+          end
         end
-      end
     rescue Errno::ECONNREFUSED
       raise DiscourseTheme::ThemeError.new "Connection refused for #{request.path}"
     end
@@ -153,19 +145,17 @@ module DiscourseTheme
     end
 
     def guess_url(settings)
-      url = ENV['DISCOURSE_URL']
-      if url
-        UI.progress "Using #{url} from DISCOURSE_URL"
-      end
+      url = normalize_url(ENV["DISCOURSE_URL"])
+      UI.progress "Using #{url} from DISCOURSE_URL" if url
 
       if !url && settings.url
-        url = settings.url
+        url = normalize_url(settings.url)
         UI.progress "Using #{url} from #{DiscourseTheme::Cli.settings_file}"
       end
 
       if !url || @reset
-        url = UI.ask("What is the root URL of your Discourse site?", default: url).strip
-        url = "http://#{url}" unless url =~ /^https?:\/\//
+        url = normalize_url(UI.ask("What is the root URL of your Discourse site?", default: url))
+        url = "http://#{url}" unless url =~ %r{^https?://}
 
         # maybe this is an HTTPS redirect
         uri = URI.parse(url)
@@ -184,11 +174,13 @@ module DiscourseTheme
       url
     end
 
+    def normalize_url(url)
+      url&.strip&.chomp("/")
+    end
+
     def guess_api_key(settings)
-      api_key = ENV['DISCOURSE_API_KEY']
-      if api_key
-        UI.progress "Using api key from DISCOURSE_API_KEY"
-      end
+      api_key = ENV["DISCOURSE_API_KEY"]
+      UI.progress "Using api key from DISCOURSE_API_KEY" if api_key
 
       if !api_key && settings.api_key
         api_key = settings.api_key
@@ -213,8 +205,7 @@ module DiscourseTheme
       path = "/" if path.empty?
       req = Net::HTTP::Get.new("/")
       response = Net::HTTP.start(url.host, url.port) { |http| http.request(req) }
-      Net::HTTPRedirection === response && response['location'] =~ /^https/i
+      Net::HTTPRedirection === response && response["location"] =~ /^https/i
     end
-
   end
 end

data/lib/discourse_theme/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module DiscourseTheme
-  VERSION = "0.7.4"
+  VERSION = "0.7.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discourse_theme
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.6
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-25 00:00:00.000000000 Z
+date: 2023-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitar
@@ -217,6 +217,7 @@ files:
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Guardfile