out_put 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c39b950419b24b87b7be771a242866ca754b66d4
-  data.tar.gz: e91476c98ce8e57c1f99f65ae5984adced45a407
+  metadata.gz: 5eb4abc2cead8a3b3f71d44018f0d4effc25229b
+  data.tar.gz: eebd9c033b8bab41a2c8f293b6b38cf281b84cfa
 SHA512:
-  metadata.gz: b71f6421cbcf135c415fe436336d5bd9bcd4c904d2c22246714008c17b5471b78219fa93fa89efcc56c8ec9d236480e8568182abe1e0ee98b1d49819ecadab58
-  data.tar.gz: 233b32f3cd0bad137225e799d3a68073975aa8458fcee54e7f6fda33eadeba538611850a7a28985496f86c8b6869593f5ba72418808e473e1fb667f4a9659bcc
+  metadata.gz: b933aeeaf70c301eac67f472eb3380916d78d4799cd7868773f4632aebb8c2e4752ed32b5b9ec087bc356648283da316a16df007c4dfb78c5f8f74e034e5c8a8
+  data.tar.gz: ec751a39a1c4d5e8b6c85d763bf5e1dedd8e3053da4c41da7450ff6778bdd850e3584ab50126c3f35aedced4a9258eed44c56be2b5dae4f4195c1419d07a25dd

data/.gitignore

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

data/lib/out_put.rb

@@ -5,12 +5,13 @@ require 'out_put/view'
 module OutPut
   def output(code = 0, msg = '', only: nil, http: 200, cache: nil, **data, &block)
     if !code.is_a?(Integer) && code.respond_to?(:info)
-      code, msg, http, only = code.info.slice(:code, :msg, :http, :only).values
+      only = code.info[:only]
+      code, msg, http = code.info.slice(:code, :msg, :http).values
     elsif cache && block_given?
       data, only = _output_cache(cache, data: data, only: only, &block)
     end
 
-    return render json: only, status: http if only.present?
+    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?
@@ -26,7 +27,7 @@ module OutPut
   alias error_with output
 
   def build_with(code = 0, msg = 'success', **data)
-    @view = View.new(code, msg, **data)
+    (@view ||= View.new(code, msg)).merge!(data)
     # Then jump to your view
   end
 
@@ -44,6 +45,6 @@ module OutPut
       instance_eval(&block)
     end
 
-    [ data.merge(cached), only&.merge(cached[:only]) ]
+    [ data.merge(cached), cached&.[](:only)&.merge(only || { }) ]
   end
 end

data/lib/out_put/version.rb

@@ -1,3 +1,3 @@
 module OutPut
-  VERSION = '2.2.0'
+  VERSION = '2.2.1'
 end

data/lib/out_put/view.rb

@@ -1,10 +1,7 @@
 module OutPut
   class View < Hash
-    attr_accessor :data
-
-    def initialize(code, msg, **data)
-      self.data = data
-      self.merge!(code: code, msg: msg, **data)
+    def initialize(code, msg)
+      self.merge!(code: code, msg: msg)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: out_put
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - zhandao
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-22 00:00:00.000000000 Z
+date: 2018-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,7 +64,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:
-    out_put (2.2.0)
-
-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)
-  out_put!
-  rake (~> 10.0)
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   1.16.6