fluid_cli 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d4ed2faafcc963d22b9fa4b03055cd293d28e4e012640d756a5768dbbe62058
-  data.tar.gz: 9de0e583efab1f05083c436029b1f93ea306f6b8e77e10870d8d8192cb979d22
+  metadata.gz: 58ad193f70041410034e5fc3b9e1d5aa53b13dd22b5cf2733d7c3e24a6f608ae
+  data.tar.gz: 1bf00b84c91d05c142ab94aa021be0752e0071136d6dfedeba6200b9a16f4bc6
 SHA512:
-  metadata.gz: 0e58b4628f7d73bc3a3908a7c0a5ea062c67d5340f8843f2ef88111e4ff04fd5e9f377c48d8ab1a3675f947829502fd06c5cc6057ad637abe2d52c6ff70c2b02
-  data.tar.gz: a361fe5746e3f24e265f361a0a2df7eb1840cea61b0a17f981be43ffacfef6bcec4bc3ba3c3d9471fd51355409c87f7d3f2099d376639cfa2e1953afa8d75a89
+  metadata.gz: a236707efc4f4bf63581f44c05d2d05f49d13b78758a19b3293f9fc77053b6485c4989fd62da78e0e6ad85d76769a2c0e6578f0b46dedcfdb837f920743ce9de
+  data.tar.gz: 5bc4bb573085cbd9bf6ccb4d50e93bad1aca40ed0760b8c1eee86f941696bed03f3351521206800c0ce7405d5a2f299340f584753b851b9c58cca2d699435a55

data/lib/fluid_cli/api.rb

@@ -47,10 +47,14 @@ module FluidCLI
       rest_request(method: "MULTIPART_PUT", path: path, **args, &block)
     end
 
-    def rest_request(path:, query: nil, body: nil, method: "GET", token: nil)
+    def multipart_post(path:, **args, &block)
+      rest_request(method: "MULTIPART_POST", path: path, **args, &block)
+    end
+
+    def rest_request(path:, query: nil, body: nil, method: "GET", token: nil, host: nil)
       CLI::Kit::Util.begin do
         url = URI::HTTPS.build(
-          host: FluidCLI::API_HOST,
+          host: host || FluidCLI::API_HOST,
           path: "/api/#{path}",
           query: query,
         )
@@ -99,9 +103,11 @@ module FluidCLI
           HttpRequest.delete(uri, body, headers)
         elsif method == "MULTIPART_PUT"
           HttpRequest.multipart_put(uri, body, headers)
+        elsif method == "MULTIPART_POST"
+          HttpRequest.multipart_post(uri, body, headers)
         end
 
-             
+
         case response.code.to_i
         when 200..399
           [response.code.to_i, JSON.parse(response.body), response]

data/lib/fluid_cli/http_request.rb

@@ -30,6 +30,12 @@ module FluidCLI
         request(uri, nil, headers, req)
       end
 
+      def multipart_post(uri, body, headers)
+        req = Net::HTTP::Post::Multipart.new(uri.request_uri, body)
+
+        request(uri, nil, headers, req)
+      end
+
       def request(uri, body, headers, req)
         cert_store = OpenSSL::X509::Store.new
         cert_store.set_default_paths
@@ -39,7 +45,7 @@ module FluidCLI
         http.cert_store = cert_store
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE if ENV["SSL_VERIFY_NONE"]
 
-        unless req.is_a?(Net::HTTP::Put::Multipart)
+        unless req.is_a?(Net::HTTP::Post::Multipart)
           req.body = body unless body.nil?
           req["Content-Type"] = "application/json"
           headers.each { |header, value| req[header] = value }

data/lib/fluid_cli/theme/syncer.rb

@@ -313,20 +313,31 @@ module FluidCLI
         
         if file.text?
           application_theme_resource[:content] = file.read
-          _status, body, response = api_client.put(
-          path: path,
-          body: JSON.generate(application_theme_resource: application_theme_resource),
-        )
+            _status, body, response = api_client.put(
+            path: path,
+            body: JSON.generate(application_theme_resource: application_theme_resource),
+          )
         else
-          ::File.open(file.path) do |f|
-            _status, body, response = api_client.multipart_put(
-              path: path,
-              body: {
-                :'application_theme_resource[key]' => file.relative_path,
-                :'application_theme_resource[file]' => UploadIO.new(f, file.mime_type.name, file.name)
-              }
-            )
-          end
+          asset_path_response = create_dam_asset_with_placeholder(file)[1]
+          auth_response = api_client.post(path: "dam/assets/imagekit_auth", body: JSON.generate({}))[1]
+          imagekit_folder = convert_canonical_path_to_imagekit_folder(asset_path_response.dig("asset", "canonical_path"))
+          imagekit_response = upload_to_imagekit(file, imagekit_folder, auth_response)[1]
+          backfill_response = backfill_dam_asset_from_imagekit(file, imagekit_response, asset_path_response)[1]
+
+          application_theme_resource[:dam_asset] = {
+            dam_asset_code: backfill_response.dig("asset", "code"),
+            content_type: file.mime_type.name,
+            content_size: imagekit_response.dig("size"),
+            filename: file.name,
+            handle: backfill_response.dig("asset", "code"),
+            url: backfill_response.dig("asset", "default_variant_url"),
+            preview_image_url: imagekit_response.dig("thumbnailUrl")
+
+          }
+          _status, body, response = api_client.put(
+            path: path,
+            body: JSON.generate(application_theme_resource: application_theme_resource)
+          )
         end
 
         update_checksums([body["application_theme_resource"]])
@@ -334,6 +345,75 @@ module FluidCLI
         response
       end
 
