blobs 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9f2cd95af697c75032b66c4b5f60e7103ada354
-  data.tar.gz: 6e21d7194171750e2c059c654ece609d7dcc32ed
+  metadata.gz: 2db96b44e679e209d021ae68a1e2ae774587cb85
+  data.tar.gz: bad53bb902bb78c301e7e2ad74cc3a38f31728cd
 SHA512:
-  metadata.gz: ccbdbf0cc19719fb53305bcbc9019313e44066c07632373e72e85271be4250cd53f2451082372e43726749092c1ac9b01f61db746cf969080a30d5a19042c1fc
-  data.tar.gz: 1d0be765842755f575ec0619162adeab18c827d57c402f9e854f68ba8691030c657bab2f520e033bacb9be2e0ef16efbe5aedadfda4d16c1f81d63dc84071ae1
+  metadata.gz: f984ca11dc6f8629ec7f64843ca4b495ef3f91cf21b91ab0806c4d29d7049543d62190664c5fb96a99c5e0a11951ece2e2819f58d4fc8137cced06d2ac1cb77c
+  data.tar.gz: 7399915d11a599cce6fc3d436f54b0b38d1ffe26559a8c28fadb22cd71170ec0366897f24d64f39fc3c1aa8a035b8debe27aaf55b287044e0e4b09e45fc91a07

data/lib/blobs/version.rb

@@ -1,3 +1,3 @@
 module Blobs
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/blobs.rb

@@ -43,20 +43,17 @@ module Blobs
     def create_user(email, password)
       raise "You need to set the master key to create users!" unless master_token
       user = { email: email, password: password }
-      response = HTTParty.post("#{base_url}/users?access_token=#{master_token}",
-        body: user)
+      response = HTTParty.post("#{base_url}/users",
+        body: user, headers: { 'Authorization': "Bearer #{master_token}" })
       log "#{response.parsed_response.inspect}"
-      if response.code == 201 and response.parsed_response and response.parsed_response['email']
-        return response.parsed_response
-      end
-      nil
+      response.parsed_response
     end
 
     def all(key = nil)
       raise 'No access token!' unless self.token
-      url = "#{base_url}/blobs?access_token=#{CGI::escape(self.token)}"
+      url = "#{base_url}/blobs"
       url += "&key=#{CGI::escape(sha256(key))}" if key
-      response = HTTParty.get(url)
+      response = HTTParty.get(url, { headers: headers })
       log "Blobs: #{response.parsed_response.inspect}"
       response.parsed_response.map do |blob|
         {
@@ -72,7 +69,7 @@ module Blobs
     def find(blob_id)
       raise 'No access token!' unless self.token
       raise "No blob id!" unless blob_id
-      response = HTTParty.get("#{base_url}/blobs/#{blob_id}?access_token=#{self.token}")
+      response = HTTParty.get("#{base_url}/blobs/#{blob_id}", { headers: headers })
       log "Blob: #{response.parsed_response.inspect}"
       response.parsed_response ? JSON.parse(decrypt(response.parsed_response['json'])) : nil
     end
@@ -81,8 +78,12 @@ module Blobs
       raise 'No access token!' unless self.token
       raise "No json hash!" unless json
       raise "No key!" unless key
-      response = HTTParty.post("#{base_url}/blobs?access_token=#{self.token}",
-        { body: { json: encrypt(json.to_json), key: sha256(key), isFile: is_file } })
+      response = HTTParty.post("#{base_url}/blobs",
+        {
+          body: { json: encrypt(json.to_json), key: sha256(key), isFile: is_file },
+          headers: headers
+        }
+      )
       log "Blob created: #{response.parsed_response.inspect}"
       response.parsed_response
     end
@@ -91,8 +92,8 @@ module Blobs
       raise 'No access token!' unless self.token
       raise "No blob id!" unless json
       raise "No json hash!" unless json
-      response = HTTParty.put("#{base_url}/blobs/#{blob_id}?access_token=#{self.token}",
-        { body: { json: encrypt(json.to_json), key: sha256(key) } })
+      response = HTTParty.put("#{base_url}/blobs/#{blob_id}",
+        { body: { json: encrypt(json.to_json), key: sha256(key) }, headers: headers })
       log "Blob update: #{response.parsed_response.inspect}"
       response.parsed_response
     end
@@ -100,7 +101,7 @@ module Blobs
     def destroy(blob_id)
       raise 'No access token!' unless self.token
       raise "No blob id!" unless blob_id
-      response = HTTParty.delete("#{base_url}/blobs/#{blob_id}?access_token=#{self.token}")
+      response = HTTParty.delete("#{base_url}/blobs/#{blob_id}", { headers: headers })
       log "Blob destroyed: #{response.parsed_response.inspect}"
       response.parsed_response
     end
@@ -154,6 +155,12 @@ module Blobs
     end
 
     private
+    def headers(additional_headers = {})
+      additional_headers.merge({
+        'Authorization': "Bearer #{self.token}"
+      })
+    end
+
     def sha256(str)
       Base64.encode64(Digest::SHA256.digest(str)).strip
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blobs
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Oliver Kiessler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-25 00:00:00.000000000 Z
+date: 2017-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler