uri-query_params 0.7.2 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98c8b432e06a2809b54dfa91b64fbfe6424b7fa8db77cc6193b577b40eca90a5
-  data.tar.gz: af5598c46102cc70eda79bea50ad934532e14fa77729280fdd5dd0e9da2f13c6
+  metadata.gz: cc67bd83bfc5a5da2b33ddb21f124663d45e54ce09498b541f223a6180851236
+  data.tar.gz: 692d674b03b6e0e165c4ee5cd78363b9e7288ac428d4972c69de8f90379668fc
 SHA512:
-  metadata.gz: 57dca3b3b845dfaf78873bae42784b957a3efb21c684fd4d6ffff615bcb96f0ab554491167dbf7c2424321c263af7fe5b5ac52c753c0c4b8d94a0ef7ebe6412f
-  data.tar.gz: ad0079b30c44014d25f08c5af69d08bc1eb7d33be6a9cbaa7afec6e8f31df9ade45d852be58abdbb13f94409ac30ea1c8abbee383e13d4c205e13a878dabd26c
+  metadata.gz: cb4d13c217fabbd2abe86abab5a4bdce9c7039430967c955cac58d9eb06584c29dfd7cbdfefe04250d6670936f28bae2d619ea4bb9a9c762ba5ac005bb83d1f4
+  data.tar.gz: 902d5196f48db8853c9f60110039ffc0fa41835c6877dac60798f69ea3a5e0f063c5cc321f5d8bae3635ddd41d00920edd3ee87cd24ab1eee46e32a78e285d29

data/.github/workflows/ruby.yml

@@ -1,10 +1,6 @@
 name: CI
 
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: ['**']
+on: [ push, pull_request ]
 
 jobs:
   tests:
@@ -13,11 +9,10 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - 2.4
-          - 2.5
-          - 2.6
-          - 2.7
+          - '3.0'
+          - 3.1
           - jruby
+          - truffleruby
     name: Ruby ${{ matrix.ruby }}
     steps:
       - uses: actions/checkout@v2

data/.gitignore

@@ -1,4 +1,5 @@
 /Gemfile.lock
+/coverage/
 /doc/
 /pkg/
 /vendor/bundle

data/ChangeLog.md

