added model spec

fehguy · fehguy · commit 5973a192dbca · 2014-02-03T22:15:58.000-08:00
diff --git a/Cakefile b/Cakefile
@@ -51,5 +51,6 @@ task 'dev', "Open source files, run spec in browser, and watch for changes", ->
   exec "open http-spec.html"
   exec "open operation-spec.html"
   exec "open request-spec.html"
+  exec "open model-spec.html"
   coffee = spawn 'coffee', ['-cw', '-o', 'lib', 'src']
   coffee.stdout.on 'data', (data) -> console.log data.toString().trim()
diff --git a/lib/swagger-model-spec.js b/lib/swagger-model-spec.js
diff --git a/lib/swagger.js b/lib/swagger.js
diff --git a/model-spec.html b/model-spec.html
@@ -0,0 +1,28 @@
+<!DOCTYPE HTML>
+<head>
+  <title>swagger.js specs</title>
+  
+  <link rel="stylesheet" type="text/css" href="lib/jasmine-1.3.1/jasmine.css">
+
+  <script type="text/javascript" src="lib/shred.bundle.js" /></script>  
+  <script type="text/javascript" src="lib/jquery-1.8.0.min.js"></script>
+  <script type="text/javascript" src="lib/jasmine-1.3.1/jasmine.js"></script>
+  <script type="text/javascript" src="lib/jasmine-1.3.1/jasmine-html.js"></script>
+
+  <!-- be sure to include source files first -->
+  <script type="text/javascript" src="lib/swagger.js"></script>
+  
+  <!-- then spec files -->
+  <script type="text/javascript" src="lib/swagger-model-spec.js"></script>
+</head>
+<body>
+
+<script type="text/javascript">
+  $(function() { 
+    jasmine.getEnv().addReporter(new jasmine.TrivialReporter());
+    jasmine.getEnv().execute();
+  });
+</script>
+
+</body>
+</html>
diff --git a/src/swagger-model-spec.coffee b/src/swagger-model-spec.coffee
@@ -0,0 +1,56 @@
+window.api_key = 'special-key'
+
+describe 'Swagger models version 1.2 spec', ->
+
+  beforeEach ->
+    success =  ->
+      ""
+    window.authorizations.add "key", new ApiKeyAuthorization("api_key", "special-key", "header")
+    window.swagger = new SwaggerApi({url: 'http://localhost:8002/api/api-docs', success: success})
+    waitsFor ->
+      swagger.ready?
+
+  describe "get model operations", ->
+
+    beforeEach ->
+      window.body = null
+      window.response = null
+      window.callback = null
+      window.error = null
+      window.success_callback = (data) ->
+        window.response = data
+      window.error_callback = (data) ->
+        window.error = data
+
+    it "verifies the Pet model", ->
+      pet = window.swagger.apis.pet.models["Pet"]
+      expect(pet.name).toBe("Pet")
+      expect(pet.properties.length).toBe(6)
+
+      props = pet.properties
+
+      expect(props[0].name).toBe("id")
+      expect(props[0].dataType).toBe("integer")
+
+      expect(props[1].name).toBe("category")
+      expect(props[1].dataType).toBe("Category")
+
+      expect(props[2].name).toBe("name")
+      expect(props[2].dataType).toBe("string")
+
+      expect(props[3].name).toBe("photoUrls")
+      expect(props[3].dataType).toBe("array")
+      expect(props[3].refDataType).toBe("string")
+
+      expect(props[4].name).toBe("tags")
+      expect(props[4].dataType).toBe("array")
+      expect(props[4].refDataType).toBe("Tag")
+
+      expect(props[5].name).toBe("status")
+      expect(props[5].dataType).toBe("string")
+
+    it "verifies the Pet sample JSON", ->
+      pet = window.swagger.apis.pet.models["Pet"]
+      sample = pet.createJSONSample()
+      console.log sample
+      console.log JSON.stringify sample
diff --git a/src/swagger.coffee b/src/swagger.coffee
@@ -1,3 +1,6 @@
+log = ->
+  if window.console then console.log.apply console,arguments
+
 class SwaggerApi
   
   # Defaults
@@ -471,11 +474,24 @@ class SwaggerModelProperty
       result = @refModel.createJSONSample(modelsToIgnore)
     else
       if @isCollection
-        result = @refDataType
+        result = @toSampleValue @refDataType
       else
-        result = @dataType
+        result = @toSampleValue @dataType
     if @isCollection then [result] else result
 
+  toSampleValue: (value) ->
+    if value is "integer"
+      result = 0
+    else if value is "boolean"
+      result = false
+    else if value is "double"
+      result = 0.0
+    else if value is "string"
+      result = ""
+    else
+      result = value
+    result
+
   toString: ->
     req = if @required then 'propReq' else 'propOpt'
 
@@ -745,7 +761,7 @@ class SwaggerRequest
       # if any form params, content-type must be set
       if (param for param in @operation.parameters when param.paramType is "form").length > 0
         type = param.type || param.dataType
-        if (param for param in @operation.parameters when type.toLowerCase() is "file").length > 0
+        if (param for param in @operation.parameters when typeof type isnt 'undefined' and type.toLowerCase() is "file").length > 0
           requestContentType = "multipart/form-data"
         else
           requestContentType = "application/x-www-form-urlencoded"