+      def create_dam_asset_with_placeholder(file)
+        api_client.post(path: "dam/assets", body: JSON.generate({
+              placeholder_asset: {
+                description: "Uploaded via FilePicker: #{file.name}",
+                mime_type: file.mime_type.name,
+                name: file.name
+              }
+        }))
+      end
+
+      def convert_canonical_path_to_imagekit_folder(canonical_path)
+        parts = canonical_path.split(".")
+        if parts.length < 2
+          throw new Error(`Invalid canonical path format: ${canonical_path}`)
+        end
+
+        company_id = parts[0]
+        category = parts[1]
+        asset_code = parts[2]
+
+        # Map DAM categories to ImageKit folder structure
+        folder_mapping = {
+          images: "images",
+          videos: "videos",
+          audio: "audio",
+          documents: "documents",
+          files: "files", # fallback
+        }
+
+        folder_type = category ? folder_mapping[category] || "files" : "files"
+
+        "#{company_id}/#{folder_type}/#{asset_code}"
+      end
+
+      def upload_to_imagekit(file, imagekit_folder, auth_response)
+        ::File.open(file.path) do |f|
+          _status, body, response = api_client.multipart_post(
+            path: "v1/files/upload",
+            host: "upload.imagekit.io",
+            body: {
+              file: UploadIO.new(f, file.mime_type.name, file.name),
+              token: auth_response.dig("token"),
+              signature: auth_response.dig("signature"),
+              expire: auth_response.dig("expire"),
+              folder: imagekit_folder,
+              fileName: file.name,
+              publicKey: 'public_j7s4Ih9ETh/OCp41mVQH7tlXBdU='
+            }
+          )
+        end
+      end
+
+      def backfill_dam_asset_from_imagekit(file, imagekit_response, asset_path_response)
+        api_client.post(path: "dam/assets/backfill_imagekit", body: JSON.generate({
+          asset: {
+            id: asset_path_response.dig("asset", "id"),
+            imagekit_file_id: imagekit_response.dig("fileId"),
+            imagekit_url: imagekit_response.dig("url"),
+            mime_type: file.mime_type.name,
+            name: file.name,
+            file_size: imagekit_response.dig("size"),
+            height: imagekit_response.dig("height"),
+            width: imagekit_response.dig("width"),
+            expected_path: asset_path_response.dig("asset", "canonical_path")
+          }
+        }))
+      end
+        
+
       def get(file, _options = {})
         _status, body, response = api_client.get(
           path: "themes/#{@theme.id}/assets.json",

data/lib/fluid_cli/version.rb

@@ -1,3 +1,3 @@
 module FluidCLI
-  VERSION = "0.1.4"
+  VERSION = "0.1.6"
 end

data/lib/fluid_cli.rb

@@ -1,6 +1,7 @@
 require 'cli/ui'
 require 'cli/kit'
 require "webrick"
+# require "debug"
 
 CLI::UI::StdoutRouter.enable
 

data/packaging/homebrew/fluid_cli.base.rb

@@ -20,9 +20,7 @@ class FluidCli < Formula
         ENV["GEM_SPEC_CACHE"] = "#{cache}/gem_spec_cache"
 
         _, err, status = Open3.capture3("gem", "fetch", "fluid_cli", "--version", gem_version)
-        unless status.success?
-          odie err
-        end
+        odie err unless status.success?
       end
     end
 
@@ -37,6 +35,7 @@ class FluidCli < Formula
     def gem_version
       @version ||= @resource&.version if defined?(@resource)
       raise "Unable to determine version; did Homebrew change?" unless @version
+
       @version
     end
 
@@ -53,7 +52,6 @@ class FluidCli < Formula
   version "FLUID_CLI_VERSION"
   sha256 "FLUID_CLI_GEM_CHECKSUM"
   depends_on "ruby"
-  depends_on "git"
 
   def install
     # set GEM_HOME and GEM_PATH to make sure we package all the dependent gems
@@ -64,9 +62,7 @@ class FluidCli < Formula
 
     # Use /usr/local/bin at the front of the path instead of Homebrew shims,
     # which mess with Ruby's own compiler config when building native extensions
-    if defined?(HOMEBREW_SHIMS_PATH)
-      ENV["PATH"] = ENV["PATH"].sub(HOMEBREW_SHIMS_PATH.to_s, "/usr/local/bin")
-    end
+    ENV["PATH"] = ENV["PATH"].sub(HOMEBREW_SHIMS_PATH.to_s, "/usr/local/bin") if defined?(HOMEBREW_SHIMS_PATH)
 
     system(
       "gem",
@@ -83,7 +79,7 @@ class FluidCli < Formula
 
     raise "gem install 'fluid_cli' failed with status #{$CHILD_STATUS.exitstatus}" unless $CHILD_STATUS.success?
 
-    bin.rmtree if bin.exist?
+    rm_r(bin) if bin.exist?
     bin.mkpath
 
     brew_gem_prefix = "#{prefix}/gems/fluid_cli-#{version}"
@@ -91,7 +87,7 @@ class FluidCli < Formula
     ruby_libs = Dir.glob("#{prefix}/gems/*/lib")
     exe = "fluid"
     file = Pathname.new("#{brew_gem_prefix}/exe/#{exe}")
-    (bin + "#{file.basename}").open("w") do |f|
+    (bin + file.basename.to_s).open("w") do |f|
       f << <<~RUBY
         #!#{ruby_bin}/ruby -rjson --disable-gems
         ENV['ORIGINAL_ENV']=ENV.to_h.to_json

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: fluid_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Fluid
 bindir: exe
 cert_chain: []
-date: 2025-11-06 00:00:00.000000000 Z
+date: 2025-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bugsnag
@@ -37,6 +37,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.7.0
+- !ruby/object:Gem::Dependency
+  name: observer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: multipart-post
   requirement: !ruby/object:Gem::Requirement
@@ -51,6 +65,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: debug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.11.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.11.0
 description: Write a longer description or delete this line.
 executables:
 - fluid
@@ -213,101 +241,6 @@ files:
 - vendor/deps/cli-ui/lib/cli/ui/work_queue.rb
 - vendor/deps/cli-ui/lib/cli/ui/wrap.rb
 - vendor/deps/cli-ui/vendor/reentrant_mutex.rb
-- vendor/deps/listen/.github/release-drafter.yml
-- vendor/deps/listen/.github/workflows/development.yml
-- vendor/deps/listen/.github/workflows/push.yml
-- vendor/deps/listen/.gitignore
-- vendor/deps/listen/.rspec
-- vendor/deps/listen/.rubocop.yml
-- vendor/deps/listen/.yardopts
-- vendor/deps/listen/CHANGELOG.md
-- vendor/deps/listen/CONTRIBUTING.md
-- vendor/deps/listen/Gemfile
-- vendor/deps/listen/Guardfile
-- vendor/deps/listen/LICENSE.txt
-- vendor/deps/listen/README.md
-- vendor/deps/listen/Rakefile
-- vendor/deps/listen/bin/listen
-- vendor/deps/listen/lib/listen.rb
-- vendor/deps/listen/lib/listen/adapter.rb
-- vendor/deps/listen/lib/listen/adapter/base.rb
-- vendor/deps/listen/lib/listen/adapter/bsd.rb
-- vendor/deps/listen/lib/listen/adapter/config.rb
-- vendor/deps/listen/lib/listen/adapter/darwin.rb
-- vendor/deps/listen/lib/listen/adapter/linux.rb
-- vendor/deps/listen/lib/listen/adapter/polling.rb
-- vendor/deps/listen/lib/listen/adapter/windows.rb
-- vendor/deps/listen/lib/listen/backend.rb
-- vendor/deps/listen/lib/listen/change.rb
-- vendor/deps/listen/lib/listen/cli.rb
-- vendor/deps/listen/lib/listen/directory.rb
-- vendor/deps/listen/lib/listen/error.rb
-- vendor/deps/listen/lib/listen/event/config.rb
-- vendor/deps/listen/lib/listen/event/loop.rb
-- vendor/deps/listen/lib/listen/event/processor.rb
-- vendor/deps/listen/lib/listen/event/queue.rb
-- vendor/deps/listen/lib/listen/file.rb
-- vendor/deps/listen/lib/listen/fsm.rb
-- vendor/deps/listen/lib/listen/listener.rb
-- vendor/deps/listen/lib/listen/listener/config.rb
-- vendor/deps/listen/lib/listen/logger.rb
-- vendor/deps/listen/lib/listen/monotonic_time.rb
-- vendor/deps/listen/lib/listen/options.rb
-- vendor/deps/listen/lib/listen/queue_optimizer.rb
-- vendor/deps/listen/lib/listen/record.rb
-- vendor/deps/listen/lib/listen/record/entry.rb
-- vendor/deps/listen/lib/listen/record/symlink_detector.rb
-- vendor/deps/listen/lib/listen/silencer.rb
-- vendor/deps/listen/lib/listen/silencer/controller.rb
-- vendor/deps/listen/lib/listen/thread.rb
-- vendor/deps/listen/lib/listen/version.rb
-- vendor/deps/listen/listen.gemspec
-- vendor/deps/listen/spec/acceptance/listen_spec.rb
-- vendor/deps/listen/spec/lib/listen/adapter/base_spec.rb
-- vendor/deps/listen/spec/lib/listen/adapter/bsd_spec.rb
-- vendor/deps/listen/spec/lib/listen/adapter/config_spec.rb
-- vendor/deps/listen/spec/lib/listen/adapter/darwin_spec.rb
-- vendor/deps/listen/spec/lib/listen/adapter/linux_spec.rb
-- vendor/deps/listen/spec/lib/listen/adapter/polling_spec.rb
-- vendor/deps/listen/spec/lib/listen/adapter/windows_spec.rb
-- vendor/deps/listen/spec/lib/listen/adapter_spec.rb
-- vendor/deps/listen/spec/lib/listen/backend_spec.rb
-- vendor/deps/listen/spec/lib/listen/change_spec.rb
-- vendor/deps/listen/spec/lib/listen/cli_spec.rb
-- vendor/deps/listen/spec/lib/listen/directory_spec.rb
-- vendor/deps/listen/spec/lib/listen/event/config_spec.rb
-- vendor/deps/listen/spec/lib/listen/event/loop_spec.rb
-- vendor/deps/listen/spec/lib/listen/event/processor_spec.rb
-- vendor/deps/listen/spec/lib/listen/event/queue_spec.rb
-- vendor/deps/listen/spec/lib/listen/file_spec.rb
-- vendor/deps/listen/spec/lib/listen/fsm_spec.rb
-- vendor/deps/listen/spec/lib/listen/listener/config_spec.rb
-- vendor/deps/listen/spec/lib/listen/listener_spec.rb
-- vendor/deps/listen/spec/lib/listen/logger_spec.rb
-- vendor/deps/listen/spec/lib/listen/monotonic_time_spec.rb
-- vendor/deps/listen/spec/lib/listen/queue_optimizer_spec.rb
-- vendor/deps/listen/spec/lib/listen/record_spec.rb
-- vendor/deps/listen/spec/lib/listen/silencer/controller_spec.rb
-- vendor/deps/listen/spec/lib/listen/silencer_spec.rb
-- vendor/deps/listen/spec/lib/listen/thread_spec.rb
-- vendor/deps/listen/spec/lib/listen_spec.rb
-- vendor/deps/listen/spec/spec_helper.rb
-- vendor/deps/listen/spec/support/acceptance_helper.rb
-- vendor/deps/listen/spec/support/fixtures_helper.rb
-- vendor/deps/listen/spec/support/platform_helper.rb
-- vendor/deps/observer/.github/dependabot.yml
-- vendor/deps/observer/.github/workflows/test.yml
-- vendor/deps/observer/.gitignore
-- vendor/deps/observer/BSDL
-- vendor/deps/observer/COPYING
-- vendor/deps/observer/Gemfile
-- vendor/deps/observer/README.md
-- vendor/deps/observer/Rakefile
-- vendor/deps/observer/bin/console
-- vendor/deps/observer/bin/setup
-- vendor/deps/observer/lib/observer.rb
-- vendor/deps/observer/observer.gemspec
-- vendor/deps/observer/test/test_observer.rb
 - vendor/deps/webrick/.gitignore
 - vendor/deps/webrick/Gemfile
 - vendor/deps/webrick/LICENSE.txt

data/vendor/deps/listen/.github/release-drafter.yml

@@ -1,17 +0,0 @@
-name-template: "v$NEXT_PATCH_VERSION"
-tag-template: "v$NEXT_PATCH_VERSION"
-categories:
-  - title: "⚠️ Breaking Changes"
-    label: "⚠️ Breaking"
-  - title: "✨ New Features"
-    label: "✨ Feature"
-  - title: "🐛 Bug Fixes"
-    label: "🐛 Bug Fix"
-  - title: "📚 Documentation"
-    label: "📚 Docs"
-  - title: "🏠 Housekeeping"
-    label: "🏠 Housekeeping"
-change-template: "- $TITLE (#$NUMBER) @$AUTHOR"
-no-changes-template: "- No changes"
-template: |
-  $CHANGES

data/vendor/deps/listen/.github/workflows/development.yml

@@ -1,67 +0,0 @@
-name: Development
-
-on: [push, pull_request]
-
-jobs:
-  test:
-    runs-on: ${{matrix.os}}-latest
-    continue-on-error: ${{matrix.experimental}}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - ubuntu
-          - macos
-
-        ruby:
-          - 2.7
-          - "3.0" # quotes ensure this isn't misinterpreted as Integer 3: https://github.com/actions/runner/issues/849
-          - 3.1
-          - 3.2
-          - 3.3
-          - 3.4
-
-        experimental: [false]
-        env: [""]
-
-        include:
-          - os: macos
-            ruby: truffleruby-head
-            experimental: true
-          - os: ubuntu
-            ruby: truffleruby-head
-            experimental: true
-          - os: ubuntu
-            ruby: jruby
-            experimental: true
-          - os: ubuntu
-            ruby: head
-            experimental: true
-
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{matrix.ruby}}
-        bundler-cache: true
-
-    - name: Run tests
-      timeout-minutes: 6
-      run: |
-        ${{matrix.env}} bundle exec rspec
-
-  linting:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 3.2
-        bundler-cache: true
-
-    - name: Run rubocop
-      timeout-minutes: 6
-      run: |
-        bundle exec rake rubocop

data/vendor/deps/listen/.github/workflows/push.yml

@@ -1,12 +0,0 @@
-on: push
-name: Push
-jobs:
-  draftRelease:
-    name: Draft Release
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@master
-      - name: Draft Release
-        uses: toolmantim/release-drafter@v5.2.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

data/vendor/deps/listen/.gitignore

@@ -1,28 +0,0 @@
-pkg/*
-doc/*
-*.gem
-*.rbc
-.*.swp
-*.bak
-bundle
-.bundle
-.yardoc
-.rbx
-.rvmrc
-.vagrant
-Gemfile.lock
-spec/.fixtures
-coverage
-.ruby-version
-example*
-test.txt
-
-## MAC OS
-.DS_Store
-.Trashes
-.com.apple.timemachine.supported
-.fseventsd
-Desktop DB
-Desktop DF
-
-.idea

data/vendor/deps/listen/.rspec

@@ -1,3 +0,0 @@
---color
---format documentation
---require spec_helper