sophos_central_api 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4001f1778a4cbba03903acb2007aeca8c0840b351baf9654e2e238efb5b1650a
-  data.tar.gz: fd8467571f6574c9647faab25aa1fc3016a6e1321a179ba5a94de32911cb4fc2
+  metadata.gz: ed2be4896987431b40e0fc3b01f61addc9b58485aa3f1157493dadb070a792e2
+  data.tar.gz: 848756dcc5fd520b1f5584acad7a9a318caf569cfd4bbef377b9e646fbc6c5f6
 SHA512:
-  metadata.gz: df69465b988d9cdc9460ea1e3220eb5e8516386b1c1b6b54d44885c23724c6eac20084053eb7002bc0b1d7bca600e181000879bac27192f0fc2aa4fea14311d1
-  data.tar.gz: 5766c1061673b8fc638573094111ca4c0023c25d02c58480cc824874187c981e39dce26aeaf93c6ccbacde44b0c862589f973db52789de5d3bb26023dff3ac98
+  metadata.gz: b0e6aff68a24b83ae099fbb6d4273dc3cfa918b36223fefca96951b51f352081c50bfeef5f246205daf0ec98281a837f32390d151704340e2f048193479a2bf8
+  data.tar.gz: 5aec805aaf3ab8988af7dc8adc50fb4e41564e94bf1cfdfa1fd05b6251bd7ac6a0af0a87fc94b1e619e408b5e1e8266d8ddfa3d86fd2a92bb4dd39c2112731d1

data/.env.template

@@ -1,2 +1,3 @@
 SOPHOS_CLIENT_ID=<SOPHOS_CLIENT_ID>
 SOPHOS_CLIENT_SECRET=<SOPHOS_CLIENT_SECRET>
+TEST_TENANT=<TENANT ID>

data/CHANGELOG.md

@@ -6,3 +6,5 @@
 ## [0.1.1] - 2024-02-14
 - Convienience method added to get client for a teannt api host
 
+## [0.1.2] - 2024-02-15
+- Fix initialization issue

data/lib/sophos/client/partner.rb

@@ -7,28 +7,6 @@ module Sophos
     # @see https://developer.sophos.com/docs/partner-v1/1/overview
     module Partner
 
-      def self.__def_partner_call(method, id_field = nil)
-        if id_field
-          self.send(:define_method, method) do |id = nil|
-            url = partner_url(method)
-            if id
-              get(partner_url("#{method}/#{id}"))
-            else
-              get_paged(url)
-            end
-          end
-          # strip trailing 's'
-          singular = method.to_s.chop.to_sym
-          self.send(:define_method, singular) do |id, params = nil|
-            get(partner_url("#{method}/#{id}", params))
-          end
-        else
-          self.send(:define_method, method) do
-            get_paged(partner_url(method))
-          end
-        end
-      end
-
       # @see https://developer.sophos.com/docs/partner-v1/1/routes/tenants/get
       Helper::def_api_call :tenants, Helper::partner_url(:tenants), true
 
@@ -61,11 +39,6 @@ module Sophos
         get_paged(Helper::partner_url("billing/usage/#{year}/#{month}"), params)
       end
 
-    private
-
-      def __partner_url(method, id = nil)
-        "/partner/v1/#{method}"
-      end
     end
   end
 end

data/lib/sophos/configuration.rb

@@ -1,4 +1,6 @@
 require 'wrapi'
+require File.expand_path('version', __dir__)
+require File.expand_path('pagination', __dir__)
 
 module Sophos
   # Defines constants and methods related to configuration
@@ -11,10 +13,35 @@ module Sophos
     # @private
     attr_accessor *VALID_OPTIONS_KEYS
 
+    DEFAULT_ENDPOINT = 'https://api.central.sophos.com'.freeze
+    DEFAULT_ID_ENDPOINT = 'https://id.sophos.com'.freeze
+    DEFAULT_UA = "Sophos Ruby API wrapper #{Sophos::VERSION}".freeze
+    DEFAULT_PAGINATION = Sophos::RequestPagination::PagesPagination
+    DEFAULT_PAGE_SIZE = 100
+
+    # When this module is extended, set all configuration options to their default values
+    def self.extended(base)
+      base.reset
+    end
+
+    # Create a hash of options and their values
+    def options
+      VALID_OPTIONS_KEYS.inject({}) do |option, key|
+        option.merge!(key => send(key))
+      end
+    end
+
     # Reset all configuration options to defaults
     def reset
       super
       self.partner_id = nil
+      self.tenant_id = nil
+
+      self.endpoint = DEFAULT_ENDPOINT
+      self.id_endpoint = DEFAULT_ID_ENDPOINT
+      self.user_agent = DEFAULT_UA
+      self.page_size = DEFAULT_PAGE_SIZE
+      self.pagination_class = DEFAULT_PAGINATION
     end
   end
 end

data/lib/sophos/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sophos
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/sophos_central_api.rb

@@ -1,37 +1,14 @@
 require "wrapi"
 require File.expand_path('sophos/api', __dir__)
 require File.expand_path('sophos/client', __dir__)
-require File.expand_path('sophos/pagination', __dir__)
-require File.expand_path('sophos/version', __dir__)
 
 module Sophos
   extend Configuration
   extend WrAPI::RespondTo
 
-  DEFAULT_ENDPOINT = 'https://api.central.sophos.com'.freeze
-  DEFAULT_ID_ENDPOINT = 'https://id.sophos.com'.freeze
-  DEFAULT_UA = "Sophos Ruby API wrapper #{Sophos::VERSION}".freeze
-  DEFAULT_PAGINATION = Sophos::RequestPagination::PagesPagination
-  DEFAULT_PAGE_SIZE = 100
-
   #
   # @return [Sophos::Client]
   def self.client(options = {})
-    Sophos::Client.new({
-      endpoint: DEFAULT_ENDPOINT,
-      id_endpoint: DEFAULT_ID_ENDPOINT,
-      user_agent: DEFAULT_UA,
-      page_size: DEFAULT_PAGE_SIZE,
-      pagination_class: DEFAULT_PAGINATION
-    }.merge(options))
-  end
-
-  def self.reset
-    super
-    self.endpoint = DEFAULT_ENDPOINT
-    self.id_endpoint = DEFAULT_ID_ENDPOINT
-    self.user_agent = DEFAULT_UA
-    self.page_size = DEFAULT_PAGE_SIZE
-    self.pagination_class = DEFAULT_PAGINATION
+    Sophos::Client.new
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sophos_central_api
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Janco Tanis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-14 00:00:00.000000000 Z
+date: 2024-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday