Permalink
Browse files

Merge pull request #6 from dparis/master

Updated to use latest version of Addressable gem
  • Loading branch information...
2 parents cf559af + 3a07aef commit f4e29268148e7f906f3f493f665834e72d3d6c49 @igrigorik igrigorik committed Sep 28, 2012
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'

0 comments on commit f4e2926

Please sign in to comment.