uri-query_params 0.6.2 → 0.8.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: da86f32384123e5240b11aae3767b48770696604afb3eee3c4a04351badaa585
+  data.tar.gz: c469674aa5d7f20e72f19dd6fb2eac80917182638706390fe1cc2e60d89ecb98
+SHA512:
+  metadata.gz: 62031ef7a85c4e0d17205964f3d2b14c0596d42da4c04f583faedd83f8a7f3c861bddfefdae6e4c36055913e2a59738a93021d943bd0447d91cf360d3762b8b3
+  data.tar.gz: af4ad8d768e9114636279f4abe2d197b439f856474bab5dbb5269388e8f5ad7aaa0a780858e16c797d77f68874f696d3c2e58e486dfada640bcbe19b826b4e3e

data/.github/workflows/ruby.yml

@@ -0,0 +1,28 @@
+name: CI
+
+on: [ push, pull_request ]
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - 2.6
+          - 2.7
+          - '3.0'
+          - 3.1
+          - jruby
+          - truffleruby
+    name: Ruby ${{ matrix.ruby }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Install dependencies
+        run: bundle install --jobs 4 --retry 3
+      - name: Run tests
+        run: bundle exec rake test

data/.gitignore

@@ -1,9 +1,10 @@
-doc
-pkg
-tmp/*
+/Gemfile.lock
+/doc/
+/pkg/
+/vendor/bundle
+/.bundle
+/.yardoc
 .DS_Store
-.bundle
-.yardoc
 *.db
 *.log
 *.swp

data/ChangeLog.md

@@ -1,3 +1,32 @@
+### 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
+  `URI.escape` / `URI.unescape`.
+
+### 0.7.1 / 2015-06-11
+
+* Fixed a Ruby 2.2 specific bug where `alias`es are defined before the method
+  they alias. (@iraupph)
+* Removed the `URI::Generic#path_query` monkeypatch.
+* Override {URI::Generic#to_s} to call the `query` method overrode by
+  {URI::QueryParams::Mixin}, instead of `@query`. Starting in Ruby 2.2.0,
+  `path_query` was inlined directly into `URI::Generic#to_s` which broke our
+  `path_query` monkeypatch.
+
+### 0.7.0 / 2012-03-27
+
+* Inject {URI::QueryParams::Mixin} into {URI::Generic}, so all URIs have
+  `query_params`.
+* Inject {URI::QueryParams::Mixin} into `Addressable::URI`, if `addressable/uri`
+  is loaded.
+
 ### 0.6.2 / 2012-03-15
 
 * Fixed a query parameter ordering issue in {URI::QueryParams.dump},
@@ -26,7 +55,7 @@
   * Contains RFC 3986 unsafe URI characters.
   * Use {URI::QueryParams::UNSAFE} in {URI::QueryParams.dump} for safer
     query strings.
-* Added {URI::QueryParams::Mixin#query}:
+* Added `URI::QueryParams::Mixin#query`:
   * If any query-params are set, dump them out using
     {URI::QueryParams.dump}.
 * Renamed `parse_query_params` to
@@ -48,3 +77,4 @@
 
 * Initial release.
 
+[ruby]: https://www.ruby-lang.org/

data/Gemfile

@@ -0,0 +1,18 @@
+source 'https://rubygems.org'
+
+gemspec
+
+group :test do
+  gem 'addressable'
+end
+
+group :development do
+  gem 'rake'
+  gem 'rubygems-tasks', '~> 0.2'
+
+  gem 'rspec', '~> 3.0'
+
+  gem 'kramdown'
+  gem 'yard', '~> 0.9'
+  gem 'yard-spellcheck', require: false
+end

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2012 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

@@ -1,33 +1,48 @@
 # URI query_params
 
-* [Source](http://github.com/postmodern/uri-query_params)
-* [Issues](http://github.com/postmodern/uri-query_params/issues)
+* [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
 
 Allows access to the query component of the URI as a Hash. This is similar
-to `$_GET` from PHP, except available on any {URI::HTTP} object.
+to `$_GET` from PHP, except available on any Ruby URI object.
 
 ## Examples
 
 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:
+
+```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
 
@@ -35,6 +50,8 @@ Setting the URI query_params:
 
 ## License
 
-Copyright (c) 2010-2012 Hal Brodigan
+Copyright (c) 2010-2022 Hal Brodigan
 
 See {file:LICENSE.txt} for license information.
+
+[ruby]: https://www.ruby-lang.org/

data/Rakefile

@@ -1,36 +1,12 @@
 require 'rubygems'
-require 'rake'
 
-begin
-  gem 'ore-tasks', '~> 0.4'
-  require 'ore/tasks'
+require 'rubygems/tasks'
+Gem::Tasks.new
 
-  Ore::Tasks.new
-rescue LoadError => e
-  warn e.message
-  warn "Run `gem install ore-tasks` to install 'ore/tasks'."
-end
-
-begin
-  gem 'rspec', '~> 2.4'
-  require 'rspec/core/rake_task'
-
-  RSpec::Core::RakeTask.new
-rescue LoadError => e
-  task :spec do
-    abort "Please run `gem install rspec` to install RSpec."
-  end
-end
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new
 task :test => :spec
 task :default => :spec
 
-begin
-  gem 'yard', '~> 0.6.0'
-  require 'yard'
-
-  YARD::Rake::YardocTask.new  
-rescue LoadError => e
-  task :yard do
-    abort "Please run `gem install yard` to install YARD."
-  end
-end
+require 'yard'
+YARD::Rake::YardocTask.new

data/gemspec.yml

@@ -2,12 +2,19 @@ name: uri-query_params
 summary: Access the query parameters of a URI, just like $_GET in PHP.
 description: Allows access to the query component of the URI as a Hash.
 license: MIT
-homepage: http://github.com/postmodern/uri-query_params
+homepage: https://github.com/postmodern/uri-query_params
 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:
-  ore-tasks: ~> 0.4
-  rspec: ~> 2.4
-  yard: ~> 0.6
+  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,58 @@
+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

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

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

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

@@ -0,0 +1 @@
+require 'uri/query_params/core_ext/addressable/uri'

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

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

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

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

data/lib/uri/query_params/extensions.rb

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

data/lib/uri/query_params/mixin.rb

@@ -10,6 +10,58 @@ module URI
       # Allows setting the query_params.
       attr_writer :query_params
 
+      #
+      # Called when {Mixin} is included into a URI Class. Overrides the `query`
+      # and `query=` methods to transparently update the {#query_params}.
+      #
+      def self.included(base)
+        base.module_eval do
+          alias raw_query query
+
+          #
+          # The raw query-string.
+          #
+          # @return [String, nil]
+          #   The raw query-string.
+          #
+          # @see QueryParams.dump
+          #
+          # @since 0.5.2
+          #
+          def query
+            if defined?(@query_params) && @query_params
+              URI::QueryParams.dump(@query_params)
+            else
+              raw_query
+            end
+          end
+
+          alias raw_query= query=
+
+          #
+          # Sets the query string and updates query_params.
+          #
+          # @param [String] query_str
+          #   The new URI query string to use.
+          #
+          # @return [String]
+          #   The new URI query string.
+          #
+          # @example
+          #   url.query = 'a=1&b=2'
+          #   # => "a=1&b=2"
+          #
+          # @see QueryParams.parse
+          #
+          def query=(new_query)
+            new_query = (self.raw_query = new_query)
+
+            parse_query_params! if defined?(@query_params) && @query_params
+            return new_query
+          end
+        end
+      end
+
       #
       # Deep-copies the {#query_params} from another URL.
       #
@@ -26,46 +78,6 @@ module URI
         super(url)
       end
 
-      #
-      # The raw query-string.
-      #
-      # @return [String, nil]
-      #   The raw query-string.
-      #
-      # @see QueryParams.dump
-      #
-      # @since 0.5.2
-      #
-      def query
-        if @query_params
-          QueryParams.dump(@query_params)
-        else
-          super
-        end
-      end
-
-      #
-      # Sets the query string and updates query_params.
-      #
-      # @param [String] query_str
-      #   The new URI query string to use.
-      #
-      # @return [String]
-      #   The new URI query string.
-      #
-      # @example
-      #   url.query = 'a=1&b=2'
-      #   # => "a=1&b=2"
-      #
-      # @see QueryParams.parse
-      #
-      def query=(raw_query)
-        new_query = super(raw_query)
-
-        parse_query_params! if @query_params
-        return new_query
-      end
-
       #
       # The query params of the URI.
       #
@@ -100,7 +112,7 @@ module URI
         query_params.each(&block)
       end
 
-      protected
+      private
 
       #
       # Parses the query parameters from the query data, populating
@@ -111,26 +123,9 @@ module URI
       # @since 0.5.2
       #
       def parse_query_params!
-        @query_params = QueryParams.parse(@query)
+        @query_params = URI::QueryParams.parse(@query)
       end
 
-      private
-
-      def path_query
-        if @query_params
-          str = @path
-
-          unless @query_params.empty?
-            str += '?' + QueryParams.dump(@query_params)
-          end
-
-          str
-        else
-          # do not rebuild the path-query, if the query_params have not
-          # been parsed yet
-          super
-        end
-      end
     end
   end
 end

data/lib/uri/query_params/query_params.rb

@@ -39,7 +39,9 @@ module URI
     #   Version 0.6.0 allows {parse} to yield the query params, in the order
     #   they are parsed.
     #
-    def QueryParams.parse(query_string)
+    # @api semipublic
+    #
+    def self.parse(query_string)
       query_params = {}
 
       if query_string
@@ -48,10 +50,8 @@ module URI
           next if param.empty?
 
           name, value = param.split('=',2)
-          value = if value
-                    URI.unescape(value)
-                  else
-                    ''
+          value = if value then URI::DEFAULT_PARSER.unescape(value)
+                  else          ''
                   end
 
           yield(name,value) if block_given?
@@ -62,6 +62,28 @@ module URI
       return query_params
     end
 
+    #
+    # Escapes a URI query param value.
+    #
+    # @param [Array, true, false, nil, #to_s] value
+    #   The query param value to escape.
+    #
+    # @return [String]
+    #   The raw escaped query param value.
+    #
+    # @since 0.7.1
+    #
+    # @api semipublic
+    #
+    def self.escape(value)
+      case value
+      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
+
     #
     # Dumps the URI query params.
     #
@@ -85,28 +107,12 @@ module URI
     #
     # @since 0.5.0
     #
-    def QueryParams.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 = case value
-                when Array
-                  URI.escape(value.join(' '),UNSAFE)
-                when true
-                  'active'
-                when false, nil
-                  ''
-                else
-                  URI.escape(value.to_s,UNSAFE)
-                end
-
-        query << "#{name}=#{value}"
-      end
-
-      return query.join('&')
+    # @api semipublic
+    #
+    def self.dump(query_params)
+      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.6.2'
+    VERSION = '0.8.0'
   end
 end

data/spec/core_ext/addressable/uri_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+require 'query_params_mixin_examples'
+require 'uri/query_params/core_ext/addressable/uri'
+
+describe Addressable::URI do
+  let(:uri) { 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
+  let(:uri) { URI('/page.php') }
+
+  it_should_behave_like "URI::QueryParams::Mixin"
+end

data/spec/{extensions → core_ext/uri}/http_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 require 'query_params_mixin_examples'
-require 'uri/query_params/extensions/http'
+require 'uri/query_params/core_ext/uri'
 
 describe URI::HTTP do
   let(:uri) { URI('http://www.example.com/page.php') }

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

@@ -0,0 +1,13 @@
+require 'spec_helper'
+require 'uri/query_params/extensions/uri/generic'
+
+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 "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

@@ -10,62 +10,77 @@ shared_examples_for "URI::QueryParams::Mixin" do
 
   before(:each) { uri.query = query }
 
-  it "should include QueryParams" do
-    subject.class.should include(URI::QueryParams::Mixin)
-  end
+  context "when included" do
+    it "should include QueryParams::Mixin" do
+      expect(subject.class).to include(URI::QueryParams::Mixin)
+    end
 
-  it "should still provide access to #query" do
-    uri.query.should == query
-  end
+    it "should still provide access to #query" do
+      expect(uri.query).to eq(query)
+    end
 
-  it "should provide #query_params" do
-    should respond_to(:query_params)
+    it "should provide #query_params" do
+      is_expected.to respond_to(:query_params)
+    end
   end
 
-  it "should update #query_params after #query is set" do
-    subject.query = 'u=2'
-    subject.query_params['u'].should == '2'
-  end
+  context "when copied" do
+    it "should deep-copy the query_params Hash" do
+      original = subject.query_params.object_id
 
-  it "should dump out the #query_params when accessing #query" do
-    subject.query_params = {'u' => '3'}
-    subject.query.should == 'u=3'
+      expect(subject.dup.query_params.object_id).not_to eq(original)
+      expect(subject.clone.query_params.object_id).not_to eq(original)
+    end
   end
 
-  it "should properly escape query param values" do
-    subject.query_params = {'x' => '1&2', 'y' => 'one=two', 'z' => '?'}
+  describe "#query=" do
+    it "should update #query_params after #query is set" do
+      subject.query = 'u=2'
 
-    subject.to_s.match(/\?(.+)$/)[1].should == "x=1%262&y=one%3Dtwo&z=%3F"
+      expect(subject.query_params['u']).to eq('2')
+    end
   end
 
-  it "should deep-copy the query_params Hash" do
-    original = subject.query_params.object_id
+  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
+
+    it "should properly escape query param values" do
+      subject.query_params = {'x' => '1&2', 'y' => 'one=two', 'z' => '?'}
 
-    subject.dup.query_params.object_id.should_not == original
-    subject.clone.query_params.object_id.should_not == original
+      expect(subject.query).to eq("x=1%262&y=one%3Dtwo&z=%3F")
+    end
+  end
+
+  describe "#to_s" do
+    it "should include the #query_params" do
+      expect(subject.to_s.split('?',2).last).to eq(query)
+    end
   end
 
   describe "#query_params" do
     subject { uri.query_params }
 
     it "should be a Hash" do
-      subject.class.should == Hash
+      expect(subject.class).to eq(Hash)
     end
 
     it "should contain params" do
-      should_not be_empty
+      is_expected.not_to be_empty
     end
 
     it "can contain single-word params" do
-      subject['x'].should == '1'
+      expect(subject['x']).to eq('1')
     end
 
     it "can contain multi-word params" do
-      subject['y'].should == 'one two'
+      expect(subject['y']).to eq('one two')
     end
 
     it "can contain empty params" do
-      subject['z'].should be_empty
+      expect(subject['z']).to be_empty
     end
   end
 end

data/spec/query_params_spec.rb

@@ -6,41 +6,41 @@ require 'uri'
 describe URI::QueryParams do
   describe "parse" do
     it "should not parse an empty String" do
-      subject.parse('').should be_empty
+      expect(subject.parse('')).to be_empty
     end
 
     it "should not parse empty params" do
-      subject.parse('a&&&b').should == {'a' => '', 'b' => ''}
+      expect(subject.parse('a&&&b')).to eq({'a' => '', 'b' => ''})
     end
 
     it "should parse a single query param name" do
-      subject.parse('x').should have_key('x')
+      expect(subject.parse('x')).to have_key('x')
     end
 
     it "should parse a query param with an empty value" do
       query_params = subject.parse('x=')
 
-      query_params.should have_key('x')
-      query_params['x'].should be_empty
+      expect(query_params).to have_key('x')
+      expect(query_params['x']).to be_empty
     end
 
     it "should URI decode query param values" do
       query_params = subject.parse('x=1%202')
 
-      query_params['x'].should == '1 2'
+      expect(query_params['x']).to eq('1 2')
     end
 
     it "should ignore multiple '=' characters in query param values" do
       query_params = subject.parse('x=1=2')
 
-      query_params['x'].should == '1=2'
+      expect(query_params['x']).to eq('1=2')
     end
 
     it "should parse multiple query params" do
       query_params = subject.parse('x=1&y=2')
 
-      query_params['x'].should == '1'
-      query_params['y'].should == '2'
+      expect(query_params['x']).to eq('1')
+      expect(query_params['y']).to eq('2')
     end
 
     context "when given a block" do
@@ -51,7 +51,7 @@ describe URI::QueryParams do
           params << [name, value]
         end
 
-        params.should == [['z', '1'], ['z', '2'], ['z', '3']]
+        expect(params).to eq([['z', '1'], ['z', '2'], ['z', '3']])
       end
 
       it "should yield the query params in the order they are parsed" do
@@ -61,38 +61,38 @@ describe URI::QueryParams do
           params << [name, value]
         end
 
-        params.should == [['z', '1'], ['y', '2'], ['x', '3']]
+        expect(params).to eq([['z', '1'], ['y', '2'], ['x', '3']])
       end
     end
   end
 
   describe "dump" do
     it "should not dump an empty Hash" do
-      subject.dump({}).should be_empty
+      expect(subject.dump({})).to be_empty
     end
 
     it "should dump query params with no values" do
-      subject.dump({'x' => nil}).should == 'x='
+      expect(subject.dump({'x' => nil})).to eq('x=')
     end
 
     it "should dump query params with empty values" do
-      subject.dump({'x' => ''}).should == 'x='
+      expect(subject.dump({'x' => ''})).to eq('x=')
     end
 
     it "should dump query params with true values" do
-      subject.dump({'x' => true}).should == 'x=active'
+      expect(subject.dump({'x' => true})).to eq('x=active')
     end
 
     it "should dump query params with non String values" do
-      subject.dump({'x' => 1}).should == 'x=1'
+      expect(subject.dump({'x' => 1})).to eq('x=1')
     end
 
     it "should dump query params with Array values" do
-      subject.dump({'x' => [1,2]}).should == 'x=1%202'
+      expect(subject.dump({'x' => [1,2]})).to eq('x=1%202')
     end
 
     it "should dump multiple query params" do
-      subject.dump({'x' => '1', 'y' => '2'}).should == 'x=1&y=2'
+      expect(subject.dump({'x' => '1', 'y' => '2'})).to eq('x=1&y=2')
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,2 +1 @@
-gem 'rspec', '~> 2.4'
 require 'rspec'

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,105 +1,98 @@
 --- !ruby/object:Gem::Specification
 name: uri-query_params
 version: !ruby/object:Gem::Version
-  version: 0.6.2
-  prerelease: 
+  version: 0.8.0
 platform: ruby
 authors:
 - Postmodern
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-03-16 00:00:00.000000000 Z
+date: 2022-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ore-tasks
-  requirement: &19935200 !ruby/object:Gem::Requirement
-    none: false
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *19935200
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &19934680 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :development
-  prerelease: false
-  version_requirements: *19934680
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &19934200 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: *19934200
+        version: '2.0'
 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
-- .gemtest
-- .gitignore
-- .rspec
-- .yardopts
+- ".document"
+- ".github/workflows/ruby.yml"
+- ".gitignore"
+- ".rspec"
+- ".yardopts"
 - ChangeLog.md
+- Gemfile
 - LICENSE.txt
 - README.md
 - 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/extensions.rb
-- lib/uri/query_params/extensions/http.rb
-- lib/uri/query_params/extensions/https.rb
+- lib/uri/query_params/extensions/addressable/uri.rb
+- lib/uri/query_params/extensions/uri.rb
+- lib/uri/query_params/extensions/uri/generic.rb
 - lib/uri/query_params/mixin.rb
 - lib/uri/query_params/query_params.rb
 - lib/uri/query_params/version.rb
-- spec/extensions/http_spec.rb
-- spec/extensions/https_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_spec.rb
+- spec/extensions_spec.rb
 - spec/query_params_mixin_examples.rb
 - spec/query_params_spec.rb
 - spec/spec_helper.rb
 - uri-query_params.gemspec
-homepage: http://github.com/postmodern/uri-query_params
+homepage: https://github.com/postmodern/uri-query_params
 licenses:
 - MIT
-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
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.15
-signing_key: 
-specification_version: 3
+rubygems_version: 3.2.22
+signing_key:
+specification_version: 4
 summary: Access the query parameters of a URI, just like $_GET in PHP.
-test_files:
-- spec/extensions/http_spec.rb
-- spec/extensions/https_spec.rb
-- spec/query_params_spec.rb
-has_rdoc: 
+test_files: []

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

@@ -1,11 +0,0 @@
-require 'uri/query_params/mixin'
-
-require 'uri/http'
-
-module URI
-  class HTTP < Generic
-
-    include QueryParams::Mixin
-
-  end
-end

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

@@ -1,3 +0,0 @@
-require 'uri/query_params/extensions/http'
-
-require 'uri/https'

data/spec/extensions/https_spec.rb

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