uri-query_params 0.7.0 → 0.7.1

data/.gitignore

@@ -1,3 +1,4 @@
+Gemfile.lock
 doc
 pkg
 tmp/*

data/.travis.yml

@@ -0,0 +1,6 @@
+---
+rvm:
+  - 1.9.3
+  - 2.0
+  - 2.1
+  - 2.2

data/ChangeLog.md

@@ -1,3 +1,13 @@
+### 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

data/Gemfile

@@ -0,0 +1,17 @@
+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.8'
+end

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2012 Hal Brodigan
+Copyright (c) 2010-2015 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,10 +1,12 @@
 # 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)
 
+[![Build Status](https://secure.travis-ci.org/postmodern/uri-query_params.svg)](https://travis-ci.org/postmodern/uri-query_params)
+
 ## Description
 
 Allows access to the query component of the URI as a Hash. This is similar
@@ -41,6 +43,6 @@ Parsing URI query_params embedded within the Fragment Identifier:
 
 ## License
 
-Copyright (c) 2010-2012 Hal Brodigan
+Copyright (c) 2010-2015 Hal Brodigan
 
 See {file:LICENSE.txt} for license information.

data/Rakefile

@@ -1,26 +1,18 @@
-require 'rubygems'
-require 'rake'
-
 begin
-  gem 'rspec', '~> 2.4'
-  require 'rspec/core/rake_task'
-
-  RSpec::Core::RakeTask.new
+  require 'bundler/setup'
 rescue LoadError => e
-  task :spec do
-    abort "Please run `gem install rspec` to install RSpec."
-  end
+  abort e.message
 end
+
+require 'rake'
+
+require 'rubygems/tasks'
+Gem::Tasks.new
+
+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,11 +2,10 @@ 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
 
 development_dependencies:
-  rspec: ~> 2.4
-  yard: ~> 0.6
+  bundler: ~> 1.0

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

@@ -7,32 +7,51 @@ module URI
 
     include URI::QueryParams::Mixin
 
-    private
-
-    alias raw_path_query path_query
-
     #
-    # Parses the query parameters from the query data, populating
-    # query_params with the parsed parameters.
+    # Constructs String from URI
     #
-    # @see QueryParams.parse
+    # @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`.
     #
-    # @since 0.5.2
+    # @see https://github.com/ruby/ruby/blob/v2_2_0/lib/uri/generic.rb#L1338-L1376
     #
-    def path_query
-      if @query_params
-        str = @path
-
-        unless @query_params.empty?
-          str += '?' + URI::QueryParams.dump(@query_params)
-        end
+    def to_s
+      str = ''
+      if @scheme
+        str << @scheme
+        str << ':'.freeze
+      end
 
-        str
+      if @opaque
+        str << @opaque
       else
-        # do not rebuild the path-query, if the query_params have not
-        # been parsed yet
-        raw_path_query
+        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

data/lib/uri/query_params/mixin.rb

@@ -112,7 +112,7 @@ module URI
         query_params.each(&block)
       end
 
-      protected
+      private
 
       #
       # Parses the query parameters from the query data, populating

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
@@ -62,6 +64,32 @@ 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
+        URI.escape(value.join(' '),UNSAFE)
+      when true
+        'active'
+      when false, nil
+        ''
+      else
+        URI.escape(value.to_s,UNSAFE)
+      end
+    end
+
     #
     # Dumps the URI query params.
     #
@@ -85,23 +113,16 @@ module URI
     #
     # @since 0.5.0
     #
-    def QueryParams.dump(query_params)
+    # @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 = case value
-                when Array
-                  URI.escape(value.join(' '),UNSAFE)
-                when true
-                  'active'
-                when false, nil
-                  ''
-                else
-                  URI.escape(value.to_s,UNSAFE)
-                end
+        value = escape(value)
 
         query << "#{name}=#{value}"
       end

data/lib/uri/query_params/version.rb

@@ -1,6 +1,6 @@
 module URI
   module QueryParams
     # uri-query_params version
-    VERSION = '0.7.0'
+    VERSION = '0.7.1'
   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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uri-query_params
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,30 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-28 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &13944620 !ruby/object:Gem::Requirement
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *13944620
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &13944020 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: *13944020
+        version: '1.0'
 description: Allows access to the query component of the URI as a Hash.
 email: postmodern.mod3@gmail.com
 executables: []
@@ -40,11 +34,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .document
-- .gemtest
 - .gitignore
 - .rspec
+- .travis.yml
 - .yardopts
 - ChangeLog.md
+- Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -64,7 +59,7 @@ files:
 - 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: 
@@ -85,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: Access the query parameters of a URI, just like $_GET in PHP.
@@ -94,4 +89,3 @@ test_files:
 - spec/extensions/uri/generic_spec.rb
 - spec/extensions/uri/http_spec.rb
 - spec/query_params_spec.rb
-has_rdoc: