ruby_desk 0.5.0 → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/lib/ruby_desk/connector.rb

@@ -24,15 +24,28 @@ module RubyDesk
 
     # Sign the given parameters and returns the signature
     def sign(params)
-      RubyDesk.logger.info "Params to sign: #{params.inspect}"
+      RubyDesk.logger.debug {"Params to sign: #{params.inspect}"}
       # sort parameters by its names (keys)
       sorted_params = params.sort { |a, b| a.to_s <=> b.to_s}
 
+      RubyDesk.logger.debug {"Sorted params: #{sorted_params.inspect}"}
+      
+      # Unescape escaped params
+      sorted_params.map! do |k, v|
+        [k, URI.unescape(v)]
+      end
+
       # concatenate secret with names, values
       concatenated = @api_secret + sorted_params.to_s
 
+      RubyDesk.logger.debug {"concatenated: #{concatenated}"}
+
       # Calculate and return md5 of concatenated string
-      Digest::MD5.hexdigest(concatenated)
+      md5 = Digest::MD5.hexdigest(concatenated)
+
+      RubyDesk.logger.debug {"md5: #{md5}"}
+
+      return md5
     end
 
     # Returns the correct URL to go to to invoke the given api

data/lib/ruby_desk/time_report.rb

@@ -20,7 +20,7 @@ class RubyDesk::TimeReport
   #
   # Allowed values for options are
   # :select
-  # :condition
+  # :conditions
   #   Here is the limited support for the where clause.
   #     Fields
   #      * Name
@@ -76,7 +76,7 @@ class RubyDesk::TimeReport
     gds_query = ""
     gds_query << "SELECT " << (options[:select].respond_to?(:join)?
       options[:select].join(",") : options[:select])
-    if options[:conditions]
+    if options[:conditions] && options[:conditions].any?
       gds_query << " WHERE "
       combined = options[:conditions].map do |field, condition|
         "(" +

data/test/test_ruby_desk.rb

@@ -5,7 +5,7 @@ class TestRubyDesk < Test::Unit::TestCase
 
   def dummy_connector(result_filename)
     connector = RubyDesk::Connector.new('824d225a889aca186c55ac49a6b23957',
-      '984aa36db13fff5c')
+      '984aa36db13fff5c', 'fffff')
     connector.instance_variable_set '@result_filename', result_filename
     def connector.invoke_api_call(*args)
       File.read(File.join(File.dirname(__FILE__), @result_filename))
@@ -22,11 +22,20 @@ class TestRubyDesk < Test::Unit::TestCase
         :api_token=>'ffffffffffffffffffffffffffffffff')
   end
 
-  def test_api_call
+  def test_sign_escaped_params
     connector  = RubyDesk::Connector.new('824d225a889aca186c55ac49a6b23957',
       '984aa36db13fff5c')
+    assert_equal 'dc30357f7c6b62aadf99e5313ac93365',
+      connector.sign(:online=>'a%6C%6C', :tz=>'mine',
+        :api_key=>'824d225a889aca186c55ac49a6b23957',
+        :api_token=>'ffffffffffffffffffffffffffffffff')
+  end
+
+  def test_api_call
+    connector  = RubyDesk::Connector.new('824d225a889aca186c55ac49a6b23957',
+      '984aa36db13fff5c', 'fff')
     api_call = connector.prepare_api_call('auth/v1/keys/tokens',
-      :params=>{:frob=>@frob, :api_key=>@api_key},
+      :params=>{:frob=>'342423', :api_key=>@api_key},
       :method=>:post, :format=>'json')
     assert api_call[:url].index('.json')
     assert api_call[:url].index('/api/auth/v1/keys/tokens')
@@ -35,7 +44,7 @@ class TestRubyDesk < Test::Unit::TestCase
 
   def test_gds_api_call
     connector  = RubyDesk::Connector.new('824d225a889aca186c55ac49a6b23957',
-      '984aa36db13fff5c')
+      '984aa36db13fff5c', 'ff')
     api_call = connector.prepare_api_call('timereports/v1/companies/1',
       :method=>:post, :base_url=>RubyDesk::Connector::ODESK_GDS_URL)
     assert api_call[:url].index('/gds/timereports/v1/companies/1')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby_desk
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Ahmed ElDawy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-21 00:00:00 +02:00
+date: 2010-02-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency