uri-query_params 0.5.4 → 0.6.0

data/.gitignore

@@ -0,0 +1,10 @@
+doc
+pkg
+tmp/*
+.DS_Store
+.bundle
+.yardoc
+*.db
+*.log
+*.swp
+*~

data/ChangeLog.md

@@ -1,3 +1,8 @@
+### 0.6.0 / 2011-12-06
+
+* Allow {URI::QueryParams.parse} to yield query-params, in the order they were
+  parsed.
+
 ### 0.5.4 / 2011-03-19
 
 * Fixed a bug when parsing query params containing `&&&&`.

data/Rakefile

@@ -7,8 +7,8 @@ begin
 
   Ore::Tasks.new
 rescue LoadError => e
-  STDERR.puts e.message
-  STDERR.puts "Run `gem install ore-tasks` to install 'ore/tasks'."
+  warn e.message
+  warn "Run `gem install ore-tasks` to install 'ore/tasks'."
 end
 
 begin

data/lib/uri/query_params/query_params.rb

@@ -14,6 +14,15 @@ module URI
     # @param [String] query_string
     #   The URI query string.
     #
+    # @yield [name,value]
+    #   The given block will be passed each parsed query param.
+    #
+    # @yieldparam [String] name
+    #   The name of the query param.
+    #
+    # @yieldparam [String] value
+    #   The value of the query param.
+    #
     # @return [Hash{String => String}]
     #   The parsed query parameters.
     #
@@ -25,6 +34,10 @@ module URI
     #   QueryParams.parse("x=a%20b%20c&y")
     #   # => {"x"=>"a b c", "y"=>""}
     #
+    # @note
+    #   Version 0.6.0 allows {parse} to yield the query params, in the order
+    #   they are parsed.
+    #
     def QueryParams.parse(query_string)
       query_params = {}
 
@@ -34,12 +47,14 @@ module URI
           next if param.empty?
 
           name, value = param.split('=',2)
+          value = if value
+                    URI.unescape(value)
+                  else
+                    ''
+                  end
 
-          if value
-            query_params[name] = URI.unescape(value)
-          else
-            query_params[name] = ''
-          end
+          yield(name,value) if block_given?
+          query_params[name] = value
         end
       end
 

data/lib/uri/query_params/version.rb

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

data/spec/query_params_spec.rb

@@ -42,6 +42,28 @@ describe URI::QueryParams do
       query_params['x'].should == '1'
       query_params['y'].should == '2'
     end
+
+    context "when given a block" do
+      it "should yield the duplicate named query params" do
+        params = []
+
+        subject.parse('z=1&z=2&z=3') do |name,value|
+          params << [name, value]
+        end
+
+        params.should == [['z', '1'], ['z', '2'], ['z', '3']]
+      end
+
+      it "should yield the query params in the order they are parsed" do
+        params = []
+
+        subject.parse('z=1&y=2&x=3') do |name,value|
+          params << [name, value]
+        end
+
+        params.should == [['z', '1'], ['y', '2'], ['x', '3']]
+      end
+    end
   end
 
   describe "dump" do

data/uri-query_params.gemspec

@@ -1,15 +1,127 @@
-# -*- encoding: utf-8 -*-
-
-begin
-  Ore::Specification.new do |gemspec|
-    # custom logic here
-  end
-rescue NameError
-  begin
-    require 'ore/specification'
-    retry
-  rescue LoadError
-    STDERR.puts "The 'uri-query_params.gemspec' file requires Ore."
-    STDERR.puts "Run `gem install ore-core` to install Ore."
+# encoding: utf-8
+
+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
+
+  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
+
+  gemspec.email = metadata['email']
+  gemspec.homepage = metadata['homepage']
+
+  case metadata['require_paths']
+  when Array
+    gemspec.require_paths = metadata['require_paths']
+  when String
+    gemspec.require_path = metadata['require_paths']
+  end
+
+  gemspec.files = filter_files[metadata['files']]
+
+  gemspec.executables = metadata['executables']
+  gemspec.extensions = metadata['extensions']
+
+  if Gem::VERSION < '1.7.'
+    gemspec.default_executable = gemspec.executables.first
+  end
+
+  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
+
+  if gemspec.respond_to?(:required_rubygems_version=)
+    gemspec.required_rubygems_version = metadata['required_ruby_version']
+  end
+
+  parse_versions = lambda { |versions|
+    case versions
+    when Array
+      versions.map { |v| v.to_s }
+    when String
+      versions.split(/,\s*/)
+    end
+  }
+
+  if metadata['dependencies']
+    metadata['dependencies'].each do |name,versions|
+      gemspec.add_dependency(name,parse_versions[versions])  
+    end
+  end
+
+  if metadata['runtime_dependencies']
+    metadata['runtime_dependencies'].each do |name,versions|
+      gemspec.add_runtime_dependency(name,parse_versions[versions])  
+    end
+  end
+
+  if metadata['development_dependencies']
+    metadata['development_dependencies'].each do |name,versions|
+      gemspec.add_development_dependency(name,parse_versions[versions])  
+    end
   end
 end

metadata

@@ -1,65 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: uri-query_params
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.6.0
   prerelease: 
-  version: 0.5.4
 platform: ruby
-authors: 
+authors:
 - Postmodern
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-19 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ore-tasks
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &18100340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.4"
+      - !ruby/object:Gem::Version
+        version: '0.4'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *18100340
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &18099820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.4"
+      - !ruby/object:Gem::Version
+        version: '2.4'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *18099820
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &18099340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *18099340
 description: Allows access to the query component of the URI as a Hash.
-email: 
-- postmodern.mod3@gmail.com
+email: postmodern.mod3@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README.md
-- ChangeLog.md
-- LICENSE.txt
-files: 
+extra_rdoc_files: []
+files:
 - .document
 - .gemtest
+- .gitignore
 - .rspec
 - .yardopts
 - ChangeLog.md
@@ -80,35 +73,33 @@ files:
 - spec/query_params_spec.rb
 - spec/spec_helper.rb
 - uri-query_params.gemspec
-has_rdoc: yard
 homepage: http://github.com/postmodern/uri-query_params
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: uri-query_params
-rubygems_version: 1.6.2
+rubyforge_project: 
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Access the query parameters of a URI, just like $_GET in PHP.
-test_files: 
-- spec/query_params_spec.rb
-- spec/extensions/https_spec.rb
+test_files:
 - spec/extensions/http_spec.rb
+- spec/extensions/https_spec.rb
+- spec/query_params_spec.rb
+has_rdoc: