discourse_subscription_client 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f069fe8f7e5ca4e06fca3133df12ad2a67599b3d175ad644b9ab346437adc93f
-  data.tar.gz: c1a8b49c041741767cd37016d3bde41fc23138b23837b74ff2a3c00b80f24fc0
+  metadata.gz: 03fe5f25d9d530751ddc8530ff74fb3bca6eef434172769f621beb0ddaebf8bb
+  data.tar.gz: 39a728c0ffecdbbfb5d4b6b69983b49fa533dd410ccecd72dfb52aa19657d3ed
 SHA512:
-  metadata.gz: f5efe845b7c65951a24bae6a4697db67f48ac528e089aa1182c1594fc1698a4eb1ae7e1fc44f1be82b55603f369d07dd8ad5f665049f2ab96a6ad835710032f5
-  data.tar.gz: b510d995e599fb23af27447a3e84e6cdbf9c16957fd8b59dfc4d416e8074ddcdbb6fa729d447774e54a6559f4de27fda987ae71f7beb64f1da4dfbd2d40961b9
+  metadata.gz: ce4bf56aecb3056ecdda3888508088511417f5739334203dc16d0504324bb4acdb8314de6fdc9818cf14942367e26594c4c91d911eec060cc0d2deb2dac0d72b
+  data.tar.gz: c26396551c3dea1b80770918dbc64d4b7ff423e6b0e674ce856c87a46114b11a8ac074cad7631ac47e4cc61350749a34470e925757fea992dba22cfc9623e300

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/app/serializers/discourse_subscription_client/supplier_serializer.rb

@@ -4,6 +4,7 @@ module DiscourseSubscriptionClient
   class SupplierSerializer < ApplicationSerializer
     attributes :id,
                :name,
+               :url,
                :authorized,
                :authorized_at
 

data/lib/discourse_subscription_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DiscourseSubscriptionClient
-  VERSION = "0.1.5"
+  VERSION = "0.1.7"
 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.7
 platform: ruby
 authors:
 - Angus McLeod
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-17 00:00:00.000000000 Z
+date: 2024-10-24 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