zanoxrb 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb0e3c81b39e97f52e2e1db629b60ba632f9abcb
-  data.tar.gz: 159dbebcc514d393d43655cbf1cfd3e565b6253a
+  metadata.gz: 1dd9f08ace2ce5f98f28b96a2d844abb3e2f152f
+  data.tar.gz: b3ceb6ac205b0d431bc9f0eb504e6a3700812891
 SHA512:
-  metadata.gz: 6c3ad875d26619c956875c63b31421bbaaf3bd68f8dbeeed710d2fb0ad32a19ae10a5ae2a68ee726accea87f574fab1bbf9160e18e811b1e008a93802a3f97c3
-  data.tar.gz: 31d75ad5c119003e2cd8f4eac3b266067a5bf7d453f929505ec5bc9cb292402d817afe9766562ce87637b89e4b2e5f7fa76cfe9302d10fceb7bae5d4c09644c4
+  metadata.gz: 2db51f310649d9a5881ed495879d8eb074bb1bc5dcebb15356d24062c7d1330ee69ac04a6a73ccabadeffc34fe606d5d54026b79945011785312882f2f207140
+  data.tar.gz: fe6900a5666f4ea39bf4957297c7d9045f19712e22cded574e3bef974676e81c550f8e9d4f529cf0519572b6aad705c4345577e358f44be3e8d315d9470d6b7f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zanoxrb (0.1)
+    zanoxrb (0.2)
       httparty (~> 0.13)
 
 GEM

data/lib/zanox/api.rb

@@ -45,8 +45,7 @@ module Zanox
 
       def request(method, options = {}, headers = {})
         if Session.secret_key
-          method_path = method[0] == '/' ? method : "/#{method}"
-          timestamp, nonce, signature = fingerprint_of(method_path, options)
+          timestamp, nonce, signature = Session.fingerprint_of(method, options)
           headers.merge!({
             'Authorization' => "ZXWS #{Session.connect_id}:#{signature}",
             'Date'          => timestamp,
@@ -61,28 +60,6 @@ module Zanox
         response = get("/json/2011-03-01/#{method}", query: options, headers: headers)
         Response.new(response)
       end
-
-      private
-      def fingerprint_of(method, options, verb = 'GET')
-        timestamp = get_timestamp
-        nonce     = get_nonce
-        params    = ''#?' + URI.encode_www_form(options)
-        signature = create_signature(Session.secret_key, "#{verb}#{method.downcase}#{params}#{timestamp}#{nonce}")
-        [timestamp, nonce, signature]
-      end
-
-      def get_timestamp
-        Time.now.strftime('%a, %e %b %Y %T %Z')
-      end
-
-      def get_nonce
-        Digest::MD5.hexdigest((Time.new.usec + rand()).to_s)
-      end
-
-      def create_signature(secret_key, string_to_sign)
-        digest = OpenSSL::HMAC.digest('sha1', secret_key, string_to_sign)
-        Base64.encode64(digest)[0..-2]
-      end
     end
   end
 end

data/lib/zanox/session.rb

@@ -28,6 +28,29 @@ module Zanox
       class << self
         attr_accessor :connect_id
         attr_accessor :secret_key
+
+        def fingerprint_of(method, options, verb = 'GET')
+          method = method[0] == '/' ? method : "/#{method}"
+
+          timestamp = get_timestamp
+          nonce     = get_nonce
+          signature = create_signature(Session.secret_key, "#{verb}#{method.downcase}#{timestamp}#{nonce}")
+          [timestamp, nonce, signature]
+        end
+
+        private
+        def get_timestamp
+          Time.now.strftime('%a, %e %b %Y %T %Z')
+        end
+
+        def get_nonce
+          Digest::MD5.hexdigest((Time.new.usec + rand()).to_s)
+        end
+
+        def create_signature(secret_key, string_to_sign)
+          digest = OpenSSL::HMAC.digest('sha1', secret_key, string_to_sign)
+          Base64.encode64(digest)[0..-2]
+        end
       end
     end
   end

data/lib/zanox/version.rb

@@ -23,5 +23,5 @@
 #++
 
 module Zanox
-  VERSION = '0.1'
+  VERSION = '0.2'
 end

data/specs/spec_helper.rb

@@ -3,4 +3,3 @@ require 'rspec/collection_matchers'
 
 Zanox::API::Session.connect_id = '802B8BF4AE99EBE00F41'
 Zanox::API::Session.secret_key = 'fa4c0c2020Aa4c+ab9Ea0ec8d39E06/df2c5aa44'
-Zanox::API.debug!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zanoxrb
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Giovanni Capuano