gravaty 9.0.1 → 10.0.0

data/test/gravaty/parsers/test_avatar.rb

@@ -1,6 +1,6 @@
 #--
 # gravaty
-# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019  Marco Bresciani
+# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
 #
 # This file is part of gravaty.
 #
@@ -28,11 +28,11 @@ describe Gravaty::Gravaty do
       @parser = subject
     end
 
-    subject {Gravaty::Parsers::Avatar.new}
+    subject { Gravaty::Parsers::Avatar.new }
 
     [['avatar/', true], ['', false]].each do |pair|
       it "shall return '#{pair[0]}' when parameter is '#{pair[1]}'" do
-        subject.parse(pair[1]).must_equal pair[0]
+        _(subject.parse(pair[1])).must_equal pair[0]
       end
     end
   end

data/test/gravaty/parsers/test_callback.rb

@@ -1,6 +1,6 @@
 #--
 # gravaty
-# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019  Marco Bresciani
+# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
 #
 # This file is part of gravaty.
 #
@@ -28,13 +28,13 @@ describe Gravaty::Gravaty do
       @parser = subject
     end
 
-    subject {Gravaty::Parsers::Callback.new}
+    subject { Gravaty::Parsers::Callback.new }
 
     %w(test sample_callback).each do |value|
       [[nil, ''], ['', ''], %W(#{value} callback=#{value})]
           .each do |pair|
         it "shall return '#{pair[1]}' when parameter is '#{pair[0]}'" do
-          subject.parse(pair[0]).must_equal pair[1]
+          _(subject.parse(pair[0])).must_equal pair[1]
         end
       end
     end

data/test/gravaty/parsers/test_default.rb

@@ -1,6 +1,6 @@
 #--
 # gravaty
-# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019  Marco Bresciani
+# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
 #
 # This file is part of gravaty.
 #
@@ -33,12 +33,12 @@ describe Gravaty::Gravaty do
       @parser = subject
     end
 
-    subject {Gravaty::Parsers::Default.new}
+    subject { Gravaty::Parsers::Default.new }
 
     Gravaty::DEFAULT_OPTIONS.each do |value|
       [[nil, ''], ['', ''], %W(#{value} d=#{value})].each do |pair|
         it "shall return '#{pair[1]}' when parameter is '#{pair[0]}'" do
-          subject.parse(pair[0]).must_equal pair[1]
+          _(subject.parse(pair[0])).must_equal pair[1]
         end
       end
     end
@@ -48,7 +48,7 @@ describe Gravaty::Gravaty do
       escaped = "d=#{CGI::escape(value)}"
 
       it "shall return '#{escaped}' when parameter is '#{value}'" do
-        subject.parse(value).must_equal escaped
+        _(subject.parse(value)).must_equal escaped
       end
     end
 
@@ -58,9 +58,9 @@ describe Gravaty::Gravaty do
           subject.parse('http://www.example.com/images/example.svg')
               .must_raise ArgumentError
         rescue ArgumentError => aErr
-          aErr.wont_be_nil
-          aErr.message.wont_be_nil
-          aErr.message.wont_be_empty
+          _(aErr).wont_be_nil
+          _(aErr.message).wont_be_nil
+          _(aErr.message).wont_be_empty
         end
       end
 
@@ -68,9 +68,9 @@ describe Gravaty::Gravaty do
         begin
           subject.parse('svg').must_raise ArgumentError
         rescue ArgumentError => aErr
-          aErr.wont_be_nil
-          aErr.message.wont_be_nil
-          aErr.message.wont_be_empty
+          _(aErr).wont_be_nil
+          _(aErr.message).wont_be_nil
+          _(aErr.message).wont_be_empty
         end
       end
     end

data/test/gravaty/parsers/test_force.rb

@@ -1,6 +1,6 @@
 #--
 # gravaty
-# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019  Marco Bresciani
+# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
 #
 # This file is part of gravaty.
 #
@@ -28,11 +28,11 @@ describe Gravaty::Gravaty do
       @parser = subject
     end
 
-    subject {Gravaty::Parsers::Force.new}
+    subject { Gravaty::Parsers::Force.new }
 
     [['f=y', true], ['', false]].each do |pair|
       it "shall return '#{pair[0]}' when parameter is '#{pair[1]}'" do
-        subject.parse(pair[1]).must_equal pair[0]
+        _(subject.parse(pair[1])).must_equal pair[0]
       end
     end
   end

data/test/gravaty/parsers/test_format.rb

@@ -1,6 +1,6 @@
 #--
 # gravaty
-# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019  Marco Bresciani
+# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
 #
 # This file is part of gravaty.
 #
@@ -31,12 +31,12 @@ describe Gravaty::Gravaty do
       @parser = subject
     end
 
-    subject {Gravaty::Parsers::Format.new}
+    subject { Gravaty::Parsers::Format.new }
 
     Gravaty::PROFILE_FORMATS.each do |value|
       [[nil, ''], %W(#{value} .#{value.downcase})].each do |pair|
         it "shall return '#{pair[1]}' when parameter is '#{pair[0]}'" do
-          subject.parse(pair[0]).must_equal pair[1]
+          _(subject.parse(pair[0])).must_equal pair[1]
         end
       end
     end
@@ -45,9 +45,9 @@ describe Gravaty::Gravaty do
       begin
         subject.parse('svg').must_raise ArgumentError
       rescue ArgumentError => aErr
-        aErr.wont_be_nil
-        aErr.message.wont_be_nil
-        aErr.message.wont_be_empty
+        _(aErr).wont_be_nil
+        _(aErr.message).wont_be_nil
+        _(aErr.message).wont_be_empty
       end
     end
   end

data/test/gravaty/parsers/test_pixelsize.rb

@@ -1,6 +1,6 @@
 #--
 # gravaty
-# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019  Marco Bresciani
+# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
 #
 # This file is part of gravaty.
 #
@@ -31,15 +31,15 @@ describe Gravaty::Gravaty do
       @parser = subject
     end
 
-    subject {Gravaty::Parsers::Pixelsize.new}
+    subject { Gravaty::Parsers::Pixelsize.new }
 
     it 'shall return nothing when parameter is nil' do
-      subject.parse(nil).must_be_empty
+      _(subject.parse(nil)).must_be_empty
     end
 
     Gravaty::ALLOWED_SIZES.each do |value|
       it "shall return s='#{value.to_s}' when parameter is '#{value}'" do
-        subject.parse(value).must_equal "s=#{value.to_s}"
+        _(subject.parse(value)).must_equal "s=#{value.to_s}"
       end
     end
 
@@ -47,9 +47,9 @@ describe Gravaty::Gravaty do
       begin
         subject.parse(0).must_raise ArgumentError
       rescue ArgumentError => aErr
-        aErr.wont_be_nil
-        aErr.message.wont_be_nil
-        aErr.message.wont_be_empty
+        _(aErr).wont_be_nil
+        _(aErr.message).wont_be_nil
+        _(aErr.message).wont_be_empty
       end
     end
   end

data/test/gravaty/parsers/test_rating.rb

@@ -1,6 +1,6 @@
 #--
 # gravaty
-# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019  Marco Bresciani
+# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
 #
 # This file is part of gravaty.
 #
@@ -31,12 +31,12 @@ describe Gravaty::Gravaty do
       @parser = subject
     end
 
-    subject {Gravaty::Parsers::Rating.new}
+    subject { Gravaty::Parsers::Rating.new }
 
     Gravaty::RATING_OPTIONS.each do |value|
       [[nil, ''], %W(#{value} rating=#{value.downcase})].each do |pair|
         it "shall return '#{pair[1]}' when parameter is '#{pair[0]}'" do
-          subject.parse(pair[0]).must_equal pair[1]
+          _(subject.parse(pair[0])).must_equal pair[1]
         end
       end
     end
@@ -45,9 +45,9 @@ describe Gravaty::Gravaty do
       begin
         subject.parse('xxx').must_raise ArgumentError
       rescue ArgumentError => aErr
-        aErr.wont_be_nil
-        aErr.message.wont_be_nil
-        aErr.message.wont_be_empty
+        _(aErr).wont_be_nil
+        _(aErr.message).wont_be_nil
+        _(aErr.message).wont_be_empty
       end
     end
   end

data/test/gravaty/parsers/test_secure.rb

@@ -1,6 +1,6 @@
 #--
 # gravaty
-# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019  Marco Bresciani
+# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
 #
 # This file is part of gravaty.
 #
@@ -28,11 +28,11 @@ describe Gravaty::Gravaty do
       @parser = subject
     end
 
-    subject {Gravaty::Parsers::Secure.new}
+    subject { Gravaty::Parsers::Secure.new }
 
     [['https://secure', true], ['http://www', false]].each do |pair|
       it "shall return '#{pair[0]}' when parameter is '#{pair[1]}'" do
-        subject.parse(pair[1]).must_equal pair[0]
+        _(subject.parse(pair[1])).must_equal pair[0]
       end
     end
   end

data/test/gravaty/parsers/test_type.rb

@@ -1,6 +1,6 @@
 #--
 # gravaty
-# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019  Marco Bresciani
+# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
 #
 # This file is part of gravaty.
 #
@@ -31,12 +31,12 @@ describe Gravaty::Gravaty do
           '*.yml')]
     end
 
-    subject {Gravaty::Parsers::Type.new}
+    subject { Gravaty::Parsers::Type.new }
 
     Gravaty::AVATAR_FORMATS.each do |value|
       [[nil, ''], %W(#{value} .#{value.downcase})].each do |pair|
         it "shall return '#{pair[1]}' when parameter is '#{pair[0]}'" do
-          subject.parse(pair[0]).must_equal pair[1]
+          _(subject.parse(pair[0])).must_equal pair[1]
         end
       end
     end

data/test/gravaty/test_application.rb

@@ -1,6 +1,6 @@
 #--
 # gravaty
-# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019  Marco Bresciani
+# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
 #
 # This file is part of gravaty.
 #
@@ -23,103 +23,87 @@ require_relative '../test_helper'
 describe Gravaty::Gravaty do
   describe 'when created with a valid email address' do
 
-    subject {Gravaty::Gravaty.new(Gravaty::TEST_MY_ADDRESS,
-                                  Gravaty::parser)}
+    subject { Gravaty::Gravaty.new(Gravaty::TEST_MY_ADDRESS,
+                                   Gravaty::parser) }
 
     it 'shall return the email content on demand' do
-      subject.email.must_equal Gravaty::TEST_MY_ADDRESS.downcase
+      _(subject.email).must_equal Gravaty::TEST_MY_ADDRESS.downcase
     end
 
     it 'shall return the digest content on demand' do
-      subject.digest.must_equal Gravaty::TEST_MY_MD5
+      _(subject.digest).must_equal Gravaty::TEST_MY_MD5
     end
 
     it 'shall return a valid string' do
-      subject.to_s.wont_be_nil
+      _(subject.to_s).wont_be_nil
     end
 
     it 'shall return a valid JSON' do
-      subject.to_json.wont_be_nil
-      JSON.parse(subject.to_json).wont_be_nil
+      _(subject.to_json).wont_be_nil
+      _(JSON.parse(subject.to_json)).wont_be_nil
     end
 
     [:avatar, :profile].each do |method|
       describe "when asked for '#{method}'" do
         describe 'when no parameters are provided' do
           it 'shall provide an URI' do
-            subject.send(method)
-                .must_match Gravaty::TEST_SIMPLE_URI_REGEXP
+            _(subject.send(method)).must_match Gravaty::TEST_SIMPLE_URI_REGEXP
           end
 
           it "shall provide a '#{method}' URI" do
-            subject.send(method)
-                .must_include Gravaty::TEST_STRING[method]
+            _(subject.send(method)).must_include Gravaty::TEST_STRING[method]
           end
 
           it "shall provide a '#{method}' with a secure URI" do
-            subject.send(method)
-                .must_match Gravaty::TEST_SECURE_URI_REGEXP
-            subject.send(method)
-                .wont_match Gravaty::TEST_UNSECURE_URI_REGEXP
+            _(subject.send(method)).must_match Gravaty::TEST_SECURE_URI_REGEXP
+            _(subject.send(method)).wont_match Gravaty::TEST_UNSECURE_URI_REGEXP
           end
         end
 
         describe 'when nil is provided' do
           it 'shall provide an URI' do
-            subject.send(method, nil)
-                .must_match Gravaty::TEST_SIMPLE_URI_REGEXP
+            _(subject.send(method, nil)).must_match Gravaty::TEST_SIMPLE_URI_REGEXP
           end
 
           it "shall provide a '#{method}' URI" do
-            subject.send(method, nil)
-                .must_include Gravaty::TEST_STRING[method]
+            _(subject.send(method, nil)).must_include Gravaty::TEST_STRING[method]
           end
 
           it "shall provide a '#{method}' with a secure URI" do
-            subject.send(method, nil)
-                .must_match Gravaty::TEST_SECURE_URI_REGEXP
-            subject.send(method, nil)
-                .wont_match Gravaty::TEST_UNSECURE_URI_REGEXP
+            _(subject.send(method, nil)).must_match Gravaty::TEST_SECURE_URI_REGEXP
+            _(subject.send(method, nil)).wont_match Gravaty::TEST_UNSECURE_URI_REGEXP
           end
 
         end
 
         describe 'when secure:false is provided' do
           it "shall provide a '#{method}' with an unsecure URI" do
-            subject.send(method, secure: false)
-                .wont_match Gravaty::TEST_SECURE_URI_REGEXP
-            subject.send(method, secure: false)
-                .must_match Gravaty::TEST_UNSECURE_URI_REGEXP
+            _(subject.send(method, secure: false)).wont_match Gravaty::TEST_SECURE_URI_REGEXP
+            _(subject.send(method, secure: false)).must_match Gravaty::TEST_UNSECURE_URI_REGEXP
           end
         end
       end
     end
 
     it 'shall provide the XML-RPC API interface' do
-      subject.must_respond_to :xmlrpc
+      _(subject).must_respond_to :xmlrpc
     end
 
     describe 'when asked for nil method' do
       it 'must raise an ArgumentError' do
-        assert_raises ArgumentError do
-          subject.xmlrpc(nil)
-        end
+        _(-> { subject.xmlrpc(nil) }).must_raise ArgumentError
       end
     end
 
     describe 'when asked for an unsupported method' do
       it 'must raise an ArgumentError' do
-        assert_raises ArgumentError do
-          subject.xmlrpc('my_method', 'my_password')
-        end
+        _(-> { subject.xmlrpc('my_method', 'my_password') }).must_raise ArgumentError
       end
     end
 
     describe 'when asked for a valid method with a nil password' do
       it 'must raise an ArgumentError' do
-        assert_raises ArgumentError do
-          subject.xmlrpc('my_method')
-        end
+        _(-> { subject.xmlrpc('my_method') }).must_raise ArgumentError
       end
     end
   end

data/test/gravaty/test_avatar.rb

@@ -1,6 +1,6 @@
 #--
 # gravaty
-# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019  Marco Bresciani
+# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
 #
 # This file is part of gravaty.
 #
@@ -23,30 +23,27 @@ require_relative '../test_helper'
 describe Gravaty::Gravaty do
   describe 'when created with a valid email address ' do
 
-    subject {Gravaty::Gravaty.new(Gravaty::TEST_MY_ADDRESS,
-                                  Gravaty::parser)}
+    subject { Gravaty::Gravaty.new(Gravaty::TEST_MY_ADDRESS,
+                                   Gravaty::parser) }
 
     Gravaty::AVATAR_FORMATS.each do |avatar|
       describe "when asked for '#{avatar}' image" do
         it "shall provide an URI with specified '#{avatar}' image" do
-          subject.avatar(type: avatar).must_include(".#{avatar}")
+          _(subject.avatar(type: avatar)).must_include(".#{avatar}")
         end
       end
     end
 
     describe 'when asked for unknown image' do
       it 'must raise an ArgumentError' do
-        assert_raises ArgumentError do
-          subject.avatar type: 'unknown'
-        end
+        _(-> { subject.avatar type: 'unknown' }).must_raise ArgumentError
       end
     end
 
     Gravaty::ALLOWED_SIZES.each do |size|
       describe "when asked for a size of '#{size}' pixels" do
         it "shall provide an URI with specified '#{size}' image" do
-          subject.avatar(pixelsize: size)
-              .must_match(/#{Gravaty::TEST_SIZE_REGEXP}$/)
+          _(subject.avatar(pixelsize: size)).must_match(/#{Gravaty::TEST_SIZE_REGEXP}$/)
         end
       end
     end
@@ -54,9 +51,7 @@ describe Gravaty::Gravaty do
     [-1, 0, Gravaty::ALLOWED_SIZES.max + 1].each do |size|
       describe "when asked for an invalid size of '#{size}' pixels" do
         it 'must raise an argument error' do
-          assert_raises ArgumentError do
-            subject.avatar(pixelsize: size)
-          end
+          _(-> { subject.avatar(pixelsize: size) }).must_raise ArgumentError
         end
       end
     end
@@ -64,30 +59,27 @@ describe Gravaty::Gravaty do
     Gravaty::RATING_OPTIONS.each do |rating|
       describe "when asked for a specific image rating '#{rating}'" do
         it "shall provide an URI with specified '#{rating}'" do
-          subject.avatar(rating: rating)
-              .must_include("rating=#{rating}")
+          _(subject.avatar(rating: rating)).must_include("rating=#{rating}")
         end
       end
     end
 
     describe 'when asked for unknown rating' do
       it 'must raise an ArgumentError' do
-        assert_raises ArgumentError do
-          subject.avatar rating: 'unknown'
-        end
+        _(-> { subject.avatar rating: 'unknown' }).must_raise ArgumentError
       end
     end
 
     describe 'when asked for forcing default image' do
       it 'shall provide a forced URI' do
-        subject.avatar(force: true).must_include Gravaty::TEST_FORCED
+        _(subject.avatar(force: true)).must_include Gravaty::TEST_FORCED
       end
     end
 
     Gravaty::DEFAULT_OPTIONS.each do |options|
       describe "when asked for a specific image options '#{options}'" do
         it "shall provide an URI with option '#{options}'" do
-          subject.avatar(default: options).must_include("d=#{options}")
+          _(subject.avatar(default: options)).must_include("d=#{options}")
         end
       end
     end
@@ -96,26 +88,20 @@ describe Gravaty::Gravaty do
       it 'shall provide a HTTP(S) URI' do
         ['', 's'].each do |type|
           an_uri = "http#{type}://www.example.com/example.jpg"
-          subject.avatar(default: an_uri).must_include CGI::escape(an_uri)
+          _(subject.avatar(default: an_uri)).must_include CGI::escape(an_uri)
         end
       end
 
       it 'must raise an ArgumentError when URI is not HTTP(S)' do
-        assert_raises ArgumentError do
-          subject.avatar default: 'ftp://www.example.com/example.jpg'
-        end
+        _(-> { subject.avatar default: 'ftp://www.example.com/example.jpg' }).must_raise ArgumentError
       end
 
       it 'must raise an ArgumentError when image format is not supported' do
-        assert_raises ArgumentError do
-          subject.avatar default: 'http://www.example.com/example.svg'
-        end
+        _(-> { subject.avatar default: 'http://www.example.com/example.svg' }).must_raise ArgumentError
       end
 
       it 'must raise an ArgumentError when URI contains a query string' do
-        assert_raises ArgumentError do
-          subject.avatar default: 'http://www.example.com?image=example.jpg'
-        end
+        _(-> { subject.avatar default: 'http://www.example.com?image=example.jpg' }).must_raise ArgumentError
       end
     end
   end