odesk-api 0.1.1 → 0.1.2

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

@@ -0,0 +1,57 @@
+# Licensed under the oDesk's API Terms of Use;
+# you may not use this file except in compliance with the Terms.
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Author::    Maksym Novozhylov (mnovozhilov@odesk.com)
+# Copyright:: Copyright 2014(c) oDesk.com
+# License::   See LICENSE.txt and TOS - http://developers.odesk.com/API-Terms-of-Use
+
+module Odesk
+  module Api
+    module Routers
+      module Activities
+        # Engagement Activities
+        class Engagement
+          ENTRY_POINT = 'api'
+          
+          # Init
+          #
+          # Arguments:
+          #  client: (Client)
+          def initialize(client)
+            @client = client
+            @client.epoint = ENTRY_POINT 
+          end
+          
+          # List activities for specific engagement
+          #
+          # Arguments:
+          #  company: (String)
+          #  team: (String)
+          #  engagement_ref: (String)
+          #  params: (Hash)
+          def get_specific(company, team, engagement_ref, params)
+            @client.get '/tasks/v2/tasks/contracts/' + engagement_ref, params
+          end
+          
+          # Assign engagements to the list of activities
+          #
+          # Arguments:
+          #  company: (String)
+          #  team: (String)
+          #  engagement: (String)
+          #  params: (Hash)
+          def assign(company, team, engagement, params)
+            @client.put '/otask/v1/tasks/companies/' + company + '/' + team + '/engagements/' + engagement, params
+          end
+        
+        end
+      end
+    end
+  end
+end

data/lib/odesk/api/routers/hr/clients/offers.rb

@@ -42,9 +42,10 @@ module Odesk
             #
             # Arguments:
             #  reference: (String)
-            def get_specific(reference)
+            #  params: (Hash)
+            def get_specific(reference, params)
               $LOG.i "running " + __method__.to_s
-              @client.get '/offers/v1/clients/offers/' + reference
+              @client.get '/offers/v1/clients/offers/' + reference, params
             end
             
             # Make an Offer
@@ -60,4 +61,4 @@ module Odesk
       end
     end
   end
-end
+end

data/lib/odesk/api/version.rb

@@ -13,6 +13,6 @@
 
 module Odesk # :nodoc:
   module Api
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/test/test_activities_engagement.rb

@@ -0,0 +1,21 @@
+$:.unshift 'lib'
+$LOAD_PATH << File.dirname(__FILE__)
+
+require 'helper'
+require 'odesk/api/routers/activities/engagement'
+require 'test/unit'
+require 'mocha/test_unit'
+
+class ActivitiesEngagementTest < Test::Unit::TestCase
+  include TestHelper
+  
+  def test_get_specific
+    api = Odesk::Api::Routers::Activities::Engagement.new(get_client_mock)
+    assert api.get_specific('company', 'team', '1234', {})
+  end
+  
+  def test_assign
+    api = Odesk::Api::Routers::Activities::Engagement.new(get_client_mock)
+    assert api.assign('company', 'team', '1234', {})
+  end
+end

data/test/test_hr_clients_offers.rb

@@ -16,11 +16,11 @@ class HrClientsOffersTest < Test::Unit::TestCase
   
   def test_get_specific
     api = Odesk::Api::Routers::Hr::Clients::Offers.new(get_client_mock)
-    assert api.get_specific('12')
+    assert api.get_specific('12', {})
   end
   
   def test_make_offer
     api = Odesk::Api::Routers::Hr::Clients::Offers.new(get_client_mock)
     assert api.make_offer({})
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: odesk-api
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -63,8 +63,8 @@ files:
 - lib/odesk/api/config.rb
 - lib/odesk/api/logger.rb
 - lib/odesk/api/routers/activities/company.rb
+- lib/odesk/api/routers/activities/engagement.rb
 - lib/odesk/api/routers/activities/team.rb
-- lib/odesk/api/routers/activities/user.rb
 - lib/odesk/api/routers/auth.rb
 - lib/odesk/api/routers/freelancers/profile.rb
 - lib/odesk/api/routers/freelancers/search.rb
@@ -96,8 +96,8 @@ files:
 - odesk-api.gemspec
 - test/helper.rb
 - test/test_activities_company.rb
+- test/test_activities_engagement.rb
 - test/test_activities_team.rb
-- test/test_activities_user.rb
 - test/test_auth.rb
 - test/test_client.rb
 - test/test_config.rb
@@ -156,8 +156,8 @@ summary: Ruby bindings for oDesk API.
 test_files:
 - test/helper.rb
 - test/test_activities_company.rb
+- test/test_activities_engagement.rb
 - test/test_activities_team.rb
-- test/test_activities_user.rb
 - test/test_auth.rb
 - test/test_client.rb
 - test/test_config.rb

data/lib/odesk/api/routers/activities/user.rb

@@ -1,125 +0,0 @@
-# Licensed under the oDesk's API Terms of Use;
-# you may not use this file except in compliance with the Terms.
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Author::    Maksym Novozhylov (mnovozhilov@odesk.com)
-# Copyright:: Copyright 2014(c) oDesk.com
-# License::   See LICENSE.txt and TOS - http://developers.odesk.com/API-Terms-of-Use
-
-module Odesk
-  module Api
-    module Routers
-      module Activities
-        # User Activities
-        class User
-          ENTRY_POINT = 'api'
-          
-          # Init
-          #
-          # Arguments:
-          #  client: (Client)
-          def initialize(client)
-            @client = client
-            @client.epoint = ENTRY_POINT 
-          end
-          
-          # List all oTask/Activity records within a Company
-          #
-          # Arguments:
-          #  company: (String)
-          #  team: (String)
-          #  user: (String)
-          def get_list(company, team, user)
-            get_by_type company, team, user, nil, false
-          end
-          
-          # List all oTask/Activity records within a Company with additional info
-          #
-          # Arguments:
-          #  company: (String)
-          #  team: (String)
-          #  user: (String)
-          def get_full_list(company, team, user)
-            get_by_type company, team, user, nil, true
-          end
-          
-          # List all oTask/Activity records within a Company by specified code(s)
-          #
-          # Arguments:
-          #  company: (String)
-          #  team: (String)
-          #  user: (String)
-          #  code: (String)
-          def get_specific_list(company, team, user, code)
-            get_by_type company, team, user, code, false
-          end
-          
-          # Create an oTask/Activity record within a company
-          #
-          # Arguments:
-          #  company: (String)
-          #  team: (String)
-          #  user: (String)
-          #  params: (Hash)
-          def add_activity(company, team, user, params)
-            @client.post '/otask/v1/tasks/companies/' + company + '/' + team + '/' + user + '/tasks', params
-          end
-          
-          # Update specific oTask/Activity record within a company
-          #
-          # Arguments:
-          #  company: (String)
-          #  team: (String)
-          #  user: (String)
-          #  code: (String)
-          #  params: (Hash)
-          def update_activities(company, team, user, code, params)
-            @client.put '/otask/v1/tasks/companies/' + company + '/' + team + '/' + user + '/tasks/' + code, params
-          end
-          
-          # Delete specific oTask/Activity record within a company
-          #
-          # Arguments:
-          #  company: (String)
-          #  team: (String)
-          #  user: (String)
-          #  code: (String)
-          def delete_activities(company, team, user, code)
-            @client.delete '/otask/v1/tasks/companies/' + company + '/' + team + '/' + user + '/tasks/' + code
-          end
-          
-          # Delete all oTask/Activity records within a company
-          #
-          # Arguments:
-          #  company: (String)
-          #  team: (String)
-          #  user: (String)
-          def delete_all_activities(company, team, user)
-            @client.delete '/otask/v1/tasks/companies/' + company + '/' + team + '/' + user + '/tasks/all_tasks'
-          end
-          
-          private
-          
-          # Get by type
-          def get_by_type(company, team, user, code = nil, is_full = false)
-            $LOG.i "running " + __method__.to_s
-            url = '';
-            if (is_full)
-                url = '/full_list';
-            elsif code != nil
-                url = '/' + code;
-            end
-    
-            @client.get '/otask/v1/tasks/companies/' + company + '/' + team + '/' + user + '/tasks' + url
-          end
-        
-        end
-      end
-    end
-  end
-end

data/test/test_activities_user.rb

@@ -1,46 +0,0 @@
-$:.unshift 'lib'
-$LOAD_PATH << File.dirname(__FILE__)
-
-require 'helper'
-require 'odesk/api/routers/activities/user'
-require 'test/unit'
-require 'mocha/test_unit'
-
-class ActivitiesUserTest < Test::Unit::TestCase
-  include TestHelper
-  
-  def test_get_list
-    api = Odesk::Api::Routers::Activities::User.new(get_client_mock)
-    assert api.get_list('company', 'team', 'user')
-  end
-  
-  def test_get_full_list
-    api = Odesk::Api::Routers::Activities::User.new(get_client_mock)
-    assert api.get_full_list('company', 'team', 'user')
-  end
-  
-  def test_get_specific_list
-    api = Odesk::Api::Routers::Activities::User.new(get_client_mock)
-    assert api.get_specific_list('company', 'team', 'user', 'code')
-  end
-    
-  def test_add_activity
-    api = Odesk::Api::Routers::Activities::User.new(get_client_mock)
-    assert api.add_activity('company', 'team', 'user', {})
-  end
-    
-  def test_update_activities
-    api = Odesk::Api::Routers::Activities::User.new(get_client_mock)
-    assert api.update_activities('company', 'team', 'user', 'code', {})
-  end
-    
-  def test_delete_activities
-    api = Odesk::Api::Routers::Activities::User.new(get_client_mock)
-    assert api.delete_activities('company', 'team', 'user', 'code')
-  end
-    
-  def test_delete_all_activities
-    api = Odesk::Api::Routers::Activities::User.new(get_client_mock)
-    assert api.delete_all_activities('company', 'team', 'user')
-  end
-end