discourse_subscription_client 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f069fe8f7e5ca4e06fca3133df12ad2a67599b3d175ad644b9ab346437adc93f
-  data.tar.gz: c1a8b49c041741767cd37016d3bde41fc23138b23837b74ff2a3c00b80f24fc0
+  metadata.gz: 41471a1d6a925dea2dbda3200eb6c0d969c7596fe198add3777e9a667e46ec8c
+  data.tar.gz: e67947bded1babfd33b7f93f74f69aaf7b6202ed7bfef5ca6659a9a2d48c090e
 SHA512:
-  metadata.gz: f5efe845b7c65951a24bae6a4697db67f48ac528e089aa1182c1594fc1698a4eb1ae7e1fc44f1be82b55603f369d07dd8ad5f665049f2ab96a6ad835710032f5
-  data.tar.gz: b510d995e599fb23af27447a3e84e6cdbf9c16957fd8b59dfc4d416e8074ddcdbb6fa729d447774e54a6559f4de27fda987ae71f7beb64f1da4dfbd2d40961b9
+  metadata.gz: 4f381d6e4adc9ab55a79279b18e1b9d0d908c993d90795fc192c0fc39731225ab29c854560a96592215c0c0fd0d6d3c791e49b10c8d0a690022f0faf22d098ee
+  data.tar.gz: 27b641921053f1455df6497cd5b770487d11ea53605760816e4e13d51d45f1b992f01463af5a981933e55ae2e124a49dc8b4c6b82d1df14f8a843b0e2976a258

data/README.md

@@ -53,7 +53,7 @@ RAILS_ENV=test rake db:drop db:create db:migrate
 If you're not adding new migrations you only need to load the schema. If you are running migrations you need to also load the schema (in addition to running the migrations)
 
 ```
-RAILS_ENV=test rake db:schema:load
+RAILS_ENV=test bundle exec rake db:schema:load
 ```
 
 ## License

data/app/controllers/discourse_subscription_client/suppliers_controller.rb

@@ -7,7 +7,13 @@ module DiscourseSubscriptionClient
     before_action :find_supplier, only: %i[authorize destroy]
 
     def index
-      render_serialized(SubscriptionClientSupplier.all, SupplierSerializer, root: "suppliers")
+      suppliers = SubscriptionClientSupplier.all
+      if params[:resource]
+        suppliers = suppliers
+                    .joins(:resources)
+                    .where(resources: { name: params[:resource] })
+      end
+      render_serialized(suppliers, SupplierSerializer, root: "suppliers")
     end
 
     def authorize

data/app/models/subscription_client_resource.rb

@@ -8,21 +8,19 @@ class SubscriptionClientResource < ActiveRecord::Base
   has_many :subscriptions, foreign_key: "resource_id", class_name: "SubscriptionClientSubscription", dependent: :destroy
 
   def get_source_url(bucket)
-    return nil unless access_key_id && secret_access_key
+    return nil unless access_key_id && secret_access_key && s3_client
     return nil unless can_access_bucket?(bucket)
 
     "s3://#{access_key_id}:#{secret_access_key}@#{bucket}"
   end
 
   def can_access_bucket?(bucket)
-    begin
-      s3_client.head_bucket(bucket: bucket)
-    rescue Aws::S3::Errors::BadRequest,
-           Aws::S3::Errors::Forbidden,
-           Aws::S3::Errors::NotFound => e
-      return false
-    end
+    s3_client.head_bucket(bucket: bucket)
     true
+  rescue Aws::S3::Errors::BadRequest,
+         Aws::S3::Errors::Forbidden,
+         Aws::S3::Errors::NotFound
+    false
   end
 
   def s3_client

data/lib/discourse_subscription_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DiscourseSubscriptionClient
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discourse_subscription_client
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Angus McLeod
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-17 00:00:00.000000000 Z
+date: 2024-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-s3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -220,20 +234,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-s3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Adds a backend subscription client to a Discourse plugin.
 email:
 - angus@mcleod.org.au