Merge pull request #25 from mmoaay/develop

Develop
mmoaay · Nov 29, 2017 · 617c729 · 617c729
2 parents fd24a4f + 9b5ef8f
commit 617c729
Show file tree

Hide file tree

Showing 6 changed files with 158 additions and 13 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,20 @@
+### Check List
+
+Thanks for considering to open an issue. Before you submit your issue, please confirm these boxes are checked.
+
+- [ ] I have read the [README.md](https://github.com/mmoaay/Bamboots/blob/master/README.md), but there is no information I need.
+- [ ] I have searched in [existing issues](https://github.com/mmoaay/Bamboots/issues?utf8=%E2%9C%93&q=is%3Aissue), but did find a same one.
+
+### Issue Description
+
+#### Description
+
+[Tell us about the issue]
+
+#### Reproduce
+
+[The steps to reproduce this issue. What are the parameters, where did you put your code, etc.]
+
+#### Other Comment
+
+[Add anything else here]
diff --git a/Bamboots/Classes/Response/Response.swift b/Bamboots/Classes/Response/Response.swift
@@ -25,17 +25,22 @@ public extension DataRequest {
         completionHandler: ((JSONErrorable) -> Void)? = nil
         ) -> Self {
         return response(completionHandler: { (response: DefaultDataResponse) in
-            if let err = response.error {
+            if let err = response.error { // Network error
                 warn.show(error: err.localizedDescription)
             }
         }).responseObject(keyPath:error.rootPath, completionHandler: { (response: DataResponse<T>) in
-            if let err = response.result.value {
-                print(err)
-                if let code = err.code {
-                    if true == error.successCodes.contains(code) {
-                        completionHandler?(err)
+            if let err = response.error { // Serialize error
+                warn.show(error: err.localizedDescription)
+            } else {
+                if let err = response.result.value {
+                    if let code = err.code {
+                        if true == error.successCodes.contains(code) { // User handled error code
+                            completionHandler?(err)
+                        } else {
+                            warn.show(error: err)
+                        }
                     } else {
-                        warn.show(error: err)
+                        print("Parse error code failed")
                     }
                 }
             }
@@ -50,7 +55,6 @@ public extension DataRequest {
     /// - Returns: The request.
     @discardableResult
     func inform<T: JSONErrorable>(error: T, inform: Informable) -> Self {
-
         return responseObject(keyPath: error.rootPath) { (response: DataResponse<T>) in
             if let err = response.result.value {
                 if let code = err.code {

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at mmoaay@sina.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,70 @@
+# Contributing Guidelines
+
+This document contains information and guidelines about contributing to this project.
+Please read it before you start participating.
+
+**Topics**
+
+* [Asking Questions](#asking-questions)
+* [Reporting Issues](#reporting-issues)
+* [Developers Certificate of Origin](#developers-certificate-of-origin)
+
+## Asking Questions
+
+We don't use GitHub as a support forum.
+For any usage questions that are not specific to the project itself,
+please ask on [Stack Overflow](https://stackoverflow.com) instead.
+By doing so, you'll be more likely to quickly solve your problem,
+and you'll allow anyone else with the same question to find the answer.
+This also allows maintainers to focus on improving the project for others.
+
+## Reporting Issues
+
+A great way to contribute to the project
+is to send a detailed issue when you encounter an problem.
+We always appreciate a well-written, thorough bug report.
+
+Check that the project issues database
+doesn't already include that problem or suggestion before submitting an issue.
+If you find a match, add a quick "+1" or "I have this problem too."
+Doing this helps prioritize the most common problems and requests.
+
+When reporting issues, please include the following:
+
+* The version of Xcode you're using
+* The version of iOS or macOS you're targeting
+* The full output of any stack trace or compiler error
+* A code snippet that reproduces the described behavior, if applicable
+* Any other details that would be useful in understanding the problem
+
+This information will help us review and fix your issue faster.
+
+## Developer's Certificate of Origin
+
+By making a contribution to this project, I certify that:
+
+- (a) The contribution was created in whole or in part by me and I
+      have the right to submit it under the open source license
+      indicated in the file; or
+
+- (b) The contribution is based upon previous work that, to the best
+      of my knowledge, is covered under an appropriate open source
+      license and I have the right under that license to submit that
+      work with modifications, whether created in whole or in part
+      by me, under the same open source license (unless I am
+      permitted to submit under a different license), as indicated
+      in the file; or
+
+- (c) The contribution was provided directly to me by some other
+      person who certified (a), (b) or (c) and I have not modified
+      it.
+
+- (d) I understand and agree that this project and the contribution
+      are public and that a record of the contribution (including all
+      personal information I submit with it, including my sign-off) is
+      maintained indefinitely and may be redistributed consistent with
+      this project or the open source license(s) involved.
+
+---
+
+*Some of the ideas and wording for the statements above were based on work by the [Alamofire](https://github.com/Alamofire/Alamofire/blob/master/CONTRIBUTING.md) communities. We commend them for their efforts to facilitate collaboration in their projects.*
diff --git a/Example/Bamboots.xcodeproj/project.pbxproj b/Example/Bamboots.xcodeproj/project.pbxproj
@@ -334,7 +334,7 @@
 				TargetAttributes = {
 					607FACCF1AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
-						DevelopmentTeam = 8682P4GC47;
+						DevelopmentTeam = 5AQZQKK3GK;
 						LastSwiftMigration = 0900;
 					};
 					607FACE41AFB9204008FA782 = {
@@ -672,7 +672,7 @@
 			baseConfigurationReference = 837C732B84DC9242063FF9D5 /* Pods-Bamboots_Example.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = 8682P4GC47;
+				DEVELOPMENT_TEAM = 5AQZQKK3GK;
 				INFOPLIST_FILE = Bamboots/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -689,7 +689,7 @@
 			baseConfigurationReference = 3563A1CF53A46C0766B4B720 /* Pods-Bamboots_Example.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = 8682P4GC47;
+				DEVELOPMENT_TEAM = 5AQZQKK3GK;
 				INFOPLIST_FILE = Bamboots/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";

diff --git a/README.md b/README.md
@@ -2,9 +2,12 @@
 
 [![CI Status](http://img.shields.io/travis/mmoaay/Bamboots.svg?style=flat)](https://travis-ci.org/mmoaay/Bamboots)
 [![Version](https://img.shields.io/cocoapods/v/Bamboots.svg?style=flat)](http://cocoapods.org/pods/Bamboots)
-[![License](https://img.shields.io/cocoapods/l/Bamboots.svg?style=flat)](http://cocoapods.org/pods/Bamboots)
 [![Platform](https://img.shields.io/cocoapods/p/Bamboots.svg?style=flat)](http://cocoapods.org/pods/Bamboots)
-
+[![Language](https://img.shields.io/badge/language-swift-orange.svg)](https://github.com/apple/swift)
+[![License](https://img.shields.io/cocoapods/l/Bamboots.svg?style=flat)](http://cocoapods.org/pods/Bamboots)
+[![Gitter](https://img.shields.io/gitter/room/Bamboots/Bamboots.svg)](https://gitter.im/Bamboots-Gitter/Lobby)
+[![Weibo](https://img.shields.io/badge/[email protected]?style=flat)](https://weibo.com/smmoaay)
+![\<3](https://img.shields.io/badge/made%20with-%3C3-orange.svg)
 
 **Bamboots** is a network request framework based on [Alamofire](https://github.com/Alamofire/Alamofire) , aiming at making network request easier for business development.
 
@@ -374,4 +377,6 @@ mmoaay, [email protected]
 
 ## License
 
+![](https://upload.wikimedia.org/wikipedia/commons/thumb/f/f8/License_icon-mit-88x31-2.svg/128px-License_icon-mit-88x31-2.svg.png)
+
 Bamboots is available under the MIT license. See the LICENSE file for more info.