ruby-uriparser 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3680a4b234ef77f02e5369d22a23279c068cc20d
-  data.tar.gz: bb7396a7b8e6722707ab1e1b2eaca53cf3792e62
+  metadata.gz: 245f54ec2e764c1ab69698c09b42e171e8f9aa2b
+  data.tar.gz: ed8b45378e1ffbed1f411c3e3a94d877b80d97ab
 SHA512:
-  metadata.gz: dbaa748e0db6df1c3d0c17c8dd7c1324ddee2b597731103dad64ee437d3d43d36da727e0341443267e46174e5bbfa04dbe9e7157db137e672aa610ef2671fb2a
-  data.tar.gz: 4d49444f58aa5da71b1c3ab80c38504bc0aae7eb62a946c6ca0c7a77638faa6cbfa050f3e7c1f2b67d79fc1bb311c7335d2bac1bee7cb38fa812d2dc6db94623
+  metadata.gz: 7358c5f250a0f90388b1ef18b97cce995eda263efd3b32f6c283a3f4465ff9c403dcaa8068fbae01f8513514e29eb919f51e04893e3dec79a6f1be24b23855aa
+  data.tar.gz: a40e3e7c64b41435c04b87d69b9c6bfae6bbeaa3c2b95b6e940e0104b4f6f9fc8cc9695f0aeb26404a57683a55020aca3dd753e88291a85baa002cc4660a680c

data/README.md

@@ -1,5 +1,7 @@
 # ruby-uriparser
 
+[![Gem Version](https://badge.fury.io/rb/ruby-uriparser.png)](http://badge.fury.io/rb/ruby-uriparser)
+
 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.
 
 It is a fairly reasonable hypothesis to consider that __all__ Ruby Rack applications will call, at least once, the `URI.parse` method for each http request, so this simple optimization can bring a significant impact on a high load environment. (See Benchmark)
@@ -17,16 +19,18 @@ If you want to override the URI class just include the following line in your co
 
 ## Benchmark
 
-The following numbers were computed for 10,000 `URI.parse` calls using the ruby benchmark library in a Mac OS X (10.8.5)/ 2.9Ghz Intel Core I5/ 8GB 1600 MHz DDR3 machine:
+The following numbers were computed for 100,000 `URI.parse` calls using the ruby benchmark library in a Mac OS X (10.8.5)/ 2.9Ghz Intel Core I5/ 8GB 1600 MHz DDR3 machine:
 
-    Rehearsal ----------------------------------------------
-    URI          0.080000   0.000000   0.080000 (  0.075157)
-    UriParser    0.010000   0.000000   0.010000 (  0.009013)
-    ------------------------------------- total: 0.090000sec
+    Rehearsal ------------------------------------------------
+    URI            0.750000   0.000000   0.750000 (  0.750619)
+    UriParser      0.110000   0.010000   0.120000 (  0.111885)
+    Addressable    1.880000   0.000000   1.880000 (  1.886091)
+    --------------------------------------- total: 2.750000sec
 
-                     user     system      total        real
-    URI          0.070000   0.000000   0.070000 (  0.073731)
-    UriParser    0.000000   0.000000   0.000000 (  0.006310)
+                       user     system      total        real
+    URI            0.730000   0.000000   0.730000 (  0.728169)
+    UriParser      0.110000   0.000000   0.110000 (  0.107235)
+    Addressable    1.870000   0.000000   1.870000 (  1.863334)
 
 ## Installation
 

data/Rakefile

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

data/ext/uriparser_ext/uriparser.c

@@ -2,46 +2,58 @@
 #include <ruby.h>
 #include <uriparser/Uri.h>
 
+#define FALSE 0
+#define TRUE 1
+typedef char bool;
+
 #define URI_TEXT_RANGE(uri_ptr, uri_field) ((uri_ptr->uri_field.afterLast == uri_ptr->uri_field.first) ? Qnil :  \
     rb_str_new(uri_ptr->uri_field.first, uri_ptr->uri_field.afterLast - uri_ptr->uri_field.first))
 
-#define RB_URIPARSER_ATTR_READER(attribute, original) \
-    static VALUE \
-    rb_uriparser_get_##attribute(VALUE self) \
-    { \
-      struct uri_data *data; \
-    \
-      /* lazy load */ \
-      Data_Get_Struct(self, struct uri_data, data); \
-      if(RB_TYPE_P(data->attribute, T_UNDEF)) { \
-        if(data->uri) { \
-          data->attribute = URI_TEXT_RANGE(data->uri, original); \
-        } else { \
-          data->attribute = Qnil; \
-        } \
-      } \
-    \
-      return data->attribute; \
+#define RB_URIPARSER_ATTR_READER(attribute, original)             \
+    static VALUE                                                  \
+    rb_uriparser_get_##attribute(VALUE self)                      \
+    {                                                             \
+      struct uri_data *data;                                      \
+                                                                  \
+      /* lazy load */                                             \
+      Data_Get_Struct(self, struct uri_data, data);               \
+      if(RB_TYPE_P(data->attribute, T_UNDEF)) {                   \
+        if(data->uri) {                                           \
+          data->attribute = URI_TEXT_RANGE(data->uri, original);  \
+        } else {                                                  \
+          data->attribute = Qnil;                                 \
+        }                                                         \
+      }                                                           \
+                                                                  \
+      return data->attribute;                                     \
     }
 
-#define RB_URIPARSER_ATTR_WRITER(attribute) \
-    static VALUE \
-    rb_uriparser_set_##attribute(VALUE self, VALUE attribute) \
-    { \
-      VALUE old; \
-      struct uri_data *data; \
-    \
-      Data_Get_Struct(self, struct uri_data, data);  \
-      old = data->attribute; \
-      data->attribute = StringValue(attribute); \
-      rb_gc_mark(old); \
-      return data->attribute; \
+#define RB_URIPARSER_ATTR_WRITER(attribute)                       \
+    static VALUE                                                  \
+    rb_uriparser_set_##attribute(VALUE self, VALUE attribute)     \
+    {                                                             \
+      VALUE old;                                                  \
+      struct uri_data *data;                                      \
+                                                                  \
+      Data_Get_Struct(self, struct uri_data, data);               \
+      old = data->attribute;                                      \
+      if(NIL_P(attribute)) {                                      \
+        data->attribute = Qnil;                                   \
+      } else {                                                    \
+        data->attribute = StringValue(attribute);                 \
+      }                                                           \
+      data->updated = TRUE;                                       \
+      rb_gc_mark(old);                                            \
+                                                                  \
+      return data->attribute;                                     \
     } 
 
-#define RB_URIPARSER_ATTR_ACCESSOR(attribute, original)  \
-    RB_URIPARSER_ATTR_READER(attribute, original); \
+#define RB_URIPARSER_ATTR_ACCESSOR(attribute, original)           \
+    RB_URIPARSER_ATTR_READER(attribute, original);                \
     RB_URIPARSER_ATTR_WRITER(attribute);
 
+#define VALID_TYPE(v) (!(NIL_P(v) || RB_TYPE_P(v, T_UNDEF)))
+
 /* Parser structure reused across requests */
 static UriParserStateA uri_parse_state; 
 static VALUE rb_mUriParser;
@@ -49,34 +61,30 @@ static VALUE rb_cUri_Class;
 
 struct uri_data {
   UriUriA *uri; /* Parsed URI data */
+  bool updated; /* flag if any field was updated */
   VALUE scheme;
   VALUE userinfo;
-  VALUE password;
   VALUE host;
   VALUE str_port;
   VALUE path;
   VALUE query;
-  VALUE opaque;
-  VALUE registry;
   VALUE fragment;
 };
 
+/* Helper methods prototypes */
+static void reset_fields(struct uri_data *);
+static void populate_fields(VALUE uri);
+static VALUE compose_uri_from_data(struct uri_data *);
+static int parse_uri(char *, UriUriA *);
+static void free_uri(UriUriA *);
+
 static void
 rb_uriparser_mark(void *p)
 {
   struct uri_data *ptr = p;
   
   if (ptr) {
-    rb_gc_mark(ptr->scheme);
-    rb_gc_mark(ptr->userinfo);
-    rb_gc_mark(ptr->password);
-    rb_gc_mark(ptr->host);
-    rb_gc_mark(ptr->str_port);
-    rb_gc_mark(ptr->path);
-    rb_gc_mark(ptr->query);
-    rb_gc_mark(ptr->opaque);
-    rb_gc_mark(ptr->registry);
-    rb_gc_mark(ptr->fragment);
+    reset_fields(ptr);
   }
 }
 
@@ -86,8 +94,7 @@ rb_uriparser_free(void *p)
   struct uri_data *ptr = p;
   
   if(ptr) {
-    uriFreeUriMembersA(ptr->uri);
-    xfree(ptr->uri);
+    free_uri(ptr->uri);
     xfree(ptr);
   }
 }
@@ -99,18 +106,16 @@ rb_uriparser_s_allocate(VALUE klass)
 
   if(data) {
     data->uri       = NULL;
+    data->updated   = FALSE;
     data->scheme    = Qundef;
     data->userinfo  = Qundef;
-    data->password  = Qundef;
     data->host      = Qundef;
     data->str_port  = Qundef;
     data->path      = Qundef;
     data->query     = Qundef;
-    data->opaque    = Qundef;
-    data->registry  = Qundef;
     data->fragment  = Qundef;
   } else {
-    rb_raise(rb_eRuntimeError, "unable to create UriParser::Generic class");
+    rb_raise(rb_eRuntimeError, "unable to create UriParser::URI class");
   }
 
   return Data_Wrap_Struct(klass, rb_uriparser_mark, rb_uriparser_free, data);
@@ -119,7 +124,7 @@ rb_uriparser_s_allocate(VALUE klass)
 static VALUE
 rb_uriparser_s_parse(VALUE klass, VALUE uri_obj)
 {
-  char *uri_str = StringValueCStr(uri_obj);
+  char *str_uri = StringValueCStr(uri_obj);
   UriUriA *uri = ALLOC(UriUriA);
   struct uri_data *data;
   VALUE generic_uri;
@@ -128,11 +133,11 @@ rb_uriparser_s_parse(VALUE klass, VALUE uri_obj)
   Data_Get_Struct(generic_uri, struct uri_data, data);
 
   data->uri = uri;
-  uri_parse_state.uri = uri;
-  if(uriParseUriA(&uri_parse_state, uri_str) != URI_SUCCESS) {
-    rb_raise(rb_eStandardError, "unable to parse the URI");
-  }
 
+  if(parse_uri(str_uri, uri) != URI_SUCCESS) {
+    rb_raise(rb_eStandardError, "unable to parse the URI: %s", str_uri);
+  }
+  
   return generic_uri;
 }
 
@@ -185,6 +190,150 @@ rb_uriparser_get_path(VALUE self)
   return data->path;
 }
 
+/* TODO: Include option mask */
+static VALUE
+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;
+  }
+
+  if(uriNormalizeSyntaxA(data->uri) != URI_SUCCESS) {
+    rb_raise(rb_eStandardError, "unable to normalize the URI");
+  } 
+  /* Invalidate any previous field value */
+  reset_fields(data);
+  
+  return self;
+}
+
+static VALUE
+rb_uriparser_escape(VALUE self)
+{
+  return Qnil;
+}
+
+static VALUE
+rb_uriparser_unescape(VALUE self)
+{
+  return Qnil;
+}
+
+static void
+reset_fields(struct uri_data *data) 
+{
+  data->updated = FALSE;
+  
+  rb_gc_mark(data->scheme);
+  data->scheme = Qundef;
+  
+  rb_gc_mark(data->userinfo);
+  data->userinfo = Qundef;
+
+  rb_gc_mark(data->host);
+  data->host = Qundef;
+  
+  rb_gc_mark(data->str_port);
+  data->str_port = Qundef;
+  
+  rb_gc_mark(data->path);
+  data->path = Qundef;
+  
+  rb_gc_mark(data->query);
+  data->query = Qundef;
+  
+  rb_gc_mark(data->fragment);
+  data->fragment = Qundef;
+}
+
+static void
+populate_fields(VALUE uri) 
+{
+  rb_uriparser_get_scheme(uri);
+  rb_uriparser_get_userinfo(uri);
+  rb_uriparser_get_host(uri);
+  rb_uriparser_get_str_port(uri);
+  rb_uriparser_get_path(uri);
+  rb_uriparser_get_query(uri);
+  rb_uriparser_get_fragment(uri);
+}
+
+static VALUE
+compose_uri_from_data(struct uri_data *data) 
+{
+  VALUE str_uri = rb_str_new2("");
+
+  if(VALID_TYPE(data->scheme)) {
+    rb_str_cat2(str_uri, StringValueCStr(data->scheme));
+    rb_str_cat2(str_uri, "://");
+  }
+
+  if(VALID_TYPE(data->userinfo)) {
+    rb_str_cat2(str_uri, StringValueCStr(data->userinfo));
+    rb_str_cat2(str_uri, "@");
+  }
+
+  if(VALID_TYPE(data->host)) {
+    rb_str_cat2(str_uri, StringValueCStr(data->host));
+  }
+
+  if(VALID_TYPE(data->str_port)) {
+    rb_str_cat2(str_uri, ":");
+    rb_str_cat2(str_uri, StringValueCStr(data->str_port));
+  }
+
+  if(VALID_TYPE(data->path)) {
+    rb_str_cat2(str_uri, StringValueCStr(data->path));
+  }
+
+  if(VALID_TYPE(data->query)) {
+    rb_str_cat2(str_uri, "?");
+    rb_str_cat2(str_uri, StringValueCStr(data->query));
+  }
+
+  if(VALID_TYPE(data->fragment)) {
+    rb_str_cat2(str_uri, "#");
+    rb_str_cat2(str_uri, StringValueCStr(data->fragment));
+  }
+
+  return str_uri;
+}
+
+static int
+parse_uri(char *str_uri, UriUriA *uri) 
+{
+  uri_parse_state.uri = uri;
+  
+  return uriParseUriA(&uri_parse_state, str_uri);
+}
+
+static void 
+free_uri(UriUriA *uri)
+{
+  if(uri) {
+    uriFreeUriMembersA(uri);
+    xfree(uri);
+  }
+}
+
 void
 Init_uriparser_ext()
 {
@@ -208,7 +357,9 @@ Init_uriparser_ext()
   rb_define_method(rb_cUri_Class, "fragment", rb_uriparser_get_fragment, 0);
   rb_define_method(rb_cUri_Class, "fragment=", rb_uriparser_set_fragment, 1);
 
-  /* TODO: include opaque and registry methods */
+  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_singleton_method(rb_mUriParser, "parse", rb_uriparser_s_parse, 1);
 }

data/lib/uriparser.rb

@@ -1,3 +1,4 @@
+$LOAD_PATH.push File.expand_path(File.dirname(__FILE__))
 require 'uriparser_ext'
 
 module UriParser
@@ -11,16 +12,24 @@ module UriParser
     end
 
     def port=value
-      @port     = value.to_i
-      str_port  = value
+      @port         = value.to_i
+      self.str_port = (value.nil? ? nil : value.to_s)
     end
 
     def user
-      userinfo.split(':').first
+      if userinfo
+        userinfo.split(':').first
+      else
+        nil
+      end
     end
 
     def password
-      userinfo.split(':')[1]
+      if userinfo
+        userinfo.split(':')[1]
+      else
+        nil
+      end
     end
   end
 end

data/lib/uriparser/version.rb

@@ -1,3 +1,3 @@
 module UriParser
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/test/test_helper.rb

@@ -0,0 +1,4 @@
+require 'test/unit'
+require 'shoulda'
+
+require './lib/uriparser'

data/test/uriparser_test.rb

@@ -0,0 +1,119 @@
+require 'test_helper'
+
+class UriParserTest < Test::Unit::TestCase
+
+  context 'URI parsing' do
+    should 'raise an exception if was unable to parse the URI' do
+      assert_raise(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'
+    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
+    end
+
+    should 'return URI object after a successful parsing' do
+      uri = UriParser.parse('https://ruby-lang.org')
+      assert_instance_of UriParser::URI, 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
+    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'
+    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
+    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'
+    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
+    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
+    end
+
+    should 'normalize an URI manually created' do
+      uri = UriParser::URI.new
+      uri.scheme    = 'http'
+      uri.host      = 'example.org'
+      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'
+    end
+  end
+end

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: ruby-uriparser
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Thiago Lewin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
-dependencies: []
+date: 2014-03-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.0
 description: Ruby wrapper for uriparser C library
 email:
 - thiago_lewin@yahoo.com.br
@@ -18,24 +38,17 @@ extensions:
 - ext/uriparser_ext/extconf.rb
 extra_rdoc_files: []
 files:
-- benchmark/benchmark.rb
+- Gemfile
+- LICENSE
+- README.md
+- Rakefile
 - ext/uriparser_ext/extconf.rb
 - ext/uriparser_ext/uriparser.c
-- Gemfile
+- lib/uriparser.rb
 - lib/uriparser/uri_gem.rb
 - lib/uriparser/version.rb
-- lib/uriparser.rb
-- lib/uriparser_ext.bundle
-- LICENSE
-- Rakefile
-- README.md
-- ruby-uriparser-0.1.0.gem
-- ruby-uriparser.gemspec
-- tmp/x86_64-darwin12.3.0/stage/lib/uriparser_ext.bundle
-- tmp/x86_64-darwin12.3.0/uriparser_ext/2.0.0/Makefile
-- tmp/x86_64-darwin12.3.0/uriparser_ext/2.0.0/mkmf.log
-- tmp/x86_64-darwin12.3.0/uriparser_ext/2.0.0/uriparser.o
-- tmp/x86_64-darwin12.3.0/uriparser_ext/2.0.0/uriparser_ext.bundle
+- test/test_helper.rb
+- test/uriparser_test.rb
 homepage: https://github.com/tlewin/ruby-uriparser
 licenses:
 - MIT
@@ -46,18 +59,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for uriparser C library
-test_files: []
+test_files:
+- test/test_helper.rb
+- test/uriparser_test.rb

data/benchmark/benchmark.rb

@@ -1,23 +0,0 @@
-require 'benchmark'
-require 'uri'
-
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-
-require 'uriparser'
-
-
-n = ARGV[0] ? ARGV[0].to_i : 10_000
-
-Benchmark.bmbm(10) do |x|
-  puts 'Complex URLs'
-  x.report('URI') {n.times {URI.parse('https://www.ruby-lang.org/en/?a=1#test')}}
-  x.report('UriParser') {n.times {UriParser.parse('https://www.ruby-lang.org/en/?a=1#test')}}
-end
-
-puts '#' * 20
-
-Benchmark.bmbm(10) do |x|
-  puts 'Simple URLs'
-  x.report('URI') {n.times {URI('https://www.ruby-lang.org/en/')}}
-  x.report('UriParser') {n.times {UriParser.parse('https://www.ruby-lang.org/en/')}}
-end

data/ruby-uriparser.gemspec

@@ -1,17 +0,0 @@
-require './lib/uriparser/version'
-
-Gem::Specification.new do |s|
-  s.name          = 'ruby-uriparser'
-  s.version       = UriParser::VERSION
-  s.date          = Time.now
-  s.platform      = Gem::Platform::RUBY
-  s.authors       = ['Thiago Lewin']
-  s.email         = ['thiago_lewin@yahoo.com.br']
-  s.homepage      = 'https://github.com/tlewin/ruby-uriparser'
-  s.summary       = 'Ruby wrapper for uriparser C library'
-  s.description   = s.summary
-  s.require_paths = ['lib']
-  s.files         = Dir['**/*'] - ['ruby-uriparser-0.0.1.gem']
-  s.extensions    = ["ext/uriparser_ext/extconf.rb"]
-  s.license       = 'MIT'
-end

data/tmp/x86_64-darwin12.3.0/uriparser_ext/2.0.0/Makefile

@@ -1,238 +0,0 @@
-
-SHELL = /bin/sh
-
-# V=0 quiet, V=1 verbose.  other values don't work.
-V = 0
-Q1 = $(V:1=)
-Q = $(Q1:0=@)
-ECHO1 = $(V:1=@:)
-ECHO = $(ECHO1:0=@echo)
-
-#### Start of system configuration section. ####
-
-srcdir = ../../../../ext/uriparser_ext
-topdir = /Users/thiagolewin/.rvm/rubies/ruby-2.0.0-p247/include/ruby-2.0.0
-hdrdir = $(topdir)
-arch_hdrdir = /Users/thiagolewin/.rvm/rubies/ruby-2.0.0-p247/include/ruby-2.0.0/x86_64-darwin12.3.0
-PATH_SEPARATOR = :
-VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
-prefix = /Users/thiagolewin/.rvm/rubies/ruby-2.0.0-p247
-rubysitearchprefix = $(rubylibprefix)/$(sitearch)
-rubyarchprefix = $(rubylibprefix)/$(arch)
-rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
-exec_prefix = $(prefix)
-vendorarchhdrdir = $(vendorhdrdir)/$(sitearch)
-sitearchhdrdir = $(sitehdrdir)/$(sitearch)
-rubyarchhdrdir = $(rubyhdrdir)/$(arch)
-vendorhdrdir = $(rubyhdrdir)/vendor_ruby
-sitehdrdir = $(rubyhdrdir)/site_ruby
-rubyhdrdir = $(includedir)/$(RUBY_VERSION_NAME)
-vendorarchdir = $(vendorlibdir)/$(sitearch)
-vendorlibdir = $(vendordir)/$(ruby_version)
-vendordir = $(rubylibprefix)/vendor_ruby
-sitearchdir = $(sitelibdir)/$(sitearch)
-sitelibdir = $(sitedir)/$(ruby_version)
-sitedir = $(rubylibprefix)/site_ruby
-rubyarchdir = $(rubylibdir)/$(arch)
-rubylibdir = $(rubylibprefix)/$(ruby_version)
-sitearchincludedir = $(includedir)/$(sitearch)
-archincludedir = $(includedir)/$(arch)
-sitearchlibdir = $(libdir)/$(sitearch)
-archlibdir = $(libdir)/$(arch)
-ridir = $(datarootdir)/$(RI_BASE_NAME)
-mandir = $(datarootdir)/man
-localedir = $(datarootdir)/locale
-libdir = $(exec_prefix)/lib
-psdir = $(docdir)
-pdfdir = $(docdir)
-dvidir = $(docdir)
-htmldir = $(docdir)
-infodir = $(datarootdir)/info
-docdir = $(datarootdir)/doc/$(PACKAGE)
-oldincludedir = /usr/include
-includedir = $(prefix)/include
-localstatedir = $(prefix)/var
-sharedstatedir = $(prefix)/com
-sysconfdir = $(DESTDIR)/etc
-datadir = $(datarootdir)
-datarootdir = $(prefix)/share
-libexecdir = $(exec_prefix)/libexec
-sbindir = $(exec_prefix)/sbin
-bindir = $(exec_prefix)/bin
-archdir = $(rubyarchdir)
-
-
-CC = /usr/bin/clang
-CXX = clang++
-LIBRUBY = $(LIBRUBY_A)
-LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = 
-LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
-empty =
-OUTFLAG = -o $(empty)
-COUTFLAG = -o $(empty)
-
-RUBY_EXTCONF_H = 
-cflags   =  $(optflags) $(debugflags) $(warnflags)
-optflags = -O3 -fno-fast-math
-debugflags = -ggdb3
-warnflags = -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wunused-variable -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wshorten-64-to-32 -Wimplicit-function-declaration
-CCDLFLAGS = -fno-common
-CFLAGS   = $(CCDLFLAGS) -O3 -I/Users/mpapis/.sm/pkg/active/include -fPIC -pipe $(ARCH_FLAG)
-INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
-DEFS     = 
-CPPFLAGS =  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT $(DEFS) $(cppflags)
-CXXFLAGS = $(CCDLFLAGS) $(cxxflags) $(ARCH_FLAG)
-ldflags  = -L.  -L/Users/mpapis/.sm/pkg/active/lib -L/usr/lib -fPIC -Bstatic -fstack-protector
-dldflags = -Wl,-undefined,dynamic_lookup -Wl,-multiply_defined,suppress 
-ARCH_FLAG =  -arch x86_64
-DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
-LDSHARED = $(CC) -dynamic -bundle
-LDSHAREDXX = $(CXX) -dynamic -bundle
-AR = ar
-EXEEXT = 
-
-RUBY_INSTALL_NAME = ruby
-RUBY_SO_NAME = ruby
-RUBYW_INSTALL_NAME = 
-RUBY_VERSION_NAME = $(RUBY_BASE_NAME)-$(ruby_version)
-RUBYW_BASE_NAME = rubyw
-RUBY_BASE_NAME = ruby
-
-arch = x86_64-darwin12.3.0
-sitearch = $(arch)
-ruby_version = 2.0.0
-ruby = $(bindir)/ruby
-RUBY = $(ruby)
-ruby_headers = $(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h $(arch_hdrdir)/ruby/config.h
-
-RM = rm -f
-RM_RF = $(RUBY) -run -e rm -- -rf
-RMDIRS = rmdir -p
-MAKEDIRS = mkdir -p
-INSTALL = /usr/bin/install
-INSTALL_PROG = $(INSTALL) -m 0755
-INSTALL_DATA = $(INSTALL) -m 644
-COPY = cp
-TOUCH = exit >
-
-#### End of system configuration section. ####
-
-preload = 
-
-libpath = . $(libdir)
-LIBPATH =  -L. -L$(libdir)
-DEFFILE = 
-
-CLEANFILES = mkmf.log
-DISTCLEANFILES = 
-DISTCLEANDIRS = 
-
-extout = 
-extout_prefix = 
-target_prefix = 
-LOCAL_LIBS = 
-LIBS =  -luriparser  -lpthread -ldl -lobjc 
-ORIG_SRCS = uriparser.c
-SRCS = $(ORIG_SRCS) 
-OBJS = uriparser.o
-HDRS = 
-TARGET = uriparser_ext
-TARGET_NAME = uriparser_ext
-TARGET_ENTRY = Init_$(TARGET_NAME)
-DLLIB = $(TARGET).bundle
-EXTSTATIC = 
-STATIC_LIB = 
-
-BINDIR        = $(DESTDIR)$(bindir)
-RUBYCOMMONDIR = $(DESTDIR)$(sitedir)$(target_prefix)
-RUBYLIBDIR    = $(DESTDIR)$(sitelibdir)$(target_prefix)
-RUBYARCHDIR   = $(DESTDIR)$(sitearchdir)$(target_prefix)
-HDRDIR        = $(DESTDIR)$(rubyhdrdir)/ruby$(target_prefix)
-ARCHHDRDIR    = $(DESTDIR)$(rubyhdrdir)/$(arch)/ruby$(target_prefix)
-
-TARGET_SO     = $(DLLIB)
-CLEANLIBS     = $(TARGET).bundle 
-CLEANOBJS     = *.o  *.bak
-
-all:    $(DLLIB)
-static: $(STATIC_LIB)
-.PHONY: all install static install-so install-rb
-.PHONY: clean clean-so clean-static clean-rb
-
-clean-static::
-clean-rb-default::
-clean-rb::
-clean-so::
-clean: clean-so clean-static clean-rb-default clean-rb
-		-$(Q)$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES) .*.time
-
-distclean-rb-default::
-distclean-rb::
-distclean-so::
-distclean-static::
-distclean: clean distclean-so distclean-static distclean-rb-default distclean-rb
-		-$(Q)$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
-		-$(Q)$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
-		-$(Q)$(RMDIRS) $(DISTCLEANDIRS) 2> /dev/null || true
-
-realclean: distclean
-install: install-so install-rb
-
-install-so: $(DLLIB) ./.RUBYARCHDIR.time
-	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
-clean-static::
-	-$(Q)$(RM) $(STATIC_LIB)
-install-rb: pre-install-rb install-rb-default
-install-rb-default: pre-install-rb-default
-pre-install-rb: Makefile
-pre-install-rb-default: Makefile
-pre-install-rb-default:
-	$(ECHO) installing default uriparser_ext libraries
-./.RUBYARCHDIR.time:
-	$(Q) $(MAKEDIRS) $(RUBYARCHDIR)
-	$(Q) $(TOUCH) $@
-
-site-install: site-install-so site-install-rb
-site-install-so: install-so
-site-install-rb: install-rb
-
-.SUFFIXES: .c .m .cc .mm .cxx .cpp .C .o
-
-.cc.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
-
-.mm.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
-
-.cxx.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
-
-.cpp.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
-
-.C.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
-
-.c.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
-
-.m.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
-
-$(DLLIB): $(OBJS) Makefile
-	$(ECHO) linking shared-object $(DLLIB)
-	-$(Q)$(RM) $(@)
-	$(Q) $(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
-	$(Q) test -z '$(RUBY_CODESIGN)' || codesign -s '$(RUBY_CODESIGN)' -f $@
-
-
-
-$(OBJS): $(HDRS) $(ruby_headers)

data/tmp/x86_64-darwin12.3.0/uriparser_ext/2.0.0/mkmf.log

@@ -1,61 +0,0 @@
-have_library: checking for main() in -luriparser... -------------------- yes
-
-"/usr/bin/clang -o conftest -I/Users/thiagolewin/.rvm/rubies/ruby-2.0.0-p247/include/ruby-2.0.0/x86_64-darwin12.3.0 -I/Users/thiagolewin/.rvm/rubies/ruby-2.0.0-p247/include/ruby-2.0.0/ruby/backward -I/Users/thiagolewin/.rvm/rubies/ruby-2.0.0-p247/include/ruby-2.0.0 -I../../../../ext/uriparser_ext -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT   -O3 -I/Users/mpapis/.sm/pkg/active/include -fPIC -pipe conftest.c  -L. -L/Users/thiagolewin/.rvm/rubies/ruby-2.0.0-p247/lib -L.  -L/Users/mpapis/.sm/pkg/active/lib -L/usr/lib -fPIC -Bstatic -fstack-protector   -arch x86_64   -lruby-static  -lpthread -ldl -lobjc "
-ld: warning: directory not found for option '-L/Users/mpapis/.sm/pkg/active/lib'
-checked program was:
-/* begin */
-1: #include "ruby.h"
-2: 
-3: int main(int argc, char **argv)
-4: {
-5:   return 0;
-6: }
-/* end */
-
-"/usr/bin/clang -o conftest -I/Users/thiagolewin/.rvm/rubies/ruby-2.0.0-p247/include/ruby-2.0.0/x86_64-darwin12.3.0 -I/Users/thiagolewin/.rvm/rubies/ruby-2.0.0-p247/include/ruby-2.0.0/ruby/backward -I/Users/thiagolewin/.rvm/rubies/ruby-2.0.0-p247/include/ruby-2.0.0 -I../../../../ext/uriparser_ext -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT   -O3 -I/Users/mpapis/.sm/pkg/active/include -fPIC -pipe conftest.c  -L. -L/Users/thiagolewin/.rvm/rubies/ruby-2.0.0-p247/lib -L.  -L/Users/mpapis/.sm/pkg/active/lib -L/usr/lib -fPIC -Bstatic -fstack-protector   -arch x86_64   -lruby-static -luriparser  -lpthread -ldl -lobjc "
-conftest.c:5:57: error: use of undeclared identifier 'main'
-int t(void) { void ((*volatile p)()); p = (void ((*)()))main; return 0; }
-                                                        ^
-1 error generated.
-checked program was:
-/* begin */
- 1: #include "ruby.h"
- 2: 
- 3: /*top*/
- 4: extern int t(void);
- 5: int t(void) { void ((*volatile p)()); p = (void ((*)()))main; return 0; }
- 6: int main(int argc, char **argv)
- 7: {
- 8:   if (argc > 1000000) {
- 9:     printf("%p", &t);
-10:   }
-11: 
-12:   return 0;
-13: }
-/* end */
-
-"/usr/bin/clang -o conftest -I/Users/thiagolewin/.rvm/rubies/ruby-2.0.0-p247/include/ruby-2.0.0/x86_64-darwin12.3.0 -I/Users/thiagolewin/.rvm/rubies/ruby-2.0.0-p247/include/ruby-2.0.0/ruby/backward -I/Users/thiagolewin/.rvm/rubies/ruby-2.0.0-p247/include/ruby-2.0.0 -I../../../../ext/uriparser_ext -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT   -O3 -I/Users/mpapis/.sm/pkg/active/include -fPIC -pipe conftest.c  -L. -L/Users/thiagolewin/.rvm/rubies/ruby-2.0.0-p247/lib -L.  -L/Users/mpapis/.sm/pkg/active/lib -L/usr/lib -fPIC -Bstatic -fstack-protector   -arch x86_64   -lruby-static -luriparser  -lpthread -ldl -lobjc "
-conftest.c:5:15: warning: implicit declaration of function 'main' is invalid in C99 [-Wimplicit-function-declaration]
-int t(void) { main(); return 0; }
-              ^
-1 warning generated.
-ld: warning: directory not found for option '-L/Users/mpapis/.sm/pkg/active/lib'
-checked program was:
-/* begin */
- 1: #include "ruby.h"
- 2: 
- 3: /*top*/
- 4: extern int t(void);
- 5: int t(void) { main(); return 0; }
- 6: int main(int argc, char **argv)
- 7: {
- 8:   if (argc > 1000000) {
- 9:     printf("%p", &t);
-10:   }
-11: 
-12:   return 0;
-13: }
-/* end */
-
---------------------
-