repres-dosser 1.0 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb97dc4a3abaf0e284039001f0109caad69abad5
-  data.tar.gz: 424747fa8803fb1ca26f57556f5f3787bc2b269d
+  metadata.gz: 6153f9e377681b5028abe1818c8e354879f46688
+  data.tar.gz: d1e2f801d3eac57b74f5de88a8edf1d8596449ca
 SHA512:
-  metadata.gz: d8d4304c26fe93ca8c7df9346cbac2b0a78e78e57f18f6419cc62bb06ea3ddbd4bfaa654df0594f7bc615f19d6cd8aef80326ba77c8a2e939891af5893271169
-  data.tar.gz: 8d0fafe8985be64dbd52ec1f418ca26f30e05e2301455e64d2e08a6c142fe12c73330fc4e1963f0efdc091898c978b69c9f9e3f099532c819722fa0da1a728f1
+  metadata.gz: d9ba25ab3a9b8e9a100a721f007c5869fdb9e7d671fc52e75bcc9d4a335e0c4eaf8e4a8db0096c036ed4572246a7d29a4a598e6e9ec4eb4c6f9ecd361172e7cd
+  data.tar.gz: 1f7274365ee57a623917191e1c0eac1ecf03f3214711fc09de8a9ce6f7d46dc629094993cb82c37432ef93d9d0e42ae9cbf7bd7f8a60dfdd2defdd689439b3a3

data/README.md

@@ -25,6 +25,6 @@ include Repres::Dosser::Concerns::ResourcePresentation
 
 def index
   self.criteria = { page: params[:page] }
-  render_ok [ { name: 'Topbit' }, { name: 'Roland' } ]
+  render_ok collection: [ { name: 'Topbit' }, { name: 'Roland' } ]
 end
 ```

data/app/controllers/repres/dosser/concerns/resource_presentation.rb

@@ -14,46 +14,46 @@ module Repres::Dosser::Concerns::ResourcePresentation
     attr_writer :criteria
 
     # 200
-    def render_ok(collection, size = collection.size, message = nil)
+    def render_ok(collection: [], success: true, code: self.class::CODE_SUCCESS, message: '成功', size: collection.size, errors: {})
       result = {
-        success:    true,
-        code:       self.class::CODE_SUCCESS,
-        message:    message||'成功。',
+        success:    success,
+        code:       code,
+        message:    message,
         collection: collection,
         size:       size,
-        errors:     {}
+        errors:     errors
       }
       respond_result :ok, result
     end
 
     # 201
-    def render_created(collection, size = collection.size, message = nil)
+    def render_created(collection: [], success: true, code: self.class::CODE_SUCCESS, message: '成功', size: collection.size, errors: {})
       result = {
-        success:    true,
-        code:       self.class::CODE_SUCCESS,
-        message:    message||'创建成功。',
+        success:    success,
+        code:       code,
+        message:    message,
         collection: collection,
         size:       size,
-        errors:     {}
+        errors:     errors
       }
       respond_result :created, result
     end
 
     # 400
-    def render_bad_request(errors, code = nil, message = nil, collection = [], size = 0)
+    def render_bad_request(success: false, code: self.class::CODE_FAILURE_WRONG_PARAMETER, message: '参数错误', collection: [], size: 0, errors: {})
       result = {
-        success:    false,
-        code:       code||self.class::CODE_FAILURE_WRONG_PARAMETER,
-        message:    message||'参数出错。',
+        success:    success,
+        code:       code,
+        message:    message,
         collection: collection,
         size:       size,
         errors:     errors
       }
       respond_result :bad_request, result
     end
-
+=begin
     # 400 bad request - blank parameter
-    def render_blank_parameter(parameter_name)
+    def render_blank_parameter(success: false, code: self.class::CODE_FAILURE_WRONG_PARAMETER, message: '参数', parameter_name)
       result = {
         success:    false,
         code:       self.class::CODE_FAILURE_WRONG_PARAMETER,
@@ -64,20 +64,20 @@ module Repres::Dosser::Concerns::ResourcePresentation
       }
       respond_result :bad_request, result
     end
-
+=end
     # 404
-    def render_not_found(errors, message = nil, collection = [], size = 0)
+    def render_not_found(success: false, code: self.class::CODE_FAILURE_NOT_FOUND, message: '没有找到符合条件的信息', collection: [], size: 0, errors: {})
       result = {
-        success:    false,
-        code:       self.class::CODE_FAILURE_NOT_FOUND,
-        message:    message||'没有找到符合条件的信息。',
+        success:    success,
+        code:       code,
+        message:    message,
         collection: collection,
         size:       size,
         errors:     errors
       }
       respond_result :not_found, result
     end
-
+=begin
     # 404 not found - inexistent
     def render_inexistent(parameter_name, message)
       result = {
@@ -90,12 +90,12 @@ module Repres::Dosser::Concerns::ResourcePresentation
       }
       respond_result :not_found, result
     end
-
+=end
     # 409
-    def render_conflict(errors, message, collection = [], size = 0)
+    def render_conflict(success: false, code: self.class::CODE_FAILURE_WRONG_STATE, message: '', collection: [], size: 0, errors: {})
       result = {
-        success:    false,
-        code:       self.class::CODE_FAILURE_WRONG_STATE,
+        success:    success,
+        code:       code,
         message:    message,
         collection: collection,
         size:       size,
@@ -105,10 +105,10 @@ module Repres::Dosser::Concerns::ResourcePresentation
     end
 
     # 409 conflict - wrong parameter
-    def render_wrong_parameter(errors, message, collection = [], size = 0)
+    def render_wrong_parameter(success: false, code: self.class::CODE_FAILURE_WRONG_PARAMETER, message: '', collection: [], size: 0, errors: {})
       result = {
-        success:    false,
-        code:       self.class::CODE_FAILURE_WRONG_PARAMETER,
+        success:    success,
+        code:       code,
         message:    message,
         collection: collection,
         size:       size,
@@ -117,6 +117,10 @@ module Repres::Dosser::Concerns::ResourcePresentation
       respond_result :conflict, result
     end
 
+    def render_internal_server_error(success: false, code: self.class::CODE_FAILURE, message: '出现临时网络故障，请稍后重试。', collection: [], size: 0, errors: {})
+      respond_result :conflict, success: success, code: code, message: message, collection: collection, size: size, errors: errors
+    end
+
     def respond_result(status, result)
       result[:meta] = { request_id: request.uuid, criteria: @criteria }
       respond_to do |format|

data/lib/repres/dosser/version.rb

@@ -1,5 +1,5 @@
 module Repres
   module Dosser
-    VERSION = '1.0'.freeze
+    VERSION = '1.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: repres-dosser
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails