wreckster 1.0.0 → 1.0.1

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+=== 1.0.1
+
+* CGI escaping query parameters to traversals
+
 === 1.0.0 / 2010-05-26
 
 * 1 major enhancement

data/Manifest.txt

@@ -9,4 +9,5 @@ lib/wreckster/object.rb
 lib/wreckster/traversal.rb
 test/helper.rb
 test/test_object.rb
+test/test_traversal.rb
 test/test_wreckster.rb

data/lib/wreckster.rb

@@ -7,7 +7,7 @@ require 'wreckster/traversal'
 require 'wreckster/object'
 
 module Wreckster
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 
   @connection = Net::HTTP::Persistent.new
   class << self

data/lib/wreckster/traversal.rb

@@ -1,3 +1,5 @@
+require 'cgi'
+
 module Wreckster
   class Traversal
     attr_reader :name
@@ -8,7 +10,7 @@ module Wreckster
     end
 
     def find options = {}
-      params = options.map { |k,v| "#{k}=#{v}" }.join("&")
+      params = options.map { |k,v| "#{k}=#{CGI.escape(v.to_s)}" }.join("&")
       map = JSON.parse(
         Wreckster.connection.request(URI.parse(url + "?#{params}")).body
       )

data/test/helper.rb

@@ -1,4 +1,4 @@
-require "test/unit"
+require 'minitest/autorun'
 require "wreckster"
 
 module Wreckster
@@ -18,4 +18,22 @@ module Wreckster
   end
   Response = Struct.new(:body)
   Wreckster.connection = FakeConnector.new
+
+  class TestCase < MiniTest::Unit::TestCase
+    def conn
+      Wreckster.connection
+    end
+
+    def traversal_response
+      <<-eojson
+    {"query_time":0,"name":"Wreckster: A Graph-Based Ranking Engine","up_time":"0[d]:00[h]:54[m]:43[s]","traversals":["grateful\/singer-writer-rank","grateful\/follows-score","grateful\/co-follows-rank","gremlin","grateful\/artist-rank"]}
+      eojson
+    end
+
+    def find_response
+      <<-eojson
+    {"ranks":[{"grateful\/co-follows-rank":5.0,"_id":"35","name":"WAY TO GO HOME","song_type":"original","performances":92,"type":"song"},{"grateful\/co-follows-rank":8.0,"_id":"36","name":"SAINT OF CIRCUMSTANCE","song_type":"original","performances":222,"type":"song"}],"query_time":1,"success":true,"size":2,"total_rank":2777.0}
+      eojson
+    end
+  end
 end

data/test/test_object.rb

@@ -1,7 +1,7 @@
 require 'helper'
 
 module Wreckster
-  class TestObject < Test::Unit::TestCase
+  class TestObject < Wreckster::TestCase
     def test_identifier
       obj = Wreckster::Object.new 'foo', '_id' => 100
       assert_equal 100, obj.identifier

data/test/test_traversal.rb

@@ -0,0 +1,30 @@
+require 'helper'
+
+module Wreckster
+  class TestTraversal < Wreckster::TestCase
+    def setup
+      super
+      conn.responses << Response.new(find_response)
+
+      @url  = 'http://localhost:8182/'
+      @name = 'grateful/co-follows-rank'
+      @t    = Wreckster::Traversal.new @url, @name
+    end
+
+    def test_traversal
+      objs = @t.find('song.name' => 'SUGAREE', 'offset.end' => 2)
+
+      assert_equal 2, objs.length
+      assert_equal %w{ song song }, objs.map { |o| o.type }
+      assert_equal [5.0, 8.0], objs.map { |o| o.rank }
+    end
+
+    def test_cgi_escape
+      objs = @t.find('song.name' => 'Aaron Patterson', 'offset.end' => 2)
+
+      assert_equal 2, objs.length
+      assert_equal %w{ song song }, objs.map { |o| o.type }
+      assert_equal [5.0, 8.0], objs.map { |o| o.rank }
+    end
+  end
+end

data/test/test_wreckster.rb

@@ -1,7 +1,7 @@
 require 'helper'
 
 module Wreckster
-  class TestWreckster < Test::Unit::TestCase
+  class TestWreckster < Wreckster::TestCase
     def setup
       @url = 'http://localhost:8182/'
     end
@@ -17,32 +17,5 @@ module Wreckster
       response = JSON.parse traversal_response
       assert_equal response['traversals'].sort, traversals.map { |t| t.name }.sort
     end
-
-    def test_traversal
-      conn.responses << Response.new(find_response)
-
-      t    = Wreckster::Traversal.new @url, 'grateful/co-follows-rank'
-      objs = t.find('song.name' => 'SUGAREE', 'offset.end' => 2)
-
-      assert_equal 2, objs.length
-      assert_equal %w{ song song }, objs.map { |o| o.type }
-      assert_equal [5.0, 8.0], objs.map { |o| o.rank }
-    end
-
-    def conn
-      Wreckster.connection
-    end
-
-    def traversal_response
-      <<-eojson
-    {"query_time":0,"name":"Wreckster: A Graph-Based Ranking Engine","up_time":"0[d]:00[h]:54[m]:43[s]","traversals":["grateful\/singer-writer-rank","grateful\/follows-score","grateful\/co-follows-rank","gremlin","grateful\/artist-rank"]}
-      eojson
-    end
-
-    def find_response
-      <<-eojson
-    {"ranks":[{"grateful\/co-follows-rank":5.0,"_id":"35","name":"WAY TO GO HOME","song_type":"original","performances":92,"type":"song"},{"grateful\/co-follows-rank":8.0,"_id":"36","name":"SAINT OF CIRCUMSTANCE","song_type":"original","performances":222,"type":"song"}],"query_time":1,"success":true,"size":2,"total_rank":2777.0}
-      eojson
-    end
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wreckster
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-01 00:00:00 -07:00
+date: 2010-06-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-http-persistent
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 1
         - 2
@@ -35,9 +38,11 @@ dependencies:
   name: json
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -47,9 +52,11 @@ dependencies:
   name: rubyforge
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 2
         - 0
@@ -61,9 +68,11 @@ dependencies:
   name: hoe
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 2
         - 6
@@ -96,6 +105,7 @@ files:
 - lib/wreckster/traversal.rb
 - test/helper.rb
 - test/test_object.rb
+- test/test_traversal.rb
 - test/test_wreckster.rb
 has_rdoc: true
 homepage: http://github.com/tenderlove/wreckster
@@ -108,26 +118,31 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: wreckster
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Wreckster is an API for accessing Rexster[http://wiki.github.com/tinkerpop/rexster/].
 test_files: 
 - test/test_object.rb
+- test/test_traversal.rb
 - test/test_wreckster.rb