error_response 0.2.0 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfd7efb20d85b835e242e64e7fee3d633522eefbe1834aedf30295b84b2cfea8
-  data.tar.gz: 9e9013875242b545811ce64585d3cf8f58a33775d773b507125e7cd8934bbaca
+  metadata.gz: cc3fa7849140a231dbc285ef371838efe21a45ec99ae156524a0f54bef763300
+  data.tar.gz: e586365e16c38a5283dd20949d173262710cc1f04102b2e5a5da313a5ae524ff
 SHA512:
-  metadata.gz: ba3d15d0cd86e5fea18fba693fef5b75fae6b8ba409a73b4d377cfa85e45e70d4cf87b116c6c3e78238cb16c047b8da10943b09abe33ece451a24aa83b462deb
-  data.tar.gz: 0aafe71739e97cd17b3fadb3614cf7c3e9fc6a221d77bab5a6bc4960d6e2374c3f9f881756153d333e59078049560268df4e290891d1ba1e4a9276bc263f1df1
+  metadata.gz: 97c32d812b6815bae358426cec75d0e5f6bb8872e05e282de3bc43a3c0d0be6c38e72ce99cf1de4df5bd8177cd9a64cbf77db93817a93f7230d13dc9606d9a4b
+  data.tar.gz: 553814f93c8bfdb03149f4eaf76c9fbe5b39307eab899941b56f5d840c6ae2044b9c08035ed0036dbc7d6d4f4b504cd5ed9d263cdd30732f8bc46e607d11c74b

data/lib/error_response.rb

@@ -1,21 +1,24 @@
 require 'yaml'
 class ErrorResponse
-  GEM_ROOT = File.expand_path("../..", __FILE__)
-  YAML_PATH = 'lib/error_response.yml'
-  EXTEND_DIR = 'lib/error_response/*.yml'
+  YAML_PATH = 'config/error_response.yml'
 
   def self.to_api(key, message=nil)
-    err_json = yaml_hash[key.to_s] || {'error_code' => 500000, 'error_message' => message}
+    err_json = yaml_hash[key.to_s]&.dup
+    if err_json.nil?
+      err_json = {'error_code' => 500000, 'error_message' => message}
+    elsif !message.nil?
+      err_json['error_message'] += ": #{message}"
+    end
 
     status = err_json['error_code'] / 1000
     {
-      'status' => status,
-      'json' => err_json
+      status: status,
+      json: err_json
     }
   end
 
   def self.to_hash(key)
-    yaml_hash[key.to_s]
+    yaml_hash[key.to_s] || {}
   end
 
   def self.all
@@ -24,14 +27,6 @@ class ErrorResponse
 
   private
   def self.yaml_hash
-    return @hash unless @hash.nil?
-
-    @hash = YAML.load_file(File.join(GEM_ROOT,YAML_PATH))
-    Dir.glob(EXTEND_DIR).each do |file|
-      extend_yml = YAML.load_file(file)
-      @hash.merge!(extend_yml)
-    end
-
-    @hash
+    @hash ||= YAML.load_file(YAML_PATH)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: error_response
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.5
 platform: ruby
 authors:
 - jameslee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-19 00:00:00.000000000 Z
+date: 2020-01-08 00:00:00.000000000 Z
 dependencies: []
 description: use for error_response
 email: jameslee@kdanmobile.com
@@ -17,7 +17,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/error_response.rb
-- lib/error_response.yml
 homepage: https://github.com/kdan-mobile-software-ltd/error_response
 licenses:
 - MIT
@@ -37,7 +36,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A tool for API error response

data/lib/error_response.yml

@@ -1,45 +0,0 @@
-wrong_email:
-  error_code: 400_001
-  error_message: user email not correct
-wrong_password:
-  error_code: 400_002
-  error_message: user password not correct
-verify_receipt_failed:
-  error_code: 400_003
-  error_message: receipt verify failed
-resend_confirmation_failed:
-  error_code: 400_004
-  error_message: confirmation mail resend failed
-reset_password_failed:
-  error_code: 400_005
-  error_message: reset password failed
-upload_video_failed:
-  error_code: 400_060
-  error_message: upload video failed
-theme_not_found:
-  error_code: 400_061
-  error_message: current theme is not found
-client_not_found:
-  error_code: 403_001
-  error_message: door_keeper client not found
-access_token_invalid:
-  error_code: 403_002
-  error_message: door_keeper access_token invalid
-user_forbidden:
-  error_code: 403_003
-  error_message: not enough privilege to access data
-provider_not_allow:
-  error_code: 403_004
-  error_message: third-party provider is not allow
-third_party_missing_email:
-  error_code: 403_005
-  error_message: third party login is missing email
-email_existed:
-  error_code: 409_001
-  error_message: email already existed
-email_confirmed:
-  error_code: 409_002
-  error_message: email already confirmed
-preview_processing:
-  error_code: 418_001
-  error_message: preview processing, please try it later