cognitive_faculty 2.0.0 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 995e99af7205541fe78e18c123c37bbf5f2be977
-  data.tar.gz: 814f2f1bc2de288548dcdcfc2f84203cfefbca1e
+SHA256:
+  metadata.gz: 95199f718d69e24b6302c44aeab67c290a4555a886f9872dc9ffd2d2b28348e8
+  data.tar.gz: 8dd37e0f402640410b7a21617f44d28f661fd795cd8db778e72532a2194cc405
 SHA512:
-  metadata.gz: bebe7301cdd5ba1dd0f2eb7538d1633593f39604e6f735ef489fec9f9eab5dabbb985c2e4299ad828791dc0cb706dd9e1453f2c8d65d56ef799ac717b57948db
-  data.tar.gz: f8377749489ab88f1cd504e1a93967af293d2d2aba2595ba9c27158cb7614e74155e7dc5cd929276884798941f896eda66b23e15ec7d306876e52109290ed174
+  metadata.gz: 1921f302cdce5a375f7444f775e91526b24556d5570c7d470ca7d0e4424b996e26d4b49d87fde7ed8382192a00da006f179656872c7797d488132d38fbfcba75
+  data.tar.gz: 2023cd3b6b83d3c727645f9852c84227005e9444923cc0bba0888c07bcc51b10f82906e17efd7babb7344ab4e0a396c596ac46c6096c2c203bbf2a01285fd3ac

data/Gemfile.lock

@@ -1,41 +1,41 @@
 PATH
   remote: .
   specs:
-    cognitive_faculty (1.1.2)
-      activemodel (~> 6.0.2.1)
-      activesupport (~> 6.0.2.1)
-      faraday_middleware (~> 0.12.2)
-      her (~> 1.1.0)
-      oauth2 (~> 1.4.0)
+    cognitive_faculty (3.0.1)
+      activemodel (>= 6.0)
+      activesupport (>= 6.0.2.1)
+      faraday_middleware (>= 0.12.2)
+      her (>= 1.1.0)
+      oauth2 (>= 1.4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.2.1)
-      activesupport (= 6.0.2.1)
-    activesupport (6.0.2.1)
+    activemodel (6.0.3.3)
+      activesupport (= 6.0.3.3)
+    activesupport (6.0.3.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      zeitwerk (~> 2.2, >= 2.2.2)
     ast (2.4.0)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     diff-lcs (1.3)
     faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.12.2)
+    faraday_middleware (0.14.0)
       faraday (>= 0.7.4, < 1.0)
     her (1.1.0)
       activemodel (>= 4.2.1)
       faraday (>= 0.8, < 1.0)
       multi_json (~> 1.7)
-    i18n (1.8.2)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
-    jwt (2.2.1)
-    minitest (5.14.0)
-    multi_json (1.14.1)
+    jwt (2.2.2)
+    minitest (5.14.2)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     oauth2 (1.4.4)
@@ -48,7 +48,7 @@ GEM
     parser (2.7.0.4)
       ast (~> 2.4.0)
     powerpack (0.1.2)
-    rack (2.2.2)
+    rack (2.2.3)
     rainbow (3.0.0)
     rake (10.5.0)
     rspec (3.9.0)
@@ -74,10 +74,10 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.10.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     unicode-display_width (1.7.0)
-    zeitwerk (2.3.0)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby

data/README.md

@@ -20,16 +20,19 @@ Or install it yourself as:
 
 ## Usage
 
+Your application must be configured in AppID (NOTE: Single-Page App's do not work because they don't provide you a secret).
+
+To use this service, you will need to supply a client ID, secret, and oauth server URL. See below for implementation, or __[click here for more information on how to obtain AppID config info](https://cloud.ibm.com/docs/appid?topic=appid-obtain-tokens#credentials-gui)__.
+
 ```ruby
+# example implementation
 require 'cognitive_faculty'
 
 CognitiveFaculty.configure do |c|
-  c.url = "https://platform.cognitivefaculty.com/api"
-  c.auth.url = "https://accounts.cognitivefaculty.com"
-  c.auth.client_id = "client id"
-  c.auth.client_secret = "secret"
-  c.auth.username = "username"
-  c.auth.password = "password"
+  c.url = "https://platform.skills.network/api"
+  c.auth.client_id = "<AppID Client ID>"
+  c.auth.client_secret = "<AppID Secret>"
+  c.auth.oauth_server_url = "<AppID oauth Server URL>"
 end
 
 CognitiveFaculty::Offer.all.each do |o|
@@ -42,3 +45,7 @@ end
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+### Testing
+
+Fill out the values in `testy/main.rb` and then run `ruby testy/main.rb` for an easy way to test the Platform API.

data/cognitive_faculty.gemspec

@@ -24,9 +24,9 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rubocop", "~> 0.58.2"
 
-  spec.add_dependency "activemodel", "~> 6.0.2.1"
-  spec.add_dependency "activesupport", "~> 6.0.2.1"
-  spec.add_dependency "faraday_middleware", "~> 0.12.2"
-  spec.add_dependency "her", "~> 1.1.0"
-  spec.add_dependency "oauth2", "~> 1.4.0"
+  spec.add_dependency "activemodel", ">= 6.0"
+  spec.add_dependency "activesupport", ">= 6.0.2.1"
+  spec.add_dependency "faraday_middleware", ">= 0.12.2"
+  spec.add_dependency "her", ">= 1.1.0"
+  spec.add_dependency "oauth2", ">= 1.4.0"
 end

data/lib/cognitive_faculty.rb

@@ -10,12 +10,10 @@ require "cognitive_faculty/configuration/configuration"
 #
 # Usage:
 #   CognitiveFaculty.configure do |c|
-#     c.url = "https://platform.cognitivefaculty.com/api"
-#     c.auth.url = "https://accounts.cognitivefaculty.com"
-#     c.auth.client_id = "client id"
-#     c.auth.client_secret = "secret"
-#     c.auth.username = "username"
-#     c.auth.password = "password"
+#     c.url = "https://platform.skills.network/api"
+#     c.auth.client_id = "<AppID Client ID>"
+#     c.auth.client_secret = "<AppID Secret>"
+#     c.auth.oauth_server_url = "<AppID oauth Server URL>"
 #   end
 #
 #   CognitiveFaculty::Offer.all.each do |o|
@@ -39,7 +37,7 @@ module CognitiveFaculty
         c.use Faraday::Response::Logger, nil, body: true
 
         # Adapter
-        c.use Faraday::Adapter::NetHttp
+        c.adapter Faraday::Adapter::NetHttp
       end
       require "cognitive_faculty/models"
       api

data/lib/cognitive_faculty/configuration/auth.rb

@@ -7,16 +7,13 @@ module CognitiveFaculty
     # Authorization configuration for Cognitive Faculty Platform API.
     #
     # Attributes:
-    #   +url+: URL for authorization server.
     #   +client_id+: Client ID used to request an acces token.
     #   +client_secret+: Client secret used to request an access token.
-    #   +username+: Username for requesting a token using the +password+ strategy.
-    #   +password+: Password for requesting a token using the +password+ strategy.
-    #   +realm+: Keycloak realm to use. Deafults to +master+.
+    #   +tenant_id+: AppID tenant id
+    #   +oauth_server_url+: AppID oauth server URL
     #   +token+: (read-only) OIDC access token.
     class Auth
-      attr_accessor :url, :client_id, :client_secret, :username, :password,
-                    :realm
+      attr_accessor :client_id, :client_secret, :tenant_id, :oauth_server_url
       attr_reader :token
 
       def initialize
@@ -29,12 +26,9 @@ module CognitiveFaculty
       end
 
       def update_token
-        opts = {
-          site: url,
-          token_url: "/auth/realms/#{realm}/protocol/openid-connect/token"
-        }
+        opts = { token_url: "#{oauth_server_url}/token" }
         oauth2 = OAuth2::Client.new(client_id, client_secret, opts)
-        @token = oauth2.password.get_token(username, password)
+        @token = oauth2.client_credentials.get_token(:username => client_id, :password => client_secret)
       end
     end
   end

data/lib/cognitive_faculty/version.rb

@@ -1,3 +1,3 @@
 module CognitiveFaculty
-  VERSION = "2.0.0".freeze
+  VERSION = "3.0.2".freeze
 end

data/testy/main.rb

@@ -0,0 +1,12 @@
+require 'cognitive_faculty'
+
+CognitiveFaculty.configure do |c|
+  c.url = "http://localhost:8080/api"
+  c.auth.client_id = "<client_id>"
+  c.auth.client_secret = "<client_secret>"
+  c.auth.oauth_server_url = "<oauth server url>"
+end
+
+CognitiveFaculty::Offer.all.each do |o|
+  puts o.name
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cognitive_faculty
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.2
 platform: ruby
 authors:
 - Luiz Aoqui
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-03-19 00:00:00.000000000 Z
+date: 2021-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,70 +70,70 @@ dependencies:
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.2.1
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.2.1
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.2.1
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: her
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
 description: Ruby gem for the Cognitive Faculty API.
@@ -162,10 +162,11 @@ files:
 - lib/cognitive_faculty/models/code.rb
 - lib/cognitive_faculty/models/offer.rb
 - lib/cognitive_faculty/version.rb
+- testy/main.rb
 homepage: https://cognitivefaculty.com
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -180,9 +181,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Cognitive Faculty Ruby SDK
 test_files: []