fustigit 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 551f4ad9ed874b976c1de00a5289a1352d946d64
-  data.tar.gz: 1954e7f60f0c10a423f8a2cc0f16d0a09ba4d085
+  metadata.gz: c751ca9b2b4344d7ffdfe8135e75415cc6c56e17
+  data.tar.gz: 59c43e03ed9c4c51507bf4db11d54c3a47bb7979
 SHA512:
-  metadata.gz: fe5bbee3df3198f8d9d93f7cc88a27c1609c2ee952e25a65884016f07b5e44b15a3d98cbe0c88e773b9f8806dc6788172708eb59be85d8bacee65b353ed88d61
-  data.tar.gz: 50f90dbc0e42dca704a759d2ab68feb3a2ab326a380b4733ff848099b45a2e1fbd4e54850c587eb72befbabe34a633b37b908ff41cfdb7ac3d08675767896861
+  metadata.gz: 19fcae6c47cbc194ec192839a64f85bae11d26431d2a2215c56f5314f34f37d406389e49b543a7b72a6bef0dce40a282925860b1bfbd523c8edc0860c9e5630f
+  data.tar.gz: f52b1964f4dd1fe5ba16000d20eb75172afd0b8ba89951985fadfc8f65ef95a21c77f3cb3e3a83edd946ba710acfc6311ad659441a713dfef5205fbfe6eb9eb8

data/CHANGELOG.md

@@ -3,6 +3,16 @@ All notable changes to this project will be documented in this file.
 This project attempts to adhere to [Semantic Versioning](http://semver.org/).
 This changelog attempts to adhere to [Keep a CHANGELOG](http://keepachangelog.com/).
 
+## [0.1.3] - 07 July 2016
+### Added
+- Triplets#split method returns the expected array of values for parsed triplets
+### Changed
+- Improved Triplets#triplet? functionality
+
+## [0.1.2] - 07 July 2016
+### Added
+- Triplets#triplet? method allows for fast testing on parsed triplets
+
 ## [0.1.1] - 09 May 2016
 ### Added
 - Fix Ruby 2.2.0 and 2.3.0 support

data/lib/fustigit/version.rb

@@ -1,5 +1,5 @@
 module Fustigit
   module Version
-    VERSION = "0.1.1".freeze
+    VERSION = "0.1.3".freeze
   end
 end

data/lib/uri/triplets.rb

@@ -23,7 +23,7 @@ module Triplets
     str << "#{scheme}://" if scheme
     str << "#{user}@" if user
     if port && port != self.class::DEFAULT_PORT
-      host_info [host, port].join(":")
+      host_info = [host, port].join(":")
       str << [host_info, path].join("/").squeeze("/")
     else
       str << [host, path].join("/").squeeze("/")
@@ -31,15 +31,19 @@ module Triplets
   end
   private :rfc_uri
 
-  # if self.path is a relative path, assume that this was parsed
-  # as a triplet and return a Triplet. Otherwise, assume that
-  # this is a valid URI and print an RFC compliant URI. This
-  # may not be the most robust method of determining if a
-  # triplet should be used, but everything starts someplace.
   def to_s
-    return triplet if relative?
+    return triplet if triplet?
     rfc_uri
   end
+
+  # Use the same regular expressions that the parser uses to determine
+  # if this is a valid triplet.
+  def triplet?
+    # False if self matches a normal URI scheme
+    !(rfc_uri =~ URI.parser.const_get(:SCHEME)) &&
+      # False unless self matches a Triplet scheme
+      !!(triplet =~ URI.parser.const_get(:TRIPLET))
+  end
 end
 
 # A SCP Triplet is *not* a canonical URI. It doesn't follow any RFCs that
@@ -60,6 +64,14 @@ module TripletInterruptus
     super(uri)
   end
 
+  def split(uri)
+    return super(uri) unless triplet?(uri)
+
+    parts = parse_triplet(uri)
+    [nil, parts[:userinfo], parts[:host], nil,
+     nil, parts[:path], nil, nil, nil]
+  end
+
   def triplet?(address)
     address.match(TRIPLET) && !address.match(SCHEME)
   end
@@ -96,6 +108,12 @@ module TripletHandling
     end
     @default_triplet_type = value
   end
+
+  def parser
+    return URI::RFC3986_Parser if
+      Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.2.0")
+    URI::Parser
+  end
 end
 
 # Reopen URI and include TripletHandling (which will then

data/spec/uri/fustigit_spec.rb

@@ -26,6 +26,10 @@ describe URI do
       it "returns URI::#{URI.default_triplet_type}" do
         URI.parse(repo).is_a?(URI.const_get(URI.default_triplet_type)).must_equal true
       end
+
+      it "recognizes URI::#{URI.default_triplet_type} as a triplet" do
+        URI.parse(repo).triplet?.must_equal true
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fustigit
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Ryan McKern
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies: []
 description: '"Parse" SCP-like address triplets with the Standard Ruby URI Library.'
 email: ryan@orangefort.com
@@ -49,7 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 3
 summary: Use URI to "parse" SCP-like triplets