error_response 0.2.6 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0f90a8aea1f1e2d6f12af804b4ae00a5ccd94b28dbb5a6ffd43409fa146c430
-  data.tar.gz: 8c7beb929a1b26a171620e5775821f826bd20ecf4a472dda785935c07f90863f
+  metadata.gz: ebe8d02da14d5ee8e61570632107f19771e72abecde069d7135bb34c605ab690
+  data.tar.gz: e474c47b4ea2a7451706d07323cd1b0cd62c29a04abba20b5cdfb184c8d616fe
 SHA512:
-  metadata.gz: 2bc4768ae9f29f625c921f780e0d8149d880b531d16910f637ed889ec38a3f98ef3bc00522d1d295ed7b856924561181bd6db9a9b418d7aa94dc7228b0fb2487
-  data.tar.gz: '019c8cf0ff9b531903520730ec3af687a93543c0d95700e030525e46e3867313d76549477e50b57edae5b4a785ef507c653e638a9711a1bd9ec37099bbf90495'
+  metadata.gz: 51fa6d71acb509c7713c19089a5cfa431a25adc6866fbb4db52c775fa08cd3117b40b9e8be0ad91059b3c8a099bbb3df3f2b95ef4ce310ca1797b2761ec4be32
+  data.tar.gz: 68e1fb3cafb7f2d42e7e1595dab4404d71e1e1c10ccbeabe4ce20acd23148a5a0e9980fe842cb91ac2480d295e2e148126fbae2ef9215d91a7856f9fe827b192

data/lib/error_response.rb

@@ -1,39 +1,47 @@
 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_hash = settings['source']['local'].map { |path| YAML.load_file(path) }.inject(&:merge)
+    remote_hash = settings['source']['remote'].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.6
+  version: 1.0.0
 platform: ruby
 authors:
-- jameslee
+- Kdan Mobile Software Developer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-14 00:00:00.000000000 Z
+date: 2020-08-24 00:00:00.000000000 Z
 dependencies: []
 description: use for error_response
-email: jameslee@kdanmobile.com
+email: dev@kdanmobile.com
 executables: []
 extensions: []
 extra_rdoc_files: []