repres-dosser 1.2 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60aec68e0da81f0486985e4c4a07b298286f0f6a
-  data.tar.gz: e911af85e074591bb3aadafd6c9271b47358ae55
+  metadata.gz: a0f36fbda1d513150d66f62df418774c8094c260
+  data.tar.gz: 115f2058adb44eaf85ef31e020a8a23e581e15b4
 SHA512:
-  metadata.gz: 0689f3ed1af02ba2560f30cf43f5a99dad8bd8561b98381a11d29aa58fefb7bd9ed38bbffa72260de81dcdf742a16cf239aba9ea75894f8b510d334604ecb7b7
-  data.tar.gz: 066bcaf68fbf9bab6b479c54ea142d7ebc4495f50cd9990db49f42e3b145e322ab8744d081d09afd5c18fa792dba204f73668ae6c5b744fecf53b4e268180a3f
+  metadata.gz: b1c8e66c84d9f274da7573d7ca37beaa6f8d9f555f4ab5f547c94e30f3345d09bc7e5cc06e04ba35140842efd96cced2d4ebfdc7cfd106611d313ad53ea4d9d8
+  data.tar.gz: 13a471c003090e390242aac6f10a13035de8fa041f485a4b439456a90ebb6b030f138cdc2a409d2aa73ceedb6541a0fac2c120118cc849b9f8beb12bbb90b120

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

@@ -5,6 +5,7 @@ module Repres::Dosser::Concerns::ResourcePresentation
   CODE_SUCCESS = 'success'.freeze
   CODE_FAILURE = 'failure'.freeze
 
+  CODE_FAILURE_FORBIDDEN       = 'failure-forbidden'.freeze
   CODE_FAILURE_NOT_FOUND       = 'failure-not-found'.freeze
   CODE_FAILURE_WRONG_PARAMETER = 'failure-wrong-parameter'.freeze
   CODE_FAILURE_WRONG_STATE     = 'failure-wrong-state'.freeze
@@ -13,70 +14,131 @@ module Repres::Dosser::Concerns::ResourcePresentation
 
     attr_writer :criteria
 
+    # https://httpstatuses.com/
+    # http://www.restapitutorial.com/httpstatuscodes.html
+    # http://guides.rubyonrails.org/layouts_and_rendering.html#the-status-option
+
     # 200
-    def render_ok(collection: [], success: true, code: self.class::CODE_SUCCESS, message: '成功', size: collection.size, errors: {})
-      result = {
+    def render_ok(
+      success:    true,
+      code:       self.class::CODE_SUCCESS,
+      message:    '成功',
+      collection: [],
+      size:       collection.size,
+      errors:     {})
+      respond_result :ok,
         success:    success,
         code:       code,
         message:    message,
         collection: collection,
         size:       size,
         errors:     errors
-      }
-      respond_result :ok, result
     end
 
     # 201
-    def render_created(collection: [], success: true, code: self.class::CODE_SUCCESS, message: '成功', size: collection.size, errors: {})
-      result = {
+    def render_created(
+      success:    true,
+      code:       self.class::CODE_SUCCESS,
+      message:    '成功',
+      collection: [],
+      size:       collection.size,
+      errors:     {})
+      respond_result :created,
+        success:    success,
+        code:       code,
+        message:    message,
+        collection: collection,
+        size:       size,
+        errors:     errors
+    end
+
+=begin
+    # 204
+    def render_no_content(
+      success:    true,
+      code:       self.class::CODE_SUCCESS,
+      message:    '成功',
+      collection: [],
+      size:       collection.size,
+      errors:     {})
+      respond_result :no_content,
         success:    success,
         code:       code,
         message:    message,
         collection: collection,
         size:       size,
         errors:     errors
-      }
-      respond_result :created, result
     end
+=end
 
     # 400
-    def render_bad_request(success: false, code: self.class::CODE_FAILURE_WRONG_PARAMETER, message: '参数错误', collection: [], size: 0, errors: {})
-      result = {
+    def render_bad_request(
+      success:    false,
+      code:       self.class::CODE_FAILURE_WRONG_PARAMETER,
+      message:    '参数错误',
+      collection: [],
+      size:       collection.size,
+      errors:     {})
+      respond_result :bad_request,
         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(success: false, code: self.class::CODE_FAILURE_WRONG_PARAMETER, message: '参数', parameter_name)
-      result = {
-        success:    false,
-        code:       self.class::CODE_FAILURE_WRONG_PARAMETER,
-        message:    "#{parameter_name}参数不能为空。",
-        collection: [],
-        size:       0,
-        errors:     { parameter_name => [ '不能为空' ] }
-      }
-      respond_result :bad_request, result
+
+    # 401
+    def render_unauthorized(
+      success:    false,
+      code:       self.class::CODE_FAILURE,
+      message:    '请先登录',
+      collection: [],
+      size:       collection.size,
+      errors:     {})
+      respond_result :unauthorized,
+        success:    success,
+        code:       code,
+        message:    message,
+        collection: collection,
+        size:       size,
+        errors:     errors
     end
-=end
+
+    # 403 forbidden
+    def render_forbidden(
+      success:    false,
+      code:       self.class::CODE_FAILURE_FORBIDDEN,
+      message:    '无权访问',
+      collection: [],
+      size:       collection.size,
+      errors:     {})
+      respond_result :forbidden,
+        success:    success,
+        code:       code,
+        message:    message,
+        collection: collection,
+        size:       size,
+        errors:     errors
+    end
+
     # 404
-    def render_not_found(success: false, code: self.class::CODE_FAILURE_NOT_FOUND, message: '没有找到符合条件的信息', collection: [], size: 0, errors: {})
-      result = {
+    def render_not_found(
+      success:    false,
+      code:       self.class::CODE_FAILURE_NOT_FOUND,
+      message:    '没有找到符合条件的信息',
+      collection: [],
+      size:       collection.size,
+      errors:     {})
+      respond_result :not_found,
         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)
@@ -91,19 +153,25 @@ module Repres::Dosser::Concerns::ResourcePresentation
       respond_result :not_found, result
     end
 =end
+
     # 409
-    def render_conflict(success: false, code: self.class::CODE_FAILURE_WRONG_STATE, message: '', collection: [], size: 0, errors: {})
-      result = {
+    def render_conflict(
+      success:    false,
+      code:       self.class::CODE_FAILURE_WRONG_STATE,
+      message:    '',
+      collection: [],
+      size:       collection.size,
+      errors:     {})
+      respond_result :conflict,
         success:    success,
         code:       code,
         message:    message,
         collection: collection,
         size:       size,
         errors:     errors
-      }
-      respond_result :conflict, result
     end
 
+=begin
     # 409 conflict - wrong parameter
     def render_wrong_parameter(success: false, code: self.class::CODE_FAILURE_WRONG_PARAMETER, message: '', collection: [], size: 0, errors: {})
       result = {
@@ -116,9 +184,22 @@ module Repres::Dosser::Concerns::ResourcePresentation
       }
       respond_result :conflict, result
     end
+=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
+    def render_internal_server_error(
+      success:    false,
+      code:       self.class::CODE_FAILURE,
+      message:    '出现临时网络故障，请稍后重试。',
+      collection: [],
+      size:       collection.size,
+      errors:     {})
+      respond_result :internal_server_error,
+        success:    success,
+        code:       code,
+        message:    message,
+        collection: collection,
+        size:       size,
+        errors:     errors
     end
 
     def respond_result(status, result)

data/lib/repres/dosser/version.rb

@@ -1,5 +1,5 @@
 module Repres
   module Dosser
-    VERSION = '1.2'.freeze
+    VERSION = '1.3'.freeze
   end
 end

metadata

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