onesky-ruby 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84d8698c355eceb9a7fbffed6c86196211d98125
-  data.tar.gz: b9f077169282a022a0ab996618651e0f16c37027
+  metadata.gz: 64e4ff02d4e28912355f0124620cd881adbc699e
+  data.tar.gz: b7957e8dfb1b8623ff8e46b442bd3adf4625feaf
 SHA512:
-  metadata.gz: e25493f10765556473ba1ce82ca040ca3433f83132e0b5ee434fa51044accd703d5dc0550174caea541763a18dd07b4258e0c8015cfa067b645ec82fda2999bc
-  data.tar.gz: 1bf1e27fff0741e1fa88dca77f00df98e8240271ff7c870fa57a32ecabce7dc3702a751b0fec844a7755e8304c2d29a73348dbb0a81e9ad8c573a4bb718d49f4
+  metadata.gz: 18f1be2f81c74f1bd1c76f160264ecd3641a1544abc785a260bf6f3e3fe97fe757ff5baa23f40dc9b2fe1f9e9b27486c2bd544e05b334ca100cad4c042292437
+  data.tar.gz: 36fd81e45173e872b938dbf8a3c889c44b963bf00b42fd977ac438963c62a83782beb4f4ba63b44b89f34856c38a42d42ae53a41d05328734720d765bb3be684

data/.travis.yml

@@ -1,5 +1,7 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.1
+  - 2.0
+  - 2.1
+  - 2.2
+  - 2.3
+  - 2.4

data/README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/onesky/onesky-ruby.svg)](https://travis-ci.org/onesky/onesky-ruby)
 
-Ruby client for [OneSky](http://www.oneskyapp.com) [Platform API](/onesky/api-documentation-platform)
+Ruby client for [OneSky](http://www.oneskyapp.com) [Platform API](https://github.com/onesky/api-documentation-platform)
 
 ## Installation
 

data/lib/onesky.rb

@@ -1,4 +1,3 @@
 require 'onesky/version'
 require 'onesky/client'
 require 'onesky/errors'
-require 'onesky/restclient'

data/lib/onesky/version.rb

@@ -1,3 +1,3 @@
 module Onesky
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/onesky-ruby.gemspec

@@ -13,15 +13,17 @@ Gem::Specification.new do |spec|
   spec.homepage      = "http://github.com/onesky/onesky-ruby"
   spec.license       = "MIT"
 
+  spec.required_ruby_version = '>= 2.0.0'
+
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'rest-client', '~> 1.8'
+  spec.add_dependency 'rest-client', '~> 2.0'
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake", "~> 10.3"
   spec.add_development_dependency "rspec", "~> 3.1.0"
-  spec.add_development_dependency "webmock", "~> 1.19.0"
+  spec.add_development_dependency "webmock", "~> 3.0"
 end

data/spec/onesky/helpers/request_spec.rb

@@ -13,8 +13,8 @@ describe 'Helpers::Request' do
     it 'should initial request with required headers' do
       stub_request(:get, full_path_with_auth_hash("/locales", api_key, api_secret))
         .with(headers: http_header)
-        .to_return(body: {})
-      expect(client.list_locale).to be_an_instance_of(Hash)
+        .to_return(body: "{}")
+      expect(client.list_locale).to be_an_instance_of(RestClient::Response)
     end
 
     it 'should raise error for error response code' do
@@ -28,8 +28,8 @@ describe 'Helpers::Request' do
     it 'should initial request with required headers' do
       stub_request(:post, full_path_with_auth_hash("/project-groups", api_key, api_secret))
         .with(headers: http_header)
-        .to_return(body: {})
-      expect(client.create_project_group({name: 'TEST'})).to be_an_instance_of(Hash)
+        .to_return(body: "{}")
+      expect(client.create_project_group({name: 'TEST'})).to be_an_instance_of(RestClient::Response)
     end
 
     it 'should return response on error' do
@@ -43,13 +43,13 @@ describe 'Helpers::Request' do
     it 'should initial request with required headers' do
       stub_request(:post, full_path_with_auth_hash("/projects/#{project_id}/files", api_key, api_secret))
         .with(headers: {'Onesky-Plugin' => 'ruby-wrapper'})
-        .to_return(body: {})
-      expect(project.upload_file({file: 'spec/fixture/en.yml', file_format: 'RUBY_YAML'})).to be_an_instance_of(Hash)
+        .to_return(body: "{}")
+      expect(project.upload_file({file: 'spec/fixture/en.yml', file_format: 'RUBY_YAML'})).to be_an_instance_of(RestClient::Response)
     end
 
     it 'should return response on error' do
       stub_request(:post, full_path_with_auth_hash("/projects/#{project_id}/files", api_key, api_secret))
-        .to_return(status: 400, body: {meta: {code: 400, message: 'error message'}}.to_json)
+        .to_return(status: 400, body: {meta: {code: 400, message: 'error message'}}.to_json.to_s)
       expect {project.upload_file({file: 'spec/fixture/en.yml', file_format: 'RUBY_YAML'})}.to raise_error(Onesky::Errors::BadRequestError, '400 Bad Request - error message')
     end
   end
@@ -58,8 +58,8 @@ describe 'Helpers::Request' do
     it 'should initial request with required headers' do
       stub_request(:put, full_path_with_auth_hash("/projects/#{project_id}", api_key, api_secret))
         .with(headers: http_header)
-        .to_return(body: {})
-      expect(project.update({name: 'NEW NAME'})).to be_an_instance_of(Hash)
+        .to_return(body: "{}")
+      expect(project.update({name: 'NEW NAME'})).to be_an_instance_of(RestClient::Response)
     end
 
     it 'should return response on error' do
@@ -73,8 +73,8 @@ describe 'Helpers::Request' do
     it 'should initial request with required headers' do
       stub_request(:delete, full_path_with_auth_hash("/projects/#{project_id}", api_key, api_secret))
         .with(headers: http_header)
-        .to_return(body: {})
-      expect(project.remove).to be_an_instance_of(Hash)
+        .to_return(body: "{}")
+      expect(project.remove).to be_an_instance_of(RestClient::Response)
     end
 
     it 'should return response on error' do

data/spec/onesky/resources/locale_spec.rb

@@ -9,9 +9,9 @@ describe 'Locale' do
   describe 'list_locale' do
     it 'should list all available locales' do
       stub_request(:get, full_path_with_auth_hash('/locales', api_key, api_secret))
-        .to_return(body: {})
+        .to_return(body: "{}")
       response = client.list_locale
-      expect(response).to be_an_instance_of(Hash)
+      expect(response).to be_an_instance_of(RestClient::Response)
     end
   end
 

data/spec/onesky/resources/project/base_spec.rb

@@ -11,9 +11,9 @@ describe 'Project::Base' do
   describe 'show' do
     it 'should show project information' do
       stub_request(:get, full_path_with_auth_hash("/projects/#{project_id}", api_key, api_secret))
-        .to_return(body: {})
+        .to_return(body: "{}")
       response = project.show
-      expect(response).to be_an_instance_of(Hash)
+      expect(response).to be_an_instance_of(RestClient::Response)
     end
   end
 
@@ -40,9 +40,9 @@ describe 'Project::Base' do
   describe 'list_language' do
     it 'should list languages of project' do
       stub_request(:get, full_path_with_auth_hash("/projects/#{project_id}/languages", api_key, api_secret))
-        .to_return(body: {})
+        .to_return(body: "{}")
       response = project.list_language
-      expect(response).to be_an_instance_of(Hash)
+      expect(response).to be_an_instance_of(RestClient::Response)
     end
   end
 

data/spec/onesky/resources/project/file_spec.rb

@@ -11,9 +11,9 @@ describe 'Project::File' do
   describe 'list_file' do
     it 'should list files in project' do
       stub_request(:get, full_path_with_auth_hash("/projects/#{project_id}/files", api_key, api_secret))
-        .to_return(body: {})
+        .to_return(body: "{}")
       response = project.list_file
-      expect(response).to be_an_instance_of(Hash)
+      expect(response).to be_an_instance_of(RestClient::Response)
     end
   end
 
@@ -22,9 +22,9 @@ describe 'Project::File' do
 
     it 'should upload file to project' do
       stub_request(:post, full_path_with_auth_hash("/projects/#{project_id}/files", api_key, api_secret))
-        .to_return(body: {})
+        .to_return(body: "{}")
       response = project.upload_file(params)
-      expect(response).to be_an_instance_of(Hash)
+      expect(response).to be_an_instance_of(RestClient::Response)
     end
 
     it 'should raise error when file does not exist' do
@@ -38,9 +38,9 @@ describe 'Project::File' do
 
     it 'should delete file from project' do
       stub_request(:delete, full_path_with_auth_hash("/projects/#{project_id}/files", api_key, api_secret) + params_as_query_string)
-        .to_return(body: {})
+        .to_return(body: "{}")
       response = project.delete_file(params)
-      expect(response).to be_an_instance_of(Hash)
+      expect(response).to be_an_instance_of(RestClient::Response)
     end
   end
 

data/spec/onesky/resources/project/import_task_spec.rb

@@ -11,9 +11,9 @@ describe 'Project::ImportTask' do
   describe 'list_import_task' do
     it 'should list import tasks of the project' do
       stub_request(:get, full_path_with_auth_hash("/projects/#{project_id}/import-tasks", api_key, api_secret))
-        .to_return(body: {})
+        .to_return(body: "{}")
       response = project.list_import_task
-      expect(response).to be_an_instance_of(Hash)
+      expect(response).to be_an_instance_of(RestClient::Response)
     end
   end
 
@@ -22,9 +22,9 @@ describe 'Project::ImportTask' do
 
     it 'should show an import task details' do
       stub_request(:get, full_path_with_auth_hash("/projects/#{project_id}/import-tasks/#{import_task_id}", api_key, api_secret))
-        .to_return(body: {})
+        .to_return(body: "{}")
       response = project.show_import_task(import_task_id)
-      expect(response).to be_an_instance_of(Hash)
+      expect(response).to be_an_instance_of(RestClient::Response)
     end
   end
 

data/spec/onesky/resources/project/order_spec.rb

@@ -11,9 +11,9 @@ describe 'Project::Order' do
   describe 'list_order' do
     it 'should list orders in project' do
       stub_request(:get, full_path_with_auth_hash("/projects/#{project_id}/orders", api_key, api_secret))
-        .to_return(status: 200, body: {})
+        .to_return(status: 200, body: "{}")
       response = project.list_order
-      expect(response).to be_an_instance_of(Hash)
+      expect(response).to be_an_instance_of(RestClient::Response)
     end
   end
 
@@ -22,9 +22,9 @@ describe 'Project::Order' do
 
     it 'should show an order details' do
       stub_request(:get, full_path_with_auth_hash("/projects/#{project_id}/orders/#{order_id}", api_key, api_secret))
-        .to_return(status: 200, body: {})
+        .to_return(status: 200, body: "{}")
       response = project.show_order(order_id)
-      expect(response).to be_an_instance_of(Hash)
+      expect(response).to be_an_instance_of(RestClient::Response)
     end
   end
 
@@ -36,9 +36,9 @@ describe 'Project::Order' do
     it 'should create an order' do
       stub_request(:post, full_path_with_auth_hash("/projects/#{project_id}/orders", api_key, api_secret))
         .with(body: params.to_json, headers: {'Content_Type' => 'application/json'})
-        .to_return(status: 200, body: {})
+        .to_return(status: 200, body: "{}")
       response = project.create_order(params)
-      expect(response).to be_an_instance_of(Hash)
+      expect(response).to be_an_instance_of(RestClient::Response)
     end
   end
 

data/spec/onesky/resources/project/translation_spec.rb

@@ -50,9 +50,9 @@ describe 'Project::Translation' do
 
     it 'should show translation status' do
       stub_request(:get, full_path_with_auth_hash("/projects/#{project_id}/translations/status", api_key, api_secret) + params_as_query_string)
-        .to_return(body: {})
+        .to_return(body: "{}")
       response = project.get_translation_status(params)
-      expect(response).to be_an_instance_of(Hash)
+      expect(response).to be_an_instance_of(RestClient::Response)
     end
   end
 

data/spec/onesky/resources/project_group_spec.rb

@@ -9,9 +9,9 @@ describe 'Project Group' do
   describe 'list_project_group' do
     it 'should list all available project group' do
       stub_request(:get, full_path_with_auth_hash('/project-groups', api_key, api_secret))
-        .to_return(body: {})
+        .to_return(body: "{}")
       response = client.list_project_group
-      expect(response).to be_an_instance_of(Hash)
+      expect(response).to be_an_instance_of(RestClient::Response)
     end
   end
 
@@ -20,9 +20,9 @@ describe 'Project Group' do
 
     it 'should show a project group information' do
       stub_request(:get, full_path_with_auth_hash("/project-groups/#{project_group_id}", api_key, api_secret))
-        .to_return(body: {})
+        .to_return(body: "{}")
       response = client.show_project_group(project_group_id)
-      expect(response).to be_an_instance_of(Hash)
+      expect(response).to be_an_instance_of(RestClient::Response)
     end
   end
 
@@ -32,9 +32,9 @@ describe 'Project Group' do
     it 'should create a project group' do
       stub_request(:post, full_path_with_auth_hash('/project-groups', api_key, api_secret))
         .with(body: params.to_json, headers: {'Content_Type' => 'application/json'})
-        .to_return(body: {})
+        .to_return(body: "{}")
       response = client.create_project_group(params)
-      expect(response).to be_an_instance_of(Hash)
+      expect(response).to be_an_instance_of(RestClient::Response)
     end
   end
 
@@ -43,9 +43,9 @@ describe 'Project Group' do
 
     it 'should delete a project group' do
       stub_request(:delete, full_path_with_auth_hash("/project-groups/#{project_group_id}", api_key, api_secret))
-        .to_return(body: {})
+        .to_return(body: "{}")
       response = client.delete_project_group(project_group_id)
-      expect(response).to be_an_instance_of(Hash)
+      expect(response).to be_an_instance_of(RestClient::Response)
     end
   end
 
@@ -54,9 +54,9 @@ describe 'Project Group' do
 
     it 'should list languages activated of a project group' do
       stub_request(:get, full_path_with_auth_hash("/project-groups/#{project_group_id}/languages", api_key, api_secret))
-        .to_return(body: {})
+        .to_return(body: "{}")
       response = client.list_project_group_languages(project_group_id)
-      expect(response).to be_an_instance_of(Hash)
+      expect(response).to be_an_instance_of(RestClient::Response)
     end
   end
 

data/spec/onesky/resources/project_spec.rb

@@ -11,9 +11,9 @@ describe 'Project' do
 
     it 'should list all projects of a project group' do
       stub_request(:get, full_path_with_auth_hash("/project-groups/#{project_group_id}/projects", api_key, api_secret))
-        .to_return(body: {})
+        .to_return(body: "{}")
       response = client.list_project(project_group_id)
-      expect(response).to be_an_instance_of(Hash)
+      expect(response).to be_an_instance_of(RestClient::Response)
     end
   end
 
@@ -24,9 +24,9 @@ describe 'Project' do
     it 'should list all projects of a project group' do
       stub_request(:post, full_path_with_auth_hash("/project-groups/#{project_group_id}/projects", api_key, api_secret))
         .with(body: params.to_json, headers: {'Content_Type' => 'application/json'})
-        .to_return(body: {})
+        .to_return(body: "{}")
       response = client.create_project(project_group_id, params)
-      expect(response).to be_an_instance_of(Hash)
+      expect(response).to be_an_instance_of(RestClient::Response)
     end
   end
 

data/spec/onesky/resources/project_type_spec.rb

@@ -9,9 +9,9 @@ describe 'Project Type' do
   describe 'list_project_type' do
     it 'should list all available project type' do
       stub_request(:get, full_path_with_auth_hash('/project-types', api_key, api_secret))
-        .to_return(body: {})
+        .to_return(body: "{}")
       response = client.list_project_type
-      expect(response).to be_an_instance_of(Hash)
+      expect(response).to be_an_instance_of(RestClient::Response)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onesky-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Victor Lam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2017-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: '3.0'
 description: Ruby wrapper for OneSky API
 email:
 - victorebox@yahoo.com.hk
@@ -110,7 +110,6 @@ files:
 - lib/onesky/resources/project/translation.rb
 - lib/onesky/resources/project_group.rb
 - lib/onesky/resources/project_type.rb
-- lib/onesky/restclient.rb
 - lib/onesky/version.rb
 - onesky-ruby.gemspec
 - spec/fixture/en.yml
@@ -139,7 +138,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -147,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: To interact with OneSky Platform API

data/lib/onesky/restclient.rb

@@ -1,38 +0,0 @@
-# Monkey patching RestClient::Request.process_url_params
-# To support array in URL params
-# RestClient.get('http://www.example.com', params: {weekday: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri']})
-# => GET http://www.example.com?weekday[]=Mon&weekday[]=Tue&weekday[]=Wed&weekday[]=Thu&weekday[]=Fri
-
-module RestClient
-  class Request
-
-    def process_url_params url, headers
-      url_params = {}
-      headers.delete_if do |key, value|
-        if 'params' == key.to_s.downcase && value.is_a?(Hash)
-          url_params.merge! value
-          true
-        else
-          false
-        end
-      end
-      unless url_params.empty?
-        query_string = url_params.collect { |k, v| build_url_params(k, v) }.join('&')
-        url + "?#{query_string}"
-      else
-        url
-      end
-    end
-
-    private
-
-    def build_url_params key, value
-      if value.is_a?(Array)
-        value.map { |v| "#{key.to_s}[]=#{CGI::escape(v.to_s)}" }.join('&')
-      else
-        "#{key.to_s}=#{CGI::escape(value.to_s)}"
-      end
-    end
-
-  end
-end