@@ -1,3 +1,16 @@
+### 0.8.1 / 2022-10-22
+
+* Updated {URI::Generic#to_s} to ruby-3.0.0.
+* Override {URI::HTTP#request_uri} to be aware of
+  {URI::QueryParams::Mixin#query_params}.
+
+### 0.8.0 / 2022-01-14
+
+* Require [ruby] >= 2.0.0.
+* Renamed `uri/query_params/extensions` to `uri/query_params/core_ext`.
+* Removed legacy [ruby] 1.8 code.
+* Fix instance variable warnings in `uri/query_params/mixin`.
+
 ### 0.7.2 / 2020-11-29
 
 * Use `URI::DEFAULT_PARSER.escape` / `.unescape` instead of the deprecated
@@ -70,3 +83,4 @@
 
 * Initial release.
 
+[ruby]: https://www.ruby-lang.org/

data/Gemfile

@@ -10,8 +10,10 @@ group :development do
   gem 'rake'
   gem 'rubygems-tasks', '~> 0.2'
 
-  gem 'rspec', '~> 3.0'
+  gem 'rspec',     '~> 3.0'
+  gem 'simplecov', '~> 0.20'
 
   gem 'kramdown'
   gem 'yard', '~> 0.9'
+  gem 'yard-spellcheck', require: false
 end

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2020 Hal Brodigan
+Copyright (c) 2010-2022 Hal Brodigan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -3,7 +3,6 @@
 * [Source](https://github.com/postmodern/uri-query_params)
 * [Issues](https://github.com/postmodern/uri-query_params/issues)
 * [Documentation](http://rubydoc.info/gems/uri-query_params/frames)
-* [Email](mailto:postmodern.mod3 at gmail.com)
 
 ## Description
 
@@ -14,26 +13,36 @@ to `$_GET` from PHP, except available on any Ruby URI object.
 
 Inspecting the URI query_params:
 
-    require 'uri/query_params'
-    
-    url = URI('http://www.google.com/search?hl=en&client=firefox-a&rls=org.mozilla%3Aen-US%3Aofficial&hs=1HY&q=bob+ross&btnG=Search')
-    url.query_params
-    # => {"btnG"=>"Search", "hs"=>"1HY", "rls"=>"org.mozilla:en-US:official", "client"=>"firefox-a", "hl"=>"en", "q"=>"bob+ross"}
+```ruby
+require 'uri/query_params'
 
-    url.query_params['q']
-    # => "bob+ross"
+url = URI('http://www.google.com/search?hl=en&client=firefox-a&rls=org.mozilla%3Aen-US%3Aofficial&hs=1HY&q=bob+ross&btnG=Search')
+url.query_params
+# => {"btnG"=>"Search", "hs"=>"1HY", "rls"=>"org.mozilla:en-US:official", "client"=>"firefox-a", "hl"=>"en", "q"=>"bob+ross"}
+
+url.query_params['q']
+# => "bob+ross"
+```
 
 Setting the URI query_params:
 
-    url.query_params['q'] = 'Upright Citizens Brigade'
-    url.to_s
-    # => "http://www.google.com/search?btnG=Search&hs=1HY&rls=org.mozilla:en-US:official&client=firefox-a&hl=en&q=Upright%20Citizens%20Brigade"
+```ruby
+url.query_params['q'] = 'Upright Citizens Brigade'
+url.to_s
+# => "http://www.google.com/search?btnG=Search&hs=1HY&rls=org.mozilla:en-US:official&client=firefox-a&hl=en&q=Upright%20Citizens%20Brigade"
+```
 
 Parsing URI query_params embedded within the Fragment Identifier:
 
-    url = URI('https://twitter.com/#!/download?lang=en&logged_out=1')
-    URI(url.fragment).query_params
-    # => {"logged_out"=>"1", "lang"=>"en"}
+```ruby
+url = URI('https://twitter.com/#!/download?lang=en&logged_out=1')
+URI(url.fragment).query_params
+# => {"logged_out"=>"1", "lang"=>"en"}
+```
+
+## Requirements
+
+* [ruby] >= 2.0.0
 
 ## Install
 
@@ -41,6 +50,8 @@ Parsing URI query_params embedded within the Fragment Identifier:
 
 ## License
 
-Copyright (c) 2010-2020 Hal Brodigan
+Copyright (c) 2010-2022 Hal Brodigan
 
 See {file:LICENSE.txt} for license information.
+
+[ruby]: https://www.ruby-lang.org/

data/gemspec.yml

@@ -7,5 +7,14 @@ authors: Postmodern
 email: postmodern.mod3@gmail.com
 has_yard: true
 
+metadata:
+  documentation_uri: https://rubydoc.info/gems/uri-query_params
+  source_code_uri:   https://github.com/postmodern/uri-query_params.rb
+  bug_tracker_uri:   https://github.com/postmodern/uri-query_params.rb/issues
+  changelog_uri:     https://github.com/postmodern/uri-query_params.rb/blob/master/ChangeLog.md
+  rubygems_mfa_required: 'true'
+
+required_ruby_version: ">= 2.0.0"
+
 development_dependencies:
   bundler: ~> 2.0

data/lib/uri/query_params/core_ext/addressable/uri.rb

@@ -0,0 +1,11 @@
+require 'uri/query_params/mixin'
+
+require 'addressable/uri'
+
+module Addressable
+  class URI
+
+    include ::URI::QueryParams::Mixin
+
+  end
+end

data/lib/uri/query_params/core_ext/uri/generic.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'uri/query_params/mixin'
+
+require 'uri/generic'
+
+module URI
+  class Generic
+
+    include URI::QueryParams::Mixin
+
+    #
+    # Constructs String from URI
+    #
+    # @note
+    #   This is the `URI::Generic#to_s` method from Ruby 3.0.0, with the minor
+    #   modification of calling the `query` method overrode by
+    #   {URI::QueryParams::Mixin}, instead of `@query`.
+    #
+    # @see https://github.com/ruby/ruby/blob/v3_0.0/lib/uri/generic.rb#L1330-L1368
+    #
+    def to_s
+      str = ''.dup
+      if @scheme
+        str << @scheme
+        str << ':'
+      end
+
+      if @opaque
+        str << @opaque
+      else
+        if @host || %w[file postgres].include?(@scheme)
+          str << '//'
+        end
+        if self.userinfo
+          str << self.userinfo
+          str << '@'
+        end
+        if @host
+          str << @host
+        end
+        if @port && @port != self.default_port
+          str << ':'
+          str << @port.to_s
+        end
+        str << @path
+        if (query = self.query)
+          str << '?'
+          str << query
+        end
+      end
+      if @fragment
+        str << '#'
+        str << @fragment
+      end
+      str
+    end
+
+  end
+end

data/lib/uri/query_params/core_ext/uri/http.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'uri/query_params/core_ext/uri/generic'
+
+require 'uri/http'
+
+module URI
+  class HTTP < Generic
+
+    alias raw_request_uri request_uri
+
+    #
+    # Returns the full path for an HTTP request.
+    #
+    # @return [String, nil]
+    #   The request URI (path + query params) or `nil` if the URI has no
+    #   path.
+    #
+    # @example
+    #   uri.path = '/path'
+    #   uri.query_params['foo'] = '1'
+    #   uri.query_params['bar'] = '2'
+    #   uri.request_uri
+    #   # => "/path?foo=1&bar=2"
+    #
+    def request_uri
+      if defined?(@query_params) && @query_params
+        return unless @path
+
+        query = URI::QueryParams.dump(@query_params)
+
+        url = "#{@path}?#{query}"
+        url = "/#{url}" unless url.start_with?('/')
+        url
+      else
+        raw_request_uri
+      end
+    end
+
+  end
+end

data/lib/uri/query_params/core_ext/uri.rb

@@ -0,0 +1,2 @@
+require 'uri/query_params/core_ext/uri/generic'
+require 'uri/query_params/core_ext/uri/http'

data/lib/uri/query_params/core_ext.rb

@@ -0,0 +1,2 @@
+require 'uri/query_params/core_ext/uri'
+require 'uri/query_params/core_ext/addressable/uri' if defined?(Addressable)

data/lib/uri/query_params/extensions/addressable/uri.rb

@@ -1,11 +1 @@
-require 'uri/query_params/mixin'
-
-require 'addressable/uri'
-
-module Addressable
-  class URI
-
-    include ::URI::QueryParams::Mixin
-
-  end
-end
+require 'uri/query_params/core_ext/addressable/uri'

data/lib/uri/query_params/extensions/uri/generic.rb

@@ -1,58 +1 @@
-require 'uri/query_params/mixin'
-
-require 'uri/generic'
-
-module URI
-  class Generic
-
-    include URI::QueryParams::Mixin
-
-    #
-    # Constructs String from URI
-    #
-    # @note
-    #   This is the `URI::Generic#to_s` method from Ruby 2.2.0, with the minor
-    #   modification of calling the `query` method overrode by
-    #   {URI::QueryParams::Mixin}, instead of `@query`.
-    #
-    # @see https://github.com/ruby/ruby/blob/v2_2_0/lib/uri/generic.rb#L1338-L1376
-    #
-    def to_s
-      str = ''
-      if @scheme
-        str << @scheme
-        str << ':'.freeze
-      end
-
-      if @opaque
-        str << @opaque
-      else
-        if @host
-          str << '//'.freeze
-        end
-        if self.userinfo
-          str << self.userinfo
-          str << '@'.freeze
-        end
-        if @host
-          str << @host
-        end
-        if @port && @port != self.default_port
-          str << ':'.freeze
-          str << @port.to_s
-        end
-        str << @path
-        if query
-          str << '?'.freeze
-          str << query
-        end
-      end
-      if @fragment
-        str << '#'.freeze
-        str << @fragment
-      end
-      str
-    end
-
-  end
-end
+require 'uri/query_params/core_ext/uri/generic'

data/lib/uri/query_params/extensions/uri.rb

@@ -1 +1 @@
-require 'uri/query_params/extensions/uri/generic'
+require 'uri/query_params/core_ext/uri'

data/lib/uri/query_params/extensions.rb

@@ -1,2 +1 @@
-require 'uri/query_params/extensions/uri'
-require 'uri/query_params/extensions/addressable/uri' if defined?(Addressable)
+require 'uri/query_params/core_ext'

data/lib/uri/query_params/mixin.rb

@@ -29,7 +29,7 @@ module URI
           # @since 0.5.2
           #
           def query
-            if @query_params
+            if defined?(@query_params) && @query_params
               URI::QueryParams.dump(@query_params)
             else
               raw_query
@@ -56,7 +56,7 @@ module URI
           def query=(new_query)
             new_query = (self.raw_query = new_query)
 
-            parse_query_params! if @query_params
+            parse_query_params! if defined?(@query_params) && @query_params
             return new_query
           end
         end

data/lib/uri/query_params/query_params.rb

@@ -50,10 +50,8 @@ module URI
           next if param.empty?
 
           name, value = param.split('=',2)
-          value = if value
-                    URI::DEFAULT_PARSER.unescape(value)
-                  else
-                    ''
+          value = if value then URI::DEFAULT_PARSER.unescape(value)
+                  else          ''
                   end
 
           yield(name,value) if block_given?
@@ -79,14 +77,10 @@ module URI
     #
     def self.escape(value)
       case value
-      when Array
-        URI::DEFAULT_PARSER.escape(value.join(' '),UNSAFE)
-      when true
-        'active'
-      when false, nil
-        ''
-      else
-        URI::DEFAULT_PARSER.escape(value.to_s,UNSAFE)
+      when Array      then URI::DEFAULT_PARSER.escape(value.join(' '),UNSAFE)
+      when true       then 'active'
+      when false, nil then ''
+      else                 URI::DEFAULT_PARSER.escape(value.to_s,UNSAFE)
       end
     end
 
@@ -116,18 +110,9 @@ module URI
     # @api semipublic
     #
     def self.dump(query_params)
-      query = []
-
-      # explicitly re-order the Hash on Ruby 1.8.x
-      query_params.rehash if RUBY_VERSION < '1.9'
-
-      query_params.each do |name,value|
-        value = escape(value)
-
-        query << "#{name}=#{value}"
-      end
-
-      return query.join('&')
+      query_params.map { |name,value|
+        "#{name}=#{escape(value)}"
+      }.join('&')
     end
 
   end

data/lib/uri/query_params/version.rb

@@ -1,6 +1,6 @@
 module URI
   module QueryParams
     # uri-query_params version
-    VERSION = '0.7.2'
+    VERSION = '0.8.1'
   end
 end

data/lib/uri/query_params.rb

@@ -1,2 +1,2 @@
 require 'uri/query_params/query_params'
-require 'uri/query_params/extensions'
+require 'uri/query_params/core_ext'

data/spec/{extensions → core_ext}/addressable/uri_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 require 'query_params_mixin_examples'
-require 'uri/query_params/extensions/addressable/uri'
+require 'uri/query_params/core_ext/addressable/uri'
 
 describe Addressable::URI do
-  let(:uri) { described_class.parse('http://www.example.com/page.php') }
+  subject { described_class.parse('http://www.example.com/page.php') }
 
   it_should_behave_like "URI::QueryParams::Mixin"
 end

data/spec/core_ext/uri/generic_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+require 'query_params_mixin_examples'
+require 'uri/query_params/core_ext/uri'
+
+describe URI::Generic do
+  subject { URI.parse('/page.php') }
+
+  it_should_behave_like "URI::QueryParams::Mixin"
+end

data/spec/core_ext/uri/http_spec.rb

@@ -0,0 +1,77 @@
+require 'spec_helper'
+require 'query_params_mixin_examples'
+require 'uri/query_params/core_ext/uri/http'
+
+describe URI::HTTP do
+  subject { URI.parse("http://www.example.com/page.php") }
+
+  it_should_behave_like "URI::QueryParams::Mixin"
+
+  describe "#request_uri" do
+    context "when #query_params is set" do
+      let(:query_params) do
+        {'x' => '1', 'y' => '2'}
+      end
+
+      before { subject.query_params = query_params }
+
+      context "and when #path is set" do
+        it "must return the #path and #query_params" do
+          expect(subject.request_uri).to eq("#{subject.path}?x=#{query_params['x']}&y=#{query_params['y']}")
+        end
+
+        context "but #path does not start with a '/' character" do
+          subject { URI.parse("http://www.example.com") }
+
+          it "must prepend a '/' character" do
+            expect(subject.request_uri).to eq("/#{subject.path}?x=#{query_params['x']}&y=#{query_params['y']}")
+          end
+        end
+      end
+
+      context "but #path is not set" do
+        before { subject.path = nil }
+
+        it "must return nil" do
+          expect(subject.request_uri).to be(nil)
+        end
+      end
+    end
+
+    context "when #query_params is not set" do
+      context "and when #path is set" do
+        context "and when #query is set" do
+          let(:query) { 'x=1&y=2' }
+
+          subject { URI("http://www.example.com/page.php?#{query}") }
+
+          it "must return the #path and #query" do
+            expect(subject.request_uri).to eq("#{subject.path}?#{subject.query}")
+          end
+        end
+
+        context "but when #query is not set" do
+          it "must return #path" do
+            expect(subject.request_uri).to eq(subject.path)
+          end
+        end
+
+        context "but #path does not start with a '/' character" do
+          subject { URI.parse("http://www.example.com") }
+
+          it "must prepend a '/' character" do
+            expect(subject.request_uri).to eq("/#{subject.path}")
+          end
+        end
+      end
+
+      context "but #path is not set" do
+        before { subject.path = nil }
+
+        it "must return nil" do
+          expect(subject.request_uri).to be(nil)
+        end
+      end
+    end
+  end
+end

data/spec/extensions/addressable/uri.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+require 'uri/query_params/extensions/addressable/uri'
+
+describe 'uri/query_params/extensions/addressable/uri' do
+  let(:root) { File.expand_path(File.join('..','..','..'),__dir__) }
+  let(:path) do
+    File.join(root,'lib','uri','query_params','core_ext', 'addressable','uri.rb')
+  end
+
+  it "must require 'uri/query_params/core_ext/addressable/uri'" do
+    expect($LOADED_FEATURES).to include(path)
+  end
+end

data/spec/extensions/uri/generic_spec.rb

@@ -1,9 +1,13 @@
 require 'spec_helper'
-require 'query_params_mixin_examples'
-require 'uri/query_params/extensions/uri'
+require 'uri/query_params/extensions/uri/generic'
 
-describe URI::Generic do
-  let(:uri) { URI('/page.php') }
+describe 'uri/query_params/extensions/uri/generic' do
+  let(:root) { File.expand_path(File.join('..','..','..'),__dir__) }
+  let(:path) do
+    File.join(root,'lib','uri','query_params','core_ext', 'uri','generic.rb')
+  end
 
-  it_should_behave_like "URI::QueryParams::Mixin"
+  it "must require 'uri/query_params/core_ext/uri/generic'" do
+    expect($LOADED_FEATURES).to include(path)
+  end
 end

data/spec/extensions/uri_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+require 'uri/query_params/extensions/uri'
+
+describe 'uri/query_params/extensions/uri' do
+  let(:root) { File.expand_path(File.join('..','..'),__dir__) }
+  let(:path) { File.join(root,'lib','uri','query_params','core_ext', 'uri.rb') }
+
+  it "must require 'uri/query_params/core_ext/uri'" do
+    expect($LOADED_FEATURES).to include(path)
+  end
+end

data/spec/extensions_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+require 'uri/query_params/extensions'
+
+describe 'uri/query_params/extensions' do
+  let(:root) { File.expand_path('..',__dir__) }
+  let(:path) { File.join(root,'lib','uri','query_params','core_ext.rb') }
+
+  it "must require 'uri/query_params/core_ext'" do
+    expect($LOADED_FEATURES).to include(path)
+  end
+end

data/spec/query_params_mixin_examples.rb

@@ -6,9 +6,7 @@ require 'uri'
 shared_examples_for "URI::QueryParams::Mixin" do
   let(:query) { 'x=1&y=one%20two&z' }
 
-  subject { uri }
-
-  before(:each) { uri.query = query }
+  before { subject.query = query }
 
   context "when included" do
     it "should include QueryParams::Mixin" do
@@ -16,11 +14,11 @@ shared_examples_for "URI::QueryParams::Mixin" do
     end
 
     it "should still provide access to #query" do
-      expect(uri.query).to eq(query)
+      expect(subject.query).to eq(query)
     end
 
     it "should provide #query_params" do
-      is_expected.to respond_to(:query_params)
+      expect(subject).to respond_to(:query_params)
     end
   end
 
@@ -44,6 +42,7 @@ shared_examples_for "URI::QueryParams::Mixin" do
   describe "#query" do
     it "should dump out the #query_params when accessing #query" do
       subject.query_params = {'u' => '3'}
+
       expect(subject.query).to eq('u=3')
     end
 
@@ -61,26 +60,24 @@ shared_examples_for "URI::QueryParams::Mixin" do
   end
 
   describe "#query_params" do
-    subject { uri.query_params }
-
     it "should be a Hash" do
-      expect(subject.class).to eq(Hash)
+      expect(subject.query_params.class).to eq(Hash)
     end
 
     it "should contain params" do
-      is_expected.not_to be_empty
+      expect(subject.query_params).not_to be_empty
     end
 
     it "can contain single-word params" do
-      expect(subject['x']).to eq('1')
+      expect(subject.query_params['x']).to eq('1')
     end
 
     it "can contain multi-word params" do
-      expect(subject['y']).to eq('one two')
+      expect(subject.query_params['y']).to eq('one two')
     end
 
     it "can contain empty params" do
-      expect(subject['z']).to be_empty
+      expect(subject.query_params['z']).to be_empty
     end
   end
 end

data/spec/spec_helper.rb

@@ -1 +1,4 @@
 require 'rspec'
+require 'simplecov'
+
+SimpleCov.start

data/uri-query_params.gemspec

@@ -2,126 +2,60 @@
 
 require 'yaml'
 
-Gem::Specification.new do |gemspec|
-  files = if File.directory?('.git')
-            `git ls-files`.split($/)
-          elsif File.directory?('.hg')
-            `hg manifest`.split($/)
-          elsif File.directory?('.svn')
-            `svn ls -R`.split($/).select { |path| File.file?(path) }
-          else
-            Dir['{**/}{.*,*}'].select { |path| File.file?(path) }
-          end
+Gem::Specification.new do |gem|
+  gemspec = YAML.load_file('gemspec.yml')
 
-  filter_files = lambda { |paths|
-    case paths
-    when Array
-      (files & paths)
-    when String
-      (files & Dir[paths])
-    end
-  }
-
-  version = {
-    :file => 'lib/uri/query_params/version.rb',
-    :constant => 'URI::QueryParams::VERSION'
-  }
-
-  defaults = {
-    'name' => File.basename(File.dirname(__FILE__)),
-    'files' => files,
-    'executables' => filter_files['bin/*'].map { |path| File.basename(path) },
-    'test_files' => filter_files['{test/{**/}*_test.rb,spec/{**/}*_spec.rb}'],
-    'extra_doc_files' => filter_files['*.{txt,rdoc,md,markdown,tt,textile}'],
-  }
-
-  metadata = defaults.merge(YAML.load_file('gemspec.yml'))
-
-  gemspec.name = metadata.fetch('name',defaults[:name])
-  gemspec.version = if metadata['version']
-                      metadata['version']
-                    elsif File.file?(version[:file])
-                      require File.join('.',version[:file])
-                      eval(version[:constant])
-                    end
-
-  gemspec.summary = metadata.fetch('summary',metadata['description'])
-  gemspec.description = metadata.fetch('description',metadata['summary'])
-
-  case metadata['license']
-  when Array
-    gemspec.licenses = metadata['license']
-  when String
-    gemspec.license = metadata['license']
-  end
-
-  case metadata['authors']
-  when Array
-    gemspec.authors = metadata['authors']
-  when String
-    gemspec.author = metadata['authors']
-  end
+  gem.name    = gemspec.fetch('name')
+  gem.version = gemspec.fetch('version') do
+                  lib_dir = File.join(File.dirname(__FILE__),'lib')
+                  $LOAD_PATH << lib_dir unless $LOAD_PATH.include?(lib_dir)
 
-  gemspec.email = metadata['email']
-  gemspec.homepage = metadata['homepage']
+                  require 'uri/query_params/version'
+                  URI::QueryParams::VERSION
+                end
 
-  case metadata['require_paths']
-  when Array
-    gemspec.require_paths = metadata['require_paths']
-  when String
-    gemspec.require_path = metadata['require_paths']
-  end
+  gem.summary     = gemspec['summary']
+  gem.description = gemspec['description']
+  gem.licenses    = Array(gemspec['license'])
+  gem.authors     = Array(gemspec['authors'])
+  gem.email       = gemspec['email']
+  gem.homepage    = gemspec['homepage']
+  gem.metadata    = gemspec['metadata'] if gemspec['metadata']
 
-  gemspec.files = filter_files[metadata['files']]
+  glob = lambda { |patterns| gem.files & Dir[*patterns] }
 
-  gemspec.executables = metadata['executables']
-  gemspec.extensions = metadata['extensions']
+  gem.files = `git ls-files`.split($/)
+  gem.files = glob[gemspec['files']] if gemspec['files']
 
-  if Gem::VERSION < '1.7.'
-    gemspec.default_executable = gemspec.executables.first
+  gem.executables = gemspec.fetch('executables') do
+    glob['bin/*'].map { |path| File.basename(path) }
   end
+  gem.default_executable = gem.executables.first if Gem::VERSION < '1.7.'
 
-  gemspec.test_files = filter_files[metadata['test_files']]
-
-  unless gemspec.files.include?('.document')
-    gemspec.extra_rdoc_files = metadata['extra_doc_files']
-  end
-
-  gemspec.post_install_message = metadata['post_install_message']
-  gemspec.requirements = metadata['requirements']
-
-  if gemspec.respond_to?(:required_ruby_version=)
-    gemspec.required_ruby_version = metadata['required_ruby_version']
-  end
+  gem.extensions       = glob[gemspec['extensions'] || 'ext/**/extconf.rb']
+  gem.test_files       = glob[gemspec['test_files'] || '{test/{**/}*_test.rb']
+  gem.extra_rdoc_files = glob[gemspec['extra_doc_files'] || '*.{txt,md}']
 
-  if gemspec.respond_to?(:required_rubygems_version=)
-    gemspec.required_rubygems_version = metadata['required_ruby_version']
-  end
+  gem.require_paths = Array(gemspec.fetch('require_paths') {
+    %w[ext lib].select { |dir| File.directory?(dir) }
+  })
 
-  parse_versions = lambda { |versions|
-    case versions
-    when Array
-      versions.map { |v| v.to_s }
-    when String
-      versions.split(/,\s*/)
-    end
-  }
+  gem.requirements              = gemspec['requirements']
+  gem.required_ruby_version     = gemspec['required_ruby_version']
+  gem.required_rubygems_version = gemspec['required_rubygems_version']
+  gem.post_install_message      = gemspec['post_install_message']
 
-  if metadata['dependencies']
-    metadata['dependencies'].each do |name,versions|
-      gemspec.add_dependency(name,parse_versions[versions])  
-    end
-  end
+  split = lambda { |string| string.split(/,\s*/) }
 
-  if metadata['runtime_dependencies']
-    metadata['runtime_dependencies'].each do |name,versions|
-      gemspec.add_runtime_dependency(name,parse_versions[versions])  
+  if gemspec['dependencies']
+    gemspec['dependencies'].each do |name,versions|
+      gem.add_dependency(name,split[versions])
     end
   end
 
-  if metadata['development_dependencies']
-    metadata['development_dependencies'].each do |name,versions|
-      gemspec.add_development_dependency(name,parse_versions[versions])  
+  if gemspec['development_dependencies']
+    gemspec['development_dependencies'].each do |name,versions|
+      gem.add_development_dependency(name,split[versions])
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uri-query_params
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.1
 platform: ruby
 authors:
 - Postmodern
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-29 00:00:00.000000000 Z
+date: 2022-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,7 +28,10 @@ description: Allows access to the query component of the URI as a Hash.
 email: postmodern.mod3@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- ChangeLog.md
+- LICENSE.txt
+- README.md
 files:
 - ".document"
 - ".github/workflows/ruby.yml"
@@ -42,6 +45,11 @@ files:
 - Rakefile
 - gemspec.yml
 - lib/uri/query_params.rb
+- lib/uri/query_params/core_ext.rb
+- lib/uri/query_params/core_ext/addressable/uri.rb
+- lib/uri/query_params/core_ext/uri.rb
+- lib/uri/query_params/core_ext/uri/generic.rb
+- lib/uri/query_params/core_ext/uri/http.rb
 - lib/uri/query_params/extensions.rb
 - lib/uri/query_params/extensions/addressable/uri.rb
 - lib/uri/query_params/extensions/uri.rb
@@ -49,9 +57,13 @@ files:
 - lib/uri/query_params/mixin.rb
 - lib/uri/query_params/query_params.rb
 - lib/uri/query_params/version.rb
-- spec/extensions/addressable/uri_spec.rb
+- spec/core_ext/addressable/uri_spec.rb
+- spec/core_ext/uri/generic_spec.rb
+- spec/core_ext/uri/http_spec.rb
+- spec/extensions/addressable/uri.rb
 - spec/extensions/uri/generic_spec.rb
-- spec/extensions/uri/http_spec.rb
+- spec/extensions/uri_spec.rb
+- spec/extensions_spec.rb
 - spec/query_params_mixin_examples.rb
 - spec/query_params_spec.rb
 - spec/spec_helper.rb
@@ -59,8 +71,13 @@ files:
 homepage: https://github.com/postmodern/uri-query_params
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  documentation_uri: https://rubydoc.info/gems/uri-query_params
+  source_code_uri: https://github.com/postmodern/uri-query_params.rb
+  bug_tracker_uri: https://github.com/postmodern/uri-query_params.rb/issues
+  changelog_uri: https://github.com/postmodern/uri-query_params.rb/blob/master/ChangeLog.md
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -68,19 +85,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Access the query parameters of a URI, just like $_GET in PHP.
-test_files:
-- spec/extensions/addressable/uri_spec.rb
-- spec/extensions/uri/generic_spec.rb
-- spec/extensions/uri/http_spec.rb
-- spec/query_params_spec.rb
+test_files: []

data/spec/extensions/uri/http_spec.rb

@@ -1,9 +0,0 @@
-require 'spec_helper'
-require 'query_params_mixin_examples'
-require 'uri/query_params/extensions/uri'
-
-describe URI::HTTP do
-  let(:uri) { URI('http://www.example.com/page.php') }
-
-  it_should_behave_like "URI::QueryParams::Mixin"
-end