gitable 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzE0ZTY2Yjc1ZTI4MmU0N2VkMmZkNTQ3ODBlM2UzYWE5NjY3ZDhlOQ==
+    MDAyYWRhZmQ4YmE3ZTY5YWNlOTI0YWI1NjhiYTg3NWUxNWIyZjc0Zg==
   data.tar.gz: !binary |-
-    OGY2ZDZjZTk3OTNiMDU2MDdkNjNiZTgwNDY3MjVkY2M5MzVjNjg2ZA==
+    NTlkZWEyMGYyMTMzZmUyNWNjY2FhMzg5NDU2ZTM0OTlmMmViYmJiYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NzI3MmM5ZjkyNGRkZDA1N2YwMGE5OThjZmE1MDBlN2E3MDVkM2Q0MjJjNWI1
-    MWUzY2U5YTI4OTUyYWMzY2UzNjM2NTQxN2RmNDg0MTUzNWQ5M2NiMzc4M2I2
-    YmE4YWZhODRiNjVkOGZjNzBjZmFkNWJjOTc1ODk0MDVkMTRiODU=
+    ZDRlMzdlOGJjYWU4ZGJiNjY5NTFjMzdhNTViYjZmZDlkNzBhODJjYzhhMDA3
+    NTI3NWMxZTJmNGQxNGFhMzUzOTRkNTY0ZGMxN2VkZmU4ZjIzOTJmMjRjN2Yx
+    NWY2ZDFjZDE5M2U3ZmFiNTJlNWFkYTQyZDY3NzVjNDk1ZGM3NWI=
   data.tar.gz: !binary |-
-    Y2ZmNjhiZDllODY0NjZmM2E4NjM5ZGMwYWVjYWQxMmM2NmI0MmMwNDRkMjA0
-    ODBhYzljNmJiZjBhZGE3ZGNkZGMyNTA5YTNmNzU0NWJmZjFlZGEwNmM5OTQ4
-    YWU1MTJjZGJkZDIyODg2YjA1NzFlMWYxMzZmZjQ2OThmYTRmNjY=
+    OGJhNjcwNDk3Mjg2MjE4NWM0NzAyMGFiZWJlMzg3YzI0OWJjZTYxMDg3NTdk
+    YzQ3MzU3MjZlZWQwMzYxNWZjM2UwM2E2Zjg3MTYwZjJiOWRiNmJlMDhiOTkx
+    OWQ5Y2NiMWRmZDA2OTFhNDcyZWZkYmYyMTJhMGU2NjkzY2YyNzg=

data/.travis.yml

@@ -1,11 +1,6 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
   - jruby
-  - rbx-18mode
   - rbx-19mode
-  - ruby-head
-  - ree
-bundler_args: --without rcov

data/gitable.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "gitable"
-  s.version     = "0.3.0"
+  s.version     = "0.3.1"
   s.authors     = ["Martin Emde"]
   s.email       = ["martin.emde@gmail.com"]
   s.homepage    = "http://github.org/martinemde/gitable"

data/lib/gitable/scp_uri.rb

@@ -8,7 +8,7 @@ module Gitable
     # Deprecated: This serves no purpose. You might as well just parse the URI.
     def self.scp?(uri)
       $stderr.puts "DEPRECATED: Gitable::ScpURI.scp?. You're better off parsing the URI and checking #scp?."
-      parse(uri).scp?
+      Gitable::URI.parse(uri).scp?
     end
 
     ##

data/lib/gitable/uri.rb

@@ -184,7 +184,8 @@ module Gitable
     #
     # @return [Boolean] true if the URI probably indicates the same repository.
     def equivalent?(other_uri)
-      other = Gitable::URI.parse(other_uri)
+      other = Gitable::URI.parse_when_valid(other_uri)
+      return false unless other
 
       same_host = normalized_host.to_s == other.normalized_host.to_s
 
@@ -199,8 +200,6 @@ module Gitable
         # if the path is absolute, we can assume it's the same for all users (so the user doesn't have to match).
         same_host && same_path && (path =~ %r#^/# || same_user)
       end
-    rescue Gitable::URI::InvalidURIError
-      false
     end
 
     # Dun da dun da dun, Inspector Gadget.

data/spec/gitable_spec.rb

@@ -79,9 +79,25 @@ describe Gitable::URI do
       expect(Gitable::URI.parse(nil)).to be_nil
     end
 
-    it "returns the same uri when passed a Gitable::URI" do
+    it "returns a Gitable::URI when passed a URI" do
+      stdlib_uri = URI.parse(@uri)
+      gitable = Gitable::URI.parse(stdlib_uri)
+      expect(gitable).to be_a_kind_of(Gitable::URI)
+      expect(gitable.to_s).to eq(stdlib_uri.to_s)
+    end
+
+    it "returns a Gitable::URI when passed an Addressable::URI" do
+      addr_uri = Addressable::URI.parse(@uri)
+      gitable = Gitable::URI.parse(addr_uri)
+      expect(gitable).to be_a_kind_of(Gitable::URI)
+      expect(gitable.to_s).to eq(addr_uri.to_s)
+    end
+
+    it "returns a duplicate of the uri when passed a Gitable::URI" do
       gitable = Gitable::URI.parse(@uri)
-      expect(Gitable::URI.parse(gitable)).to eq(gitable)
+      parsed = Gitable::URI.parse(gitable)
+      expect(parsed).to eq(gitable)
+      expect(parsed).to_not eq(gitable.object_id)
     end
 
     it "raises a TypeError on bad type" do
@@ -111,6 +127,10 @@ describe Gitable::URI do
           it "returns nil on parse_when_valid" do
             expect(Gitable::URI.parse_when_valid(uri)).to be_nil
           end
+
+          it "is not equivalent to a bad uri" do
+            expect(Gitable::URI.parse('git://github.com/martinemde/gitable.git')).to_not be_equivalent(uri)
+          end
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitable
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Martin Emde
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-19 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable