api_tools 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b2637610408853515f08ec127020ca41ee97547f
-  data.tar.gz: 7da01e10d454e98cc3adeb017df3f3f4d34c8d3d
+SHA256:
+  metadata.gz: a5375a4ba2ebc5fb2e679f359e123d6d52c9ca9a91105a885cb3b0be50ab4b99
+  data.tar.gz: 39ae0597a908411a2f0a9f048a94c21c95fe02be2980be03055c68f43dbefbc1
 SHA512:
-  metadata.gz: 721b5c4644d526693adc6db0e8212ac697d649e02669fb756825c676f210de66965f57ec9257364e6d71305093a650748330d973bce81065f5c8a62d79bcf71f
-  data.tar.gz: 7bc85b4e20ddaf2712bde23b70d2f78feac221f32ba29768bb82c949a70d8f3e4774725fb1f08e127167d9b80604d50245f1c406414c65ca7221180c7b8050c0
+  metadata.gz: 5db6205a5c9c3e4652d5edb6dd3ec9aafd8776357c26d08f9ebbc535542a0b80efb0f480b8809bcdf54da17d93f717b58617c37d5947f78d4ab9aeb0402ad077
+  data.tar.gz: c73926f4a30791ce69f430f4b5ef275ec951ae34469380bcd6da66bb69ac5e4087f1b993bf17c6c167de624264772c02ed53c5d8aa484250fbad0eee6d7074cb

data/.gitignore

@@ -14,3 +14,4 @@ pkg
 
 # rspec failure tracking
 .rspec_status
+TAGS

data/Gemfile

@@ -1,7 +1,7 @@
 if ENV["USING_OFFICIAL_GEM"]
   source "https://rubygems.org"
 else
-  source "https://gems.ruby-china.org"
+  source "https://gems.ruby-china.com"
 end
 
 # Specify your gem's dependencies in api_tools.gemspec

data/api_tools.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["atpking"]
   spec.email         = ["atpking@gmail.com"]
 
-  spec.summary       = '常用工具集合'
-  spec.description   = '常用工具都放这里了'
+  spec.summary       = 'rest 的常用请求'
+  spec.description   = '简单点'
   spec.homepage      = "http://jicheng1014.cnblogs.com"
   spec.license       = "MIT"
 
@@ -31,6 +31,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "oj", '> 2.0'
-  spec.add_dependency "rest-client", '> 1.0'
+  spec.add_dependency 'multi_json'
+  spec.add_dependency "rest-client", '~> 2.0'
 end

data/lib/api_tools/default_rest.rb

@@ -3,7 +3,7 @@ require_relative './default_rest_module.rb'
 require 'json'
 require 'uri'
 require 'rest-client'
-require 'oj'
+require 'multi_json'
 
 class DefaultRest
   extend ApiTools::DefaultRestModule

data/lib/api_tools/default_rest_module.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ApiTools
   module DefaultRestModule
     %w[get delete head].each do |word|
@@ -47,11 +49,12 @@ module ApiTools
     def build_whole_url(path)
       web = basic_url
       return web if path.length.zero?
-      return path if path.start_with?("http") # path 是一个绝对路径
-      if web[-1] == "/"
-        path = path[1..-1] if path[0] == "/"
+      return path if path.start_with?('http') # path 是一个绝对路径
+
+      if web[-1] == '/'
+        path = path[1..-1] if path[0] == '/'
       else
-        path = "/#{path}" if path[0] != "/"
+        path = "/#{path}" if path[0] != '/'
       end
       web + path
     end
@@ -61,21 +64,22 @@ module ApiTools
       user_options[:retry_times].times do
         begin
           response = ::RestClient::Request.execute(request_dict)
-          return ::Oj.load(response.body, symbol_keys: true) if user_options[:response_json]
+          return MultiJson.load(response.body, symbolize_keys: true) if user_options[:response_json]
+
           return response.body
         rescue RestClient::Exception => e
-          
           exception = e
           next
         end
       end
       puts "Restclient error, body = #{exception.response.body}" if exception.respond_to? :response
       raise exception unless user_options[:ensure_no_exception]
+
       {
         status: false,
         message: exception.message,
-        response_code: exception && exception.response.code,
-        response_body: exception && exception.response.body
+        response_code: exception&.response&.code,
+        response_body: exception&.response&.body
       }
     end
 
@@ -100,5 +104,4 @@ module ApiTools
       {} # 子类中复写
     end
   end
-
-end
+end

data/lib/api_tools/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ApiTools
-  VERSION = "0.0.6"
+  VERSION = '0.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api_tools
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - atpking
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-24 00:00:00.000000000 Z
+date: 2019-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,34 +95,34 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: oj
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-description: 常用工具都放这里了
+        version: '2.0'
+description: 简单点
 email:
 - atpking@gmail.com
 executables: []
@@ -164,9 +164,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
-summary: 常用工具集合
+summary: rest 的常用请求
 test_files: []