ruby-upwork-oauth2 2.0.0 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f950287c9a08d380f4911c57feb1ed858341264e52f34037f2d9f83223f02af
-  data.tar.gz: 39ea135cbab5433dcbee0febcd68a90dc49fa4b5cf9ad7c0e314b990e77f61b6
+  metadata.gz: ae0c55c23aa24352c0f7abbb6e8997c9ddd9a569f18e51073d677ee1db27de56
+  data.tar.gz: 1146d2241c4ef5309dcbfa9437cfe07531e72c5c61b5fbf1188a7279802e4ac1
 SHA512:
-  metadata.gz: 02a09a90a058d02cb7aaf06e111355dcf469aab4884f9c98f6f243d50aad5dfb74ac480da327677cbbcb8b68726a4829f3e7eec13eb3f3bf07238b1c3da5e56a
-  data.tar.gz: da5e2095a70f08564f10126b901fb98a3336bf8135806e0ba5bd08e8ab2a112a38d996b182404b12a018976e942e465d5934fe66fd254ea2108fab573da55a46
+  metadata.gz: 7de51dee4754a23762d8641acb725641838942563bcef8389058db5dd915e624105242d5266c932d833c85ebdd3c085b7ccfd57369eace355d8640aac135e4b0
+  data.tar.gz: '064596e784a903ca8415a130a9df988ead4082dbe6ac2037dc6cbd55d9920f1dd6f97e979604070c8a761a55250579f203e7278456cea262c555dda69773e483'

data/.tests

@@ -0,0 +1 @@
+rake test

data/.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
 script: rake
 rvm:
-  - 2.2.2
   - 2.3.0
   - 2.4.3
   - 2.5.0

data/CHANGES.md

@@ -0,0 +1,21 @@
+# Release History
+
+## 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
+
+## 2.0.1
+* Set library User-Agent
+
+## 2.0.0
+* Release ruby-upwork-oauth2

data/README.md

@@ -1,11 +1,11 @@
 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)
-[![Gem Version](https://badge.fury.io/rb/upwork-api.svg)](http://badge.fury.io/rb/upwork-api)
-[![GitHub release](https://img.shields.io/github/release/upwork/ruby-upwork.svg)](https://github.com/upwork/ruby-upwork/releases)
-[![Build Status](https://travis-ci.org/upwork/ruby-upwork.svg)](https://travis-ci.org/upwork/ruby-upwork)
-[![Stories in Ready](http://badge.waffle.io/upwork/ruby-upwork.png)](http://waffle.io/upwork/ruby-upwork)
+[![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)
 
 # Upwork::Api
 
@@ -60,7 +60,7 @@ To integrate this library you need to have:
 
 Add this line to your application's Gemfile:
 
-    gem 'upwork-api'
+    gem 'ruby-upwork-oauth2'
 
 And then execute:
 
@@ -68,7 +68,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install upwork-api
+    $ gem install ruby-upwork-oauth2
 
 ## Usage
 

data/lib/upwork/api/client.rb

@@ -43,7 +43,8 @@ module Upwork
           @config.client_secret,
 	  :site => Upwork::Api::BASE_HOST,
 	  :authorize_url => @url_auth,
-	  :token_url => @url_atoken
+	  :token_url => @url_atoken,
+	  :connection_opts => { :headers => {'User-Agent' => 'Github Upwork API Ruby Client' }}
 	)
       end
       
@@ -137,7 +138,7 @@ module Upwork
       
       # get url with parameters for get requests
       def get_url_with_params(path, params)
-        "#{path}?".concat(params.collect{|k,v| "#{k}=#{OAuth::Helper::escape(v.to_s)}"}.join("&"))
+        "#{path}?".concat(params.collect{|k,v| "#{k}=#{URI::escape(v.to_s)}"}.join("&"))
       end
       
       # Send request

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/metadata.rb

@@ -39,6 +39,18 @@ module Upwork
           @client.get '/profiles/v1/metadata/skills'
         end
         
+        # Get skills V2
+        def get_skills_v2(params)
+          $LOG.i "running " + __method__.to_s
+          @client.get '/profiles/v2/metadata/skills'
+        end
+
+        # Get specialties
+        def get_specialties
+          $LOG.i "running " + __method__.to_s
+          @client.get '/profiles/v1/metadata/specialties'
+        end
+
         # Get regions
         def get_regions
           $LOG.i "running " + __method__.to_s

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.0.0"
+    VERSION = "2.1.3"
   end
 end

data/ruby-upwork-oauth2.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake", "~> 0"
+  spec.add_development_dependency "rake", ">= 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', {})

data/test/test_metadata.rb

@@ -24,6 +24,16 @@ class MetadataTest < Test::Unit::TestCase
     assert api.get_skills
   end
     
+  def test_get_skills_v2
+    api = Upwork::Api::Routers::Metadata.new(get_client_mock)
+    assert api.get_skills_v2({})
+  end
+
+  def test_get_specialties
+    api = Upwork::Api::Routers::Metadata.new(get_client_mock)
+    assert api.get_specialties
+  end
+
   def test_get_categories_v2
     api = Upwork::Api::Routers::Metadata.new(get_client_mock)
     assert api.get_categories_v2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-upwork-oauth2
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.3
 platform: ruby
 authors:
 - Maksym Novozhylov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-06 00:00:00.000000000 Z
+date: 2020-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
@@ -42,16 +42,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -90,7 +90,9 @@ extra_rdoc_files: []
 files:
 - ".docgen"
 - ".gitignore"
+- ".tests"
 - ".travis.yml"
+- CHANGES.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -187,8 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for Upwork API (OAuth2).