furi 0.2.5 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60584a8bc9851e0f203430c73a18b5b4c4d22c25484134caf8f256279203ed7e
-  data.tar.gz: ee1258bc6788c8d11bf8f5c7a48dced7c5338ad36409de0a3eb049c194cd3347
+  metadata.gz: 5923ee7cbb73b1b035612324a274790d95ec2cef4369558fc6874e28da4fe77b
+  data.tar.gz: bebdc6c2ab8ae6b5a8cc262c2c70d53a8d1721020fcd7581a713f9f2f629b010
 SHA512:
-  metadata.gz: 161c291815412a22f32a2c6e6e8b32fc74241eba6e44442197f1a04d2c934522898014e8e7c6b0cc53c396f0a95076a193e23dd41a8abf38ea0b976058b76d00
-  data.tar.gz: ac25ee7829104064cde493e5310a7302d08593808f56674bc4cce7af4e1d6e5be3504300cd396d79276abe5a6153be52084613af8a7679d30fbc1afa2f007912
+  metadata.gz: 9b9a3c1d0116faa7828205294fc22b6eb2045536ffdd3c3665d7d8ea8dc4de3ac88bd43904f82c9c33948e943c073e9c0a44dc5a6c6a80e4b30252fd690b49f4
+  data.tar.gz: 5ef899e9301205592801d7f037d7193d4f1f13c057198fa3eff06e559e86bcdb8b209df0e77e24aad04f8d555ff4aaf443e8373adc3f79dc17360c24e330787a

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+# v0.2.7
+
+* Add `origin` part (location + path, without query string and anchor)
+
+  ```ruby
+  Furi.parse("http://gusiev.com/articles/index.html?a=1#top").origin
+  # => "http://gusiev.com/articles/index.html"
+
+  Furi.replace("http://gusiev.com/index.html?a=1#top", origin: "http://gusiev.com/blog.html")
+  # => "http://gusiev.com/blog.html?a=1#top"
+  ```
+
+# v0.2.6
+
+* Support `filename` part replacement and extraction
+
+# v0.2.5
+
+* Fix replacement of path starting with `/`
+
 # v0.2.4
 
 * Improved `Furi.update` behavior for `path:` overrides:

data/Gemfile

@@ -5,7 +5,6 @@ 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/lib/furi/uri.rb

@@ -207,6 +207,18 @@ module Furi
       end
     end
 
+    def origin
+      [location, path].join
+    end
+
+    def origin=(string)
+      string ||= ""
+      string = parse_protocol(string)
+      authority, path = string.split("/", 2)
+      self.authority = authority
+      self.path = path ? "/#{path}" : nil
+    end
+
     def location=(string)
       string ||= ""
       string  = string.gsub(%r(/\Z), '')
@@ -327,9 +339,21 @@ module Furi
       self.path = string + file.to_s
     end
 
+    def filename
+      return nil unless file
+      file_tokens.first
+    end
+
+    def filename=(value)
+      t = file_tokens
+      t[0] = value
+      self.file = t.join(".")
+    end
+
     def extension
       return nil unless file
-      file_tokens.size > 1 ? file_tokens.last : nil
+      tokens = file_tokens[1..-1]
+      tokens.any? ? tokens.join(".") : nil
     end
 
     def extension=(string)
@@ -341,7 +365,7 @@ module Furi
         tokens.push(string)
       else
         if string
-          tokens[-1] = string
+          tokens = [tokens.first, string]
         else
           tokens.pop
         end

data/lib/furi/version.rb

@@ -1,3 +1,3 @@
 module Furi
-  VERSION = "0.2.5"
+  VERSION = "0.2.7"
 end

data/lib/furi.rb

@@ -9,13 +9,16 @@ module Furi
 
   ESSENTIAL_PARTS =  [
     :anchor, :protocol, :query_tokens,
-    :path, :host, :port, :username, :password
+    :path, :host, :port, :username, :password,
+    :filename,
   ]
+
   COMBINED_PARTS = [
     :hostinfo, :userinfo, :authority, :ssl, :domain, :domainname,
-    :domainzone, :request, :location, :query,
+    :domainzone, :request, :location, :origin, :query,
     :directory, :extension, :file
   ]
+
   PARTS = ESSENTIAL_PARTS + COMBINED_PARTS
 
   ALIASES = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: furi
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.7
 platform: ruby
 authors:
 - Bogdan Gusiev