appoxy_api 0.0.8 → 0.0.9

data/lib/api/client.rb

@@ -14,8 +14,7 @@ module Appoxy
         @@logger
       end
 
-      attr_accessor :host, :access_key, :secret_key
-
+      attr_accessor :host, :access_key, :secret_key, :version
 
       def initialize(host, access_key, secret_key, options={})
         @host = host
@@ -73,27 +72,23 @@ module Appoxy
         url
       end
 
-      # old way
+
       def add_params(command_path, hash)
-        ts = Appoxy::Api::Signatures.generate_timestamp(Time.now.gmtime)
+        v            = version||"0.1"
+        ts           = Appoxy::Api::Signatures.generate_timestamp(Time.now.gmtime)
         # puts 'timestamp = ' + ts
-        sig = Appoxy::Api::Signatures.generate_signature(command_path, ts, secret_key)
-
-        extra_params = {'sigv'=>"0.1", 'sig' => sig, 'timestamp' => ts, 'access_key' => access_key}
+        sig          = case v
+                         when "0.2"
+                           Appoxy::Api::Signatures.generate_signature(command_path + Appoxy::Api::Signatures.hash_to_s(hash), ts, secret_key)
+                         when "0.1"
+                           Appoxy::Api::Signatures.generate_signature(command_path, ts, secret_key)
+                       end
+
+        extra_params = {'sigv'=>v, 'sig' => sig, 'timestamp' => ts, 'access_key' => access_key}
         hash.merge!(extra_params)
 
       end
 
-      # new way
-#            def add_params(command_path, hash)
-#                ts = Appoxy::Api::Signatures.generate_timestamp(Time.now.gmtime)
-#                #p "hash_to s" + command_path + Appoxy::Api::Signatures.hash_to_s(hash)
-#                sig = Appoxy::Api::Signatures.generate_signature(command_path + Appoxy::Api::Signatures.hash_to_s(hash), ts, secret_key)
-#                extra_params = {'sigv'=>"0.2", 'sig' => sig, 'timestamp' => ts, 'access_key' => access_key}
-#                hash.merge!(extra_params)
-#
-#            end
-
 
       def append_params(host, params)
         host += "?"

data/lib/api/signatures.rb

@@ -17,7 +17,7 @@ module Appoxy
 
       def self.hash_to_s(hash)
         str = ""
-        hash.each_pair { |key, value| str+= "#{key}#{value}" }
+        hash.sort.each { |a| str+= "#{a[0]}#{a[1]}" }
         #removing all characters that could differ after parsing with rails
         return str.delete "\"\/:{}[]\' T"
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appoxy_api
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &26585748 !ruby/object:Gem::Requirement
+  requirement: &27110040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26585748
+  version_requirements: *27110040
 description: Appoxy API Helper gem description...
 email: travis@appoxy.com
 executables: []