zaikio-directory 0.0.8 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83519e37312c30b97c65aca908bbbc1065a6781e2050241a6f1c9c8f9d36e32a
-  data.tar.gz: 90f53637753cb130d93565027def981f13906ea7c940b118345b078bb1972380
+  metadata.gz: 90ecc69c9bfccc037868c41f76b665d456a9588bf9c573a3a53833d81b844419
+  data.tar.gz: 0c12da5059d2aadd77c4ec3f4f371c41582d77f0c866911df83216c42ee62b9a
 SHA512:
-  metadata.gz: c459a05fdcf957bd0fe8091a9a377480f0467a2978027c4baca49dee853c1f75a3be1b7bfb1864c5f1366736ae5446f729bd6fd55f9cdf0734e1fa3baa6e4554
-  data.tar.gz: b1f185b1e5c6f9a3b8a5240ad119885694f5a8305cc11d2384119a538fc48aa658a1d160b151d155f8162ddfd7a24f44a7bd4ac2e6f5b9b97dbb12f44e397c87
+  metadata.gz: 4d084614b98a1ca2867b7806eb5f6edeeaab2ff29e4c4724de48b3edeadbffb926dccd7a4338f541e8358dd8dc90929b0b9576eda82b82f0195521ac8ce1fe0c
+  data.tar.gz: ce5486bccd57d2444533c6cb08380ad103af33ffafe9f41bec02daf1914afeca6f07c07eeb3bd528dc3bd9a7bd655dedf5b30d4fb70cbfcff2acb62992179d2f

data/CHANGELOG.md

@@ -0,0 +1,22 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [0.1.1] - 2020-09-02
+
+### Fixed
+- Thread-Safety on current access token
+
+## [0.1.0] - 2020-08-24
+
+### Added
+- Added subscriptions (migration required)
+
+[Unreleased]: https://github.com/crispymtn/zaikio-directory-ruby/compare/v0.1.1...HEAD
+[0.1.1]: https://github.com/crispymtn/zaikio-directory-ruby/compare/5c6cb4dbcac316733560ddb2b1e13b53e55eb66e...v0.1.1
+[0.1.0]: https://github.com/crispymtn/zaikio-directory-ruby/compare/d149fb4c0abe6005f123def3952d2dd2ef6404bb...29889d8a6a496542a81e05688da2a46cf4c44188

data/README.md

@@ -26,7 +26,7 @@ $ gem install zaikio-directory
 # config/initializers/zaikio_directory.rb
 
 Zaikio::Directory.configure do |config|
-  config.host :production # sandbox or production
+  config.environment = :production # sandbox or production
 end
 ```
 
@@ -35,7 +35,7 @@ end
 
 The Directory Client has an ORM like design. However, we distinguish between the contexts of the organization and the person.
 
-For the requests to work, a valid JSON Web token with the correct OAuth Scopes must always be provided. Please refer to [zakio-oauth_client](#todo).
+For the requests to work, a valid JSON Web token with the correct OAuth Scopes must always be provided. Please refer to [zakio-oauth_client](https://github.com/crispymtn/zaikio-oauth_client).
 
 If you want to know which actions are available and which scopes are required, please refer to the [Directory API Reference](https://docs.zaikio.com/api/directory/directory.html).
 
@@ -97,6 +97,10 @@ end
 ```rb
 Zaikio::Directory.with_basic_auth(client_id, client_secret) do
   connections = Zaikio::Directory::Connection.all
+  subscription = Zaikio::Directory::Subscription.find("Organization-b1475f65-236c-58b8-96e1-e1778b43beb7")
+  subscription.plan # => "advanced"
+  subscription.activate!
+  subscription.increment_usage_by!(:orders_created, 12)
 end
 
 roles = Zaikio::Directory::Role.all

data/lib/zaikio/directory.rb

@@ -8,12 +8,14 @@ require "zaikio/directory/basic_auth_middleware"
 # Models
 require "zaikio/error"
 require "zaikio/directory/base"
+require "zaikio/directory/asset"
 require "zaikio/directory/organization_membership"
 require "zaikio/directory/business_relationship"
 require "zaikio/directory/organization"
 require "zaikio/directory/person"
 require "zaikio/directory/machine"
 require "zaikio/directory/software"
+require "zaikio/directory/specialist"
 require "zaikio/directory/site"
 require "zaikio/directory/membership"
 require "zaikio/directory/current_person"
@@ -21,29 +23,31 @@ require "zaikio/directory/current_organization"
 require "zaikio/directory/role"
 require "zaikio/directory/revoked_access_token"
 require "zaikio/directory/connection"
+require "zaikio/directory/subscription"
 
 module Zaikio
   module Directory
     class << self
       attr_accessor :configuration
+      class_attribute :connection
 
       def configure
-        @connection = nil
+        self.connection = nil
         self.configuration ||= Configuration.new
         yield(configuration)
 
-        Base.connection = connection
+        Base.connection = create_connection
       end
 
       def with_token(token)
-        AuthorizationMiddleware.token token
+        AuthorizationMiddleware.token = token
         yield
       ensure
         AuthorizationMiddleware.reset_token
       end
 
       def with_basic_auth(login, password)
-        BasicAuthMiddleware.credentials [login, password]
+        BasicAuthMiddleware.credentials = [login, password]
         yield
       ensure
         BasicAuthMiddleware.reset_credentials
@@ -57,8 +61,9 @@ module Zaikio
         create_token_data(payload)
       end
 
-      def connection
-        @connection ||= Faraday.new(url: "#{configuration.host}/api/v1") do |c|
+      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
           c.use         JSONParser
@@ -70,7 +75,7 @@ module Zaikio
 
       private
 
-      def create_token_data(payload) # rubocop:disable Metrics/AbcSize
+      def create_token_data(payload)
         subjects = payload["sub"].split(">")
 
         OpenStruct.new(

data/lib/zaikio/directory/asset.rb

@@ -0,0 +1,55 @@
+module Zaikio
+  module Directory
+    module Asset
+      extend ActiveSupport::Concern
+
+      included do
+        # Callbacks
+        after_create :make_organization_owner
+      end
+
+      def make_organization_owner
+        if Zaikio::Directory.current_token_data.subject_type == "Organization"
+          self.class.request(:post,
+                             "#{collection_name}/#{id}/#{singular_name}_ownership")
+        else
+          org_path = "person/organizations/#{organization_id}"
+          self.class.request(:post,
+                             "#{org_path}/#{collection_name}/#{id}/#{singular_name}_ownership")
+        end
+      end
+
+      def destroy
+        if Zaikio::Directory.current_token_data.subject_type == "Organization"
+          self.class.request(:delete,
+                             "#{collection_name}/#{id}/#{singular_name}_ownership")
+        else
+          org_path = "person/organizations/#{owner_id || organization_id}"
+          self.class.request(:delete,
+                             "#{org_path}/#{collection_name}/#{id}/#{singular_name}_ownership")
+        end
+      end
+
+      def specification
+        prefix = if Zaikio::Directory.current_token_data.subject_type == "Person"
+                   "person/organizations/#{owner_id || organization_id}/"
+                 else
+                   ""
+                 end
+        self.class.request(:get,
+                           "#{prefix}#{collection_name}/#{id}/#{singular_name}_specification")
+            &.body&.dig("data")
+      end
+
+      private
+
+      def collection_name
+        self.class.name.demodulize.underscore.pluralize
+      end
+
+      def singular_name
+        self.class.name.demodulize.underscore
+      end
+    end
+  end
+end

data/lib/zaikio/directory/authorization_middleware.rb

@@ -1,15 +1,22 @@
 require "faraday"
 require "jwt"
+require "concurrent"
 
 module Zaikio
   module Directory
     class AuthorizationMiddleware < Faraday::Middleware
-      def self.reset_token
-        @token = nil
+      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.token(token = nil)
-        @token = token || @token
+      def self.reset_token
+        self.token = nil
       end
 
       def call(request_env)

data/lib/zaikio/directory/basic_auth_middleware.rb

@@ -4,12 +4,20 @@ require "base64"
 module Zaikio
   module Directory
     class BasicAuthMiddleware < Faraday::Middleware
-      def self.reset_credentials
-        @credentials = nil
+      class_attribute :credentials
+
+      def self.credentials
+        @credentials ||= Concurrent::ThreadLocalVar.new { nil }
+        @credentials.value
       end
 
-      def self.credentials(credentials = nil)
-        @credentials = credentials || @credentials
+      def self.credentials=(value)
+        @credentials ||= Concurrent::ThreadLocalVar.new { nil }
+        @credentials.value = value
+      end
+
+      def self.reset_credentials
+        self.credentials = nil
       end
 
       def call(request_env)

data/lib/zaikio/directory/configuration.rb

@@ -4,11 +4,11 @@ module Zaikio
   module Directory
     class Configuration
       HOSTS = {
-        development: "http://directory.zaikio.test",
-        test: "http://directory.zaikio.test",
-        staging: "https://directory.staging.zaikio.com",
-        sandbox: "https://directory.sandbox.zaikio.com",
-        production: "https://directory.zaikio.com"
+        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

data/lib/zaikio/directory/connection.rb

@@ -1,9 +1,19 @@
 module Zaikio
   module Directory
     class Connection < Base
-      uri "connections"
+      uri "connections(/:id)"
 
       include_root_in_json :connection
+
+      def initialize(attributes = {})
+        if attributes["connectable_id"]
+          super(attributes.merge(
+            "id" => "#{attributes['connectable_type']}-#{attributes['connectable_id']}"
+          ))
+        else
+          super
+        end
+      end
     end
   end
 end

data/lib/zaikio/directory/current_organization.rb

@@ -22,6 +22,8 @@ module Zaikio
                                          uri: "software(/:id)"
       has_many :machines,                class_name: "Zaikio::Directory::Machine",
                                          uri: "machines(/:id)"
+      has_many :specialists,             class_name: "Zaikio::Directory::Specialist",
+                                         uri: "specialists(/:id)"
       has_many :sites,                   class_name: "Zaikio::Directory::Site",
                                          uri: "sites(/:id)"
 
@@ -29,6 +31,10 @@ module Zaikio
         self.attributes = get
       end
 
+      def reload
+        self.attributes = self.class.find.attributes
+      end
+
       def members
         memberships.with_fallback.map(&:person)
       end

data/lib/zaikio/directory/machine.rb

@@ -1,29 +1,10 @@
 module Zaikio
   module Directory
     class Machine < Base
+      include Asset
+
       uri "machines(/:id)"
       include_root_in_json :machine
-
-      # Callbacks
-      after_create :make_organization_owner
-
-      def make_organization_owner
-        if Zaikio::Directory.current_token_data.subject_type == "Organization"
-          self.class.request(:post, "machines/#{id}/machine_ownership")
-        else
-          org_path = "person/organizations/#{organization_id}"
-          self.class.request(:post, "#{org_path}/machines/#{id}/machine_ownership")
-        end
-      end
-
-      def destroy
-        if Zaikio::Directory.current_token_data.subject_type == "Organization"
-          self.class.request(:delete, "machines/#{id}/machine_ownership")
-        else
-          org_path = "person/organizations/#{owner_id || organization_id}"
-          self.class.request(:delete, "#{org_path}/machines/#{id}/machine_ownership")
-        end
-      end
     end
   end
 end

data/lib/zaikio/directory/organization.rb

@@ -12,6 +12,8 @@ module Zaikio
                                          uri: "person/organizations/:organization_id/software"
       has_many :machines,                class_name: "Zaikio::Directory::Machine",
                                          uri: "person/organizations/:organization_id/machines"
+      has_many :specialists,             class_name: "Zaikio::Directory::Specialist",
+                                         uri: "person/organizations/:organization_id/specialists"
       has_many :sites,                   class_name: "Zaikio::Directory::Site",
                                          uri: "person/organizations/:organization_id/sites"
     end

data/lib/zaikio/directory/software.rb

@@ -1,28 +1,15 @@
 module Zaikio
   module Directory
     class Software < Base
+      include Asset
+
       uri "software(/:id)"
       include_root_in_json :software
 
-      # Callbacks
-      after_create :make_organization_owner
-
-      def make_organization_owner
-        if Zaikio::Directory.current_token_data.subject_type == "Organization"
-          self.class.request(:post, "software/#{id}/software_ownership")
-        else
-          org_path = "person/organizations/#{organization_id}"
-          self.class.request(:post, "#{org_path}/software/#{id}/software_ownership")
-        end
-      end
+      private
 
-      def destroy
-        if Zaikio::Directory.current_token_data.subject_type == "Organization"
-          self.class.request(:delete, "software/#{id}/software_ownership")
-        else
-          org_path = "person/organizations/#{owner_id || organization_id}"
-          self.class.request(:delete, "#{org_path}/software/#{id}/software_ownership")
-        end
+      def collection_name
+        "software"
       end
     end
   end

data/lib/zaikio/directory/specialist.rb

@@ -0,0 +1,10 @@
+module Zaikio
+  module Directory
+    class Specialist < Base
+      include Asset
+
+      uri "specialists(/:id)"
+      include_root_in_json :specialist
+    end
+  end
+end

data/lib/zaikio/directory/subscription.rb

@@ -0,0 +1,27 @@
+module Zaikio
+  module Directory
+    class Subscription < Base
+      uri "subscriptions(/:id)"
+
+      include_root_in_json :subscription
+
+      def initialize(attributes = {})
+        if attributes["subscriber_id"]
+          super(attributes.merge(
+            "id" => "#{attributes['subscriber_type']}-#{attributes['subscriber_id']}"
+          ))
+        else
+          super
+        end
+      end
+
+      def activate!
+        update(status: "active")
+      end
+
+      def increment_usage_by!(usage, by = 1)
+        update(increment_usages_in_current_billing_period: { usage => by })
+      end
+    end
+  end
+end

data/lib/zaikio/directory/version.rb

@@ -1,5 +1,5 @@
 module Zaikio
   module Directory
-    VERSION = "0.0.8".freeze
+    VERSION = "0.1.1".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zaikio-directory
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.1
 platform: ruby
 authors:
 - crispymtn
@@ -10,8 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-11 00:00:00.000000000 Z
+date: 2020-09-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -30,16 +44,22 @@ dependencies:
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.14.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.14.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.16.0
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -77,10 +97,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - MIT-LICENSE
 - README.md
 - Rakefile
 - lib/zaikio/directory.rb
+- lib/zaikio/directory/asset.rb
 - lib/zaikio/directory/authorization_middleware.rb
 - lib/zaikio/directory/base.rb
 - lib/zaikio/directory/basic_auth_middleware.rb
@@ -99,12 +121,15 @@ files:
 - lib/zaikio/directory/role.rb
 - lib/zaikio/directory/site.rb
 - lib/zaikio/directory/software.rb
+- lib/zaikio/directory/specialist.rb
+- lib/zaikio/directory/subscription.rb
 - lib/zaikio/directory/version.rb
 - lib/zaikio/error.rb
 homepage: https://www.zaikio.com/
 licenses:
 - MIT
-metadata: {}
+metadata:
+  changelog_uri: https://github.com/crispymtn/zaikio-directory-ruby/blob/master/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -120,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Ruby API Client for Zaikio's Directory