ruby-upwork-oauth2 2.1.0 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d105d8606187a3191bb9adc2b45ef2d2ccd03fd0f6dd6d4771d290b3e645304
-  data.tar.gz: f236ee521251163733139f42b72817ff1cb7f543f0132561ef3bddf125f0e6af
+  metadata.gz: 30396e38e7003832bc1afee54cb092275109658e4054ff0aa477f1d587075dc9
+  data.tar.gz: dfc128c0a3fe618af664075bce4f87f3adcb9255ad653620e8ddf8dd1684f320
 SHA512:
-  metadata.gz: 6a6d8b780f1147622d17265a233b5d14b027948617cd465a93a112c4159788f7ec7d76263004e6d834d9b307b1eafdfb2130dd8ff427ffe7b93cf4b701bd08e1
-  data.tar.gz: 6a7769b3ca265144e0d5dcc6137d42514191b0188bffbc4cb6714e3d9df34bafaf49a8a3eb0576eee0314b2db658899310156f37f5d2ceb05d55c30ddde1ebbb
+  metadata.gz: 71b9945740d5412cc7c80e720ba4f73ed06b70a409fd7e36f09153c33adb49d4f9fb9d5abaab818a4d3f721cd49c142688f9e630d1f50093a461470750317a64
+  data.tar.gz: 7ad335171b968d0b6e53cb22807e781ba0f4f0f8d334df7c866075ae408c37d498222f9486260705a1d4583f75aac19444d9c2613a5fc4dfba7ffbd3e4d4dd2e

data/.github/workflows/build.yml

@@ -0,0 +1,34 @@
+name: build
+
+on:
+  push:
+    paths-ignore:
+      - '**.md'
+  pull_request:
+    paths-ignore:
+      - '**.md'
+
+jobs:
+  test:
+
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        ruby: [ '2.7.3', '2.6.7', '2.5.9' ]
+
+    name: Ruby ${{ matrix.ruby }}
+    steps:
+      - uses: actions/checkout@v2
+      # step 1: setup
+      - name: Setup ruby
+        uses: ruby/setup-ruby@477b21f02be01bcb8030d50f37cfec92bfa615b6
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      # step 2: install dependencies
+      - name: Install dependencies
+        run: gem install oauth2 test-unit mocha
+      # step 3: run test
+      - name: Run tests
+        run: rake test

data/CHANGES.md

@@ -1,5 +1,18 @@
 # Release History
 
+## 2.1.4
+* Add GraphQL support
+
+## 2.1.3
+* Send Message to a Batch of Rooms API
+
+## 2.1.2
+* Add Room Messages API
+* Sync-up routers with OAuth1 version
+
+## 2.2.1
+* Resolve a vulnarable dependency
+
 ## 2.1.0
 * Add Specialties API
 * Add Skills V2 API

data/README.md

@@ -1,11 +1,10 @@
 Ruby bindings for Upwork API (OAuth2)
 ============
 
-[![License](http://img.shields.io/packagist/l/upwork/php-upwork.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
+[![License](https://img.shields.io/github/license/upwork/ruby-upwork-oauth2)](http://www.apache.org/licenses/LICENSE-2.0.html)
 [![Gem Version](https://badge.fury.io/rb/ruby-upwork-oauth2.svg)](http://badge.fury.io/rb/ruby-upwork-oauth2)
 [![GitHub release](https://img.shields.io/github/release/upwork/ruby-upwork-oauth2.svg)](https://github.com/upwork/ruby-upwork-oauth2/releases)
-[![Build Status](https://travis-ci.org/upwork/ruby-upwork-oauth2.svg)](https://travis-ci.org/upwork/ruby-upwork-oauth2)
-[![Stories in Ready](http://badge.waffle.io/upwork/ruby-upwork-oauth2.png)](http://waffle.io/upwork/ruby-upwork-oauth2)
+[![Build Status](https://github.com/upwork/ruby-upwork-oauth2/workflows/build/badge.svg)](https://github.com/upwork/ruby-upwork-oauth2/actions)
 
 # Upwork::Api
 

data/example/example.rb

@@ -5,6 +5,7 @@ $:.unshift '../lib'
 $LOAD_PATH << File.dirname(__FILE__)
 
 require 'upwork/api'
+require 'upwork/api/routers/graphql'
 require 'upwork/api/routers/auth'
 require 'upwork/api/routers/messages'
 require 'upwork/api/routers/reports/time'
@@ -43,6 +44,24 @@ end
 # periodically to sync-up the data
 @actual_access_token_data = client.get_actual_config
 
+# execute graphql request
+#client.set_org_uid_header('1234567890') # Organization UID (optional)
+#graphql = Upwork::Api::Routers::Graphql.new(client)
+#params = {
+#  'query' => "query {
+#      user {
+#        id
+#        nid
+#        rid
+#      }
+#      organization {
+#        id
+#      }
+#    }"
+#}
+#data = graphql.execute params
+#p data['data']['user']['id']
+
 # get my auth data
 #auth = Upwork::Api::Routers::Auth.new(client)
 #info = auth.get_user_info

data/lib/upwork/api/client.rb

@@ -37,6 +37,7 @@ module Upwork
         @config = config
         @epoint = Upwork::Api::DEFAULT_EPOINT
 	@url_auth, @url_rtoken, @url_atoken = URI_AUTH, URI_RTOKEN, URI_ATOKEN
+        @tenant_id = nil
 
 	@oauth2_client = OAuth2::Client.new(
           @config.client_id,
@@ -73,6 +74,11 @@ module Upwork
       def get_actual_config
         @config
       end
+
+      # Configure X-Upwork-API-TenantId header
+      def set_org_uid_header(tenant_id)
+        @tenant_id = tenant_id
+      end
       
       # Run GET request
       #
@@ -117,7 +123,7 @@ module Upwork
       
       # Get URI with :format
       def get_uri_with_format(uri) # :nodoc:
-        (@epoint) + uri + ((@epoint == 'api') ? '.' + DATA_FORMAT : '')
+        (@epoint == 'graphql') ? Upwork::Api::GQL_EPOINT : ((@epoint) + uri + ((@epoint == 'api') ? '.' + DATA_FORMAT : ''))
       end
       
       private
@@ -172,7 +178,15 @@ module Upwork
           url = get_url_with_params get_uri_with_format(uri), params
           response = @access_token.get(url).body
         when :post, :put, :delete
-          response = @access_token.post(get_uri_with_format(uri), {body: params}).body
+          if @epoint == 'graphql'
+            data = {:body => params.to_json, :headers => {'Content-Type' => 'application/json'}}
+            if @tenant_id
+              data[:headers]['X-Upwork-API-TenantId'] = @tenant_id
+            end
+          else
+            data = {body: params}
+          end
+          response = @access_token.post(get_uri_with_format(uri), data).body
         else
           raise ArgumentError, "Don't know how to handle http method: :#{method.to_s}"
         end

data/lib/upwork/api/routers/activities/engagement.rb

@@ -44,7 +44,7 @@ module Upwork
           #  engagement: (String)
           #  params: (Hash)
           def assign(company, team, engagement, params)
-            @client.put '/otask/v1/tasks/companies/' + company + '/' + team + '/engagements/' + engagement, params
+            @client.put '/otask/v1/tasks/companies/' + company + '/teams/' + team + '/engagements/' + engagement + '/tasks', params
           end
 
           # Assign to specific engagement the list of activities
@@ -53,7 +53,7 @@ module Upwork
           #  engagement_ref: (String)
           #  params: (Hash)
           def assign_to_engagement(engagement_ref, params)
-            @client.put '/tasks/v2/tasks/contracts/' + engagement_ref
+            @client.put '/tasks/v2/tasks/contracts/' + engagement_ref, params
           end
         
         end

data/lib/upwork/api/routers/messages.rb

@@ -47,6 +47,17 @@ module Upwork
           @client.get '/messages/v3/' + company + '/rooms/' + room_id, params
         end
         
+        # Get messages from a specific room
+        #
+        # Arguments:
+        #  company: (String)
+	#  room_id: (String)
+        #  params: (Hash)
+        def get_room_messages(company, room_id, params = {})
+          $LOG.i "running " + __method__.to_s
+          @client.get '/messages/v3/' + company + '/rooms/' + room_id + '/stories', params
+        end
+
         # Get a specific room by offer ID
         #
         # Arguments:
@@ -89,7 +100,7 @@ module Upwork
           $LOG.i "running " + __method__.to_s
           @client.post '/messages/v3/' + company + '/rooms', params
         end
-        
+
         # Send a message to a room
         #
         # Arguments:
@@ -100,7 +111,17 @@ module Upwork
           $LOG.i "running " + __method__.to_s
           @client.post '/messages/v3/' + company + '/rooms/' + room_id + '/stories', params
         end
-        
+
+        # Send a message to a batch of rooms
+        #
+        # Arguments:
+        #  company: (String)
+        #  params: (Hash)
+        def send_message_to_rooms(company, params = {})
+          $LOG.i "running " + __method__.to_s
+          @client.post '/messages/v3/' + company + '/stories/batch', params
+        end
+
         # Update a room settings
         #
         # Arguments:

data/lib/upwork/api/routers/snapshot.rb

@@ -34,7 +34,7 @@ module Upwork
         #  ts: (String)
         def get_by_contract(contract, ts)
           $LOG.i "running " + __method__.to_s
-          @client.get '/team/v2/snapshots/contracts/' + contract + '/' + ts
+          @client.get '/team/v3/snapshots/contracts/' + contract + '/' + ts
         end
         
         # Update snapshot by specific contract
@@ -45,7 +45,7 @@ module Upwork
         #  params: (Hash)
         def update_by_contract(contract, ts, params)
           $LOG.i "running " + __method__.to_s
-          @client.put '/team/v2/snapshots/contracts/' + contract + '/' + ts, params
+          @client.put '/team/v3/snapshots/contracts/' + contract + '/' + ts, params
         end
         
         # Delete snapshot by specific contract
@@ -54,7 +54,7 @@ module Upwork
         #  ts: (String)
         def delete_by_contract(contract, ts)
           $LOG.i "running " + __method__.to_s
-          @client.delete '/team/v2/snapshots/contracts/' + contract + '/' + ts
+          @client.delete '/team/v3/snapshots/contracts/' + contract + '/' + ts
         end
       end
     end

data/lib/upwork/api/routers/workdays.rb

@@ -35,7 +35,7 @@ module Upwork
         #  params: (Hash)
         def get_by_company(company, from_date, till_date, params = {})
           $LOG.i "running " + __method__.to_s
-          @client.get '/team/v2/workdays/companies/' + company + '/' + from_date + ',' + till_date, params
+          @client.get '/team/v3/workdays/companies/' + company + '/' + from_date + ',' + till_date, params
         end
         
         # Get Workdays by Contract
@@ -46,7 +46,7 @@ module Upwork
         #  params: (Hash)
         def get_by_contract(contract, from_date, till_date, params = {})
           $LOG.i "running " + __method__.to_s
-          @client.get '/team/v2/workdays/contracts/' + contract + '/' + from_date + ',' + till_date, params
+          @client.get '/team/v3/workdays/contracts/' + contract + '/' + from_date + ',' + till_date, params
         end
       end
     end

data/lib/upwork/api/routers/workdiary.rb

@@ -27,6 +27,16 @@ module Upwork
           @client.epoint = ENTRY_POINT 
         end
         
+        # Get Workdiary by Company
+        # Arguments:
+        #  company: (String)
+        #  date: (String)
+        #  params: (Hash)
+        def get(company, date, params = {})
+          $LOG.i "running " + __method__.to_s
+          @client.get '/team/v3/workdiaries/companies/' + company + '/' + date, params
+        end
+
         # Get Work Diary by Contract
         # Arguments:
         #  contract: (String)
@@ -34,7 +44,7 @@ module Upwork
         #  params: (Hash)
         def get_by_contract(contract, date, params = {})
           $LOG.i "running " + __method__.to_s
-          @client.get '/team/v2/workdiaries/contracts/' + contract + '/' + date, params
+          @client.get '/team/v3/workdiaries/contracts/' + contract + '/' + date, params
         end
       end
     end

data/lib/upwork/api/version.rb

@@ -13,6 +13,6 @@
 
 module Upwork # :nodoc:
   module Api
-    VERSION = "2.1.0"
+    VERSION = "2.1.4"
   end
 end

data/lib/upwork/api.rb

@@ -23,6 +23,7 @@ module Upwork # :nodoc:
     # define some constants
     BASE_HOST       = 'https://www.upwork.com'
     DEFAULT_EPOINT  = 'api'
+    GQL_EPOINT      = 'https://api.upwork.com/graphql'
     
     $LOG = Logger.new
   end

data/ruby-upwork-oauth2.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake", "~> 0"
+  spec.add_development_dependency "bundler", "~> 2.2", ">= 2.2.10"
+  spec.add_development_dependency "rake", "~>12.3", ">= 12.3.3"
   spec.add_development_dependency "mocha", "~> 0"
   spec.add_development_dependency "test-unit", "~> 0"
 end

data/test/test_messages.rb

@@ -19,6 +19,11 @@ class MessagesTest < Test::Unit::TestCase
     assert api.get_room_details('company', 'room-id', {})
   end
   
+  def test_get_room_messages
+    api = Upwork::Api::Routers::Messages.new(get_client_mock)
+    assert api.get_room_messages('company', 'room-id', {})
+  end
+
   def test_get_room_by_offer
     api = Upwork::Api::Routers::Messages.new(get_client_mock)
     assert api.get_room_by_offer('company', '1234', {})
@@ -44,6 +49,11 @@ class MessagesTest < Test::Unit::TestCase
     assert api.send_message_to_room('company', 'room-id', {})
   end
   
+  def test_send_message_to_rooms
+    api = Upwork::Api::Routers::Messages.new(get_client_mock)
+    assert api.send_message_to_rooms('company', {})
+  end
+  
   def test_update_room_settings
     api = Upwork::Api::Routers::Messages.new(get_client_mock)
     assert api.update_room_settings('company', 'room-id', 'username', {})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-upwork-oauth2
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.4
 platform: ruby
 authors:
 - Maksym Novozhylov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-21 00:00:00.000000000 Z
+date: 2021-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
@@ -30,28 +30,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -89,9 +101,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".docgen"
+- ".github/workflows/build.yml"
 - ".gitignore"
 - ".tests"
-- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE.txt
@@ -189,8 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for Upwork API (OAuth2).

data/.travis.yml

@@ -1,19 +0,0 @@
-language: ruby
-script: rake
-rvm:
-  - 2.2.2
-  - 2.3.0
-  - 2.4.3
-  - 2.5.0
-  - jruby-head
-  - ruby-head
-install: gem install oauth2 test-unit mocha
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-  fast_finish: true
-notifications:
-  email:
-    recipients:
-      - apisupport@upwork.com
-    on_failure: change