error_response 0.2.7 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5d432ebcabf92071c87523400f57e48da9a9f8661de3d3b8a876e4c4a3af55d
-  data.tar.gz: 7ec2778e10bfbbeb747a034b5a3cdb40fd380a7799d6cc96a688bbc628646c06
+  metadata.gz: 4337265a4915af5e2401a44cc42d65a309e46152ea9a565a72e8ac2ee4428c6d
+  data.tar.gz: ab9ec645f4cd894f493ba8df370fc944a57e5c464e17da29659ce3193c0e75a8
 SHA512:
-  metadata.gz: d77aa5697bd27a238f131d655e46ded35a6a57206e35697a30919151daa3586fed19cc247b9a713299af4a22aa087a06ab92d0ee77356ec6fb1a27f7a109e707
-  data.tar.gz: c6ce5a07d41871ee19f67cc31735a5537db8c8288f1c558bb1ede8f97290563962914a0fdd83253fa6ae202e2cd206851d589f8cf3c90228395d0ea0110adace
+  metadata.gz: 287974143f9c2c9cd714e9ba26f3f700cf709884cb0af76badc24abab2fdf4edef9d9ef0fd3253bddba16d7dbe026d33d62d1b47a7a9eca1762ffbb20ec7004a
+  data.tar.gz: c808a0de1c3cdd652105a323e1b709dda8a2128c70453015a020158eb80c2733896ce12a6343f1f06c3b6bba44ddd8161d30ad61a7caeed9d60a2ac6b4ec13e4

data/lib/error_response.rb

@@ -1,39 +1,50 @@
 require 'yaml'
+require 'open-uri'
+
 class ErrorResponse
-  YAML_PATH = 'config/error_response.yml'
+  SETTING_PATH = 'config/error_response.yml'
 
-  def self.to_api(key, message=nil)
-    err_json = yaml_hash[key.to_s]&.dup
-    err_json['error_key'] = key.to_s if !err_json.nil? && !key.nil? && yaml_hash.key?(key.to_s)
-    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
-    }
+  def self.all
+    yaml_hash
   end
 
   def self.to_hash(key)
-    if yaml_hash.key?(key.to_s)
-      result = yaml_hash[key.to_s]
-      result['error_key'] = key.to_s
-    else
-      result = nil
-    end
-    result
+    return unless yaml_hash.key?(key.to_s)
+    yaml_hash[key.to_s].merge({ 'error_key' => key.to_s })
   end
 
-  def self.all
-    yaml_hash
+  def self.to_api(key, message=nil)
+    default_result = {
+      status: 500,
+      json: { 'error_code' => 500_000, 'error_message' => message }
+    }
+    return default_result unless yaml_hash.key?(key.to_s)
+
+    json = yaml_hash[key.to_s].merge({ 'error_key' => key.to_s })
+    json['error_message'] += ": #{message}" unless message.nil?
+    {
+      status: json['error_code'] / 1_000,
+      json: json
+    }
   end
 
   private
+
   def self.yaml_hash
-    @hash ||= YAML.load_file(YAML_PATH)
+    return @hash unless @hash.nil?
+
+    settings = YAML.load(File.read(SETTING_PATH))
+    local_array = settings['source']['local']
+    local_hash = local_array.nil? ? {} : local_array.map { |path| YAML.load_file(path) }.inject(&:merge)
+
+    remote_array = settings['source']['remote']
+    remote_hash = remote_array.nil? ? {} : remote_array.map { |url| build_yaml(url) }.inject(&:merge)
+    
+    @hash = local_hash.merge(remote_hash)
+  end
+
+  def self.build_yaml(url)
+    content = open(url){|f| f.read}
+    YAML.load(content)
   end
-end
+end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: error_response
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 1.0.1
 platform: ruby
 authors:
-- jameslee
+- Kdan Mobile Software Developer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-13 00:00:00.000000000 Z
+date: 2020-08-25 00:00:00.000000000 Z
 dependencies: []
 description: use for error_response
-email: jameslee@kdanmobile.com
+email: dev@kdanmobile.com
 executables: []
 extensions: []
 extra_rdoc_files: []