spearly-sdk-ruby 0.2.4 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67814c681befa771a269e339b41cd446c68bdc242dd3a61900c3a1f507165167
-  data.tar.gz: ae7c1f34d649ebc34c0bd8ec4d1e468542c5c7c13bbf351fc0c9e3c294010996
+  metadata.gz: ff4e69930eb91c2c598d261ecf89ba3054ae06781adcd1b5a65220df547aed41
+  data.tar.gz: 3d7aa5463bb510214093c434ef2360de11af132cdfb2f9fbc092037b23463711
 SHA512:
-  metadata.gz: b5e943c498662cd93bcaaa2a5db68e5f16129a337860f8f35637a3d4056bcda54684a5f542201017ac1642ca9dab50549a77324d5d1c7c0354178eaa92b9c88c
-  data.tar.gz: a7fff0b9890ee300d37a958cfd714057d5684dbd534fb05e7a8cd24b6f7f59c1e45fd084ab64a457da3fcbf5c2a51c437e7d11704174db4fb00b1db30040e855
+  metadata.gz: d668c71f640036c5e34a0a7fef4f2420c5ddfa0503e07930c0e9e114cafb342d4923fd499d58e4354895210dc46f10cdaf8950c140efa2cae2a471b64e5b783e
+  data.tar.gz: f3d0eba2bd731c73771d0cae35e0ecc0ace751336f28ea023cc001f1a4ff7ce87254c5fabc3497954aa02b5fd7619df67c9f39448a31c12e143b11eea31809d3

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [0.3.2] - 2021-09-13
+
+- Use the new `Spearly API v2`
+- Refactors parsing `JSON` data
+
+## [0.2.4] - 2021-07-16
+
+- Rescue `Signet::AuthorizationError` on `Spearly::Auth::Authorizer`
+
 ## [0.2.3] - 2021-06-18
 
 - Raise `Spearly::Auth::AuthorizationError` and `Spearly::Auth::ServerError` from `Spearly::Auth::User` and `Spearly::Auth::Token`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spearly-sdk-ruby (0.2.3)
+    spearly-sdk-ruby (0.3.1)
       addressable (~> 2.3)
       faraday (>= 0.17.4, < 2.0)
       rake (~> 13.0)
@@ -10,24 +10,30 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     coderay (1.1.3)
     diff-lcs (1.4.4)
-    faraday (1.4.2)
+    faraday (1.7.1)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
       faraday-net_http (~> 1.0)
       faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords (>= 0.0.4)
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
     faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.1.0)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
     jwt (2.2.3)
     method_source (1.0.0)
     multi_json (1.15.0)
@@ -40,7 +46,7 @@ GEM
       method_source (~> 1.0)
     public_suffix (4.0.6)
     rainbow (3.0.0)
-    rake (13.0.3)
+    rake (13.0.6)
     regexp_parser (2.1.1)
     rexml (3.2.5)
     rspec (3.10.0)
@@ -71,9 +77,9 @@ GEM
       rubocop (~> 1.0)
       rubocop-ast (>= 1.1.0)
     ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.4)
-    signet (0.15.0)
-      addressable (~> 2.3)
+    ruby2_keywords (0.0.5)
+    signet (0.16.0)
+      addressable (~> 2.8)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
@@ -81,6 +87,7 @@ GEM
 
 PLATFORMS
   x86_64-darwin-20
+  x86_64-linux
 
 DEPENDENCIES
   pry (~> 0.13.1)

data/README.md

@@ -20,29 +20,42 @@ Or install it manually:
 gem install spearly-sdk-ruby
 ```
 
-## Publish
+## Contribute
 ### Increment version
 ```sh
 vim lib/spearly/version.rb
 ```
 
-### Build
+### Update CHANGELOG
 ```sh
-rake build
+vim CHANGELOG.md
 ```
 
-### Push to RubyGems
+### Update Gemfile.lock
 ```sh
-new_version=$(ruby -e "require 'spearly/version'; puts Spearly::VERSION")
-
-gem push pkg/spearly-sdk-ruby-$new_version.gem
+bundle install
 ```
 
-## Contribute
 ### New version commit
 ```sh
-new_version=$(ruby -e "require 'spearly/version'; puts Spearly::VERSION")
+new_version=$(ruby -e "require './lib/spearly/version'; puts Spearly::VERSION")
 
 git commit -m "v$new_version"
 git tag -a v$new_version -m "Release $new_version"
+
+git push origin main
+git push origin --tags
+```
+
+## Publish
+### Build
+```sh
+rake build
+```
+
+### Push to RubyGems
+```sh
+new_version=$(ruby -e "require './lib/spearly/version'; puts Spearly::VERSION")
+
+gem push pkg/spearly-sdk-ruby-$new_version.gem
 ```

data/lib/spearly/auth/authorizer.rb

@@ -19,13 +19,19 @@ module Spearly
       private
 
       def initialize_client
+        Faraday.default_connection_options = {
+          headers: {
+            'Accept' => 'application/vnd.spearly.v2+json'
+          }
+        }
+
         client = ::Signet::OAuth2::Client.new
         client.client_id = @params[:client_id] || @params['client_id']
         client.client_secret = @params[:client_secret] || @params['client_secret']
         client.code = @params[:code] || @params['code']
         client.grant_type = @params[:grant_type] || @params['grant_type']
-        client.authorization_uri = "#{ENV['SPEARLY_AUTH_API_URL']}/api/v1/oauth/authorize"
-        client.token_credential_uri = "#{ENV['SPEARLY_AUTH_API_URL']}/api/v1/oauth/token"
+        client.authorization_uri = "#{ENV['SPEARLY_API_URL']}/oauth/authorize"
+        client.token_credential_uri = "#{ENV['SPEARLY_API_URL']}/oauth/token"
         client.redirect_uri = @params[:redirect_uri] || @params['redirect_uri']
 
         client.access_token = @params[:access_token] || @params['access_token']

data/lib/spearly/auth/oauth_user.rb

@@ -6,22 +6,22 @@ require 'faraday'
 module Spearly
   module Auth
     class OauthUser
-      attr_reader :attributes
+      attr_reader :data
 
-      def initialize(attributes)
-        @attributes = attributes
+      def initialize(data)
+        @data = data
       end
 
       def method_missing(name, *_args)
-        @attributes[name.to_s]
+        @data[name.to_s]
       end
 
       def to_json(*_args)
-        @attributes.to_json
+        @data.to_json
       end
 
       def as_json
-        @attributes.as_json
+        @data.as_json
       end
     end
   end

data/lib/spearly/auth/rails/helpers.rb

@@ -5,7 +5,7 @@ module Spearly
     module Rails
       module Helpers
         def spearly_authorize!
-          raise Spearly::Auth::AuthorizationError unless spearly_token
+          spearly_token
         end
 
         private
@@ -13,16 +13,18 @@ module Spearly
         def spearly_token
           @spearly_token ||= begin
             token = Spearly::Auth::Token.new(request.authorization)
+            token.info
 
-            token.info ? token : nil
+            token
           end
         end
 
         def spearly_user
           @spearly_user ||= begin
             user = Spearly::Auth::User.new(request.authorization)
+            user.find
 
-            user.find ? user : nil
+            user
           end
         end
       end

data/lib/spearly/auth/team.rb

@@ -6,22 +6,22 @@ require 'faraday'
 module Spearly
   module Auth
     class Team
-      attr_reader :attributes
+      attr_reader :data
 
-      def initialize(attributes)
-        @attributes = attributes
+      def initialize(data)
+        @data = data
       end
 
       def method_missing(name, *_args)
-        @attributes[name.to_s]
+        @data[name.to_s]
       end
 
       def to_json(*_args)
-        @attributes.to_json
+        @data.to_json
       end
 
       def as_json
-        @attributes.as_json
+        @data.as_json
       end
     end
   end

data/lib/spearly/auth/token.rb

@@ -6,32 +6,38 @@ require 'faraday'
 module Spearly
   module Auth
     class Token
-      attr_reader :attributes, :token
+      attr_reader :data, :token
 
       def initialize(token)
         @token = token
       end
 
       def method_missing(name, *_args)
-        @attributes[name.to_s]
+        @data[name.to_s]
       end
 
       def info
-        token_info_uri = "#{ENV['SPEARLY_AUTH_API_URL']}/api/v1/oauth/token/info"
+        token_info_uri = "#{ENV['SPEARLY_API_URL']}/oauth/token/info"
         url = Addressable::URI.parse(token_info_uri).normalize.to_s
         client = Faraday.default_connection
 
         res = client.get(url,
                          nil,
+                         'Accept' => 'application/vnd.spearly.v2+json',
                          'Authorization' => @token)
 
-        return unless res.status == 200
+        case res.status
+        when 401
+          raise Spearly::Auth::AuthorizationError
+        when 500
+          raise Spearly::Auth::ServerError
+        end
 
-        @attributes = JSON.parse(res.body)
+        @data = JSON.parse(res.body)
       end
 
       def revoke(params)
-        token_revoke_uri = "#{ENV['SPEARLY_AUTH_API_URL']}/api/v1/oauth/revoke"
+        token_revoke_uri = "#{ENV['SPEARLY_API_URL']}/oauth/revoke"
         url = Addressable::URI.parse(token_revoke_uri).normalize.to_s
         client = Faraday.default_connection
 
@@ -46,11 +52,11 @@ module Spearly
       end
 
       def to_json(*_args)
-        @attributes.to_json
+        @data.to_json
       end
 
       def as_json
-        @attributes.as_json
+        @data.as_json
       end
     end
   end

data/lib/spearly/auth/user.rb

@@ -6,72 +6,66 @@ require 'faraday'
 module Spearly
   module Auth
     class User
-      attr_reader :attributes
+      attr_reader :data
 
       def initialize(token)
         @token = token
       end
 
       def method_missing(name, *_args)
-        @attributes[name.to_s]
+        @data[name.to_s]
       end
 
       def find
-        user_profile_uri = "#{ENV['SPEARLY_AUTH_API_URL']}/api/v1/oauth/profile"
+        user_profile_uri = "#{ENV['SPEARLY_API_URL']}/profile"
         url = Addressable::URI.parse(user_profile_uri).normalize.to_s
         client = Faraday.default_connection
 
         res = client.get(url,
                          nil,
+                         'Accept' => 'application/vnd.spearly.v2+json',
                          'Authorization' => @token)
 
-        return unless res.status == 200
+        case res.status
+        when 401
+          raise Spearly::Auth::AuthorizationError
+        when 500
+          raise Spearly::Auth::ServerError
+        end
 
-        @attributes = JSON.parse(res.body)['user']
+        @data = JSON.parse(res.body)['data']
       end
 
       def teams
-        teams_uri = "#{ENV['SPEARLY_AUTH_API_URL']}/api/v1/teams"
+        teams_uri = "#{ENV['SPEARLY_API_URL']}/teams"
         url = Addressable::URI.parse(teams_uri).normalize.to_s
         client = Faraday.default_connection
 
         res = client.get(url,
                          nil,
+                         'Accept' => 'application/vnd.spearly.v2+json',
                          'Authorization' => @token)
 
-        return [] unless res.status == 200
+        case res.status
+        when 401
+          raise Spearly::Auth::AuthorizationError
+        when 500
+          raise Spearly::Auth::ServerError
+        end
 
-        team_hashes = JSON.parse(res.body)['teams']
+        team_hashes = JSON.parse(res.body)['data']
 
         team_hashes.map do |team_hash|
           Spearly::Auth::Team.new(team_hash)
         end
       end
 
-      def oauth_users
-        oauth_users_uri = "#{ENV['SPEARLY_AUTH_API_URL']}/api/v1/oauth_users"
-        url = Addressable::URI.parse(oauth_users_uri).normalize.to_s
-        client = Faraday.default_connection
-
-        res = client.get(url,
-                         nil,
-                         'Authorization' => @token)
-
-        return [] unless res.status == 200
-
-        oauth_user_hashes = JSON.parse(res.body)['oauth_users']
-
-        oauth_user_hashes.map do |oauth_user_hash|
-          Spearly::Auth::OauthUser.new(oauth_user_hash)
-        end
-      end
-
       def to_json(*_args)
-        @attributes.to_json
+        @data.to_json
       end
 
       def as_json
-        @attributes.as_json
+        @data.as_json
       end
     end
   end

data/lib/spearly/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spearly
-  VERSION = '0.2.4'
+  VERSION = '0.3.2'
 end

data/spearly.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = Gem::Requirement.new('>= 2.7.2')
   gem.metadata['homepage_uri'] = gem.homepage
   gem.metadata['source_code_uri'] = 'https://github.com/unimal-jp/spearly-sdk-ruby'
-  gem.metadata['changelog_uri'] = "https://github.com/unimal-jp/spearly-sdk-ruby/blob/#{Spearly::VERSION}/CHANGELOG.md"
+  gem.metadata['changelog_uri'] = "https://github.com/unimal-jp/spearly-sdk-ruby/blob/v#{Spearly::VERSION}/CHANGELOG.md"
 
   gem.files = `git ls-files`.split("\n")
   gem.executables   = 'spearly'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spearly-sdk-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.2
 platform: ruby
 authors:
 - Spearly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-16 00:00:00.000000000 Z
+date: 2021-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -166,7 +166,7 @@ licenses: []
 metadata:
   homepage_uri: https://github.com/unimal-jp/spearly-sdk-ruby
   source_code_uri: https://github.com/unimal-jp/spearly-sdk-ruby
-  changelog_uri: https://github.com/unimal-jp/spearly-sdk-ruby/blob/0.2.4/CHANGELOG.md
+  changelog_uri: https://github.com/unimal-jp/spearly-sdk-ruby/blob/v0.3.2/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths: