rally_rest_api 0.6.0 → 0.6.1

data/Rakefile

@@ -41,11 +41,12 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
   p.test_globs = ["test/*.rb"]
   p.clean_globs = CLEAN  #An array of file patterns to delete on clean.
-  p.extra_deps = ["builder"]
+
+  p.extra_deps = []
+  p.extra_deps << ["builder"]
 
   # == Optional
   #p.changes        - A description of the release's latest changes.
-
   #p.spec_extras    - A hash of extra values to set in the gemspec.
 end
           

data/lib/rally_rest_api/query.rb

@@ -79,6 +79,7 @@ class RestQuery
   def initialize(type, args = {}, &block)
     @type = type
     @query_string = "query=" << URI.escape(QueryBuilder.new("and", &block).to_q) if block_given?
+    @query_string.gsub!("&", "%26")
     @args_for_paging = {}
     [:workspace, :project, :project_scope_down, :project_scope_up].each { |k| @args_for_paging[k] = args[k] if args.key?(k) }
     @query_params = process_args(args)

data/lib/rally_rest_api/query_result.rb

@@ -69,6 +69,7 @@ class QueryResult < RestObject
 
   # Are there more pages?
   def more_pages?
+    return false if start_index == 0
     (self.start_index + self.page_length) -1 < self.total_result_count
   end
 end

data/lib/rally_rest_api/rest_object.rb

@@ -179,6 +179,8 @@ class RestObject
   end
 
    def ==(other)
+     return true if self.equal other
+     return false unless other.kind_of? RestObject
      other.ref == self.ref
    end
 

data/lib/rally_rest_api/version.rb

@@ -2,7 +2,7 @@ module RallyRestVersion #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 6
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/query_result_spec.rb

@@ -0,0 +1,73 @@
+require 'rubygems'
+require 'spec'
+require 'builder'
+
+require File.dirname(__FILE__) + '/../lib/rally_rest_api/query_result'
+
+context "A QueryResult" do
+
+  setup do
+    @api = mock("RallyRestAPI")
+    @api.stub! :username
+    @api.stub! :password
+  end
+
+  def make_result(total, page_size, start_index)
+    result_count = total > page_size ? page_size : total
+
+    b = Builder::XmlMarkup.new(:indent => 2)
+    xml = b.QueryResult {
+      b.TotalResultCount total
+      b.PageSize page_size
+      b.StartIndex start_index
+
+      if (result_count > 0)
+	b.Results {
+	  result_count.times { |i| b.RefElement(:ref => "http", :refObjectName => "name#{i}") }
+	}
+      else
+	b.Results
+      end
+    }
+
+    QueryResult.new(nil, @api, xml)
+  end
+
+  specify "should have the total result count" do
+    make_result(20, 20, 1).total_result_count.should_be 20
+  end
+
+  specify "should have the page size" do
+    make_result(20, 20, 1).page_size.should_be 20
+  end
+
+  specify "should have the start_index" do
+    make_result(20, 20, 1).start_index.should_be 1
+  end
+
+  specify "should have no more pages when no results are returned" do
+    make_result(0, 20, 0).more_pages?.should_be false
+  end
+
+  specify "should have not more pages when the total result count is less then the page size" do
+    make_result(1, 20, 1).more_pages?.should_be false
+    make_result(19, 20, 1).more_pages?.should_be false
+    make_result(20, 20, 1).more_pages?.should_be false
+  end
+
+  specify "should have more pages when total result count is more then the page size" do
+    make_result(21, 20, 1).more_pages?.should_be true
+    make_result(39, 20, 1).more_pages?.should_be true
+  end
+
+  specify "an empty query should not iteratate on each" do
+    start = 0
+    make_result(0, 20, 0).each { start += 1 }
+    start.should_be 0
+  end
+
+end
+
+context "A QueryResult with 2 pages" do
+  
+end

data/test/tc_query_result.rb

@@ -27,6 +27,12 @@ class QueryResultTestCase < Test::Unit::TestCase
     assert_equal(20, result.page_length)
   end
 
+  def test_more_pages_when_enpty
+    query_result_xml = make_result(0, 0, 0)
+    result = QueryResult.new(nil, @api, query_result_xml)
+    assert(! result.more_pages?, "No more pages when results empty")
+  end
+
   def test_more_pages_when_no_pages
     query_result_xml = make_result(20, 20, 1)
     result = QueryResult.new(nil, @api, query_result_xml)

data/test/tc_rest_object.rb

@@ -66,6 +66,25 @@ class RestObjectTestCase < Test::Unit::TestCase
     MyRestBuilder.test = self
     o
   end
+  
+  def test_equal_same_instance
+    xml = %Q(<Object><TextNode>text</TextNode></Object>)
+    r1 = r2 = rest_object(xml)
+    assert(r1 == r2)
+  end
+
+  def test_equal_with_nil
+    xml = %Q(<Object><TextNode>text</TextNode></Object>)
+    r1 = rest_object(xml)
+    assert(r1 != nil)
+  end
+
+  def test_equal_refs
+    r1 = rest_object(%Q(<Object ref="bla"><TextNode>text</TextNode></Object>))
+    r2 = rest_object(%Q(<Object ref="bla"><TextNode>not text</TextNode></Object>))
+    assert_equal(r1, r2)
+  end
+
 
   def test_basic_text_node
     xml = %Q(<Object><TextNode>text</TextNode></Object>)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: rally_rest_api
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
-date: 2006-12-13 00:00:00 -07:00
+  version: 0.6.1
+date: 2006-12-18 00:00:00 -07:00
 summary: A ruby-ized interface to Rally's REST webservices API
 require_paths: 
 - lib
@@ -51,6 +51,7 @@ files:
 test_files: 
 - test/tc_rest_api.rb
 - test/tc_rest_object.rb
+- test/query_result_spec.rb
 - test/tc_rest_query.rb
 - test/test_helper.rb
 - test/tc_query_result.rb