zaikio-hub 0.8.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 334a558132d7077ca054fbdf5c085025e324d7e37061d5608bcd8e4ab11b8266
-  data.tar.gz: cc234b4c4dbb4dfad4f0fc68cdd58091206057701b7307fa26a2cc18e6ae4705
+  metadata.gz: e6de6ed1ed5cb7442b72ffa036df6de0cf7f371d59d52018b4458850b7e71848
+  data.tar.gz: 5dc770e601267c847094fdb07875651529ec14458676c5d5be558af9c0d15c39
 SHA512:
-  metadata.gz: c84626e8323410a6d4d4f28302ec04fc18d61ee52347ed281635cbdcc389291f9df274cf4f53e5cbf0b4086da2b478ea28b4c9bd7aa89398f495783432589c7a
-  data.tar.gz: 75cc5d306c754be2f701e629818e65746cf0fef20dd3129af3587be68b8251b7a8b917e008c19a905842da1ed3962ba69eba22c871de431eba2c5f4f386c52c6
+  metadata.gz: 2b168642b4f8c6ac5607602a7e2237224e98fe52b4991c3f06b3a61591eeeacb6a6d76a60f63acaa272fe55cb9ee43f42f0a7aea871a3eeca7a2a770abc5f8ae
+  data.tar.gz: 4aca04231bccaf9dc4d85ebf752ef4663f365cc7bc788a8b55d979983047e4eb78e3978bf2bd28ef274186f7408ce2d5288941b08e4bdb40329ed6468ab000dc

data/CHANGELOG.md

@@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.10.0] - 2022-08-15
+
+* Update `zaikio-client-helpers` and reuse logic to use `Zaikio::Client.with_token`
+
+## [0.9.1] - 2022-01-05
+
+* Fix warning about redefined methods in BasicAuthMiddleware
+* Permit newer versions of Spyke & JWT gems
+
+## [0.9.0] - 2021-08-31
+
+* Added `.connections` and `.apps` for `CurrentOrganization`s that are vendors
+
 ## [0.8.0] - 2021-08-25
 
 * Added `CurrentOrganization#create_subscription`
@@ -77,7 +90,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Added subscriptions (migration required)
 
-[Unreleased]: https://github.com/zaikio/zaikio-hub-ruby/compare/v0.7.0..HEAD
+[Unreleased]: https://github.com/zaikio/zaikio-hub-ruby/compare/v0.9.0..HEAD
+[0.9.0]: https://github.com/zaikio/zaikio-hub-ruby/compare/v0.8.0..v0.9.0
+[0.8.0]: https://github.com/zaikio/zaikio-hub-ruby/compare/v0.7.0..v0.8.0
 [0.7.0]: https://github.com/zaikio/zaikio-hub-ruby/compare/v0.6.2..v0.7.0
 [0.6.2]: https://github.com/zaikio/zaikio-hub-ruby/compare/v0.6.1..v0.6.2
 [0.6.1]: https://github.com/zaikio/zaikio-hub-ruby/compare/v0.6.0..v0.6.1

data/Rakefile

@@ -29,9 +29,7 @@ task default: :test
 
 namespace :test do
   desc 'Runs RuboCop on specified directories'
-  RuboCop::RakeTask.new(:rubocop) do |task|
-    task.fail_on_error = false
-  end
+  RuboCop::RakeTask.new(:rubocop)
 end
 
 Rake::Task[:test].enhance ['test:rubocop']

data/lib/zaikio/hub/app.rb

@@ -0,0 +1,12 @@
+module Zaikio
+  module Hub
+    class App < Base
+      uri "apps(/:id)"
+
+      include_root_in_json :app
+
+      # Attributes
+      attributes :name, :category, :kind, :state, :configuration
+    end
+  end
+end

data/lib/zaikio/hub/basic_auth_middleware.rb

@@ -4,8 +4,6 @@ require "base64"
 module Zaikio
   module Hub
     class BasicAuthMiddleware < Faraday::Middleware
-      class_attribute :credentials
-
       def self.credentials
         @credentials ||= Concurrent::ThreadLocalVar.new { nil }
         @credentials.value

data/lib/zaikio/hub/client.rb

@@ -1,3 +1,5 @@
+require "jwt"
+
 module Zaikio
   module Hub
     class RequestWrapper

data/lib/zaikio/hub/configuration.rb

@@ -2,38 +2,15 @@ require "logger"
 
 module Zaikio
   module Hub
-    class Configuration
-      HOSTS = {
-        development: "https://hub.zaikio.test",
-        test: "https://hub.zaikio.test",
-        staging: "https://hub.staging.zaikio.com",
-        sandbox: "https://hub.sandbox.zaikio.com",
-        production: "https://hub.zaikio.com"
-      }.freeze
-
-      attr_accessor :host
-      attr_reader :environment
-      attr_writer :logger
-
-      def initialize
-        @environment = :sandbox
-      end
-
-      def logger
-        @logger ||= Logger.new($stdout)
-      end
-
-      def environment=(env)
-        @environment = env.to_sym
-        @host = host_for(environment)
-      end
-
-      private
-
-      def host_for(environment)
-        HOSTS.fetch(environment) do
-          raise StandardError.new, "Invalid Zaikio::Hub environment '#{environment}'"
-        end
+    class Configuration < Zaikio::Client::Helpers::Configuration
+      def self.hosts
+        {
+          development: "https://hub.zaikio.test/api/v1",
+          test: "https://hub.zaikio.test/api/v1",
+          staging: "https://hub.staging.zaikio.com/api/v1",
+          sandbox: "https://hub.sandbox.zaikio.com/api/v1",
+          production: "https://hub.zaikio.com/api/v1"
+        }.freeze
       end
     end
   end

data/lib/zaikio/hub/current_organization.rb

@@ -35,6 +35,11 @@ module Zaikio
                                          uri: "specialists(/:id)"
       has_many :sites,                   class_name: "Zaikio::Hub::Site",
                                          uri: "sites(/:id)"
+      # For vendors
+      has_many :connections,             class_name: "Zaikio::Hub::Connection",
+                                         uri: "connections(/:id)"
+      has_many :apps,                    class_name: "Zaikio::Hub::App",
+                                         uri: "apps(/:id)"
 
       def fetch
         self.attributes = get
@@ -49,11 +54,11 @@ module Zaikio
       end
 
       def create_subscription(status: "active", plan_name: nil)
-        if Zaikio::Hub.current_token_data.subject_type == "Organization"
-          result = self.class.request(:post, "organization/subscription",
-                                      subscription: { status: status, plan_name: plan_name })
-          Zaikio::Hub::Subscription.new(result.data)
-        end
+        return unless Zaikio::Hub.current_token_data.subject_type == "Organization"
+
+        result = self.class.request(:post, "organization/subscription",
+                                    subscription: { status: status, plan_name: plan_name })
+        Zaikio::Hub::Subscription.new(result.data)
       end
     end
   end

data/lib/zaikio/hub/version.rb

@@ -1,5 +1,5 @@
 module Zaikio
   module Hub
-    VERSION = "0.8.0".freeze
+    VERSION = "0.10.0".freeze
   end
 end

data/lib/zaikio/hub.rb

@@ -3,7 +3,6 @@ require "spyke"
 require "zaikio-client-helpers"
 
 require "zaikio/hub/configuration"
-require "zaikio/hub/authorization_middleware"
 require "zaikio/hub/basic_auth_middleware"
 
 # Models
@@ -25,6 +24,7 @@ require "zaikio/hub/current_organization"
 require "zaikio/hub/role"
 require "zaikio/hub/revoked_access_token"
 require "zaikio/hub/connection"
+require "zaikio/hub/app"
 require "zaikio/hub/subscription"
 require "zaikio/hub/test_account"
 
@@ -43,11 +43,8 @@ module Zaikio
         Base.connection = create_connection
       end
 
-      def with_token(token)
-        AuthorizationMiddleware.token = token
-        yield
-      ensure
-        AuthorizationMiddleware.reset_token
+      def with_token(token, &block)
+        Zaikio::Client.with_token(token, &block)
       end
 
       def with_basic_auth(login, password)
@@ -58,23 +55,20 @@ module Zaikio
       end
 
       def current_token_data
-        return unless AuthorizationMiddleware.token
+        return unless Zaikio::Client::Helpers::AuthorizationMiddleware.token
 
-        payload = JWT.decode(AuthorizationMiddleware.token, nil, false).first
+        payload = JWT.decode(
+          Zaikio::Client::Helpers::AuthorizationMiddleware.token,
+          nil,
+          false
+        ).first
 
         create_token_data(payload)
       end
 
       def create_connection
-        self.connection = Faraday.new(url: "#{configuration.host}/api/v1",
-                                      ssl: { verify: configuration.environment != :test }) do |c|
-          c.request     :json
-          c.response    :logger, configuration&.logger, headers: false
-          c.use         Zaikio::Client::Helpers::Pagination::FaradayMiddleware
-          c.use         Zaikio::Client::Helpers::JSONParser
-          c.use         AuthorizationMiddleware
-          c.use         BasicAuthMiddleware
-          c.adapter     Faraday.default_adapter
+        self.connection = Zaikio::Client.create_connection(configuration).tap do |c|
+          c.use BasicAuthMiddleware
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zaikio-hub
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.10.0
 platform: ruby
 authors:
 - crispymtn
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-25 00:00:00.000000000 Z
+date: 2022-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -30,16 +30,22 @@ dependencies:
   name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -89,7 +95,7 @@ dependencies:
         version: 5.3.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -99,21 +105,21 @@ dependencies:
         version: 5.3.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.2.0
 - !ruby/object:Gem::Dependency
   name: zaikio-client-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 description: Ruby API Client for Zaikio's Hub
 email:
 - op@crispymtn.com
@@ -129,8 +135,8 @@ files:
 - Rakefile
 - lib/zaikio/hub.rb
 - lib/zaikio/hub/address.rb
+- lib/zaikio/hub/app.rb
 - lib/zaikio/hub/asset.rb
-- lib/zaikio/hub/authorization_middleware.rb
 - lib/zaikio/hub/base.rb
 - lib/zaikio/hub/basic_auth_middleware.rb
 - lib/zaikio/hub/business_relationship.rb

data/lib/zaikio/hub/authorization_middleware.rb

@@ -1,32 +0,0 @@
-require "faraday"
-require "jwt"
-require "concurrent"
-
-module Zaikio
-  module Hub
-    class AuthorizationMiddleware < Faraday::Middleware
-      def self.token
-        @token ||= Concurrent::ThreadLocalVar.new { nil }
-        @token.value
-      end
-
-      def self.token=(value)
-        @token ||= Concurrent::ThreadLocalVar.new { nil }
-        @token.value = value
-      end
-
-      def self.reset_token
-        self.token = nil
-      end
-
-      def call(request_env)
-        if self.class.token
-          request_env[:request_headers]["Authorization"] = "Bearer #{self.class.token}"
-        end
-
-        @app.call(request_env).on_complete do |response_env|
-        end
-      end
-    end
-  end
-end