cmcc_hxy 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bd2ac9ea657119d886c6603654661fb99c666ab06dac227bd3091b6560c11db
-  data.tar.gz: 38eebbbde7b839491f5cff2c5313254c96cef521d38ba62475c6aff0c6e33e96
+  metadata.gz: 984f0fe27aae09d51cbccf73b62fe2ca7e1a48372349108c434b995ad40db484
+  data.tar.gz: '086cd02e91661014e756532606bf97aeb47090f20f8c883f413ca5500fc28be0'
 SHA512:
-  metadata.gz: f39de22d0ac1140f48731ecc4bbbc1ee5a4e60360094d97c01a1bebe2dd6b85586fb920b7d27f4639f53bcc2ee6509c4d3a74be8d592c8044e0c07528e8dc4fa
-  data.tar.gz: 228abea7a4f295108eaf8238f021a593431a9aea333b5d4c0e1c957cdb66bbcf3d6eb79fac312c13cc777ca78bd7fe1ce12328338960184aebe6068b57bf3e2e
+  metadata.gz: d1eb30f68f8e50b1962e55bd2b5dd88599ee0e69302a7892ae6dcb397f00d6685598bc7e314fc9e83a562da37a055538431688a81dec40cfa81713948d93902b
+  data.tar.gz: f1528e3e91219cba965eb878f6ede988d078901895c90dc6e18aad57ca14b5f9644f5f3db5f2cfd3459d5dba99cdb72bb397d67298fe84429d9e780be8a98861

data/cmcc_hxy.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", "~> 2.1.4"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "webmock", "~> 3.8.3"

data/lib/cmcc_hxy/client.rb

@@ -82,6 +82,6 @@ class CmccHxy::Client
   private
 
   def request(url, params)
-    CmccHxy::RestClient.new(:get, url, params).request
+    CmccHxy::RestClient.get(url, params)
   end
 end

data/lib/cmcc_hxy/rest_client.rb

@@ -3,22 +3,30 @@ require 'rest-client'
 require 'cmcc_hxy/error'
 
 class CmccHxy::RestClient
-  def initialize(method, url, params)
-    @method, @url, @params = method, url, params
-  end
+  class << self
+    def get(url, params)
+      request { RestClient.get(url, params) }
+    end
 
-  def request
-    response = RestClient::Request.execute(method: @method, url: @url, headers: {params: @params})
-    result = JSON.parse(response)
-  rescue JSON::ParserError
-    raise CmccHxy::Error.new("移动和校园 JSON 解析出错")
-  rescue RestClient::ExceptionWithResponse => e
-    raise CmccHxy::Error.new("移动和校园请求出错 #{e.response.code}")
-  else
-    if response.code == 200 && result.is_a?(Hash) && result.key?('error_code')
-      raise CmccHxy::Error.new(result.fetch('error_msg'))
+    def post(url, params)
+      request { RestClient.post(url, params) }
     end
 
-    result
+    private
+
+    def request
+      response = yield
+      result = JSON.parse(response)
+
+      if response.code == 200 && result.is_a?(Hash) && result.key?('error_code')
+        raise CmccHxy::Error.new(result.fetch('error_msg'))
+      end
+
+      result
+    rescue JSON::ParserError
+      raise CmccHxy::Error.new("移动和校园 JSON 解析出错")
+    rescue RestClient::ExceptionWithResponse => e
+      raise CmccHxy::Error.new("移动和校园请求出错 #{e.response.code}")
+    end
   end
 end

data/lib/cmcc_hxy/sms_client.rb

@@ -36,7 +36,7 @@ class CmccHxy::SmsClient
       }.to_json
     }
 
-    CmccHxy::RestClient.new(:post, url, params).request
+    CmccHxy::RestClient.post(url, params)
   end
 
   # 接口权限：系统接口，需要分配权限才能调用
@@ -69,7 +69,7 @@ class CmccHxy::SmsClient
       Data: {appid: @appid, smssn: smssn}.to_json
     }
 
-    CmccHxy::RestClient.new(:post, url, params).request
+    CmccHxy::RestClient.post(url, params)
   end
 
   private

data/lib/cmcc_hxy/version.rb

@@ -1,3 +1,3 @@
 class CmccHxy
-  VERSION = "0.2.0".freeze
+  VERSION = "0.2.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmcc_hxy
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - zidcn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-02 00:00:00.000000000 Z
+date: 2020-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement