discourse_theme 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ae10d6ff12ed0ef1f90fdb5dea7b651838b9aa0
-  data.tar.gz: 41988a300ce1a6707c48ea3def6d3105b85c22a3
+  metadata.gz: 5aeb29aae52cfe3e665464d04e2b8813a2bc7128
+  data.tar.gz: 31b93b745ce43c33598e60fc2009ebaa59f15a87
 SHA512:
-  metadata.gz: 523d613933d74ce58989b1f506f314a1f253f13a17fdc0c368a80be1e2aeaabc79c26832caa825031f358c94c4980bb71b8afd8652ee8a234212981c88fb7a02
-  data.tar.gz: f88e0f0cacdbd905b54153f5f55e55b21416ae600fdab7c2ac6008a796b34ace524a62be2efe9f46bb3583a8b6fff76141b09ab1ba464f1225da095516c03ee1
+  metadata.gz: e4c8a5dd67329602d0941fe25d96a533699b255572abf99cbd649d7e68b84c10685b6b002bab80e90a605b3905f4402b0723dac8fe1f49e0e1c36c6ccd1e021d
+  data.tar.gz: bc614b8b759385faa5d6fe8834d4a3eaea8e770625c9e7c267225fff40ff150ba24424939504c5cb6e6153ad970a1dcf5bbd2723ce5711b5786a800fe91f8d51

data/lib/discourse_theme/scaffold.rb

@@ -22,6 +22,8 @@ class DiscourseTheme::Scaffold
     mobile/footer.html
     mobile/head_tag.html
     mobile/body_tag.html
+
+    settings.yml
   }
 
   ABOUT_JSON = <<~STR

data/lib/discourse_theme/uploader.rb

@@ -1,9 +1,12 @@
 class DiscourseTheme::Uploader
 
+  THEME_CREATOR_REGEX = /^https:\/\/theme-creator.discourse.org$/i
+
   def initialize(dir:, api_key:, site:)
     @dir = dir
     @api_key = api_key
     @site = site
+    @is_theme_creator = !!(THEME_CREATOR_REGEX =~ site)
     @theme_id = nil
   end
 
@@ -55,14 +58,20 @@ class DiscourseTheme::Uploader
       }
     }
 
-    uri = URI.parse(@site + "/admin/themes/#{@theme_id}?api_key=#{@api_key}")
+    endpoint = 
+      if @is_theme_creator
+        "/user_themes/#{@theme_id}"
+      else
+        "/admin/themes/#{@theme_id}?api_key=#{@api_key}"
+      end
 
+    uri = URI.parse(@site + endpoint)
     http = Net::HTTP.new(uri.host, uri.port)
     http.use_ssl = URI::HTTPS === uri
 
     request = Net::HTTP::Put.new(uri.request_uri, 'Content-Type' => 'application/json')
     request.body = args.to_json
-
+    add_headers(request)
     http.start do |h|
       response = h.request(request)
       if response.code.to_i == 200
@@ -80,8 +89,14 @@ class DiscourseTheme::Uploader
     filename = "#{Pathname.new(Dir.tmpdir).realpath}/bundle_#{SecureRandom.hex}.tar.gz"
     compress_dir(filename, @dir)
 
-    # new full upload endpoint
-    uri = URI.parse(@site + "/admin/themes/import.json?api_key=#{@api_key}")
+    endpoint = 
+      if @is_theme_creator
+        "/user_themes/import.json"
+      else
+        "/admin/themes/import.json?api_key=#{@api_key}"
+      end
+
+    uri = URI.parse(@site + endpoint)
     http = Net::HTTP.new(uri.host, uri.port)
     http.use_ssl = URI::HTTPS === uri
     File.open(filename) do |tgz|
@@ -90,6 +105,7 @@ class DiscourseTheme::Uploader
         uri.request_uri,
         "bundle" => UploadIO.new(tgz, "application/tar+gzip", "bundle.tar.gz"),
       )
+      add_headers(request)
       response = http.request(request)
       if response.code.to_i == 201
         json = JSON.parse(response.body)
@@ -107,4 +123,12 @@ class DiscourseTheme::Uploader
   ensure
     FileUtils.rm_f filename
   end
+
+  private
+
+    def add_headers(request)
+      if @is_theme_creator
+        request["User-Api-Key"] = @api_key
+      end
+    end
 end

data/lib/discourse_theme/version.rb

@@ -1,3 +1,3 @@
 module DiscourseTheme
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discourse_theme
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-15 00:00:00.000000000 Z
+date: 2018-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler