tilia-uri 1.0.1 → 1.0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d05aacc9eb7c559b01f9845a5baf5fff2f92f0c4
-  data.tar.gz: 1242281c7936522ba63c1ce8e2130ad6522bc2b9
+  metadata.gz: 09e0ca42bc4ae761128b569b6b23fee7e0c4c5be
+  data.tar.gz: e552181bbf1a3b8e536fc95eda81fe689e722e75
 SHA512:
-  metadata.gz: 7bbe25462c7a574ba32b8e579fa4edddda7c086fcc97325f38c2b25bffc6e2836fdc03b6aeb98f8460f8502650ade09052917c389ce51afdbb96cb1d999857f2
-  data.tar.gz: 3afe6f78cd198ba2b8fc24d86cf2a12d20f09fbd0ca6b2b270e25eec98341d02aa6b0f8ca349568b02846a0dc46ba758bde26020b02492e4a579721a437357f8
+  metadata.gz: da688f7e21c205162da6db73304147ea21bb3508259f5e3d9c68cf70717a1ebc26039f027efc744bcd7cc9d5dba5dd4cea19a0bd9a4332e1dde394965ae00ea4
+  data.tar.gz: 5aaaeff5968abee8f4c0581e1c5c570b8b91858ad61706db3294fc45e8bc8001b61e93ab371f812ea41dd6429f7c7dfed14a95af5a67076b4465e612f917412c

data/.simplecov

@@ -1,4 +1,4 @@
 SimpleCov.start do
-  add_filter "/spec/"
+  add_filter "/test/"
 end
 

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 # External dependencies
-gem 'activesupport', '~> 4.2'
+gemspec
 
 # Testing
 gem 'rake'

data/Gemfile.lock

@@ -1,7 +1,13 @@
+PATH
+  remote: .
+  specs:
+    tilia-uri (1.0.1.1)
+      activesupport (>= 4.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.4)
+    activesupport (4.2.5.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -40,11 +46,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (~> 4.2)
   minitest (~> 5.8)
   rake
   rubocop (~> 0.34)
   simplecov (~> 0.10)
+  tilia-uri!
   yard (~> 0.8)
 
 BUNDLED WITH

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2015 Jakob Sack (tilia@jakobsack.de)
+Copyright (C) 2015-2016 Jakob Sack (tilia@jakobsack.de)
 
 All rights reserved.
 

data/LICENSE.sabre

@@ -1,4 +1,4 @@
-Copyright (C) 2014-2015 fruux GmbH (https://fruux.com/)
+Copyright (C) 2014-2016 fruux GmbH (https://fruux.com/)
 
 All rights reserved.
 

data/Rakefile

@@ -12,6 +12,7 @@ RuboCop::RakeTask.new do |t|
 end
 YARD::Rake::YardocTask.new do |t|
   t.files = ['lib/**/*.rb', '-', 'README.md']
+  t.options = ['--private', '--protected']
 end
 
 task(default: :test)

data/lib/tilia/uri.rb

@@ -32,27 +32,27 @@ module Tilia
 
       # If the new path defines a scheme, it's absolute and we can just return
       # that.
-      return build(delta) if delta['scheme']
+      return build(delta) if delta[:scheme]
 
       new_parts = {}
 
-      new_parts['scheme'] = pick.call('scheme')
-      new_parts['host']   = pick.call('host')
-      new_parts['port']   = pick.call('port')
+      new_parts[:scheme] = pick.call(:scheme)
+      new_parts[:host]   = pick.call(:host)
+      new_parts[:port]   = pick.call(:port)
 
       path = ''
-      if !delta['path'].blank?
+      if !delta[:path].blank?
         # If the path starts with a slash
-        if delta['path'][0] == '/'
-          path = delta['path']
+        if delta[:path][0] == '/'
+          path = delta[:path]
         else
           # Removing last component from base path.
-          path = base['path']
+          path = base[:path]
           path = path[0...path.rindex('/')] if path.index '/'
-          path += '/' + delta['path']
+          path += '/' + delta[:path]
         end
       else
-        path = base['path'].blank? ? '/' : base['path']
+        path = base[:path].blank? ? '/' : base[:path]
       end
 
       # Removing .. and .
@@ -79,15 +79,15 @@ module Tilia
       path = new_path_parts.join '/'
 
       # If the source url ended with a /, we want to preserve that.
-      new_parts['path'] = path
-      if delta['query']
-        new_parts['query'] = delta['query']
-      elsif !base['query'].blank? && delta['host'].blank? && delta['path'].blank?
+      new_parts[:path] = path
+      if delta[:query]
+        new_parts[:query] = delta[:query]
+      elsif !base[:query].blank? && delta[:host].blank? && delta[:path].blank?
         # Keep the old query if host and path didn't change
-        new_parts['query'] = base['query']
+        new_parts[:query] = base[:query]
       end
 
-      new_parts['fragment'] = delta['fragment'] if delta['fragment']
+      new_parts[:fragment] = delta[:fragment] if delta[:fragment]
       build(new_parts)
     end
 
@@ -104,8 +104,8 @@ module Tilia
     def self.normalize(uri)
       parts = parse(uri)
 
-      unless parts['path'].blank?
-        path_parts = parts['path'].gsub(%r{^/+}, '').split(%r{/})
+      unless parts[:path].blank?
+        path_parts = parts[:path].gsub(%r{^/+}, '').split(%r{/})
 
         new_path_parts = []
         path_parts.each do |path_part|
@@ -120,32 +120,32 @@ module Tilia
             new_path_parts << URI.escape(URI.unescape(path_part), Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
           end
         end
-        parts['path'] = '/' + new_path_parts.join('/')
+        parts[:path] = '/' + new_path_parts.join('/')
       end
 
-      if parts['scheme']
-        parts['scheme'] = parts['scheme'].downcase
+      if parts[:scheme]
+        parts[:scheme] = parts[:scheme].downcase
         default_ports = {
           'http'  => '80',
           'https' => '443'
         }
 
-        if !parts['port'].blank? && default_ports.key?(parts['scheme']) && default_ports[parts['scheme']] == parts['port']
+        if !parts[:port].blank? && default_ports.key?(parts[:scheme]) && default_ports[parts[:scheme]] == parts[:port]
           # Removing default ports.
-          parts['port'] = nil
+          parts[:port] = nil
         end
 
         # A few HTTP specific rules.
-        case parts['scheme']
+        case parts[:scheme]
         when 'http', 'https'
-          if parts['path'].blank?
+          if parts[:path].blank?
             # An empty path is equivalent to / in http.
-            parts['path'] = '/'
+            parts[:path] = '/'
           end
         end
       end
 
-      parts['host'] = parts['host'].downcase if parts['host']
+      parts[:host] = parts[:host].downcase if parts[:host]
 
       build(parts)
     end
@@ -157,17 +157,17 @@ module Tilia
     # set by parse_url, which makes it a bit easier to work with.
     #
     # @param [String] uri
-    # @return [Hash]
+    # @return [Hash{Symbol => String}]
     def self.parse(uri)
       u = ::URI.split(uri)
       {
-        'scheme'   => u[0],
-        'user'     => u[1],
-        'host'     => u[2],
-        'port'     => u[3],
-        'path'     => u[5] || u[6], # 6 = mailto, opaque
-        'query'    => u[7],
-        'fragment' => u[8]
+        scheme:   u[0],
+        user:     u[1],
+        host:     u[2],
+        port:     u[3],
+        path:     u[5] || u[6], # 6 = mailto, opaque
+        query:    u[7],
+        fragment: u[8]
       }
     end
 
@@ -180,16 +180,16 @@ module Tilia
       uri = ''
 
       authority = ''
-      unless parts['host'].blank?
-        authority = parts['host']
+      unless parts[:host].blank?
+        authority = parts[:host]
 
-        authority = parts['user'] + '@' + authority unless parts['user'].blank?
-        authority = authority + ':' + parts['port'].to_s unless parts['port'].blank?
+        authority = parts[:user] + '@' + authority unless parts[:user].blank?
+        authority = authority + ':' + parts[:port].to_s unless parts[:port].blank?
       end
 
-      unless parts['scheme'].blank?
+      unless parts[:scheme].blank?
         # If there's a scheme, there's also a host.
-        uri = parts['scheme'] + ':'
+        uri = parts[:scheme] + ':'
       end
 
       unless authority.blank?
@@ -197,9 +197,9 @@ module Tilia
         uri += '//' + authority
       end
 
-      uri += parts['path'] unless parts['path'].blank?
-      uri += '?' + parts['query'] unless parts['query'].blank?
-      uri += '#' + parts['fragment'] unless parts['fragment'].blank?
+      uri += parts[:path] unless parts[:path].blank?
+      uri += '?' + parts[:query] unless parts[:query].blank?
+      uri += '#' + parts[:fragment] unless parts[:fragment].blank?
 
       uri
     end
@@ -219,12 +219,12 @@ module Tilia
     # the end of the string is stripped off.
     #
     # @param [String] path
-    # @return [Array]
+    # @return [Array(String, String)]
     def self.split(path)
       if path =~ %r{^(?:(?:(.*)(?:\/+))?([^\/]+))(?:\/?)$}u
         [Regexp.last_match[1] || '', Regexp.last_match[2] || '']
       else
-        [nil, nil]
+        ['', '']
       end
     end
   end

data/lib/tilia/uri/version.rb

@@ -3,7 +3,7 @@ module Tilia
     # This class contains the version number for this package.
     class Version
       # Full version number
-      VERSION = '1.0.1'
+      VERSION = '1.0.1.1'
     end
   end
 end

data/test/split_test.rb

@@ -15,7 +15,7 @@ module Tilia
         'foo/'                     => ['', 'foo'],
         '/foo/'                    => ['', 'foo'],
         '/foo'                     => ['', 'foo'],
-        ''                         => [nil, nil],
+        ''                         => ['', ''],
 
         # UTF-8
         "/\xC3\xA0fo\xC3\xB3/bar"  => ["/\xC3\xA0fo\xC3\xB3", 'bar'],

data/tilia-uri.gemspec

@@ -9,5 +9,6 @@ Gem::Specification.new do |s|
   s.email       = 'tilia@jakobsack.de'
   s.files       = `git ls-files`.split("\n")
   s.homepage    = 'https://github.com/tilia/tilia-uri'
-  s.add_runtime_dependency 'activesupport', '~> 4.2'
+
+  s.add_runtime_dependency 'activesupport', '>= 4.0'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: tilia-uri
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.1.1
 platform: ruby
 authors:
 - Jakob Sack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.0'
 description: Functions for making sense out of URIs.
 email: tilia@jakobsack.de
 executables: []