fireimg 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5250ba61c2e4e5c42e372bf3947a710a941eb6d1a3c208e466f3a42185931056
-  data.tar.gz: bf9ec77b5168637ad0ca494cc74038b83b37a4b45c82810ab9dcc345b85a6571
+  metadata.gz: 5926fd58382eaafd20085a2f21c6857f81b6be3cd832cb73d80cd81497d59ebc
+  data.tar.gz: c8ff329a137b3e4a5e2783367f7a082f2c37ef71c5ee4cc77e29dc21c9321652
 SHA512:
-  metadata.gz: 6632550c999b8450549eeda9214af9c853c2e49b29931eb2e25be227c86fd579e40f5fcf73a2ecc063e11121cb5e336d2ecb4169e41ea646b201c7d47bac899d
-  data.tar.gz: f50017794cf2dfd83bfc463850d972eb8f7807356b40c0a59ee5d5c501486d856b3ffeb897513507eb0be6d3d0b6432a5c12fa6fb3afad59f7fefd93ea43174e
+  metadata.gz: 3473e296a6204d7c541eac38528ebb7088d77e9127d682237d343975acb895b21272ea780481dc7327515d62f135b99dde6a3b0a9db25ec2d83af3da97fb8fdb
+  data.tar.gz: 879d5d4c5cf51e878d1c140a2f291651a7391d8db7c9595879708371cbb2a87af861f525afc3c6cabb3391b845bbde91f15cf4d2adfe7097d4782cba2ee5701c

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.1.0
+
+- `Fireimg.upload` / `upload_many` presign then PUT, matching the FireImg CLI
+- `presign` remains for apps that PUT from the client (NeedApp native/web)
+
 ## 1.0.0
 
 - Presign uploads (folder keys, optional `sizes` to pre-generate variants)

data/README.md

@@ -8,7 +8,7 @@ Source of truth is developed in the private FireImg repo and mirrored here.
 ## Install
 
 ```ruby
-gem 'fireimg', '~> 1.0'
+gem 'fireimg', '~> 1.1'
 ```
 
 ```bash
@@ -31,23 +31,35 @@ the block. `FIREIMG_API_BASE` and `FIREIMG_CDN_BASE` have the defaults above.
 
 ## Upload
 
+`Fireimg.upload` does both steps the CLI does: request a presigned URL, then
+PUT the bytes.
+
 ```ruby
-result = Fireimg.presign(
+result = Fireimg.upload(
   filename: 'feed_items/43/uuid.jpg',
   content_type: 'image/jpeg',
+  path: '/tmp/photo.jpg', # or io: / body:
   sizes: [
-    { width: 800, quality: 'medium' },
-    { width: 160, height: 160, fit: 'cover', pos: 'center' }
+    { width: 800, quality: 'medium', fmt: 'webp' },
+    { width: 160, height: 160, fit: 'cover', pos: 'center', fmt: 'webp' }
   ]
 )
 
-# PUT raw bytes to result.upload_url with the same Content-Type.
+result.image_key # => "feed_items/43/uuid.jpg"
+result.cdn_url   # => "https://img.fireimg.com/{project}/images/feed_items/43/uuid.jpg"
 ```
 
-`filename` may include folders. Optional `sizes` (up to 20) are generated
-asynchronously after the `PUT` and **replace** the project's default image
-params for that upload. Omit `sizes` to keep project defaults. Pass `sizes: []`
-to pre-generate only FireImg's 80px dashboard thumbnail.
+`filename` may include folders. Provide the bytes with `path:`, `io:`, or
+`body:`. Optional `sizes` (up to 20) are generated asynchronously after the
+`PUT` and **replace** the project's default image params for that upload. Omit
+`sizes` to keep project defaults. Pass `sizes: []` to pre-generate only
+FireImg's 80px dashboard thumbnail.
+
+`Fireimg.upload_many(files:, sizes:)` batches the same way as the CLI
+(up to 20 files per presign request).
+
+If the client PUTs directly (NeedApp native/web), use `Fireimg.presign` and
+PUT to `result.upload_url` with the same `Content-Type`.
 
 ## Moderate and delete
 

data/lib/fireimg/client.rb

@@ -46,6 +46,55 @@ module Fireimg
       rows.first
     end
 
+    # Presign + PUT, matching `fireimg upload` in the CLI.
+    # Provide the bytes with `path:`, `io:`, or `body:`.
+    def upload(filename:, content_type:, sizes: nil, **source)
+      rows = upload_many(
+        files: [source.merge(filename: filename, content_type: content_type)],
+        sizes: sizes
+      )
+      raise Error, 'FireImg upload returned no results' if rows.empty?
+
+      rows.first
+    end
+
+    def upload_many(files:, sizes: nil)
+      list = Array(files)
+      raise Error, 'files cannot be empty' if list.empty?
+
+      prepared = []
+      seen = {}
+      list.each do |file|
+        payload = file_payload(file)
+        name = payload['filename']
+        raise Error, "duplicate filename #{name.inspect}" if seen.key?(name)
+
+        seen[name] = true
+        prepared << {
+          payload: payload,
+          content_type: payload['contentType'],
+          bytes: read_bytes(file)
+        }
+      end
+
+      rows = presign_many(files: prepared.map { |item| item[:payload] }, sizes: sizes)
+      by_name = prepared.to_h { |item| [item[:payload]['filename'], item] }
+
+      rows.map do |row|
+        item = by_name[row.filename]
+        raise Error, "presign returned unexpected filename #{row.filename.inspect}" if item.nil?
+
+        put(row.upload_url, item[:content_type], item[:bytes])
+        image_key = row.filename.to_s.sub(%r{\A/+}, '')
+        UploadResult.new(
+          filename: image_key,
+          image_key: image_key,
+          cdn_url: public_url(image_key),
+          s3_key: row.s3_key
+        )
+      end
+    end
+
     def presign_many(files:, sizes: nil)
       payload = {
         'slug' => project,
@@ -88,6 +137,42 @@ module Fireimg
       )
     end
 
+    def read_bytes(file)
+      h = stringify_keys(file)
+      if (path = h['path']).to_s.strip != ''
+        File.binread(path)
+      elsif (io = h['io'])
+        io = io.to_io if io.respond_to?(:to_io) && !io.respond_to?(:read)
+        io.binmode if io.respond_to?(:binmode)
+        io.rewind if io.respond_to?(:rewind)
+        io.read
+      elsif !h['body'].nil?
+        bytes = h['body']
+        bytes.respond_to?(:b) ? bytes.b : bytes.to_s
+      else
+        raise Error, 'path, io, or body is required'
+      end
+    end
+
+    def put(upload_url, content_type, body)
+      raise Error, 'upload URL is required' if upload_url.to_s.strip.empty?
+
+      uri = URI.parse(upload_url)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = uri.scheme == 'https'
+      http.open_timeout = 5
+      http.read_timeout = 60
+      req = Net::HTTP::Put.new(uri.request_uri)
+      req['Content-Type'] = content_type
+      req.body = body
+      res = http.request(req)
+      return true if res.is_a?(Net::HTTPSuccess)
+
+      message = res.body.to_s.strip
+      message = res.message if message.empty?
+      raise Error, "FireImg PUT #{res.code}: #{message[0, 200]}"
+    end
+
     def query_string(options)
       params = []
       w = options[:width]

data/lib/fireimg/upload_result.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Fireimg
+  # Result of a completed upload (presign + PUT), matching the FireImg CLI.
+  UploadResult = Struct.new(:filename, :image_key, :cdn_url, :s3_key, keyword_init: true) do
+    def to_h
+      {
+        'filename' => filename,
+        'image_key' => image_key,
+        'cdn_url' => cdn_url,
+        's3_key' => s3_key
+      }
+    end
+  end
+end

data/lib/fireimg/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Fireimg
-  VERSION = '1.0.0'
+    VERSION = '1.1.0'
 end

data/lib/fireimg.rb

@@ -5,6 +5,7 @@ require_relative 'fireimg/error'
 require_relative 'fireimg/configuration'
 require_relative 'fireimg/size'
 require_relative 'fireimg/presign_result'
+require_relative 'fireimg/upload_result'
 require_relative 'fireimg/client'
 
 module Fireimg
@@ -40,6 +41,14 @@ module Fireimg
       client.url(image_key, **options)
     end
 
+    def upload(...)
+      client.upload(...)
+    end
+
+    def upload_many(...)
+      client.upload_many(...)
+    end
+
     def presign(...)
       client.presign(...)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fireimg
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Firelit Studio
@@ -11,10 +11,10 @@ cert_chain: []
 date: 2026-08-25 00:00:00.000000000 Z
 dependencies: []
 description: |
-  Server-side Ruby client for FireImg. Request presigned uploads (including
+  Server-side Ruby client for FireImg. Upload images (presign + PUT, including
   folder keys and optional pre-generated sizes), run content moderation, and
-  build CDN URLs. Matches the FireImg API-key HTTP API and @fireimg/js URL
-  query parameters.
+  build CDN URLs. Matches the FireImg API-key HTTP API, the FireImg CLI upload
+  flow, and @fireimg/js URL query parameters.
 email:
 - hello@firelit.studio
 executables: []
@@ -30,6 +30,7 @@ files:
 - lib/fireimg/error.rb
 - lib/fireimg/presign_result.rb
 - lib/fireimg/size.rb
+- lib/fireimg/upload_result.rb
 - lib/fireimg/version.rb
 homepage: https://github.com/FirelitStudio/fireimg-ruby
 licenses: