ruby_desk 0.6.1 → 0.7.0

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.7.0

data/lib/ruby_desk/connector.rb

@@ -100,6 +100,7 @@ module RubyDesk
       case resp.code
         when "200" then return data
         when "401" then raise RubyDesk::UnauthorizedError, data
+        when "404" then raise RubyDesk::PageNotFound, data
         when "500" then raise RubyDesk::ServerError, data
       end
 
@@ -109,6 +110,7 @@ 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)
@@ -129,7 +131,7 @@ module RubyDesk
     # return the URL that logs user out of odesk applications
     def logout_url
       logout_call = prepare_api_call("", :base_url=>ODESK_AUTH_URL,
-        :secure=>false)
+        :secure=>false, :auth=>false)
       return logout_call[:url]
     end
 

data/lib/ruby_desk/time_report.rb

@@ -29,27 +29,34 @@ class RubyDesk::TimeReport
   #      * provider_id
   #      * worked_on
   #      * assignment_team_id
-  #      * provider_id
   #      * task
   # :order
   def self.find(connector, options={})
     options = DEFAULT_OPTIONS.merge(options)
+    options[:conditions].each_pair do |k, v|
+      if Array === v && v.size == 1
+        options[:conditions][k] = v.first
+      elsif Array === v && v.empty?
+        options[:conditions].delete(k)
+      end
+    end
     call_url = "timereports/v1"
     # Adjust a URL that has as much information as we can
     if String === options[:conditions][:company_id]
       # Limit to one company in url (better looking)
       call_url << "/companies/#{options[:conditions].delete :company_id}"
-
-      if String === options[:conditions][:agency_id]
-        # Limit to one agency in url (better looking)
-        call_url << "/agencies/#{options[:conditions].delete :agency_id}"
-      elsif String === options[:conditions][:team_id]
-        # Limit to one team in url (better looking)
-        call_url << "/teams/#{options[:conditions].delete :team_id}"
-      end
-    elsif String === options[:conditions][:provider_id]
+    end
+    if String === options[:conditions][:provider_id]
       call_url << "/providers/#{options[:conditions].delete :provider_id}"
     end
+    if String === options[:conditions][:agency_id]
+      # Limit to one agency in url (better looking)
+      call_url << "/agencies/#{options[:conditions].delete :agency_id}"
+    end
+    if String === options[:conditions][:team_id]
+      # Limit to one team in url (better looking)
+      call_url << "/teams/#{options[:conditions].delete :team_id}"
+    end
 
     call_url << "/hours" if options[:hours]
 
@@ -104,7 +111,7 @@ class RubyDesk::TimeReport
 
   def self.value_to_str(value)
     case value
-      when String then value
+      when String then "'#{value}'"
       when Date, Time then "'"+value.strftime("%Y-%m-%d")+"'"
       when Numeric then value.to_s
     end

data/lib/ruby_desk.rb

@@ -5,6 +5,7 @@ require 'logger'
 module RubyDesk
   class Error < RuntimeError; end;
   class UnauthorizedError < Error; end;
+  class PageNotFound < Error; end;
   class ServerError < Error; end;
 
   class << self

data/test/test_ruby_desk.rb

@@ -105,9 +105,9 @@ class TestRubyDesk < Test::Unit::TestCase
         "SELECT worked_on WHERE (worked_on='2009-10-10')"],
       [{:select=>"worked_on, provider_id", :conditions=>{:provider_id=>[1,2,3]}},
         "SELECT worked_on, provider_id WHERE (provider_id=1 OR provider_id=2 OR provider_id=3)"],
-      [{:select=>"worked_on", :conditions=>{:provider_id=>1, :agency_id=>3}},
-        ["SELECT worked_on WHERE (agency_id=3) AND (provider_id=1)",
-        "SELECT worked_on WHERE (provider_id=1) AND (agency_id=3)"]],
+      [{:select=>"worked_on", :conditions=>{:provider_id=>'aseldawy', :agency_id=>3}},
+        ["SELECT worked_on WHERE (agency_id=3) AND (provider_id='aseldawy')",
+        "SELECT worked_on WHERE (provider_id='aseldawy') AND (agency_id=3)"]],
       [{:select=>"worked_on", :conditions=>{:provider_id=>1..3}},
         "SELECT worked_on WHERE (provider_id>=1 AND provider_id<=3)"],
       [{:select=>"worked_on", :conditions=>{:provider_id=>1...3}},
@@ -116,6 +116,7 @@ class TestRubyDesk < Test::Unit::TestCase
         "SELECT worked_on,hours"],
     ]
     test_data.each do |options, query|
+      # I use include? because some queries have more than possible form
       assert query.include?(RubyDesk::TimeReport.build_query(options))
     end
   end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ruby_desk
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  prerelease: false
+  segments: 
+  - 0
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Ahmed ElDawy
@@ -9,19 +14,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-23 00:00:00 +02:00
+date: 2010-03-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: A gem that works as an interface for oDesk APIs that can be used for both desktop and web applications
 email: ahmed.eldawy@badrit.com
 executables: []
@@ -67,18 +74,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Wrapper for oDesk APIs in Ruby