aries 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a721b5050b0c0d62fac4c082a6999db9b0b7fd32
-  data.tar.gz: 83c31100b9aa075a09bad91bfa6215edf82fd5b6
+  metadata.gz: 3e6227534776e0c86fd9d60f9cd995b05e2d183c
+  data.tar.gz: d1b03be5e483fa2875381fb19d0d24189bd708fc
 SHA512:
-  metadata.gz: abbab34967cf7e96b9552886c2f777aeffefd67eca7295e180f871fc468065649a91faf586f58ff56325c5f10962e8ee48d055861b821f320242ceb67d5885aa
-  data.tar.gz: c7fa32042565cc17e52379d51d5c53d7497d228cf7781ef0872d80b3278635dabc6764c0ac320189f969c19abbcb16fb1d527a96659d0e9e5e62ed4b525a1cf2
+  metadata.gz: 64e02c38a77a72588d62ef6dec0af77dae2b0c558c4e08d496d1dc6f84ff2cbd50ab1d00b5490e1cea4bf345ee221234ed316a06e6a91c7dcaebaffd180f34f7
+  data.tar.gz: 7b82b2f2db6c42afaa07517d1525c2568a2edd9c6f0d5ee5e9259ab6858368212f44890767a3eae5f90f78f6443fe5ae11ead985dac004e8d08fbdf1005a3532

data/README.md

@@ -34,9 +34,9 @@ Aries can setup costom config for api client class name, base url, output path.
                                           --url http://api.myapp.com \
                                           --output /path/to/dir
 
-### Swift(v1,1)
+### Swift(v1.2)
 
-Dependent on [SwiftTask](https://github.com/ReactKit/SwiftTask), [Alamofire](https://github.com/Alamofire/Alamofire), [URITemplate](https://github.com/kylef/URITemplate.swift).
+Dependent on [SwiftTask](https://github.com/ReactKit/SwiftTask), [Alamofire](https://github.com/Alamofire/Alamofire),
 Aries api client should be used with these libraries, and works like promise style.
 
 Aries api client behaves use the following.

data/examples/clients/RackJsonSchemaApi.swift

@@ -1,23 +1,22 @@
 //
-//  RackJsonSchemaApi.swift
+//  RackJSONSchemaApi.swift
 //
-//  Auto generated by Aries on 2015/04/11.
+//  Auto generated by Aries on 2015/04/30.
 //  Do not modify this file directory
 //
 
 import Alamofire
 import SwiftTask
-import URITemplate
 
-typealias RackJsonSchemaApiResponse = Task<Int,AnyObject,NSError>
+typealias RackJSONSchemaApiResponse = Task<Int,AnyObject,NSError>
 
-protocol RackJsonSchemaApiDelegate {
+protocol RackJSONSchemaApiDelegate {
     func customReqeust(request: NSMutableURLRequest) -> NSMutableURLRequest
     func onDefaultSuccess(response: AnyObject) -> AnyObject
     func onDefaultFailure(err: NSError) -> NSError
 }
 
-class RackJsonSchemaApi {
+class RackJSONSchemaApi {
 
     private struct BaseUrlStringStruct{ static var url = "http://localhost:5000" }
     class var BaseUrlString: String {
@@ -27,21 +26,21 @@ class RackJsonSchemaApi {
 
     // workaround tips
     // After updated swift 1.2, use ( static var someVariable: Int = 0 ) instead
-    private struct delegateStruct{ static var detegator: RackJsonSchemaApiDelegate? }
-    class var delegate: RackJsonSchemaApiDelegate? {
+    private struct delegateStruct{ static var detegator: RackJSONSchemaApiDelegate? }
+    class var delegate: RackJSONSchemaApiDelegate? {
         get{ return delegateStruct.detegator }
         set{ delegateStruct.detegator = newValue }
     }
 
     private class func defaultURLRequest(let path: String, let method: Alamofire.Method) -> NSMutableURLRequest {
-        let URL = NSURL(string: RackJsonSchemaApi.BaseUrlString)!
+        let URL = NSURL(string: RackJSONSchemaApi.BaseUrlString)!
         let mutableURLRequest = NSMutableURLRequest(URL: URL.URLByAppendingPathComponent(path))
 
         mutableURLRequest.HTTPMethod = method.rawValue
         mutableURLRequest.setValue("application/json", forHTTPHeaderField: "Content-Type")
         mutableURLRequest.setValue("application/json", forHTTPHeaderField: "Accept")
 
-        if let delegate = self.delegate?{
+        if let delegate = self.delegate{
             return delegate.customReqeust(mutableURLRequest)
         }
 
@@ -49,34 +48,39 @@ class RackJsonSchemaApi {
     }
 
     private class func generateURI(template: String, params: [String: AnyObject]?) -> String {
+        var uri = template
         if let params = params {
-            return URITemplate(template: template).expand(params)
+          for (key, value) in params {
+              if let value = value as? String {
+                  uri = uri.stringByReplacingOccurrencesOfString("{\(key)}", withString: value)
+              }
+          }
         }
-        return template
+        return uri
     }
 
     class Base {
 
-        private class func request(URLRequest: URLRequestConvertible) -> RackJsonSchemaApiResponse {
-            return RackJsonSchemaApiResponse {(progress, fulfill, reject, configure) in
+        private class func request(URLRequest: URLRequestConvertible) -> RackJSONSchemaApiResponse {
+            return RackJSONSchemaApiResponse {(progress, fulfill, reject, configure) in
                 let alam = Alamofire.request(URLRequest)
                                     .validate()
-                                    .responseJSON({ (req, res, data, err) -> Void in
+                                    .responseJSON { (req, res, data, err) -> Void in
 
                     if let err = err {
                         reject(self.buildErr(res, data: data, err: err))
                         return
                     }
                     fulfill(data!)
-                })
+                }
                 debugPrintln(alam)
                 configure.pause  = { [weak alam] in if let alam = alam { alam.suspend() } }
                 configure.resume = { [weak alam] in if let alam = alam { alam.resume() }  }
                 configure.cancel = { [weak alam] in if let alam = alam { alam.cancel() }  }
-            }.then({ (data, errorInfo) -> RackJsonSchemaApiResponse in
-                return RackJsonSchemaApiResponse { (progress, fulfill, reject, configure) in
+            }.then({ (data, errorInfo) -> RackJSONSchemaApiResponse in
+                return RackJSONSchemaApiResponse { (progress, fulfill, reject, configure) in
                     if(errorInfo == nil){
-                        if let delegate = RackJsonSchemaApi.delegate {
+                        if let delegate = RackJSONSchemaApi.delegate {
                             let newData: AnyObject = delegate.onDefaultSuccess(data!)
                             fulfill(newData)
                             return
@@ -86,7 +90,7 @@ class RackJsonSchemaApi {
                     }else{
                         let (err, isCancelled) = errorInfo!
                         if let err = err {
-                            if let delegate = RackJsonSchemaApi.delegate{
+                            if let delegate = RackJSONSchemaApi.delegate{
                                 let newErr = delegate.onDefaultFailure(err)
                                 reject(newErr)
                                 return
@@ -123,7 +127,7 @@ class RackJsonSchemaApi {
       class App: Base {
 
 
-          class func Create(name: String? = nil) -> RackJsonSchemaApiResponse {
+          class func Create(name: String? = nil) -> RackJSONSchemaApiResponse {
               var params = [String: AnyObject]()
 
 
@@ -135,7 +139,7 @@ class RackJsonSchemaApi {
           }
 
 
-          class func Delete(appId: String) -> RackJsonSchemaApiResponse {
+          class func Delete(appId: String) -> RackJSONSchemaApiResponse {
               var params = [String: AnyObject]()
 
                 params["appId"] = appId
@@ -145,7 +149,7 @@ class RackJsonSchemaApi {
           }
 
 
-          class func Info(appId: String) -> RackJsonSchemaApiResponse {
+          class func Info(appId: String) -> RackJSONSchemaApiResponse {
               var params = [String: AnyObject]()
 
                 params["appId"] = appId
@@ -155,17 +159,17 @@ class RackJsonSchemaApi {
           }
 
 
-          class func Info(appId: String) -> RackJsonSchemaApiResponse {
+          class func InfoText(appId: String) -> RackJSONSchemaApiResponse {
               var params = [String: AnyObject]()
 
                 params["appId"] = appId
 
 
-            return request(Router.Info(params))
+            return request(Router.InfoText(params))
           }
 
 
-          class func List() -> RackJsonSchemaApiResponse {
+          class func List() -> RackJSONSchemaApiResponse {
               var params: [String: AnyObject]? = nil
 
 
@@ -174,7 +178,7 @@ class RackJsonSchemaApi {
           }
 
 
-          class func Update(appId: String, name: String? = nil) -> RackJsonSchemaApiResponse {
+          class func Update(appId: String, name: String? = nil) -> RackJSONSchemaApiResponse {
               var params = [String: AnyObject]()
 
                 params["appId"] = appId
@@ -187,7 +191,7 @@ class RackJsonSchemaApi {
           }
 
 
-          class func Create(appId: String, file: String? = nil) -> RackJsonSchemaApiResponse {
+          class func CreateFile(appId: String, file: String? = nil) -> RackJSONSchemaApiResponse {
               var params = [String: AnyObject]()
 
                 params["appId"] = appId
@@ -196,7 +200,7 @@ class RackJsonSchemaApi {
                 params["file"] = file
               }
 
-            return request(Router.Create(params))
+            return request(Router.CreateFile(params))
           }
 
 
@@ -205,10 +209,10 @@ class RackJsonSchemaApi {
               case Create([String: AnyObject]?)
               case Delete([String: AnyObject]?)
               case Info([String: AnyObject]?)
-              case Info([String: AnyObject]?)
+              case InfoText([String: AnyObject]?)
               case List([String: AnyObject]?)
               case Update([String: AnyObject]?)
-              case Create([String: AnyObject]?)
+              case CreateFile([String: AnyObject]?)
             var method: Alamofire.Method {
                 switch self {
                   case .Create:
@@ -217,13 +221,13 @@ class RackJsonSchemaApi {
                     return .DELETE
                   case .Info:
                     return .GET
-                  case .Info:
+                  case .InfoText:
                     return .GET
                   case .List:
                     return .GET
                   case .Update:
                     return .PATCH
-                  case .Create:
+                  case .CreateFile:
                     return .POST
                 }
             }
@@ -231,19 +235,19 @@ class RackJsonSchemaApi {
             var path: String {
                 switch self {
                 case .Create(let params):
-                  return RackJsonSchemaApi.generateURI("/apps", params: params)
+                  return RackJSONSchemaApi.generateURI("/apps", params: params)
                 case .Delete(let params):
-                  return RackJsonSchemaApi.generateURI("/apps/{appId}", params: params)
-                case .Info(let params):
-                  return RackJsonSchemaApi.generateURI("/apps/{appId}", params: params)
+                  return RackJSONSchemaApi.generateURI("/apps/{appId}", params: params)
                 case .Info(let params):
-                  return RackJsonSchemaApi.generateURI("/apps/{appId}/text", params: params)
+                  return RackJSONSchemaApi.generateURI("/apps/{appId}", params: params)
+                case .InfoText(let params):
+                  return RackJSONSchemaApi.generateURI("/apps/{appId}/text", params: params)
                 case .List(let params):
-                  return RackJsonSchemaApi.generateURI("/apps", params: params)
+                  return RackJSONSchemaApi.generateURI("/apps", params: params)
                 case .Update(let params):
-                  return RackJsonSchemaApi.generateURI("/apps/{appId}", params: params)
-                case .Create(let params):
-                  return RackJsonSchemaApi.generateURI("/apps/{appId}/files", params: params)
+                  return RackJSONSchemaApi.generateURI("/apps/{appId}", params: params)
+                case .CreateFile(let params):
+                  return RackJSONSchemaApi.generateURI("/apps/{appId}/files", params: params)
                 }
             }
 
@@ -252,19 +256,19 @@ class RackJsonSchemaApi {
             var URLRequest: NSURLRequest {
               switch self{
               case .Create(let parameters):
-                return Alamofire.ParameterEncoding.JSON.encode(RackJsonSchemaApi.defaultURLRequest(path, method: method), parameters: parameters).0
+                return Alamofire.ParameterEncoding.JSON.encode(RackJSONSchemaApi.defaultURLRequest(path, method: method), parameters: parameters).0
               case .Delete(let parameters):
-                return Alamofire.ParameterEncoding.JSON.encode(RackJsonSchemaApi.defaultURLRequest(path, method: method), parameters: parameters).0
-              case .Info(let parameters):
-                return Alamofire.ParameterEncoding.URL.encode(RackJsonSchemaApi.defaultURLRequest(path, method: method), parameters: parameters).0
+                return Alamofire.ParameterEncoding.JSON.encode(RackJSONSchemaApi.defaultURLRequest(path, method: method), parameters: parameters).0
               case .Info(let parameters):
-                return Alamofire.ParameterEncoding.URL.encode(RackJsonSchemaApi.defaultURLRequest(path, method: method), parameters: parameters).0
+                return Alamofire.ParameterEncoding.URL.encode(RackJSONSchemaApi.defaultURLRequest(path, method: method), parameters: parameters).0
+              case .InfoText(let parameters):
+                return Alamofire.ParameterEncoding.URL.encode(RackJSONSchemaApi.defaultURLRequest(path, method: method), parameters: parameters).0
               case .List(let parameters):
-                return Alamofire.ParameterEncoding.URL.encode(RackJsonSchemaApi.defaultURLRequest(path, method: method), parameters: parameters).0
+                return Alamofire.ParameterEncoding.URL.encode(RackJSONSchemaApi.defaultURLRequest(path, method: method), parameters: parameters).0
               case .Update(let parameters):
-                return Alamofire.ParameterEncoding.JSON.encode(RackJsonSchemaApi.defaultURLRequest(path, method: method), parameters: parameters).0
-              case .Create(let parameters):
-                return Alamofire.ParameterEncoding.JSON.encode(RackJsonSchemaApi.defaultURLRequest(path, method: method), parameters: parameters).0
+                return Alamofire.ParameterEncoding.JSON.encode(RackJSONSchemaApi.defaultURLRequest(path, method: method), parameters: parameters).0
+              case .CreateFile(let parameters):
+                return Alamofire.ParameterEncoding.JSON.encode(RackJSONSchemaApi.defaultURLRequest(path, method: method), parameters: parameters).0
               }
             }
 

data/examples/schemas/rack-json_schema.json

@@ -73,7 +73,7 @@
           "href": "/apps/{(%23%2Fdefinitions%2Fapp%2Fdefinitions%2Fid)}/text",
           "method": "GET",
           "rel": "self",
-          "title": "Info",
+          "title": "InfoText",
           "mediaType": "text/plain"
         },
         {
@@ -116,7 +116,7 @@
               "object"
             ]
           },
-          "title": "Create"
+          "title": "CreateFile"
         }
       ],
       "properties": {

data/lib/aries/templates/client.swift.erb

@@ -7,7 +7,6 @@
 
 import Alamofire
 import SwiftTask
-import URITemplate
 
 typealias <%= class_name %>Response = Task<Int,AnyObject,NSError>
 
@@ -41,7 +40,7 @@ class <%= class_name %> {
         mutableURLRequest.setValue("application/json", forHTTPHeaderField: "Content-Type")
         mutableURLRequest.setValue("application/json", forHTTPHeaderField: "Accept")
 
-        if let delegate = self.delegate?{
+        if let delegate = self.delegate{
             return delegate.customReqeust(mutableURLRequest)
         }
 
@@ -49,10 +48,15 @@ class <%= class_name %> {
     }
 
     private class func generateURI(template: String, params: [String: AnyObject]?) -> String {
+        var uri = template
         if let params = params {
-            return URITemplate(template: template).expand(params)
+          for (key, value) in params {
+              if let value = value as? String {
+                  uri = uri.stringByReplacingOccurrencesOfString("{\(key)}", withString: value)
+              }
+          }
         }
-        return template
+        return uri
     }
 
     class Base {
@@ -61,14 +65,14 @@ class <%= class_name %> {
             return <%= class_name %>Response {(progress, fulfill, reject, configure) in
                 let alam = Alamofire.request(URLRequest)
                                     .validate()
-                                    .responseJSON({ (req, res, data, err) -> Void in
+                                    .responseJSON { (req, res, data, err) -> Void in
 
                     if let err = err {
                         reject(self.buildErr(res, data: data, err: err))
                         return
                     }
                     fulfill(data!)
-                })
+                }
                 debugPrintln(alam)
                 configure.pause  = { [weak alam] in if let alam = alam { alam.suspend() } }
                 configure.resume = { [weak alam] in if let alam = alam { alam.resume() }  }

data/lib/aries/version.rb

@@ -1,3 +1,3 @@
 module Aries
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aries
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - yss44
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable