bunny_cdn 1.3.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9a5a9f040b398baf6c3bbbebec07479c2814b9d19afd0ea4a54925515be7f40
-  data.tar.gz: da187f28d3fac19b735995b0f9f74b82453995fceba6896cc2be1293644707e9
+  metadata.gz: 0336e058f73a0e1d61e658506a8e9f7ff0c477cefa9736d083038076d3946901
+  data.tar.gz: c292d19c85e442f43f4c0a381130b3740731d14dc9ef84a9f2bf9fee971d57a2
 SHA512:
-  metadata.gz: 15cd8d2c06247609032588ec640af54a07041b194212c486db5a58d2f802c4489f8c3adc19a0065053677b89026858c847a3a752f52ff20a8466687fd7e6a30b
-  data.tar.gz: 3dda63f9681deb5a5a4c9579112104a1495bf3569bf31364cf7d90b4bd2607d65f97da607c2365f4e076b2999966de67c8b9a80ef0cd42a933cff030d4f7d016
+  metadata.gz: 10255e02cf0e24172d8c077b2777b1b6d3e30267f672c19cdf4d8dbc0ebae0715e0880cd4d7d1c1950d1975c195449d0625685948a51b22aad321951c271b513
+  data.tar.gz: f51dda17e364d3b4c0d2d147fd8ec2fa990d08b5d8a5e3db374cfa8b7a7abe23f97f7a9826541568bd29db3af7136960b45c351a225025f12250bbd37b33b6e9

data/Gemfile.lock

@@ -0,0 +1,90 @@
+PATH
+  remote: .
+  specs:
+    bunny_cdn (2.0.0)
+      faraday (>= 2.0, < 3)
+      faraday-retry (>= 2.0, < 3)
+      json (~> 2.12)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
+    bigdecimal (4.1.2)
+    crack (1.0.1)
+      bigdecimal
+      rexml
+    diff-lcs (1.6.2)
+    faraday (2.14.2)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
+    faraday-net_http (3.4.4)
+      net-http (~> 0.5)
+    faraday-retry (2.4.0)
+      faraday (~> 2.0)
+    hashdiff (1.2.1)
+    json (2.19.9)
+    logger (1.7.0)
+    net-http (0.9.1)
+      uri (>= 0.11.1)
+    public_suffix (7.0.5)
+    rake (13.4.2)
+    rexml (3.4.4)
+    rspec (3.13.2)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.6)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.8)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.7)
+    uri (1.1.1)
+    webmock (3.26.2)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
+
+PLATFORMS
+  ruby
+  x86_64-linux
+
+DEPENDENCIES
+  bundler (~> 2.6)
+  bunny_cdn!
+  rake (~> 13.2, >= 13.2.1)
+  rspec (~> 3.13)
+  webmock (~> 3.25, >= 3.25.1)
+
+CHECKSUMS
+  addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af
+  bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd
+  bunny_cdn (2.0.0)
+  crack (1.0.1) sha256=ff4a10390cd31d66440b7524eb1841874db86201d5b70032028553130b6d4c7e
+  diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962
+  faraday (2.14.2) sha256=73ccb9994a9e8648f010e32eca2ae82e41c57860aa10932cda29418b9e0223ad
+  faraday-net_http (3.4.4) sha256=0e78af151747ed1b00f33e25973b4bc220d7f16c00c39676817c8b12331eb588
+  faraday-retry (2.4.0) sha256=7b79c48fb7e56526faf247b12d94a680071ff40c9fda7cf1ec1549439ad11ebe
+  hashdiff (1.2.1) sha256=9c079dbc513dfc8833ab59c0c2d8f230fa28499cc5efb4b8dd276cf931457cd1
+  json (2.19.9) sha256=9b9025b7cdddafa38d316eca0b2358488e42d417045c1b90d216a9fefe46b79a
+  logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
+  net-http (0.9.1) sha256=25ba0b67c63e89df626ed8fac771d0ad24ad151a858af2cc8e6a716ca4336996
+  public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623
+  rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
+  rexml (3.4.4) sha256=19e0a2c3425dfbf2d4fc1189747bdb2f849b6c5e74180401b15734bc97b5d142
+  rspec (3.13.2) sha256=206284a08ad798e61f86d7ca3e376718d52c0bc944626b2349266f239f820587
+  rspec-core (3.13.6) sha256=a8823c6411667b60a8bca135364351dda34cd55e44ff94c4be4633b37d828b2d
+  rspec-expectations (3.13.5) sha256=33a4d3a1d95060aea4c94e9f237030a8f9eae5615e9bd85718fe3a09e4b58836
+  rspec-mocks (3.13.8) sha256=086ad3d3d17533f4237643de0b5c42f04b66348c28bf6b9c2d3f4a3b01af1d47
+  rspec-support (3.13.7) sha256=0640e5570872aafefd79867901deeeeb40b0c9875a36b983d85f54fb7381c47c
+  uri (1.1.1) sha256=379fa58d27ffb1387eaada68c749d1426738bd0f654d812fcc07e7568f5c57c6
+  webmock (3.26.2) sha256=774556f2ea6371846cca68c01769b2eac0d134492d21f6d0ab5dd643965a4c90
+
+BUNDLED WITH
+   2.7.2

data/README.md

@@ -1,12 +1,17 @@
 [![Gem Version](https://badge.fury.io/rb/bunny_cdn.svg)](https://badge.fury.io/rb/bunny_cdn)
-[![Codeship Status for brandon-meeks/bunny_cdn](https://app.codeship.com/projects/7f94a660-529a-0138-70bd-36e3badc0e07/status?branch=master)](https://app.codeship.com/projects/390509)
 [![Maintainability](https://api.codeclimate.com/v1/badges/2cc8e5b9529c32d7473f/maintainability)](https://codeclimate.com/github/brandon-meeks/bunny_cdn/maintainability)
 
 # BunnyCdn
 
-This gem allows you to interact with the BunnyCdn API. Currently you can interact with the Storage and Pullzone APIs.
+This gem allows you to interact with the BunnyCDN API via the Pull Zones and Storage APIs.
 
-This does require you to have an account with [BunnyCDN](https://bunnycdn.com/).
+> **⚠️ v2.0 Breaking Change:** This is a complete rewrite. The old class-based global configuration was replaced with an instance-based client. See [Migrating from v1](#migrating-from-v1) below.
+
+You need an account with [BunnyCDN](https://bunnycdn.com/).
+
+## Requirements
+
+- Ruby >= 3.1.0
 
 ## Installation
 
@@ -24,53 +29,241 @@ Or install it yourself as:
 
     $ gem install bunny_cdn
 
-## Usage
+## Quick Start
+
+```ruby
+client = BunnyCdn::Client.new(api_key: ENV["BUNNY_API_KEY"])
+
+# Pull Zones
+client.pull_zones.list
+client.pull_zones.find(123)
+client.pull_zones.create(name: "my-zone", type: 0, origin_url: "https://example.com")
 
-### Rails
+# Storage
+client.storage(zone_name: "my-storage-zone").list
+client.storage(zone_name: "my-storage-zone", region: "ny").upload("/path/to/file.txt", "Hello")
+```
+
+## Client
 
-Create the initializer `config/initializers/bunny_cdn.rb` and set the configuration options.
+Create a client with your BunnyCDN API key:
 
 ```ruby
-# Valid regions are:
-# 'de' for Frankfurt, DE
-# 'uk' for London, UK
-# 'ny' for New York, US
-# 'la' for Los Angeles, US
-# 'sg' for Singapore, SG
-# 'se' for Stockholm, SE
-# 'br' for São Paulo, BR
-# 'jh' for Johannesburg, SA
-# 'syd' for Sydney, SYD
-BunnyCdn.configure do |config|
-    config.apiKey = # The API key for your BunnyCDN account
-    config.storageZone = # The storage zone you want to work with
-    config.region = # The region of the storage zone.
-    config.accessKey = # The password for your storage zone
+client = BunnyCdn::Client.new(api_key: "your-api-key")
+```
+
+Options:
+
+| Option | Default | Description |
+|--------|---------|-------------|
+| `api_key` | (required) | Your BunnyCDN API key |
+| `base_url` | `https://api.bunny.net` | API base URL |
+| `adapter` | `Faraday.default_adapter` | Faraday adapter for HTTP |
+
+The client configures Faraday with retry middleware (max 3 retries on timeouts and server errors). All requests set `AccessKey` and `Accept: application/json` headers automatically.
+
+### Resource Accessors
+
+```ruby
+client.pull_zones   # => BunnyCdn::Resources::PullZones (memoized)
+client.storage(zone_name: "my-zone")                    # => BunnyCdn::Resources::Storage
+client.storage(zone_name: "my-zone", region: "ny")      # with region override
+```
+
+## Pull Zones
+
+All Pull Zone operations use `client.pull_zones`.
+
+### List
+
+```ruby
+# Default: page 1, 1000 per page
+client.pull_zones.list
+
+# Custom pagination
+client.pull_zones.list(page: 2, per_page: 50)
+```
+
+### Find
+
+```ruby
+client.pull_zones.find(123)
+```
+
+### Create
+
+```ruby
+client.pull_zones.create(name: "my-zone", type: 0, origin_url: "https://origin.example.com")
+```
+
+### Delete
+
+```ruby
+client.pull_zones.delete(123)
+```
+
+### Purge Cache
+
+```ruby
+# Purge entire pull zone cache
+client.pull_zones.purge(123)
+
+# Purge by cache tag
+client.pull_zones.purge_by_tag(123, "my-tag")
+```
+
+### Hostnames
+
+```ruby
+# Add a hostname to a pull zone
+client.pull_zones.add_hostname(123, "cdn.example.com")
+
+# If the hostname is already registered, returns { "success" => true, "skipped" => true }
+```
+
+### SSL
+
+```ruby
+client.pull_zones.load_free_ssl(hostname: "cdn.example.com")
+```
+
+### Health Check
+
+```ruby
+if client.pull_zones.health_check
+  puts "API is healthy"
+else
+  puts "API is down"
+end
+```
+
+## Storage
+
+Storage operations target the BunnyCDN storage API. Each call specifies the storage zone name. The connection is routed to the correct regional subdomain automatically.
+
+### Regions
+
+Available regions:
+
+| Key | Location |
+|-----|----------|
+| `de` | Frankfurt, DE |
+| `uk` | London, UK |
+| `ny` | New York, US |
+| `la` | Los Angeles, US |
+| `sg` | Singapore, SG |
+| `se` | Stockholm, SE |
+| `br` | São Paulo, BR |
+| `jh` | Johannesburg, SA |
+| `syd` | Sydney, SYD |
+
+If no region is specified, `de` (Frankfurt) is used.
+
+### List Files
+
+```ruby
+client.storage(zone_name: "my-zone").list                 # root
+client.storage(zone_name: "my-zone").list(path: "images") # /images/
+```
+
+A trailing slash is appended automatically if missing.
+
+### Download a File
+
+```ruby
+data = client.storage(zone_name: "my-zone").get("images/photo.jpg")
+# Returns raw file body (StringIO / binary string)
+```
+
+### Upload a File
+
+Two approaches:
+
+```ruby
+storage = client.storage(zone_name: "my-zone")
+
+# 1. From a file path on disk
+storage.upload("images/photo.jpg", "/local/path/photo.jpg")
+
+# 2. From a Rack-style uploaded file (e.g. Rails file input)
+storage.upload("images/photo.jpg", uploaded_file)
+```
+
+The uploaded file must respond to `original_filename` and `tempfile`, or be a String path.
+
+### Delete a File
+
+```ruby
+client.storage(zone_name: "my-zone").delete("images/old-photo.jpg")
+```
+
+## Error Handling
+
+All API errors raise `BunnyCdn::ApiError`:
+
+```ruby
+begin
+  client.pull_zones.find(999)
+rescue BunnyCdn::ApiError => e
+  puts e.message       # "[BunnyCdn] pullzone/999 failed: 404 Not Found"
+  puts e.status        # 404
+  puts e.response      # parsed JSON or raw string body
 end
 ```
 
-### File Uploads
+## Migrating from v1
+
+v2 replaces the global class-based API with an instance-based client.
 
-New to v1.2.0, there are now two methods for handling file uploads. 
+### Before (v1)
 
-To upload a file from a file input on a form, simply use 
 ```ruby
-BunnyCdn::Storage.uploadFormFile(path, file)
+BunnyCdn.configure do |config|
+  config.apiKey = ENV["BUNNY_API_KEY"]
+  config.storageZone = "my-zone"
+  config.region = "de"
+end
+
+BunnyCdn::Storage.uploadFile("path/to/file.txt", file_data)
+BunnyCdn::PullZone.list
 ```
 
-To upload a file to BunnyCDN that already exists on the system, or to upload a file as a secondary option to storing it on the system use
+### After (v2)
+
 ```ruby
-BunnyCdn::Storage.uploadFile(path, file)
+client = BunnyCdn::Client.new(api_key: ENV["BUNNY_API_KEY"])
+
+# Storage — zone and region are per-call, not global
+client.storage(zone_name: "my-zone").upload("path/to/file.txt", file_data)
+
+# Pull Zones — single client covers all operations
+client.pull_zones.list
 ```
+
+### Method Mapping
+
+| v1 | v2 |
+|----|----|
+| `BunnyCdn.configure { ... }` | `BunnyCdn::Client.new(api_key: ...)` |
+| `BunnyCdn::PullZone.list` | `client.pull_zones.list` |
+| `BunnyCdn::PullZone.find(id)` | `client.pull_zones.find(id)` |
+| `BunnyCdn::PullZone.create(...)` | `client.pull_zones.create(...)` |
+| `BunnyCdn::PullZone.delete(id)` | `client.pull_zones.delete(id)` |
+| `BunnyCdn::Storage.uploadFile(...)` | `client.storage(...).upload(...)` |
+| `BunnyCdn::Storage.uploadFormFile(...)` | `client.storage(...).upload(...)` |
+| `BunnyCdn::Storage.list(...)` | `client.storage(...).list(...)` |
+| `BunnyCdn::Storage.get(...)` | `client.storage(...).get(...)` |
+| `BunnyCdn::Storage.delete(...)` | `client.storage(...).delete(...)` |
+
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `bundle exec rspec` to run the tests. You can also run `bin/console` for an interactive prompt.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/bunny_cdn. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/bunny_cdn.
 
 ## License
 
@@ -78,4 +271,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the BunnyCdn project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/bunny_cdn/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the BunnyCdn project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/bunny_cdn/blob/master/CODE_OF_CONDUCT.md).

data/bunny_cdn.gemspec

@@ -8,19 +8,15 @@ Gem::Specification.new do |spec|
   spec.authors       = "Brandon Meeks"
   spec.email         = "meeksb86@gmail.com"
 
-  spec.summary       = %q{Gem to work with BunnyCDN}
-  spec.description   = %q{This is a simple gem to help you work with BunnyCDN.}
+  spec.summary       = %q{Modern Ruby client for Bunny.net CDN API}
+  spec.description   = %q{Instance-based Faraday client for Bunny.net Storage and Pullzone APIs.}
   spec.homepage      = "https://github.com/brandon-meeks/bunny_cdn_gem"
   spec.license       = "MIT"
 
-  # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
-
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/brandon-meeks/bunny_cdn_gem"
   spec.metadata["changelog_uri"] = "https://github.com/brandon-meeks/bunny_cdn/releases"
 
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
@@ -28,13 +24,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'rest-client', '~> 2.1'
-  spec.add_dependency 'json', '~> 2.12'
+  spec.add_dependency "faraday", ">= 2.0", "< 3"
+  spec.add_dependency "faraday-retry", ">= 2.0", "< 3"
+  spec.add_dependency "json", "~> 2.12"
 
-  spec.add_development_dependency "bundler", '~> 2.6.9'
-  spec.add_development_dependency "rake", '~> 13.2', '>= 13.2.1'
-  spec.add_development_dependency "rspec", '~> 3.13'
-  spec.add_development_dependency "webmock", '~> 3.25', '>= 3.25.1'
+  spec.add_development_dependency "bundler", "~> 2.6"
+  spec.add_development_dependency "rake", "~> 13.2", ">= 13.2.1"
+  spec.add_development_dependency "rspec", "~> 3.13"
+  spec.add_development_dependency "webmock", "~> 3.25", ">= 3.25.1"
 
-  spec.required_ruby_version = '>= 3.0.0'
+  spec.required_ruby_version = ">= 3.1.0"
 end

data/lib/bunny_cdn/client.rb

@@ -0,0 +1,38 @@
+require "faraday"
+
+module BunnyCdn
+  class Client
+    DEFAULT_BASE_URL = "https://api.bunny.net"
+
+    attr_reader :api_key, :base_url, :adapter
+
+    def initialize(api_key:, base_url: DEFAULT_BASE_URL, adapter: Faraday.default_adapter)
+      @api_key = api_key
+      @base_url = base_url
+      @adapter = adapter
+    end
+
+    def pull_zones
+      @pull_zones ||= Resources::PullZones.new(self)
+    end
+
+    def storage(zone_name:, region: nil)
+      Resources::Storage.new(self, zone_name: zone_name, region: region)
+    end
+
+    def connection
+      @connection ||= Faraday.new(url: base_url) do |conn|
+        conn.headers["AccessKey"] = api_key
+        conn.headers["Accept"] = "application/json"
+        conn.request :json
+        conn.request :retry,
+          max: 3,
+          interval: 1,
+          interval_randomness: 0.5,
+          backoff_factor: 2,
+          exceptions: [Faraday::ServerError, Faraday::TimeoutError, Faraday::ConnectionFailed]
+        conn.adapter adapter
+      end
+    end
+  end
+end

data/lib/bunny_cdn/error.rb

@@ -0,0 +1,11 @@
+module BunnyCdn
+  class ApiError < StandardError
+    attr_reader :status, :response
+
+    def initialize(message, status:, response:)
+      super(message)
+      @status = status
+      @response = response
+    end
+  end
+end

data/lib/bunny_cdn/resources/base.rb

@@ -0,0 +1,58 @@
+module BunnyCdn
+  module Resources
+    class Base
+      attr_reader :client
+
+      def initialize(client)
+        @client = client
+      end
+
+      protected
+
+      def connection
+        client.connection
+      end
+
+      private
+
+      def get(path, params = {})
+        response = connection.get(path, params)
+        handle_response(response, path)
+      end
+
+      def post(path, body = {})
+        response = connection.post(path, body)
+        handle_response(response, path)
+      end
+
+      def delete(path)
+        response = connection.delete(path)
+        handle_response(response, path)
+      end
+
+      def handle_response(response, path)
+        if response.success?
+          parse_body(response.body)
+        else
+          raise ApiError.new(
+            "[BunnyCdn] #{path} failed: #{response.status} #{response.body}",
+            status: response.status,
+            response: parse_body(response.body)
+          )
+        end
+      end
+
+      def parse_body(body)
+        return body unless body.is_a?(String)
+
+        if body.empty?
+          ""
+        else
+          JSON.parse(body)
+        end
+      rescue JSON::ParserError
+        body
+      end
+    end
+  end
+end

data/lib/bunny_cdn/resources/pull_zones.rb

@@ -0,0 +1,69 @@
+require "cgi"
+
+module BunnyCdn
+  module Resources
+    class PullZones < Base
+      def list(page: 1, per_page: 1000)
+        get("pullzone?page=#{page}&perPage=#{per_page}")
+      end
+
+      def find(id)
+        get("pullzone/#{id.to_i}")
+      end
+
+      def create(name:, type:, origin_url:)
+        post("pullzone", {
+          name: name,
+          type: type,
+          originUrl: origin_url
+        })
+      end
+
+      def delete(id)
+        path = "pullzone/#{id.to_i}"
+        response = connection.delete(path)
+        handle_response(response, path)
+      end
+
+      def purge(id)
+        post("pullzone/#{id.to_i}/purgeCache")
+      end
+
+      def add_hostname(id, hostname)
+        post("pullzone/#{id.to_i}/addHostname", {
+          "Hostname" => hostname
+        })
+      rescue ApiError => e
+        if hostname_already_registered?(e)
+          { "success" => true, "skipped" => true }
+        else
+          raise
+        end
+      end
+
+      def load_free_ssl(hostname:)
+        get("pullzone/loadFreeCertificate", { hostname: hostname })
+      end
+
+      def purge_by_tag(id, tag)
+        post("pullzone/#{id.to_i}/purgeCache?cacheTag=#{CGI.escape(tag)}", {})
+      end
+
+      def health_check
+        get("pullzone", { page: 1, perPage: 1 })
+        true
+      rescue ApiError
+        false
+      end
+
+      private
+
+      def hostname_already_registered?(error)
+        return false unless error.status == 400
+        return false unless error.response.is_a?(Hash)
+
+        error.response["ErrorKey"] == "pullzone.hostname_already_registered"
+      end
+    end
+  end
+end

data/lib/bunny_cdn/resources/storage.rb

@@ -0,0 +1,66 @@
+module BunnyCdn
+  module Resources
+    class Storage < Base
+      attr_reader :zone_name, :region
+
+      def initialize(client, zone_name:, region: nil)
+        super(client)
+        @zone_name = zone_name
+        @region = region
+      end
+
+      def list(path: "")
+        get(normalize_path(path))
+      end
+
+      def get(remote_path)
+        super("#{zone_name}/#{remote_path}")
+      end
+
+      def upload(remote_path, file)
+        contents = extract_file_data(file)
+        put_request("#{zone_name}/#{remote_path}", contents)
+      end
+
+      def delete(remote_path)
+        super("#{zone_name}/#{remote_path}")
+      end
+
+      private
+
+      def connection
+        @storage_connection ||= Faraday.new(url: storage_base_url) do |conn|
+          conn.headers["AccessKey"] = client.api_key
+          conn.request :json
+          conn.adapter Faraday.default_adapter
+        end
+      end
+
+      def storage_base_url
+        if region.nil? || region == "de"
+          "https://storage.bunnycdn.com"
+        else
+          "https://#{region}.storage.bunnycdn.com"
+        end
+      end
+
+      def normalize_path(path)
+        path = path.to_s
+        path.end_with?("/") || path.empty? ? path : "#{path}/"
+      end
+
+      def extract_file_data(file)
+        if file.respond_to?(:original_filename) && file.respond_to?(:tempfile)
+          file.tempfile.read
+        else
+          File.read(file)
+        end
+      end
+
+      def put_request(path, body)
+        response = connection.put(path, body)
+        handle_response(response, path)
+      end
+    end
+  end
+end

data/lib/bunny_cdn/version.rb

@@ -1,3 +1,3 @@
 module BunnyCdn
-  VERSION = "1.3.1"
+  VERSION = "2.0.0"
 end

data/lib/bunny_cdn.rb

@@ -1,9 +1,9 @@
-require "rest-client"
+require "faraday"
+require "faraday/retry"
 require "json"
 require "bunny_cdn/version"
-require_relative "bunny_cdn/configuration"
-require_relative "bunny_cdn/storage"
-require_relative "bunny_cdn/pullzone"
-
-module BunnyCdn
-end
+require "bunny_cdn/error"
+require "bunny_cdn/client"
+require "bunny_cdn/resources/base"
+require "bunny_cdn/resources/pull_zones"
+require "bunny_cdn/resources/storage"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny_cdn
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Brandon Meeks
@@ -10,19 +10,45 @@ cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: faraday-retry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -43,14 +69,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.9
+        version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.9
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -105,7 +131,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.25.1
-description: This is a simple gem to help you work with BunnyCDN.
+description: Instance-based Faraday client for Bunny.net Storage and Pullzone APIs.
 email: meeksb86@gmail.com
 executables: []
 extensions: []
@@ -116,6 +142,7 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -123,9 +150,11 @@ files:
 - bin/setup
 - bunny_cdn.gemspec
 - lib/bunny_cdn.rb
-- lib/bunny_cdn/configuration.rb
-- lib/bunny_cdn/pullzone.rb
-- lib/bunny_cdn/storage.rb
+- lib/bunny_cdn/client.rb
+- lib/bunny_cdn/error.rb
+- lib/bunny_cdn/resources/base.rb
+- lib/bunny_cdn/resources/pull_zones.rb
+- lib/bunny_cdn/resources/storage.rb
 - lib/bunny_cdn/version.rb
 homepage: https://github.com/brandon-meeks/bunny_cdn_gem
 licenses:
@@ -141,14 +170,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.1
 specification_version: 4
-summary: Gem to work with BunnyCDN
+summary: Modern Ruby client for Bunny.net CDN API
 test_files: []

data/lib/bunny_cdn/configuration.rb

@@ -1,25 +0,0 @@
-module BunnyCdn
-    class Configuration
-        attr_accessor :storageZone, :region, :accessKey, :apiKey
-
-        # Sets the configuration variables upon calling BunnyCdn::Configuration.new
-        def initialize
-            @storageZone = nil
-            @region = nil # Options are: eu, ny, la or sg (Asia)
-            @accessKey = nil
-            @apiKey = nil
-        end
-    end
-
-    def self.configuration
-        @configuration ||= Configuration.new
-    end
-
-    def self.configuration=(config)
-        @configuration = config
-    end
-
-    def self.configure
-        yield(configuration)
-    end
-end

data/lib/bunny_cdn/pullzone.rb

@@ -1,87 +0,0 @@
-module BunnyCdn
-  class Pullzone
-
-    RestClient.log = STDOUT # enables RestClient logging
-
-    BASE_URL = 'https://bunnycdn.com/api/pullzone' # URL to for BunnyCDN's Pullzone API
-
-    # Sets the apiKey to that in configuration
-    def self.apiKey
-      @apiKey = BunnyCdn.configuration.apiKey
-    end
-
-    # Sets the necessary headers to make requests to the BunnyCDN API
-    def self.headers
-      {
-        :accesskey => apiKey,
-        :accept => 'application/json',
-        :content_type => 'application/json'
-      }
-    end
-
-    # Gets all Pull Zones from BunnyCDN
-    def self.getAllPullzones
-      begin
-        response = RestClient.get(BASE_URL, headers)
-      rescue RestClient::ExceptionWithResponse => exception
-        return exception
-      end
-      return response
-    end
-
-    # Creates a new pullzone
-    # Params:
-    # +name+:: the name of the new Pull Zone
-    # +type+:: the pricing type of the pull zone you wish to add. 0 = Standard, 1 = High Volume
-    # originURL+:: the origin URL where the pull zone files are pulled from.
-    def self.createPullzone(name, type = 0, originUrl)
-      values = {
-        :name => name,
-        :type => type,
-        :originUrl => originUrl
-      }
-      begin
-        response = RestClient.post(BASE_URL, values.to_json, headers)
-      rescue RestClient::ExceptionWithResponse => exception
-        return exception
-      end
-      return response
-    end
-
-    # Gets the details of the pull zone using the given ID
-    # Params:
-    # +id+:: the ID of the Pull Zone to return
-    def self.getSinglePullzone(id)
-      begin
-        response = RestClient.get("#{BASE_URL}/#{id}", headers)
-      rescue RestClient::ExceptionWithResponse => exception
-        return exception
-      end
-      return response
-    end
-
-    # Deletes the pull zone using the given ID
-    # Params:
-    # +id+:: the ID of the Pull Zone to delete
-    def self.deletePullzone(id)
-      begin
-        response = RestClient.delete("#{BASE_URL}/#{id}", headers)
-      rescue RestClient::ExceptionWithResponse => exception
-        return exception
-      end
-      return response
-    end
-
-    # Purges the cache for the Pull Zone using the given ID
-    # Params:
-    # +id+:: the ID of the zone which should have the cache purged
-    def self.purgeCache(id)
-      begin
-        response = RestClient.post("#{BASE_URL}/#{id}/purgeCache", {}.to_json, headers)
-      rescue RestClient::ExceptionWithResponse => exception
-        return exception
-      end
-      return response
-    end
-  end
-end

data/lib/bunny_cdn/storage.rb

@@ -1,117 +0,0 @@
-module BunnyCdn
-  class Storage
-    
-    RestClient.log = STDOUT # enables RestClient logging
-
-    # Sets the storage zone as set in configuration
-    def self.storageZone
-      BunnyCdn.configuration.storageZone
-    end
-
-    # Sets the proper URL based on the region set in configuration
-    def self.set_region_url
-      # case BunnyCdn.configuration.region
-      # when nil || 'eu'
-      #   'https://storage.bunnycdn.com'
-      # when 'ny'
-      #   'https://ny.storage.bunnycdn.com'
-      # when 'la'
-      #   'https://la.storage.bunnycdn.com'
-      # when 'sg'
-      #   'https://sg.storage.bunnycdn.com'
-      # end
-      if BunnyCdn.configuration.region.nil? || BunnyCdn.configuration.region == 'de'
-        'https://storage.bunnycdn.com'
-      else
-        "https://#{BunnyCdn.configuration.region}.storage.bunnycdn.com"
-      end
-    end
-    
-    # Sets the apiKey to that in configuration
-    def self.apiKey
-      BunnyCdn.configuration.accessKey
-    end
-
-    # Sets the necessary headers to make requests to the BunnyCDN API
-    def self.headers
-      {
-        :accesskey => apiKey
-      }
-    end
-
-    # Gets all the files from the storage zone
-    # Params:
-    # +path+:: desired path to get files
-    def self.getZoneFiles(path= '')
-      begin
-        response = RestClient.get("#{set_region_url}/#{storageZone}/#{path}", headers)
-      rescue RestClient::ExceptionWithResponse => exception
-        return exception
-      end
-      return response.body
-    end
-
-    # Gets a single file from the storage zone
-    # Params:
-    # +path+:: desired path to get file
-    # +file+:: specific file to get from storage zone
-    def self.getFile(path= '', file)
-      begin
-        response = RestClient.get("#{set_region_url}/#{storageZone}/#{path}/#{file}", headers)
-      rescue RestClient::ExceptionWithResponse => exception
-        return exception
-      end
-      return response.body
-    end
-
-    # Uploads a file on the system to the storage zone
-    # Params:
-    # +path+:: desired path to upload file
-    # +file+:: specific file to upload to storage zone
-    def self.uploadFile(path= '', file)
-      fileName = File.basename(file)
-      headers = {
-        :accessKey => apiKey,
-        :checksum => ''
-      }
-      begin
-        response = RestClient.put("#{set_region_url}/#{storageZone}/#{path}/#{fileName}", File.read(file), headers)
-      rescue RestClient::ExceptionWithResponse => exception
-        return exception
-      end
-      return response.body
-    end
-
-    # Uploads a file from a file input to the storage zone
-    # Params:
-    # +path+:: desired path to upload file
-    # +file+:: specific file to upload to storage zone
-    def self.uploadFormFile(path= '', file)
-      fileName = file.original_filename
-      headers = {
-        :accessKey => apiKey,
-        :checksum => ''
-      }
-      begin
-        response = RestClient.put("#{set_region_url}/#{storageZone}/#{path}/#{fileName}", File.read(file.tempfile), headers)
-      rescue RestClient::ExceptionWithResponse => exception
-        return exception
-      end
-      return response.body
-    end
-
-    # Deletes a file from the storage zone
-    # Params:
-    # +path+:: path to delete file from
-    # +file+:: specific file to delete from storage zone
-    def self.deleteFile(path= '', file)
-      begin
-        response = RestClient.delete("#{set_region_url}/#{storageZone}/#{path}/#{file}", headers)
-      rescue RestClient::ExceptionWithResponse => exception
-        return exception
-      end
-      return response.body
-    end
-
-  end
-end