http_router 0.6.6 → 0.6.7

data/Rakefile

@@ -2,7 +2,9 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 
 desc "Run all tests"
-task :test => ['test:integration', 'test:examples']
+task :test => ['test:integration', 'test:examples', 'test:rdoc_examples']
+
+require 'pp'
 
 namespace :test do
   desc "Run integration tests"
@@ -52,6 +54,54 @@ namespace :test do
       end
     end
   end
+  desc "rdoc examples"
+  task :rdoc_examples do
+    $: << 'lib'
+    require 'http_router'
+    in_example = false
+    examples = []
+    STDOUT.sync = true
+    current_example = ''
+    rb_files = Dir['./lib/**/*.rb']
+    puts "Scanning #{rb_files * ', '}"
+    rb_files.each do |file|
+      lines = File.read(file).split(/\n/)
+      lines.each do |line|
+        if line[/^\s*#(.*)/] # comment
+          line = $1.strip
+          case line
+          when /^example:/i then in_example = true
+          when /^(?:# )?=+> (.*)/
+            expected = $1.strip
+            msg = expected.dup
+            msg << " was expected to be "
+            msg << "\#{__example_runner.inspect}"
+            current_example << "raise \"#{msg.gsub('"', '\\"')}\" unless __example_runner.strip == #{expected}\n" if in_example
+          when ''
+            unless current_example.empty?
+              examples << current_example
+              current_example = ''
+            end
+            in_example = false
+          else
+            current_example << "__example_runner = (" << line << ")\n" if in_example
+          end
+        else
+          unless current_example.empty?
+            examples << current_example
+            current_example = ''
+          end
+          in_example = false
+        end
+      end
+    end
+    puts "Running #{examples.size} example#{'s' if examples.size != 1}"
+    examples.each do |example|
+      print "."
+      eval(example)
+    end
+    puts " ✔"
+  end
 end
 
 require 'rake/rdoctask'

data/lib/http_router.rb

@@ -154,7 +154,7 @@ class HttpRouter
   #
   # Example:
   #   router = HttpRouter.new
-  #   router.add('/:foo.:format).name(:test).compile
+  #   router.add('/:foo.:format').name(:test).to{|env| [200, {}, []]}
   #   router.url(:test, 123, 'html')
   #   # ==> "/123.html"
   #   router.url(:test, 123, :format => 'html')

data/lib/http_router/route.rb

@@ -284,17 +284,22 @@ class HttpRouter
       path_obj
     end
 
+    def append_querystring_value(uri, key, value)
+      case value
+      when Array
+        k = "#{key}[]"
+        value.each{ |v| append_querystring_value(uri, k, v) }
+      when Hash
+        value.each{ |k, v| append_querystring_value(uri, "#{key}[#{k}]", v) }
+      else
+        uri << '&' << ::Rack::Utils.escape(key.to_s) << '=' << ::Rack::Utils.escape(value.to_s)
+      end
+    end
+
     def append_querystring(uri, params)
       if params && !params.empty?
         uri_size = uri.size
-        params.each do |k,v|
-          case v
-          when Array
-            v.each { |v_part| uri << '&' << ::Rack::Utils.escape(k.to_s) << '%5B%5D=' << ::Rack::Utils.escape(v_part.to_s) }
-          else
-            uri << '&' << ::Rack::Utils.escape(k.to_s) << '=' << ::Rack::Utils.escape(v.to_s)
-          end
-        end
+        params.each{ |k,v|  append_querystring_value(uri, k, v) }
         uri[uri_size] = ??
       end
       uri

data/lib/http_router/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 class HttpRouter #:nodoc
-  VERSION = '0.6.6'
+  VERSION = '0.6.7'
 end

data/test/helper.rb

@@ -71,6 +71,6 @@ class MiniTest::Unit::TestCase
       route = router.add(route)
     end
     route.to{|env| Rack::Response.new("Routing to #{route.to_s}").finish} if route && route.respond_to?(:to) && !route.dest
-    assert_equal path, router.url(route, *args)
+    assert_equal path.gsub('[','%5B').gsub(']','%5D'), router.url(route, *args)
   end
 end

data/test/test_generate.rb

@@ -90,4 +90,16 @@ class TestGenerate < MiniTest::Unit::TestCase
     r = router { add(':var').matching(:var => /\d+/) }
     assert_raises(HttpRouter::InvalidRouteException) { router.url(r, 'asd') }
   end
+  
+  def test_array
+    assert_generate '/var?foo[]=baz&foo[]=bar', '/var', :foo => ['baz', 'bar']
+  end
+  
+  def test_hash
+    assert_generate '/var?foo[az]=baz&foo[ar]=bar', '/var', :foo => {:az => 'baz', :ar => 'bar'}
+  end
+  
+  def test_hash_with_array
+    assert_generate '/var?foo[az]=baz&foo[ar][]=bar&foo[ar][]=barz', '/var', :foo => {:az => 'baz', :ar => ['bar', 'barz']}
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 6
-  - 6
-  version: 0.6.6
+  - 7
+  version: 0.6.7
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-27 00:00:00 -07:00
+date: 2011-03-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency