iri 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 868c45e578542b837497a14f57e1c158be827ced06a7aad6be1bb8ac21d166f5
-  data.tar.gz: f6235d5ddca9789a0161cad29d23ff435f05461855a0fa38b0cd81db2c8d0687
+  metadata.gz: e104227c43194a812146100020f7eaf541095b684ee10b710f00e0446de088a9
+  data.tar.gz: 436424739e4e28f484f8608f913c10d0f589cd75b5788a0f2a3bc3f1cd46c1a5
 SHA512:
-  metadata.gz: 2a5ccbeedf58b255986664220256354e71903a65d7fe381bfd4ff097fea88de1ae813fb1693e9115c88358822bf861ff6efe938e58b0b76a60f563abd1ffef86
-  data.tar.gz: 21df9fcf433747a5fbccd0319fb8974a650d277e7164884f315301dfbe30fd0c1d192fc3ce4614a58f8dfb8678e4e7767819e5cee384d16a30a49113a93821b7
+  metadata.gz: 8b5cc60c6e2c3741c3f02d29f76ab36998200efb49726eb68221453fd0f4680f0d9a09331d0cf0ef05dc28139fdf17e18cc8d0295bdee243c302696f1ba91652
+  data.tar.gz: bf29b9215bf96c608fccb223003d2f3f4c31f0f2a4d60db3da3e69ceda6fe05d1fc41d0e45afa17316abe80b127161c987157ab2c99a77f9e424685c0f5bce27

data/README.md

@@ -29,6 +29,8 @@ url = Iri.new('http://google.com/')
   .scheme('https') # replace 'http' with 'https'
   .host('localhost') # replace the host name
   .port('443') # replace the port
+  .path('/new/path') # replace the path of the URI, leaving the query untouched
+  .cut('/q') # replace everything after the host and port
   .to_s # convert it to a string
 ```
 

data/iri.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = '2.5'
   s.required_ruby_version = '>=2.2'
   s.name = 'iri'
-  s.version = '0.4.3'
+  s.version = '0.5.0'
   s.license = 'MIT'
   s.summary = 'Simple Immutable Ruby URI Builder'
   s.description = 'Class Iri helps you build a URI and then modify its \

data/lib/iri.rb

@@ -45,11 +45,19 @@ require 'cgi'
 # Copyright:: Copyright (c) 2019 Yegor Bugayenko
 # License:: MIT
 class Iri
+  # When URI is not valid.
+  class InvalidURI < StandardError; end
+
   # Makes a new object.
   #
   # You can even ignore the argument, which will produce an empty URI.
-  def initialize(uri = '')
-    @uri = URI(uri)
+  #
+  # By default, this class will never throw any exceptions, even if your URI
+  # is not valid. It will just assume that the URI is"/". However,
+  # you can turn this mode off, by specifying safe as FALSE.
+  def initialize(uri = '', safe: true)
+    @uri = uri
+    @safe = safe
   end
 
   # Convert it to a string.
@@ -59,7 +67,7 @@ class Iri
 
   # Convert it to an object of class +URI+.
   def to_uri
-    @uri.clone
+    the_uri.clone
   end
 
   # Add a few query arguments. For example:
@@ -175,15 +183,24 @@ class Iri
 
   private
 
+  def the_uri
+    @the_uri ||= URI(@uri)
+  rescue URI::InvalidURIError => e
+    raise InvalidURI, e.message unless @safe
+    @the_uri = URI('/')
+  end
+
   def modify
-    c = @uri.clone
+    c = the_uri.clone
     yield c
     Iri.new(c)
   end
 
   def modify_query
     modify do |c|
-      params = CGI.parse(@uri.query || '').map { |p, a| [p.to_s, a.clone] }.to_h
+      params = CGI.parse(the_uri.query || '').map do |p, a|
+        [p.to_s, a.clone]
+      end.to_h
       yield(params)
       c.query = URI.encode_www_form(params)
     end

data/test/test_iri.rb

@@ -43,6 +43,16 @@ class IriTest < Minitest::Test
     assert_equal('https://localhost:443/?q=books+about+tennis&limit=10', url)
   end
 
+  def test_broken_uri
+    assert_raises Iri::InvalidURI do
+      Iri.new('https://example.com/>', safe: false).add(a: 1)
+    end
+  end
+
+  def test_broken_uri_in_safe_mode
+    Iri.new('https://example.com/>>>').add(a: 1)
+  end
+
   def test_starts_with_empty_uri
     assert_equal(
       'https:',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iri
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2019-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codecov