resource.url and resource.name are now properties instead of functions, so they can be accessed in (swagger-ui) templates

Author: zeke

lib/swagger-spec.js

@@ -99,18 +99,18 @@
         return wordnik.ready != null;
       });
     });
-    it("has a url()", function() {
+    it("creates a url property", function() {
       return runs(function() {
         var resource;
         resource = wordnik.resources.wordList;
-        return expect(resource.url()).toMatch(/\.json$/);
+        return expect(resource.url).toMatch(/\.json$/);
       });
     });
-    it("has a name() method which is inferred from its path", function() {
+    it("has a name property which is inferred from its path", function() {
       return runs(function() {
         var resource;
         resource = wordnik.word;
-        return expect(resource.name()).toEqual('word');
+        return expect(resource.name).toEqual('word');
       });
     });
     it("creates a container object for its operations, with operation nicknames as keys", function() {

lib/swagger.js

@@ -83,15 +83,15 @@ describe 'SwaggerResource', ->
     waitsFor ->
       wordnik.ready?
 
-  it "has a url()", ->
+  it "creates a url property", ->
     runs ->
       resource = wordnik.resources.wordList
-      expect(resource.url()).toMatch(/\.json$/)
+      expect(resource.url).toMatch(/\.json$/)
 
-  it "has a name() method which is inferred from its path", ->
+  it "has a name property which is inferred from its path", ->
     runs ->
       resource = wordnik.word
-      expect(resource.name()).toEqual('word')
+      expect(resource.name).toEqual('word')
 
   it "creates a container object for its operations, with operation nicknames as keys", ->
     runs ->

src/swagger-spec.coffee

@@ -1,4 +1,6 @@
 class SwaggerApi
+  
+  # Defaults
   discoveryUrl: "http://api.wordnik.com/v4/resources.json"
   debug: false
   api_key: null
@@ -30,7 +32,7 @@ class SwaggerApi
         continue if resource.path is "/tracking.{format}" or resource.path is "/partner.{format}"
 
         res = new SwaggerResource resource.path, resource.description, this
-        @resources[res.name()] = res
+        @resources[res.name] = res
 
       this
 
@@ -50,7 +52,15 @@ class SwaggerResource
     throw "SwaggerResources must have a path." unless @path?
     @operations = {}
 
-    $.getJSON @url(), (response) =>
+    # e.g."http://api.wordnik.com/v4/word.json"
+    @url = @api.basePath + @path.replace('{format}', 'json')
+
+    # Extract name from path
+    # '/foo/dogs.format' -> 'dogs'
+    parts = @path.split("/")
+    @name = parts[parts.length - 1].replace('.{format}', '')
+    
+    $.getJSON @url, (response) =>
       @basePath = response.basePath
 
       # TODO: Take this out.. it's a wordnik API regression
@@ -65,24 +75,14 @@ class SwaggerResource
               @operations[op.nickname] = op
 
       # Store a named reference to this resource on the parent object
-      @api[this.name()] = this
+      @api[this.name] = this
 
       # Mark as ready
       @ready = true
 
       # Now that this resource is loaded, tell the API to check in on itself
       @api.selfReflect()
 
-  # e.g."http://api.wordnik.com/v4/word.json"
-  url: ->
-    @api.basePath + @path.replace('{format}', 'json')
-  
-  # Extract name from path
-  # '/foo/dogs.format' -> 'dogs'
-  name: ->
-    parts = @path.split("/")
-    parts[parts.length - 1].replace('.{format}', '')
-
 class SwaggerOperation
 
   constructor: (@nickname, @path, @httpMethod, @parameters, @summary, @resource) ->