out_put 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5eb4abc2cead8a3b3f71d44018f0d4effc25229b
-  data.tar.gz: eebd9c033b8bab41a2c8f293b6b38cf281b84cfa
+  metadata.gz: 8b5565a2cfe9fabb5a97d40b9bc7c2f512fcad54
+  data.tar.gz: f57098b58b8d4ba72d8c7536bfd89e9712b670bb
 SHA512:
-  metadata.gz: b933aeeaf70c301eac67f472eb3380916d78d4799cd7868773f4632aebb8c2e4752ed32b5b9ec087bc356648283da316a16df007c4dfb78c5f8f74e034e5c8a8
-  data.tar.gz: ec751a39a1c4d5e8b6c85d763bf5e1dedd8e3053da4c41da7450ff6778bdd850e3584ab50126c3f35aedced4a9258eed44c56be2b5dae4f4195c1419d07a25dd
+  metadata.gz: 79c6083a2d017dc7831c4d07e5bf2dec795e7143e4041f49684d5652eab88f8024d8d5ca90ddd7e31e0bf9938b1393da7d6d80eaa991facb6f63494eb2bcae24
+  data.tar.gz: d56be4ee9103076c9c7850c227611b3f64862576e40fc287d20d42bad8134f6e26cd6d80d816f837580f8433ae9d7cb1cd79d73767d68d44d798c06539aefcb5

data/lib/out_put/config.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module OutPut
   class Config
-    cattr_accessor :project_code do
-      0
-    end
+    cattr_accessor :project_code, default: 0
 
     cattr_accessor :pagination_for
+
+    cattr_accessor :request_id, default: nil
   end
 end

data/lib/out_put/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OutPut
-  VERSION = '2.2.1'
+  VERSION = '2.3.0'
 end

data/lib/out_put/view.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OutPut
   class View < Hash
     def initialize(code, msg)

data/lib/out_put.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'out_put/version'
 require 'out_put/config'
 require 'out_put/view'
@@ -6,19 +8,13 @@ module OutPut
   def output(code = 0, msg = '', only: nil, http: 200, cache: nil, **data, &block)
     if !code.is_a?(Integer) && code.respond_to?(:info)
       only = code.info[:only]
-      code, msg, http = code.info.slice(:code, :msg, :http).values
+      code, msg, http, data = code.info.values_at(:code, :msg, :http, :data)
     elsif cache && block_given?
       data, only = _output_cache(cache, data: data, only: only, &block)
     end
 
-    return render json: only.except(:http), status: only[:http] || http if only.present?
-
-    code = code.zero? ? 0 : Config.project_code + code
-    msg = 'success' if msg.blank? && code.zero?
-    render json: {
-        result: { code: code, message: msg },
-        data: _output_data(data)
-    }, status: http
+    return rendrer json: only.except(:http), status: only[:http] || http if only.present?
+    render json: { result: _output_result(code, msg), data: _output_data(data) }, status: http
   end
 
   alias ok         output
@@ -31,13 +27,22 @@ module OutPut
     # Then jump to your view
   end
 
+  # ***
+
+  def _output_result(code, msg)
+    # code = code.zero? ? 0 : Config.project_code + code
+    msg = 'success' if msg.blank? && code.zero?
+    msg = "[#{instance_exec(&Config.request_id)}] #{msg}" if Config.request_id && !code.zero?
+    { code: code, message: msg }
+  end
+
   def _output_data(data)
-    if data.key?(Config.pagination_for)
+    if data&.key?(Config.pagination_for)
       # TODO now is only for AR
       data.merge!(total: data[Config.pagination_for].try(:unscoped).count)
     end
 
-    data
+    data || { }
   end
 
   def _output_cache(time, data: { }, only: nil, &block)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: out_put
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - zhandao
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-16 00:00:00.000000000 Z
+date: 2019-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler