ruby_desk 0.6.0 → 0.6.1

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/lib/ruby_desk/connector.rb

@@ -109,7 +109,6 @@ module RubyDesk
     def prepare_and_invoke_api_call(path, options = {})
       api_call = prepare_api_call(path, options)
       data = invoke_api_call(api_call)
-
       parsed_data = case options[:format]
         when 'json' then JSON.parse(data)
         when 'xml' then REXML::Document.new(data)

data/lib/ruby_desk/time_report.rb

@@ -62,6 +62,7 @@ class RubyDesk::TimeReport
 
     columns = [json['table']['cols']].flatten
     rows = [json['table']['rows']].flatten.map do |row_data|
+      next if row_data.empty?
       row = {}
       [row_data['c']].flatten.each_with_index do |row_element, element_index|
         column = columns[element_index]
@@ -69,7 +70,7 @@ class RubyDesk::TimeReport
       end
       row
     end
-    return rows
+    return rows.compact
   end
 
   def self.build_query(options)

data/test/empty_timereport.json

@@ -0,0 +1 @@
+{"auth_user":{"messenger_id":"aseldawy", "timezone":"Africa/Cairo", "mail":"aseldawy@odesk.com", "uid":"aseldawy", "timezone_offset":"0", "first_name":"Ahmed El-Dawy", "last_name":".", "messenger_type":"yahoo"}, "table":{"rows":[""], "cols":[{"type":"number", "label":"hours"}, {"type":"date", "label":"worked_on"}]}, "server_time":"1266912462"}

data/test/test_ruby_desk.rb

@@ -131,6 +131,14 @@ class TestRubyDesk < Test::Unit::TestCase
     assert timereport.first['hours'].is_a?(Numeric)
   end
 
+  def test_empty_timreport
+    connector = dummy_connector('empty_timereport.json')
+
+    timereport = RubyDesk::TimeReport.find(connector,
+      :select=>"worked_on, sum(hours)")
+    assert_equal 0, timereport.size
+  end
+
   def test_timreport_error
     assert_raises RubyDesk::Error do
       connector = dummy_connector('timereport_error.json')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby_desk
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - Ahmed ElDawy
@@ -44,6 +44,7 @@ files:
 - lib/ruby_desk/snapshot.rb
 - lib/ruby_desk/team_room.rb
 - lib/ruby_desk/time_report.rb
+- test/empty_timereport.json
 - test/helper.rb
 - test/profile.json
 - test/providers.json