ruby-uriparser 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 245f54ec2e764c1ab69698c09b42e171e8f9aa2b
-  data.tar.gz: ed8b45378e1ffbed1f411c3e3a94d877b80d97ab
+SHA256:
+  metadata.gz: 04a0cd98ff9826b233dbc567276e1dad5485c0068ac48c5d6809929876b05c73
+  data.tar.gz: '08cb5e19c101d70dfd1a34a189be595829b03de8ed150fbaadc7edeb36ae4504'
 SHA512:
-  metadata.gz: 7358c5f250a0f90388b1ef18b97cce995eda263efd3b32f6c283a3f4465ff9c403dcaa8068fbae01f8513514e29eb919f51e04893e3dec79a6f1be24b23855aa
-  data.tar.gz: a40e3e7c64b41435c04b87d69b9c6bfae6bbeaa3c2b95b6e940e0104b4f6f9fc8cc9695f0aeb26404a57683a55020aca3dd753e88291a85baa002cc4660a680c
+  metadata.gz: fdc713b945f0874b05cf622941387ff0f90f74fd6f9a84b938f334f31e15ccfa7cb899afd9a8b1f3cbf8afb03474a7e40a959bbdf17a674b48b3356e3a11c4a9
+  data.tar.gz: ad799965b0b8bf958255b0a4be711e7f40f0a527d424a5d00c637220e4a4431ac6c199bc57346d61cb09f3b45d8fc4e56aa7788d53ba8ffc579ae23f84657ef7

data/Gemfile

@@ -1,3 +1,5 @@
-source "http://rubygems.org"
+# frozen_string_literal: true
 
-gemspec
+source 'http://rubygems.org'
+
+gemspec

data/README.md

@@ -1,6 +1,8 @@
 # ruby-uriparser
 
 [![Gem Version](https://badge.fury.io/rb/ruby-uriparser.png)](http://badge.fury.io/rb/ruby-uriparser)
+[![Build Status](https://travis-ci.org/tlewin/ruby-uriparser.svg?branch=master)](https://travis-ci.org/tlewin/ruby-uriparser)
+[![Ruby Style Guide](https://img.shields.io/badge/code_style-rubocop-brightgreen.svg)](https://github.com/rubocop-hq/rubocop)
 
 Ruby-uriparser is a wrapper for [uriparser](http://uriparser.sourceforge.net/) C library which is fast (linear input length time complexity), approximatelly 7.5x faster than the standard ruby URI library with a low memory consumption.
 
@@ -56,4 +58,4 @@ This project includes code from the New BSD licensed:
 * Copyright (C) 2007, Weijia Song <songweijia@gmail.com>
 * Copyright (C) 2007, Sebastian Pipping <webmaster@hartwork.org>
 
-All rights reserved.
+All rights reserved.

data/Rakefile

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'rake/extensiontask'
 require 'rake/testtask'
 
 Rake::ExtensionTask.new('uriparser_ext')
 
 desc 'run tests'
-Rake::TestTask.new(:test => :'ext:build') do |test|
+Rake::TestTask.new(test: :'ext:build') do |test|
   test.libs << 'test'
   test.pattern = 'test/**/*_test.rb'
   test.verbose = true
@@ -12,7 +14,7 @@ end
 
 namespace :ext do
   desc 'build extention'
-  task :build => [:clobber, :compile]
+  task build: %i[clobber compile]
 end
 
-task :default => :test
+task default: :test

data/ext/uriparser_ext/extconf.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mkmf'
 require 'rbconfig'
 
@@ -6,4 +8,4 @@ unless have_library('uriparser')
   exit
 end
 
-create_makefile 'uriparser_ext'
+create_makefile 'uriparser_ext'

data/ext/uriparser_ext/uriparser.c

@@ -73,10 +73,11 @@ struct uri_data {
 
 /* Helper methods prototypes */
 static void reset_fields(struct uri_data *);
-static void populate_fields(VALUE uri);
+static void populate_fields(VALUE);
 static VALUE compose_uri_from_data(struct uri_data *);
-static int parse_uri(char *, UriUriA *);
+static int parse_uri(const char *, UriUriA *);
 static void free_uri(UriUriA *);
+static UriUriA* update_uri(VALUE);
 
 static void
 rb_uriparser_mark(void *p)
@@ -169,14 +170,9 @@ rb_uriparser_get_path(VALUE self)
         UriPathSegmentA *path_segment = data->uri->pathHead;
         data->path = rb_str_new("/", 1);
         do { /* go through the linked list */ 
-          /* check if there is a slash to add */
-          if(*path_segment->text.afterLast == '/') {
-            rb_str_cat(data->path, path_segment->text.first, 
-              path_segment->text.afterLast - path_segment->text.first + 1);
-          } else {
-            rb_str_cat(data->path, path_segment->text.first, 
-              path_segment->text.afterLast - path_segment->text.first);
-          }
+          rb_str_cat(data->path, path_segment->text.first, 
+            path_segment->text.afterLast - path_segment->text.first + 
+              (*path_segment->text.afterLast == '/')); /* check if there is a slash to add */
           path_segment = path_segment->next;
         } while(path_segment);
       } else {
@@ -197,25 +193,8 @@ rb_uriparser_normalize_bang(VALUE self)
   struct uri_data *data;
   
   Data_Get_Struct(self, struct uri_data, data);
-  if(!data->uri || data->updated) {
-    if(data->updated) {
-      populate_fields(self);
-    }
-    /* Compute and parse the new URI */
-    VALUE new_uri = compose_uri_from_data(data);
-    UriUriA *uri = ALLOC(UriUriA);
-
-    if(parse_uri(StringValueCStr(new_uri), uri) != URI_SUCCESS) {
-      free_uri(uri);
-      rb_gc_mark(new_uri);
-      rb_raise(rb_eStandardError, "invalid URI (%s) to normalize", StringValueCStr(new_uri));
-    }
-
-    free_uri(data->uri);
-    rb_gc_mark(new_uri);
-    data->uri = uri;
-  }
-
+  update_uri(self);
+  
   if(uriNormalizeSyntaxA(data->uri) != URI_SUCCESS) {
     rb_raise(rb_eStandardError, "unable to normalize the URI");
   } 
@@ -237,6 +216,25 @@ rb_uriparser_unescape(VALUE self)
   return Qnil;
 }
 
+static VALUE
+rb_uriparser_to_s(VALUE self)
+{
+  int chars_required;
+  char *str_uri;
+  UriUriA *uri = update_uri(self);
+  VALUE obj_str_uri;
+  
+  if(uriToStringCharsRequiredA(uri, &chars_required) != URI_SUCCESS ||
+      !(str_uri = ALLOC_N(char, ++chars_required)) ||
+      uriToStringA(str_uri, uri, chars_required, NULL) != URI_SUCCESS) {
+    rb_raise(rb_eStandardError, "unable to convert to string");
+  }
+
+  obj_str_uri = rb_str_new2(str_uri);
+  xfree(str_uri);
+  return obj_str_uri;
+}
+
 static void
 reset_fields(struct uri_data *data) 
 {
@@ -318,7 +316,7 @@ compose_uri_from_data(struct uri_data *data)
 }
 
 static int
-parse_uri(char *str_uri, UriUriA *uri) 
+parse_uri(const char *str_uri, UriUriA *uri) 
 {
   uri_parse_state.uri = uri;
   
@@ -334,6 +332,37 @@ free_uri(UriUriA *uri)
   }
 }
 
+static UriUriA *
+update_uri(VALUE uri_obj)
+{
+  struct uri_data *data;
+
+  Data_Get_Struct(uri_obj, struct uri_data, data);
+  if(!data->uri || data->updated) {
+    VALUE new_uri;
+    UriUriA *uri = ALLOC(UriUriA);
+    
+    if(data->updated) {
+      populate_fields(uri_obj);
+    }
+    /* Compute and parse the new URI */
+    new_uri = compose_uri_from_data(data);
+
+    if(parse_uri(StringValueCStr(new_uri), uri) != URI_SUCCESS) {
+      free_uri(uri);
+      rb_gc_mark(new_uri);
+      rb_raise(rb_eStandardError, "invalid URI (%s) to normalize", StringValueCStr(new_uri));
+    }
+
+    free_uri(data->uri);
+    rb_gc_mark(new_uri);
+    data->uri = uri;
+  }
+
+  return data->uri;
+}
+
+
 void
 Init_uriparser_ext()
 {
@@ -360,6 +389,7 @@ Init_uriparser_ext()
   rb_define_method(rb_cUri_Class, "normalize!", rb_uriparser_normalize_bang, 0);
   rb_define_method(rb_cUri_Class, "escape", rb_uriparser_escape, 0);
   rb_define_method(rb_cUri_Class, "unescape", rb_uriparser_unescape, 0);
+  rb_define_method(rb_cUri_Class, "to_s", rb_uriparser_to_s, 0);
 
   rb_define_singleton_method(rb_mUriParser, "parse", rb_uriparser_s_parse, 1);
 }

data/lib/uriparser.rb

@@ -1,35 +1,29 @@
-$LOAD_PATH.push File.expand_path(File.dirname(__FILE__))
+# frozen_string_literal: true
+
+$LOAD_PATH.push __dir__
 require 'uriparser_ext'
 
-module UriParser
+module UriParser #:nodoc: all
   class URI
     def port
-      @port ||= if str_port.nil?
-        nil
-      else
-        str_port.to_i
-      end
+      @port ||= str_port.nil? ? nil : str_port.to_i
     end
 
-    def port=value
+    def port=(value)
       @port         = value.to_i
       self.str_port = (value.nil? ? nil : value.to_s)
     end
 
     def user
-      if userinfo
-        userinfo.split(':').first
-      else
-        nil
-      end
+      return unless userinfo
+
+      userinfo.split(':').first
     end
 
     def password
-      if userinfo
-        userinfo.split(':')[1]
-      else
-        nil
-      end
+      return unless userinfo
+
+      userinfo.split(':')[1]
     end
   end
-end
+end

data/lib/uriparser/uri_gem.rb

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 require 'uri'
 require 'uriparser'
 
 # wrapper the ruby URI class
-module URI
-  def self.parser uri
+module URI #:nodoc: all
+  def self.parse(uri)
     UriParser.parse(uri)
   end
 end
 
-module Kernel
-  def URI(uri)
+module Kernel #:nodoc: all
+  def URI(uri) # rubocop:disable Naming/MethodName
     UriParser.parse(uri)
   end
 end

data/lib/uriparser/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module UriParser
-  VERSION = '0.1.2'
-end
+  VERSION = '0.2.0'
+end

data/test/test_helper.rb

@@ -1,4 +1,13 @@
-require 'test/unit'
-require 'shoulda'
+# frozen_string_literal: true
+
+require 'minitest/autorun'
+require 'shoulda/context'
+require 'shoulda/matchers'
 
 require './lib/uriparser'
+
+Shoulda::Matchers.configure do |config|
+  config.integrate do |with|
+    with.test_framework :minitest
+  end
+end

data/test/uriparser_test.rb

@@ -1,103 +1,120 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
-class UriParserTest < Test::Unit::TestCase
+class UriParserTest < Minitest::Test # rubocop:disable Metrics/ClassLength
+  FULL_URI        = 'http://user:pwd@ruby-lang.org:80/en/about?yes=1#any'
+  SIMPLE_URI      = 'https://ruby-lang.org'
+  WEIRD_PATH_URI  = 'http://example.org/one/two/../../one'
+
+  def setup
+    @full_uri   = UriParser.parse(FULL_URI)
+    @simple_uri = UriParser.parse(SIMPLE_URI)
+
+    @manual_uri = UriParser::URI.new
+    @manual_uri.scheme    = 'http'
+    @manual_uri.host      = 'example.org'
+    @manual_uri.path      = '/one/two/../'
+    @manual_uri.fragment  = 'test'
+
+    @weird_path_uri = UriParser.parse(WEIRD_PATH_URI)
+  end
 
   context 'URI parsing' do
     should 'raise an exception if was unable to parse the URI' do
-      assert_raise(StandardError) {UriParser.parse('invalid uri')}
+      assert_raises(StandardError) { UriParser.parse('invalid uri') }
     end
 
     should 'parse valid URI' do
-      uri = UriParser.parse('http://user:pwd@ruby-lang.org:80/en/about?yes=1#any')
-      assert_equal uri.scheme,    'http'
-      assert_equal uri.userinfo,  'user:pwd'
-      assert_equal uri.host,      'ruby-lang.org'
-      assert_equal uri.str_port,  '80'
-      assert_equal uri.path,      '/en/about'
-      assert_equal uri.query,     'yes=1'
-      assert_equal uri.fragment,  'any'
+      assert_equal @full_uri.scheme,    'http'
+      assert_equal @full_uri.userinfo,  'user:pwd'
+      assert_equal @full_uri.host,      'ruby-lang.org'
+      assert_equal @full_uri.str_port,  '80'
+      assert_equal @full_uri.path,      '/en/about'
+      assert_equal @full_uri.query,     'yes=1'
+      assert_equal @full_uri.fragment,  'any'
     end
 
     should 'paser valid but incomplete URI' do
-      uri = UriParser.parse('https://ruby-lang.org')
-      assert_equal uri.scheme,    'https'
-      assert_equal uri.userinfo,  nil
-      assert_equal uri.host,      'ruby-lang.org'
-      assert_equal uri.str_port,  nil
-      assert_equal uri.path,      ''
-      assert_equal uri.query,     nil
-      assert_equal uri.fragment,  nil
+      assert_equal @simple_uri.scheme, 'https'
+      assert_nil @simple_uri.userinfo
+      assert_equal @simple_uri.host, 'ruby-lang.org'
+      assert_nil @simple_uri.str_port
+      assert_equal @simple_uri.path, ''
+      assert_nil @simple_uri.query
+      assert_nil @simple_uri.fragment
     end
 
     should 'return URI object after a successful parsing' do
-      uri = UriParser.parse('https://ruby-lang.org')
-      assert_instance_of UriParser::URI, uri
+      assert_instance_of UriParser::URI, @simple_uri
     end
   end
 
   context 'URI class API' do
     should 'allow update any URI field' do
-      uri = UriParser.parse('http://user:pwd@ruby-lang.org:80/en/about?yes=1#any')
-      uri.scheme    = 'ftp'
-      uri.userinfo  = nil
-      uri.host      = 'example.org'
-      uri.str_port  = nil
-      uri.path      = '/'
-      uri.query     = 'xx=11'
-      uri.fragment  = nil
-      assert_equal uri.scheme,    'ftp'
-      assert_equal uri.userinfo,  nil
-      assert_equal uri.host,      'example.org'
-      assert_equal uri.str_port,  nil
-      assert_equal uri.path,      '/'
-      assert_equal uri.query,     'xx=11'
-      assert_equal uri.fragment,  nil
+      @full_uri.scheme    = 'ftp'
+      @full_uri.userinfo  = nil
+      @full_uri.host      = 'example.org'
+      @full_uri.str_port  = nil
+      @full_uri.path      = '/'
+      @full_uri.query     = 'xx=11'
+      @full_uri.fragment  = nil
+      assert_equal @full_uri.scheme, 'ftp'
+      assert_nil @full_uri.userinfo
+      assert_equal @full_uri.host, 'example.org'
+      assert_nil @full_uri.str_port
+      assert_equal @full_uri.path, '/'
+      assert_equal @full_uri.query, 'xx=11'
+      assert_nil @full_uri.fragment
     end
 
     should 'split userinfo data' do
-      uri = UriParser.parse('http://user:pwd@ruby-lang.org:80/en/about?yes=1#any')
-      assert_equal uri.user, 'user'
-      assert_equal uri.password, 'pwd'
+      assert_equal @full_uri.user, 'user'
+      assert_equal @full_uri.password, 'pwd'
     end
 
     should 'return nil if no user/password informed' do
       uri = UriParser.parse('http://ruby-lang.org:80/en/about?yes=1#any')
-      assert_equal uri.user, nil
-      assert_equal uri.password, nil
+      assert_nil uri.user
+      assert_nil uri.password
     end
 
     should 'port and str_port be synchronized' do
-      uri = UriParser.parse('http://ruby-lang.org:80/en/about?yes=1#any')
-      uri.port = 1
-      assert_equal uri.str_port, '1'
+      @full_uri.port = 1
+      assert_equal @full_uri.str_port, '1'
+    end
+
+    should 'convert to string (to_s)' do
+      assert_equal @simple_uri.to_s, SIMPLE_URI
+      assert_equal @full_uri.to_s, FULL_URI
+      assert_equal @manual_uri.to_s, 'http://example.org/one/two/../#test'
+      assert_equal @weird_path_uri.to_s, WEIRD_PATH_URI
     end
   end
 
   context 'URI normalizing' do
     should 'normalize a valid URI' do
-      uri = UriParser.parse('http://example.org/one/two/../../one')
-      uri.normalize!
-      assert_equal uri.scheme,    'http'
-      assert_equal uri.userinfo,  nil
-      assert_equal uri.host,      'example.org'
-      assert_equal uri.str_port,  nil
-      assert_equal uri.path,      '/one'
-      assert_equal uri.query,     nil
-      assert_equal uri.fragment,  nil
+      @weird_path_uri.normalize!
+      assert_equal @weird_path_uri.scheme, 'http'
+      assert_nil @weird_path_uri.userinfo
+      assert_equal @weird_path_uri.host, 'example.org'
+      assert_nil @weird_path_uri.str_port
+      assert_equal @weird_path_uri.path, '/one'
+      assert_nil @weird_path_uri.query
+      assert_nil @weird_path_uri.fragment
     end
 
     should 'normalize an updated URI' do
-      uri = UriParser.parse('http://example.org')
-      uri.path = '/one/two/../../one'
-      assert_equal uri.path, '/one/two/../../one'
-      uri.normalize!
-      assert_equal uri.scheme,    'http'
-      assert_equal uri.userinfo,  nil
-      assert_equal uri.host,      'example.org'
-      assert_equal uri.str_port,  nil
-      assert_equal uri.path,      '/one'
-      assert_equal uri.query,     nil
-      assert_equal uri.fragment,  nil
+      @simple_uri.path = '/one/two/../../one'
+      assert_equal @simple_uri.path, '/one/two/../../one'
+      @simple_uri.normalize!
+      assert_equal @simple_uri.scheme, 'https'
+      assert_nil @simple_uri.userinfo
+      assert_equal @simple_uri.host, 'ruby-lang.org'
+      assert_nil @simple_uri.str_port
+      assert_equal @simple_uri.path, '/one'
+      assert_nil @simple_uri.query
+      assert_nil @simple_uri.fragment
     end
 
     should 'normalize an URI manually created' do
@@ -107,13 +124,20 @@ class UriParserTest < Test::Unit::TestCase
       uri.path      = '/one/two/../'
       uri.fragment  = 'test'
       uri.normalize!
-      assert_equal uri.scheme,    'http'
-      assert_equal uri.userinfo,  nil
-      assert_equal uri.host,      'example.org'
-      assert_equal uri.str_port,  nil
-      assert_equal uri.path,      '/one'
-      assert_equal uri.query,     nil
-      assert_equal uri.fragment,  'test'
+      assert_equal uri.scheme, 'http'
+      assert_nil uri.userinfo
+      assert_equal uri.host, 'example.org'
+      assert_nil uri.str_port
+      assert_equal uri.path, '/one'
+      assert_nil uri.query
+      assert_equal uri.fragment, 'test'
+    end
+
+    should 'update URI string representation' do
+      @weird_path_uri.normalize!
+      @manual_uri.normalize!
+      assert_equal @weird_path_uri.to_s, 'http://example.org/one'
+      assert_equal @manual_uri.to_s, 'http://example.org/one/#test'
     end
   end
-end
+end

metadata

@@ -1,35 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: ruby-uriparser
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Thiago Lewin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00.000000000 Z
+date: 2020-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
-    - - ">="
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.92'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.92'
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
 description: Ruby wrapper for uriparser C library
 email:
 - thiago_lewin@yahoo.com.br
@@ -61,18 +89,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for uriparser C library
 test_files:
-- test/test_helper.rb
 - test/uriparser_test.rb
+- test/test_helper.rb