iri 0.11.0 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '090ea814be7932c9f11a51f40052f4f6000447d48d3f0f0ebccb80b21e025482'
-  data.tar.gz: 0e4f69a33dc33844dab9a1e17c7dfe06d4d686ffa52e0c6e2337aa903f359c88
+  metadata.gz: 85b6c4103f0ea74aa2c3a24441bb5be82ef0236a1ef2ee2f31848b4f7e8b9156
+  data.tar.gz: 305382fc068d8fe5f3b1b081236296ff45b9c700ec87666a2c00e2f9558130d9
 SHA512:
-  metadata.gz: a8cdae3530a4804eceecd692c5e62f14cdb2cce5c50ece9e4fdc2f31fa4919429a51308e15a2035963e8a84fae5714800a875c7e78cce583da2771fdef743a0e
-  data.tar.gz: 0af176ae76374db851c2da1b80e7b101988d94da232b485f957f1e6b10c682108d450edda87751227e0e350d533815073dce2f3d68d810c3b27754fc7276a1f6
+  metadata.gz: 0017afd7454f2c2ce1651a9d8d57209812e760aaa2b6582c183e9eb0142f66dd3ca464296c15aa8391d7947a5c39dd7ee172d8dd86285966df5e9a1e3ea255e2
+  data.tar.gz: 54d925acb96ba79905e2fd03ec2c300f1121b37923789a4054150e5e65c3c98b042117452121ce0567e368c596cee0c18628dace289d8f8947e4688e055889dc

data/.github/workflows/copyrights.yml

@@ -5,7 +5,11 @@
 name: copyrights
 'on':
   push:
+    branches:
+      - master
   pull_request:
+    branches:
+      - master
 jobs:
   copyrights:
     timeout-minutes: 15

data/.github/workflows/xcop.yml

@@ -5,7 +5,11 @@
 name: xcop
 'on':
   push:
+    branches:
+      - master
   pull_request:
+    branches:
+      - master
 jobs:
   xcop:
     timeout-minutes: 15

data/iri.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.required_ruby_version = '>=2.2'
   s.name = 'iri'
-  s.version = '0.11.0'
+  s.version = '0.11.2'
   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

@@ -62,7 +62,7 @@ class Iri
   # @raise [InvalidURI] If the URI is malformed and safe is false
   def initialize(uri = '', local: false, safe: true)
     raise ArgumentError, "The uri can't be nil" if uri.nil?
-    @uri = uri
+    @uri = uri.to_s
     @local = local
     @safe = safe
   end
@@ -217,6 +217,8 @@ class Iri
   # @see #port
   def scheme(val)
     raise ArgumentError, "The scheme can't be nil" if val.nil?
+    val = val.to_s
+    raise ArgumentError, "The scheme can't be empty" if val.empty?
     modify do |c|
       c.scheme = val
     end
@@ -234,6 +236,8 @@ class Iri
   # @see #port
   def host(val)
     raise ArgumentError, "The host can't be nil" if val.nil?
+    val = val.to_s
+    raise ArgumentError, "The host can't be empty" if val.empty?
     modify do |c|
       c.host = val
     end
@@ -251,6 +255,10 @@ class Iri
   # @see #host
   def port(val)
     raise ArgumentError, "The port can't be nil" if val.nil?
+    val = val.to_i
+    raise ArgumentError, "The port can'be negative" if val.negative?
+    raise ArgumentError, "The port can'be zero" if val.zero?
+    raise ArgumentError, "The port can'be larger than 65536" if val > 65_536
     modify do |c|
       c.port = val
     end
@@ -268,6 +276,8 @@ class Iri
   # @see #fragment
   def path(val)
     raise ArgumentError, "The path can't be nil" if val.nil?
+    val = val.to_s
+    raise ArgumentError, "The path can't be empty" if val.empty?
     modify do |c|
       c.path = val
     end
@@ -285,6 +295,7 @@ class Iri
   # @see #query
   def fragment(val)
     raise ArgumentError, "The fragment can't be nil" if val.nil?
+    val = val.to_s
     modify do |c|
       c.fragment = val.to_s
     end
@@ -306,6 +317,7 @@ class Iri
   # @see #over
   def query(val)
     raise ArgumentError, "The query can't be nil" if val.nil?
+    val = val.to_s
     modify do |c|
       c.query = val
     end
@@ -331,6 +343,8 @@ class Iri
   # @see #fragment
   def cut(path = '/')
     raise ArgumentError, "The path can't be nil" if path.nil?
+    path = path.to_s
+    raise ArgumentError, "The path can't be empty" if path.empty?
     modify do |c|
       c.query = nil
       c.path = path
@@ -360,6 +374,8 @@ class Iri
   # @see #path
   def append(part)
     raise ArgumentError, "The part can't be nil" if part.nil?
+    part = part.to_s
+    raise ArgumentError, "The part can't be empty" if part.empty?
     modify do |c|
       tail = (c.path.end_with?('/') ? '' : '/') + CGI.escape(part.to_s)
       c.path = c.path + tail

data/test/test_iri.rb

@@ -19,9 +19,9 @@ class IriTest < Minitest::Test
       .over(q: 'books about tennis', limit: 10)
       .scheme('https')
       .host('localhost')
-      .port('443')
+      .port(8080)
       .to_s
-    assert_equal('https://localhost:443/?q=books+about+tennis&limit=10', url)
+    assert_equal('https://localhost:8080/?q=books+about+tennis&limit=10', url)
   end
 
   def test_converts_to_uri
@@ -31,6 +31,13 @@ class IriTest < Minitest::Test
     )
   end
 
+  def test_hides_https_port_number
+    assert_equal(
+      'https://google.com/abc',
+      Iri.new('https://google.com').port(443).append('abc').to_s
+    )
+  end
+
   def test_converts_to_local
     {
       'http://localhost:9292/' => '/',
@@ -156,7 +163,7 @@ class IriTest < Minitest::Test
   def test_appends_path
     assert_equal(
       'http://google/a/b/z+%2F+7/42?x=3',
-      Iri.new('http://google/a/b?x=3').append('z / 7').append(42).to_s
+      Iri.new('http://google/a/b?x=3').append('z / 7').append(42.to_s).to_s
     )
   end
 
@@ -168,10 +175,6 @@ class IriTest < Minitest::Test
   end
 
   def test_appends_empty_path
-    assert_equal(
-      'http://google.com/hello/',
-      Iri.new('http://google.com/hello').append('').append('').to_s
-    )
     assert_equal(
       'http://google.com/test',
       Iri.new('http://google.com/hello').cut.append('test').to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iri
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.2
 platform: ruby
 authors:
 - Yegor Bugayenko