Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Updated to use latest version of Addressable gem #6

Merged
merged 1 commit into from

2 participants

@dparis

Version 2.3 of the Addressable gem introduced a change to the query_values method which breaks this gem. The fix is simple, and all specs pass once the change is applied.

@igrigorik Not sure if you're still watching this repo, but I'd appreciate it if you could incorporate this fix into master and bump the rubygems version. I'll keep working from my fork in the mean time. Thanks!

@igrigorik igrigorik merged commit f4e2926 into from
@igrigorik
Owner

Thanks!

@dparis

@igrigorik No problem! Also, I just realized you may want to bump the version requirement for addressable in the gemspec to be >= 2.3.0, since this change will be incompatible with any versions previous to that.

Did you already push this change out to rubygems? There may just be some lag in that process and it hasn't showed up there yet, but I'm not seeing it.

Thanks for your time!

@igrigorik
Owner

Should be up on rubygems now!

@dparis

Thank you very much.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Sep 27, 2012
  1. @dparis
This page is out of date. Refresh to see the latest.
Showing with 6 additions and 7 deletions.
  1. +1 −4 Rakefile
  2. +1 −2  lib/postrank-uri.rb
  3. +4 −1 spec/helper.rb
View
5 Rakefile
@@ -1,9 +1,6 @@
require 'bundler'
Bundler::GemHelper.install_tasks
-require 'rspec'
require 'rspec/core/rake_task'
-Rspec::Core::RakeTask.new do |t|
- t.rspec_opts = '--color'
-end
+Rspec::Core::RakeTask.new(:spec)
View
3  lib/postrank-uri.rb
@@ -164,7 +164,7 @@ def c18n(uri, opts = {})
u = parse(uri, opts)
u = embedded(u)
- if q = u.query_values(:notation => :flat_array)
+ if q = u.query_values(Array)
q.delete_if { |k,v| C18N[:global].include?(k) }
q.delete_if { |k,v| C18N[:hosts].find {|r,p| u.host =~ r && p.include?(k) } }
end
@@ -230,4 +230,3 @@ def valid?(uri)
end
end
end
-
View
5 spec/helper.rb
@@ -1,4 +1,7 @@
require 'bundler'
Bundler.setup
-require 'lib/postrank-uri'
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')), __FILE__)
+
+require 'postrank-uri'
Something went wrong with that request. Please try again.