business_error 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fd914c847e67a508989e809dd25ae32fa9028ec
-  data.tar.gz: c6ca6e67e12fd2f25defb9aca0bd3bc34d1d3a3e
+  metadata.gz: 16354b17905dbbf9aa01fc5e27b684397e0c57f4
+  data.tar.gz: d5f4827588df4529019a69c3b6be71f4ba0798e8
 SHA512:
-  metadata.gz: 0aae1f680684090805bab33b9a2d3b98519e6add149bd9c4f8e12ec2364c28257cfe37fd81f29e44fdb75ae529f27314e23ab0261662b375ba541cbad756984d
-  data.tar.gz: 5d62dcfe75cba0eb7560ffb6186e6b26049f2dbcd77f8f7758d2e44007a2aac26969ec6fda63f5b5b0a0511c536c7c20186c5676a844cc39f8a83e1e80b6672f
+  metadata.gz: b498e72e19e195a50da503f2eb970c1eaebd036e35318a3b8efef0cf90d42d98100c5e867d3f0587c1ea33b3979234ddb35455e63ff7165a4ed7f7f5903e4734
+  data.tar.gz: e9de33d63b68499e5058096329e81b25f938bdbfaec8e83b25c66a134d5bc23ecc8e29ab5de56e4884aba2b07e73ebe3c564922d253ccfad00f8f09304f42752

data/.gitignore

@@ -12,3 +12,4 @@
 
 .idea/*
 .DS_Store
+Gemfile.lock

data/business_error.gemspec

@@ -21,6 +21,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "request_store"
+
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

data/lib/business_error.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+require 'request_store'
+
 require 'business_error/version'
 require 'business_error/error'
 require 'business_error/config'
@@ -6,12 +9,18 @@ module BusinessError
   cattr_accessor(:defs_tree) { { } }
   attr_accessor :defs
 
-  def mattr_reader name, message = '', code = _get_code, http: _get_http, group: _get_group
-    message = name.to_s.humanize if message.blank?
+  def mattr_reader name,
+                   message = name.to_s.humanize,
+                   code = _get_code,
+                   http: _get_http,
+                   group: _get_group,
+                   format: @format
+    define_singleton_method(name) do |locale = _get_locale|
+      msg = message.is_a?(Hash) ? (message[locale] || message[:en]) : message
+      Error.new(name, msg, code, http, format)
+    end
 
-    define_singleton_method(name) { Error.new(name, message, code, http) }
-    # TODO raise Error, name, message, code
-    define_singleton_method("#{name}!") { raise Error.new(name, message, code, http) }
+    define_singleton_method("#{name}!") { send(name).throw! }
 
     defs_tree[self.name] ||= { }
     (defs_tree[self.name][group] ||= [ ]) << { name: name, msg: message, code: code, http: http }
@@ -20,20 +29,11 @@ module BusinessError
 
   alias_method :define, :mattr_reader
 
-  def group group_name = :private, code_start_at = @code, http: _get_http, &block
-    @group_name, @code, @http, group_name, code_start_at, http = group_name, code_start_at, http, @group_name, @code, @http
+  def group group_name = :private, code_start_at = @code, http: _get_http, format: @format, &block
+    @group_name, @code, @http, @format, group_name, code_start_at, http, format =
+        group_name, code_start_at, http, format, @group_name, @code, @http, @format
     instance_eval(&block)
-    @group_name, @code, @http = group_name, code_start_at, http
-  end
-
-  def _get_group
-    @group_name || :public
-  end
-
-  def _get_code
-    raise ArgumentError, 'Should give a code to define your business error' if (code = @code).nil?
-    @code = @code < 0 ? (code - 1) : (code + 1)
-    code
+    @group_name, @code, @http, @format = group_name, code_start_at, http, format
   end
 
   def code_start_at code
@@ -44,8 +44,8 @@ module BusinessError
     @http_status = status_code
   end
 
-  def _get_http
-    @http_status || Config.default_http_status
+  def format template
+    @format = template
   end
 
   def define_px name, message = '', code = _get_code, http: _get_http
@@ -72,4 +72,24 @@ module BusinessError
   def all
     puts defs_tree.stringify_keys.to_yaml.gsub(' :', ' ')
   end
+
+  # ===
+
+  def _get_group
+    @group_name || :public
+  end
+
+  def _get_code
+    raise ArgumentError, 'Should give a code to define your business error' if (code = @code).nil?
+    @code = @code < 0 ? (code - 1) : (code + 1)
+    code
+  end
+
+  def _get_http
+    @http_status || Config.default_http_status
+  end
+
+  def _get_locale
+    RequestStore.store[:err_locale] ||= 'en'
+  end
 end

data/lib/business_error/config.rb

@@ -1,11 +1,9 @@
+# frozen_string_literal: true
+
 module BusinessError
   class Config
-    cattr_accessor :formats do
-      { }
-    end
-
-    cattr_accessor :default_http_status do
-      200
-    end
+    cattr_accessor :formats, default: { }
+    cattr_accessor :default_format, default: nil
+    cattr_accessor :default_http_status, default: 200
   end
 end

data/lib/business_error/error.rb

@@ -1,18 +1,25 @@
+# frozen_string_literal: true
+
 require 'business_error/config'
 
 module BusinessError
   class Error < StandardError
-    attr_accessor :name, :msg, :code, :http_status
+    attr_accessor :name, :msg, :code, :http_status, :format
 
-    def initialize(name, msg, code, http_status = Config.default_http_status)
+    def initialize(name, msg, code, http_status = Config.default_http_status, format = Config.default_format)
       msg = name.to_s.humanize if msg.blank?
       @name, @msg, @code, @http_status = name, msg, code, http_status
+      self.format = format
     end
 
     def info
       @info ||= { code: @code, msg: @msg, http: @http_status }
     end
 
+    def throw!
+      format ? format!(format) : (raise self)
+    end
+
     def format!(template, **addition_content)
       content = Config.formats[template].each_with_index.map { |k, i| [k, info.values[i]] }.to_h
       @info = { only: content.merge(addition_content) }
@@ -22,7 +29,7 @@ module BusinessError
     alias render! format!
 
     def with!(**addition_content)
-      info.merge!(addition_content)
+      info.merge!(data: addition_content)
       raise self
     end
 

data/lib/business_error/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BusinessError
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: business_error
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - zhandao
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-15 00:00:00.000000000 Z
+date: 2019-06-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: request_store
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -64,7 +78,6 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,35 +0,0 @@
-PATH
-  remote: .
-  specs:
-    business_error (1.0.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.3)
-    rake (10.5.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.16)
-  business_error!
-  rake (~> 10.0)
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   1.16.6