furi 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e47171efdec80d8610e7dea95a1eed17876ea14b
-  data.tar.gz: 33a2e11ef018c0d5c9d6695ced7c15e9f3dd3fb4
+SHA256:
+  metadata.gz: d6c5fd8026d354285814feddc9d26a68be21f33b3aca4c5a34d89da0c0bb2154
+  data.tar.gz: fe05d55272141fc548ef1b9812c06ad79acf1883e06faf9ee2dbeb09bfbcf5d9
 SHA512:
-  metadata.gz: 7e0c644b931d878b69b6d902aad0772aefa16a5ff4066db3bab871912dbe1e0b4ed91b41d4fb1b921ddfe36119f60293081e6b924cab8747865c1aa1451d3ebe
-  data.tar.gz: 1bbc865cbe5551b416a28243260e01e01409b600f32fd83b8b3a3da320cc7f9f6ce1bdc82363d92a1b8dd1941de99356e38a4d2903a57ad2f8ef956db4a22f23
+  metadata.gz: c97cef41669230f4a87dc03fcbbb28e7027778339111cc9a31907228e69228a64014e489ab73a368fb83b0454e7713f7a7f9ae168701ddf67f15b5cf64b44f78
+  data.tar.gz: 908ba0edd3795239a81b7b912acf24bb7733de192f58b46387c34e2cd2d50bea93f82a2441d87449fc3593ed95bfa9d18b223486a1c7d13fe93159afdd1667c1

data/.github/workflows/ci.yml

@@ -0,0 +1,19 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.4, 2.5, 2.6, 2.7, 3.0]
+    name: Ruby ${{ matrix.ruby }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rake

data/CHANGELOG.md

@@ -0,0 +1,29 @@
+# v0.2.4
+
+* Improved `Furi.update` behavior for `path:` overrides:
+
+  * Supports **relative path resolution** (`..` and subpaths)
+  * Leading slashes in `path` now **replace** the original path
+  * `nil` path removes the path portion entirely, leaving only the host
+
+  **Examples:**
+
+  ```ruby
+  Furi.update("https://www.google.com/maps", path: "place/1.23,3.28")
+  # => "https://www.google.com/maps/place/1.23,3.28"
+
+  Furi.update("https://www.google.com/maps", path: "/account")
+  # => "https://www.google.com/account"
+
+  Furi.update("https://www.google.com/maps", path: "..")
+  # => "https://www.google.com/"
+
+  Furi.update("https://www.google.com/maps", path: nil)
+  # => "https://www.google.com"
+  ```
+
+# v0.2.3
+
+* Ruby 3.0 support #2
+* Escaping special characters in anchor
+

data/Gemfile

@@ -1,4 +1,11 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in furi.gemspec
 gemspec
+
+gem "pry-byebug", "~> 3.9"
+gem "rake", "~> 13.0"
+gem "rspec", "~> 3.10"
+gem "bump"

data/README.md

@@ -1,5 +1,9 @@
 # Furi
 
+[![Gem Version](https://badge.fury.io/rb/furi.svg)](https://badge.fury.io/rb/furi)
+[![Build Status](https://github.com/bogdan/furi/workflows/CI/badge.svg?branch=master)](https://github.com/bogdan/furi/actions)
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fbogdan%2Ffuri.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fbogdan%2Ffuri?ref=badge_shield)
+
 Furi is a Friendly URI parsing library.
 Furi's philosophy is to make any operation possible in ONE LINE OF CODE.
 
@@ -9,7 +13,7 @@ If there is an operation that takes more than one line of code to do with Furi,
 
 Add this line to your application's Gemfile:
 
-```ruby
+``` ruby
 gem 'furi'
 ```
 
@@ -24,11 +28,10 @@ Or install it yourself as:
 ## Usage
 
 I'll say it again: any operation should take exacly one line of code!
-Here are basic: 
+Here are basic:
 
 ### Utility Methods
 
-
 Parsing the URI fragments:
 
 ``` ruby
@@ -39,31 +42,43 @@ Furi.port!("http://gusiev.com") # => 80
 
 Updating the URI parts:
 
-```
+``` ruby
 Furi.update("http://gusiev.com", protocol: '') # => "//gusiev.com"
-Furi.update("http://gusiev.com?source=google", query: {email: "a@b.com"}) 
+Furi.update("http://gusiev.com?source=google", query: {email: "a@b.com"})
     # => "http://gusiev.com?source=google&email=a@b.com"
-Furi.replace("http://gusiev.com?source=google", query: {email: "a@b.com"}) 
+Furi.replace("http://gusiev.com?source=google", query: {email: "a@b.com"})
     # => "http://gusiev.com?email=a@b.com"
 
 Furi.defaults("http://gusiev.com", subdomain: 'www') # => "http://www.gusiev.com"
 Furi.defaults("http://blog.gusiev.com", subdomain: 'www') # => "http://blog.gusiev.com"
-
 ```
 
 Building an URI from initial parts:
 
 ``` ruby
-
-Furi.build(protocol: '//', host: 'gusiev.com', path: '/assets/application.js') 
+Furi.build(protocol: '//', host: 'gusiev.com', path: '/assets/application.js')
     # => "//gusiev.com/assets/application.js"
+
+Furi.build(
+  location: 'https://calendar.google.com',
+  path: '/calendar/render',
+  query: {
+    action: 'TEMPLATE',
+    text: 'Seven Figure Club Meeting',
+    dates: [Time.now + 2.hours, Time.now + 3.hours].map do |t|
+      t.strftime("%Y%m%dT%H%M%SZ")
+    end.join('/'),
+    details: 'Seven Figure Club invites to the discussion with other founders to one of the topics you have expressed your interest to.',
+    add: ["bogdan@example.com", "brad@example.com"].join(',')
+  }
+)
 ```
 
 ### Working with Object
 
 ``` ruby
-uri = Furi.parse("gusiev.com") 
-    # => #<Furi::Uri "gusiev.com"> 
+uri = Furi.parse("gusiev.com")
+    # => #<Furi::Uri "gusiev.com">
 
 uri.port     # => nil
 uri.port!    # => 80
@@ -92,12 +107,12 @@ uri.merge_query(person: {email: 'a@b.com'})
 ## Reference
 
 ```
-                location                                            resource       
-                    |                                                ___|___     
-             _______|_______                                        /       \     
-            /               \                                      /         \    
-           /             authority                             request        \   
-          /        __________|_________                           |            \  
+                location                                            resource
+                    |                                                ___|___
+             _______|_______                                        /       \
+            /               \                                      /         \
+           /             authority                             request        \
+          /        __________|_________                           |            \
          /        /                    \                    ______|______       \
         /    userinfo                hostinfo              /             \       \
        /       __|___                ___|___              /               \       \
@@ -109,25 +124,29 @@ uri.merge_query(person: {email: 'a@b.com'})
     \_/                     \_/  \___/  \_/    \__________/\     /  \_/
      |                       |     |     |           |      \___/    |
   protocol             subdomain   | domainzone  directory    |   extension
-                                   |     |                 filename  |       
-                             domainname  /                     \_____/       
-                                    \___/                         |          
-                                      |                          file                       
-                                    domain                   
+                                   |     |                 filename  |
+                             domainname  /                     \_____/
+                                    \___/                         |
+                                      |                          file
+                                    domain
 ```
 
-
 Originated from [URI.js](http://medialize.github.io/URI.js/about-uris.html) parsing library.
 Giving credit...
 
-
 ## TODO
 
-* Improve URI.join algorithm to match the one used in Addressible library
+* Improve URI.join algorithm to match the one used in Addressable library
 * Implement filename
+* Encoding/Decoding special characters:
+  * path
+  * query
+  * fragment
 
 ## Contributing
 
 Contribute in the way you want. Branch names and other bla-bla-bla do not matter.
 
+## License
 
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fbogdan%2Ffuri.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fbogdan%2Ffuri?ref=badge_large)

data/Rakefile

@@ -1,13 +1,8 @@
-require "bundler/gem_tasks"
-
+# frozen_string_literal: true
 
-begin
-  require 'rspec/core/rake_task'
-  RSpec::Core::RakeTask.new(:spec)
-rescue LoadError
-end
-
-task :default => :spec do
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
-end
+RSpec::Core::RakeTask.new(:spec)
 
+task default: :spec

data/furi.gemspec

@@ -1,7 +1,6 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'furi/version'
+# frozen_string_literal: true
+
+require_relative "lib/furi/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "furi"
@@ -9,17 +8,17 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Bogdan Gusiev"]
   spec.email         = ["agresso@gmail.com"]
   spec.summary       = %q{Make URI processing as easy as it should be}
-  spec.description   = %q{The phylosophy of this gem is to make any URI modification or parsing operation to take only one line of code and never more}
-  spec.homepage      = ""
+  spec.description   = %q{The philosophy of this gem is to make any URI modification or parsing operation to take only one line of code and never more}
+  spec.homepage      = "https://github.com/bogdan/furi"
   spec.license       = "MIT"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.metadata["allowed_push_host"] = "https://rubygems.org"
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "pry-byebug"
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features)/}) }
+  end
+  spec.require_paths = ["lib"]
 end

data/lib/furi/uri.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 module Furi
   class Uri
 
@@ -44,6 +46,12 @@ module Furi
         case part.to_sym
         when :query, :query_tokens, :query_string
           merge_query(value)
+        when :path
+          if value
+            self[part] = Pathname.new(self[part]).join(value).to_s
+          else
+            self[part] = value
+          end
         else
           self[part] = value
         end
@@ -72,7 +80,10 @@ module Furi
     def merge_query(query)
       case query
       when Hash
-        self.query = self.query.merge(Furi::Utils.stringify_keys(query))
+        self.query = Furi::Utils.deep_merge(
+          self.query,
+          Furi::Utils.stringify_keys(query)
+        )
       when String, Array
         self.query_tokens += Furi.query_tokens(query)
       when nil
@@ -135,7 +146,7 @@ module Furi
     end
 
     def hostinfo
-      return host unless explicit_port?
+      return host unless custom_port?
       if port && !host
         raise Furi::FormattingError, "can not build URI with port but without host"
       end
@@ -178,7 +189,7 @@ module Furi
         result << "?" << query_string
       end
       if anchor
-        result << "#" << anchor
+        result << encoded_anchor
       end
       result.join
     end
@@ -238,10 +249,8 @@ module Furi
         query
       when String, Array
         self.query_tokens = value
-        @query = nil
       when Hash
         self.query_tokens = value
-        @query = value
       when nil
       else
         raise QueryParseError, 'Query can only be Hash or String'
@@ -273,7 +282,7 @@ module Furi
     end
 
     def query_tokens=(tokens)
-      @query = nil
+      @query = tokens.is_a?(Hash) ? tokens : nil
       @query_tokens = Furi.query_tokens(tokens)
     end
 
@@ -420,7 +429,7 @@ module Furi
 
     def resource
       return nil unless request
-      [request, anchor].compact.join("#")
+      request + encoded_anchor
     end
 
     def resource=(value)
@@ -483,6 +492,14 @@ module Furi
       authority
     end
 
+    def custom_port?
+      port && port != default_port
+    end
+
+    def mailto?
+      protocol == "mailto"
+    end
+
     protected
 
     def file_tokens
@@ -493,10 +510,6 @@ module Furi
       !!@query
     end
 
-    def explicit_port?
-      port && port != default_port
-    end
-
     def parse_uri_string(string)
       if string.empty?
         raise Furi::FormattingError, "can not be an empty string"
@@ -531,7 +544,7 @@ module Furi
     def parse_anchor_and_query(string)
       string ||= ''
       string, *anchor = string.split("#")
-      self.anchor = anchor.join("#")
+      self.anchor = ::URI::DEFAULT_PARSER.unescape(anchor.join("#"))
       if string && string.include?("?")
         string, query_string = string.split("?", 2)
         self.query_tokens = query_string
@@ -583,8 +596,9 @@ module Furi
       end
     end
 
-    def mailto?
-      protocol == "mailto"
+    def encoded_anchor
+      return "" unless anchor
+      "#" + ::URI::DEFAULT_PARSER.escape(anchor)
     end
   end
 end

data/lib/furi/utils.rb

@@ -10,7 +10,17 @@ module Furi
         end
         result
       end
+
+      def deep_merge(current_hash, other_hash)
+        current_hash.merge(other_hash) do |key, this_val, other_val|
+         if this_val.is_a?(Hash) && other_val.is_a?(Hash)
+           deep_merge(this_val, other_val)
+         else
+           other_val
+         end
+       end
+      end
     end
   end
 end
- 
+

data/lib/furi/version.rb

@@ -1,3 +1,3 @@
 module Furi
-  VERSION = "0.2.2"
+  VERSION = "0.2.4"
 end

data/lib/furi.rb

@@ -172,7 +172,9 @@ module Furi
   def self.join(*uris)
     uris.map do |uri|
       Furi.parse(uri)
-    end.reduce(:join)
+    end.reduce do |memo, uri|
+      memo.send(:join, uri)
+    end
   end
 
   class Error < StandardError

metadata

@@ -1,72 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: furi
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Bogdan Gusiev
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-20 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: The phylosophy of this gem is to make any URI modification or parsing
+date: 1980-01-02 00:00:00.000000000 Z
+dependencies: []
+description: The philosophy of this gem is to make any URI modification or parsing
   operation to take only one line of code and never more
 email:
 - agresso@gmail.com
@@ -74,8 +17,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -86,14 +31,13 @@ files:
 - lib/furi/uri.rb
 - lib/furi/utils.rb
 - lib/furi/version.rb
-- spec/furi/uri_spec.rb
-- spec/furi_spec.rb
-- spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/bogdan/furi
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  allowed_push_host: https://rubygems.org
+  homepage_uri: https://github.com/bogdan/furi
+  source_code_uri: https://github.com/bogdan/furi
 rdoc_options: []
 require_paths:
 - lib
@@ -101,19 +45,14 @@ 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.6.7
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Make URI processing as easy as it should be
-test_files:
-- spec/furi/uri_spec.rb
-- spec/furi_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/spec/furi/uri_spec.rb

@@ -1,12 +0,0 @@
-require 'spec_helper'
-
-describe Furi::Uri do
-
-  describe ".rfc3986?" do
-
-    it "works" do
-      expect(Furi.parse("http://goo gl.com") ).to_not be_rfc
-      expect(Furi.parse("http://googl.com") ).to be_rfc
-    end
-  end
-end