out_put 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8b5565a2cfe9fabb5a97d40b9bc7c2f512fcad54
-  data.tar.gz: f57098b58b8d4ba72d8c7536bfd89e9712b670bb
+SHA256:
+  metadata.gz: 6263458e404b6c61cabd1e5474ccbbc2eb5546fed9c4e41b87467cf4d8859b46
+  data.tar.gz: 661005b6445528f58106a0485b9479f94b86575a0190504ac485c16a5a845eb2
 SHA512:
-  metadata.gz: 79c6083a2d017dc7831c4d07e5bf2dec795e7143e4041f49684d5652eab88f8024d8d5ca90ddd7e31e0bf9938b1393da7d6d80eaa991facb6f63494eb2bcae24
-  data.tar.gz: d56be4ee9103076c9c7850c227611b3f64862576e40fc287d20d42bad8134f6e26cd6d80d816f837580f8433ae9d7cb1cd79d73767d68d44d798c06539aefcb5
+  metadata.gz: 1f4d8c0d385525cff1d423edee752d92c6412361c1bcffc28bb34b1730c2b470bd52a512c5ca0586d005c7940182efc9a5f23134775f61f8e1821637a2a90604
+  data.tar.gz: 909430d54859890ca183be0fb2262d481afe974c2f58dac58ea50ae8993762bd056f5b817ae462848272df616296ec4517ca969212d391d5bd107e77fd71eda1

data/lib/out_put.rb

@@ -5,7 +5,8 @@ require 'out_put/config'
 require 'out_put/view'
 
 module OutPut
-  def output(code = 0, msg = '', only: nil, http: 200, cache: nil, **data, &block)
+  def output(code = 0, msg = '', only: nil, http: 200, cache: nil, data: nil, **d, &block)
+    data ||= d || { }
     if !code.is_a?(Integer) && code.respond_to?(:info)
       only = code.info[:only]
       code, msg, http, data = code.info.values_at(:code, :msg, :http, :data)
@@ -13,8 +14,8 @@ module OutPut
       data, only = _output_cache(cache, data: data, only: only, &block)
     end
 
-    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
+    return render json: only.except(:http), status: only[:http] || http if only.present?
+    render json: { result: _output_result(code, msg), data: data }, status: http
   end
 
   alias ok         output
@@ -36,15 +37,6 @@ module OutPut
     { code: code, message: msg }
   end
 
-  def _output_data(data)
-    if data&.key?(Config.pagination_for)
-      # TODO now is only for AR
-      data.merge!(total: data[Config.pagination_for].try(:unscoped).count)
-    end
-
-    data || { }
-  end
-
   def _output_cache(time, data: { }, only: nil, &block)
     cached = Rails.cache.fetch("output/#{action_name}", expires_in: time) do
       instance_eval(&block)

data/lib/out_put/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: out_put
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - zhandao
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-03 00:00:00.000000000 Z
+date: 2019-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Render JSON response in a unified format