Merge 200157a into bc86ee9

badges · Jan 2, 2015 · 1c46c9a · 1c46c9a
2 parents bc86ee9 + 200157a
commit 1c46c9a
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 24 deletions.
diff --git a/config/services.yaml b/config/services.yaml
@@ -18,3 +18,15 @@ codeclimate:
   alt_text:   Code Climate
   url_path:   codeclimate.com/github
   badge_slug: codeclimate/github
+
+pulls:
+  alt_text:     Pending Pull-Requests
+  service_root: githubbadges.herokuapp.com
+  url_path:     github.com
+  suffix:       pulls
+
+issues:
+  alt_text:     Github Issues
+  service_root: githubbadges.herokuapp.com
+  url_path:     github.com
+  suffix:       issues
diff --git a/lib/badger/badger.rb b/lib/badger/badger.rb
@@ -15,13 +15,7 @@ def owner
     end
 
     def add service
-      if service == 'issues'
-        self << Badger.badge('Github Issues', "http://githubbadges.herokuapp.com/#{github_slug}/issues", "https://github.com/#{github_slug}/issues")
-      elsif service == 'pulls'
-        self << Badger.badge('Pending Pull-Requests', "http://githubbadges.herokuapp.com/#{github_slug}/pulls", "https://github.com/#{github_slug}/pulls")
-      else
-        self << Service.badge(service, github_slug)
-      end
+      self << Service.badge(service, github_slug)
       self.delete nil
     end
 

diff --git a/lib/badger/service.rb b/lib/badger/service.rb
@@ -5,29 +5,41 @@ def self.badge name, github_slug
       params = Config.instance.services[name]
 
       scheme = params['scheme'] ||= 'http'
-      case params['offers_svg']
-        when true
-          base_url = '%s://%s' % [
-              scheme,
-              params['url_path']
-          ]
-        else
-          base_url = 'http://%s/%s' % [
-              Config.instance.config['badge_service'],
-              params['badge_slug']
-          ]
+
+      if params['service_root']
+        base_url = 'http://%s' % [
+          params['service_root']
+        ]
+      else
+        base_url = 'http://%s/%s' % [
+          Config.instance.config['badge_service'],
+          params['badge_slug']
+        ]
       end
 
       badge_url = '%s/%s' % [
-          base_url,
-          github_slug
+        base_url,
+        github_slug
       ]
+
       target_url = 'https://%s/%s' % [
-          params['url_path'],
-          github_slug
+        params['url_path'],
+        github_slug
       ]
 
+      if params['suffix']
+        badge_url = suffixify badge_url, params['suffix']
+        target_url = suffixify target_url, params['suffix']
+      end
+
       Badger.badge params['alt_text'], badge_url, target_url
     end
+
+    def self.suffixify path, suffix
+      '%s/%s' % [
+        path,
+        suffix
+      ]
+    end
   end
-end
+end
diff --git a/lib/badger/version.rb b/lib/badger/version.rb
@@ -1,3 +1,3 @@
 module Badger
-  VERSION = "0.10.1"
+  VERSION = "0.10.2"
 end
diff --git a/spec/badger_spec.rb b/spec/badger_spec.rb
@@ -101,6 +101,13 @@ module Badger
       end
     end
 
+    context 'github pulls' do
+      it 'should have a pull-requests badge' do
+        @badger.add 'pulls'
+        expect(@badger[0]).to eq "[![Pending Pull-Requests](http://githubbadges.herokuapp.com/doge/wow/pulls.svg)](https://github.com/doge/wow/pulls)"
+      end
+    end
+
     context 'output' do
       it 'should produce some lines of text' do
         @badger.add 'travis'