teapi 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5138454327fd704c9c3838321b3e319230d23ee5
-  data.tar.gz: 7967b10da3af52773f314e5734d1ab24ec2d580a
+  metadata.gz: aef895c695574ed1e75b94afbd9b36566672e610
+  data.tar.gz: 1fbb569bb6636b3dcdff77b01aa4fe029eb4a36b
 SHA512:
-  metadata.gz: 87124942e3cf5e193666da26ea4987ba720202e6665b2553ab7091450e68dc3cf56719727cb7073ae90feb03ccf59649a42b1d4a2ead57d17a67af652dc80e11
-  data.tar.gz: e09bcec2df9e3cc355f2b78c2fc7c5b3957bb28c9d89e5dcc10352a6d887da4de21c624764eef3f8caae353dd4056be77960d2e9d9ba6985df1eb8693472b270
+  metadata.gz: a5d5b294981dcb6f22d19f42f7a0708d040f108ea5b4ac473a272e468c33e556e53c7799e2fb8d9b5f65a22d865f870288e5632523374f0a9eb63a6f16a777b2
+  data.tar.gz: 3f5d666191be1bfa30459f36aa232da24838554ae1762354359a8ceb0af96fcddcebe36019b9861ec25b4b558d63c1b4a8645667b36aed9e2528f40e74982f59

data/lib/teapi.rb

@@ -28,6 +28,7 @@ module Teapi #:nodoc
     # @param resource [Symbol] name of resource
     # @param body [Hash] to send to the service
     def post(resource, body)
+      assert_configured()
       sender.request(:post, resource, {body: body})
     end
 
@@ -35,6 +36,7 @@ module Teapi #:nodoc
     # @param resource [Symbol] name of resource
     # @param body [Hash] to send to the service
     def put(resource, body)
+      assert_configured()
       sender.request(:put, resource, {body: body})
     end
 
@@ -42,7 +44,16 @@ module Teapi #:nodoc
     # @param resource [Symbol] name of resource
     # @param body [Hash] to send to the service
     def delete(resource, body)
+      assert_configured()
       sender.request(:delete, resource, {body: body})
     end
+
+    private
+    def assert_configured()
+      raise 'teapi invalid configuration' if @configuration.nil?
+      raise 'teapi invalid sync_key' if @configuration.sync_key.nil?
+      raise 'teapi invalid sync_secret' if @configuration.sync_secret.nil?
+      raise 'teapi invalid host' if @configuration.host.nil?
+    end
   end
 end

data/lib/teapi/sender.rb

@@ -1,6 +1,7 @@
 require 'oj'
 require 'uri'
 require 'zlib'
+require 'time'
 require 'openssl'
 require 'httparty'
 require 'stringio'
@@ -14,10 +15,12 @@ module Teapi
       @configuration = configuration
     end
 
-    def request(method, resource, args = {}, ts = nil)
-      url = "#{BASE_URL}#{resource}?ts=#{ts || Time.now.to_i}"
+    def request(method, resource, args = {}, date = nil)
+      url = BASE_URL + resource.to_s
+      d = date || Time.now.httpdate
       args[:headers] = (args[:headers] || {}).merge({
-        'Authorization' => sign(url, args),
+        'Date' => d,
+        'Authorization' => sign(url, d, args),
       })
       if args[:body] != nil && args[:body].length > 1024 then
         args[:body] = gzip(args[:body])
@@ -25,14 +28,14 @@ module Teapi
       end
       scheme = @configuration.secure ? "https" : "http"
       res = HTTParty.send(method, "#{scheme}://#{@configuration.host}#{url}", args)
-      if res.code == 401 && res.parsed_response.include?('ts') && ts.nil?
-        return request(method, resource, args, res.parsed_response['ts'])
+      if res.code == 401 && res.parsed_response.include?('date') && date.nil?
+        return request(method, resource, args, res.parsed_response['date'])
       end
       res
     end
 
-    def sign(url, args)
-      data = url
+    def sign(url, date, args)
+      data = url + date
       data += args[:body] if args.include?(:body)
       signature = OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha256'), @configuration.sync_secret, data)
       "HMAC-SHA256 Credential=#{@configuration.sync_key},Signature=#{signature}"

data/lib/teapi/version.rb

@@ -1,3 +1,3 @@
 module Teapi
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teapi
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Karl Seguin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-14 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty