add raw option for state

badges · Jun 15, 2017 · 2010d98 · 2010d98
1 parent 5514aea
commit 2010d98
Show file tree

Hide file tree

Showing 70 changed files with 23 additions and 11 deletions.
diff --git a/.buildpacks b/.buildpacks
diff --git a/.dockerignore b/.dockerignore
diff --git a/.editorconfig b/.editorconfig
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc.yml b/.eslintrc.yml
diff --git a/.gitignore b/.gitignore
diff --git a/.istanbul.yml b/.istanbul.yml
diff --git a/.travis.yml b/.travis.yml
diff --git a/CNAME b/CNAME
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/Dockerfile b/Dockerfile
diff --git a/INSTALL.md b/INSTALL.md
diff --git a/LICENSE.md b/LICENSE.md
diff --git a/Makefile b/Makefile
diff --git a/README.md b/README.md
diff --git a/coverage.svg b/coverage.svg
diff --git a/doc/TUTORIAL.md b/doc/TUTORIAL.md
diff --git a/doc/users.md b/doc/users.md
diff --git a/favicon.png b/favicon.png
diff --git a/gh-badge.spec.js b/gh-badge.spec.js
diff --git a/lib/analytics.js b/lib/analytics.js
diff --git a/lib/badge.js b/lib/badge.js
diff --git a/lib/badge.spec.js b/lib/badge.spec.js
diff --git a/lib/color-formatters.js b/lib/color-formatters.js
diff --git a/lib/colorscheme.json b/lib/colorscheme.json
diff --git a/lib/github-auth.js b/lib/github-auth.js
diff --git a/lib/in-process-server-test-helpers.js b/lib/in-process-server-test-helpers.js
diff --git a/lib/load-logos.js b/lib/load-logos.js
diff --git a/lib/lru-cache.js b/lib/lru-cache.js
diff --git a/lib/lru-cache.spec.js b/lib/lru-cache.spec.js
diff --git a/lib/measure-text.js b/lib/measure-text.js
diff --git a/lib/php-version.js b/lib/php-version.js
diff --git a/lib/server-secrets.js b/lib/server-secrets.js
diff --git a/lib/suggest.js b/lib/suggest.js
diff --git a/lib/svg-to-img.js b/lib/svg-to-img.js
diff --git a/lib/svg-to-img.spec.js b/lib/svg-to-img.spec.js
diff --git a/lib/test-config.js b/lib/test-config.js
diff --git a/lib/text-formatters.js b/lib/text-formatters.js
diff --git a/lib/version.js b/lib/version.js
diff --git a/logo.svg b/logo.svg
diff --git a/logo/appveyor.svg b/logo/appveyor.svg
diff --git a/logo/bithound.svg b/logo/bithound.svg
diff --git a/logo/github.svg b/logo/github.svg
diff --git a/logo/gitter-white.svg b/logo/gitter-white.svg
diff --git a/logo/gratipay.svg b/logo/gratipay.svg
diff --git a/logo/sourcegraph.svg b/logo/sourcegraph.svg
diff --git a/logo/twitter.svg b/logo/twitter.svg
diff --git a/package.json b/package.json
diff --git a/public/404.html b/public/404.html
diff --git a/public/500.html b/public/500.html
diff --git a/secret.tpl.json b/secret.tpl.json
diff --git a/server.js b/server.js
@@ -3224,12 +3224,12 @@ cache(function(data, match, sendBadge, request) {
 }));
 
 // GitHub issues integration.
-camp.route(/^\/github\/issues(-pr)?(-closed)?(-raw)?(-state)?\/([^\/]+)\/([^\/]+)\/?([^\/]+)?\.(svg|png|gif|jpg|json)$/,
+camp.route(/^\/github\/issues(-pr)?(-closed)?(-state)?(-raw)?\/([^\/]+)\/([^\/]+)\/?([^\/]+)?\.(svg|png|gif|jpg|json)$/,
 cache(function(data, match, sendBadge, request) {
   var isPR = !!match[1];
   var isClosed = !!match[2];
-  var isRaw = !!match[3];
-  var isState = !!match[4];
+  var isState = !!match[3];
+  var isRaw = !!match[4];
   var user = match[5];  // eg, badges
   var repo = match[6];  // eg, shields
   var ghLabel = match[7];  // eg, website
@@ -3271,11 +3271,19 @@ cache(function(data, match, sendBadge, request) {
       var modifier = '';
       var issues;
       if (isState && issuesApi) {
-        var state = data.state;
-        var id = data.number;
-        badgeData.text[0] = id;
-        badgeData.text[1] = state;
-        badgeData.colorscheme = (state == 'closed')? 'red': 'brightgreen';
+        var rightSide = isRaw ? data.state : '  '.repeat(2) + data.title + '  '.repeat(2);
+        var leftSide = ' '.repeat(2) +'#' + ghLabel + ' '.repeat(2);
+        if (data.state !== 'undefined') {
+          console.log("data.state !== 'undefined'", true)
+          badgeData.link = [ data.html_url ]
+          badgeData.colorscheme = (data.state == 'closed') ? 'red': 'brightgreen';
+        } else {
+          console.log("data.state !== 'undefined'", false)
+          rightSide = 'Not Found'
+          badgeData.colorscheme = 'lightgrey'
+        }
+        badgeData.text[0] = leftSide;
+        badgeData.text[1] = rightSide;
         sendBadge(format, badgeData);
       } else {
         if (isPR) {

diff --git a/server.spec.js b/server.spec.js
diff --git a/service-tests/README.md b/service-tests/README.md
diff --git a/service-tests/cran.js b/service-tests/cran.js
diff --git a/service-tests/discord.js b/service-tests/discord.js
diff --git a/service-tests/github.js b/service-tests/github.js
diff --git a/service-tests/maven-central.js b/service-tests/maven-central.js
diff --git a/service-tests/runner/cli.js b/service-tests/runner/cli.js
diff --git a/service-tests/runner/runner.js b/service-tests/runner/runner.js
diff --git a/service-tests/runner/service-tester.js b/service-tests/runner/service-tester.js
diff --git a/shields.example.env b/shields.example.env
diff --git a/spec/SPECIFICATION.md b/spec/SPECIFICATION.md
diff --git a/spec/proportions.png b/spec/proportions.png
diff --git a/templates/default-template.json b/templates/default-template.json
diff --git a/templates/flat-square-template.svg b/templates/flat-square-template.svg
diff --git a/templates/flat-template.svg b/templates/flat-template.svg
diff --git a/templates/plastic-template.svg b/templates/plastic-template.svg
diff --git a/templates/social-template.svg b/templates/social-template.svg
diff --git a/try.html b/try.html
@@ -762,9 +762,13 @@ <h3 id="miscellaneous"> Miscellaneous </h3>
     <td><img src='/github/issues-raw/badges/shields.svg' alt=''/></td>
     <td><code>https://img.shields.io/github/issues-raw/badges/shields.svg</code></td>
   </tr>
-    <tr><th data-keywords='GitHub issue' data-doc='githubDoc'></th>
-    <td><img src='/github/issues-state/badges/shields/1.svg' alt=''/></td>
-    <td><code>https://img.shields.io/github/issues-state/badges/shields/1.svg</code></td>
+  <tr><th data-keywords='GitHub issue state' data-doc='githubDoc'>GitHub issue state:</th>
+    <td><img src='/github/issues-state/badges/shields/1012.svg' alt=''/></td>
+    <td><code>https://img.shields.io/github/issues-state/badges/shields/1012.svg</code></td>
+  </tr>
+  <tr><th data-keywords='GitHub issue state' data-doc='githubDoc'></th>
+    <td><img src='/github/issues-state-raw/badges/shields/1.svg' alt=''/></td>
+    <td><code>https://img.shields.io/github/issues-state-raw/badges/shields/1.svg</code></td>
   </tr>
   <tr><th data-keywords='GitHub issue' data-doc='githubDoc'> GitHub closed issues: </th>
     <td><img src='/github/issues-closed/badges/shields.svg' alt=''/></td>