gh 0.12.2 → 0.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17c62259f2ff6776d135b5079091dee7976a24e5
-  data.tar.gz: 7cd1b53054db693b769fa6e82efd4503125a8ea1
+  metadata.gz: 6111e2fa8dbc01a5d52b267e44617e5096a152c7
+  data.tar.gz: fbd8a0a0658ba302b5901e35d37f07c20463b6fd
 SHA512:
-  metadata.gz: c051a03e105602daee90fef644b4e9a88a9ba71f5482676670615530c553b4f4706da8fbe89975d07fa8b3219d1aeb21772089e69c5ea5d056781847e6361d06
-  data.tar.gz: 27d56e64807726a167d68985709d4b880b9a9adfe44b608f1e9ec33b1dc55f6f41b71d9881565d83b679c4e2a98f344a1ea26718b816706c96f9d8704c345149
+  metadata.gz: bcc5eb0e275f4e0c268459167d400edb9959f7a5163eeacbd937f381979b7d3ca3672d96ebb70fd5ea7fb9cb2b5ca3e73e4643bb07f86df8704e6824734ebde1
+  data.tar.gz: 3d1088dfd9ce6c426f6821f50edfd847f8b21bb5d8a71f82e7d17a42744107950889c1436f75944e4bec460e90bc87df467adb38e453e6b769d3a403a1892429

data/lib/gh/normalizer.rb

@@ -79,7 +79,7 @@ module GH
       when "blog"
         set_link(hash, key, value)
       when "url"
-        type = Addressable::URI.parse(value).host == api_host.host ? "self" : "html"
+        type = value.to_s.start_with?(api_host.to_s) ? "self" : "html"
         set_link(hash, type, value)
       when /^(.+)_url$/
         set_link(hash, $1, value)

data/lib/gh/version.rb

@@ -1,4 +1,4 @@
 module GH
   # Public: Library version.
-  VERSION = "0.12.2"
+  VERSION = "0.12.3"
 end

data/spec/normalizer_spec.rb

@@ -4,16 +4,16 @@ describe GH::Normalizer do
   before { subject.backend = GH::MockBackend.new }
 
   def normalize(payload)
-    data['/payload'] = payload
+    data[subject.path_for('/payload')] = payload
   end
 
   def with_headers(headers = {})
     response = GH::Response.new("{}", headers)
-    data['/payload'], response.data = response, data['/payload']
+    data[subject.path_for('/payload')], response.data = response, data[subject.path_for('/payload')]
   end
 
   def normalized
-    subject['/payload']
+    subject[subject.path_for('/payload')]
   end
 
   it 'is set up properly' do
@@ -285,17 +285,35 @@ describe GH::Normalizer do
     end
 
     it 'detects self urls in url field'  do
-      normalize 'url' => 'http://api.github.com/foo'
+      normalize 'url' => 'https://api.github.com/foo'
       normalized.should_not include('url')
       normalized.should include('_links')
       normalized['_links'].should include('self')
       normalized['_links'].should_not include('html')
-      normalized['_links']['self']['href'].should be == 'http://api.github.com/foo'
+      normalized['_links']['self']['href'].should be == 'https://api.github.com/foo'
     end
 
     it 'passes through true' do
       normalize 'foo' => true
       normalized['foo'].should be == true
     end
+
+    it 'properly detects html links when api is served from same host' do
+      subject.backend.setup("http://localhost/api/v3", {})
+      normalize 'url' => 'http://localhost/foo'
+      normalized.should_not include('url')
+      normalized.should include('_links')
+      normalized['_links'].should include('html')
+      normalized['_links']['html']['href'].should be == 'http://localhost/foo'
+    end
+
+    it 'properly detects self links when api is served from same host' do
+      subject.backend.setup("http://localhost/api/v3", {})
+      normalize 'url' => 'http://localhost/api/v3/foo'
+      normalized.should_not include('url')
+      normalized.should include('_links')
+      normalized['_links'].should include('self')
+      normalized['_links']['self']['href'].should be == 'http://localhost/api/v3/foo'
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gh
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.12.3
 platform: ruby
 authors:
 - Konstantin Haase