blobs 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d12169aaa7aaf23ec941b9014ac639457b33e307
-  data.tar.gz: 4608a496c30c7d94771828030ecc066279fb1b8d
+  metadata.gz: a9f2cd95af697c75032b66c4b5f60e7103ada354
+  data.tar.gz: 6e21d7194171750e2c059c654ece609d7dcc32ed
 SHA512:
-  metadata.gz: c2afbdac3858b631be282f5cef4372e7c00c06e1782fbc4cf00eb699552db4b44e5e11a4fceeeb2e22ed21bb50e076df55e71c0eb8ceb31d5019c594d007d6cd
-  data.tar.gz: 0cb9a8525e0b5217c90dd1c0bebc9f8cd65b1b670ffe2e0c6af13315857eb37956a320324d403c784d29175f9aad535ad9a496cea032d0ebd68db36d68268a31
+  metadata.gz: ccbdbf0cc19719fb53305bcbc9019313e44066c07632373e72e85271be4250cd53f2451082372e43726749092c1ac9b01f61db746cf969080a30d5a19042c1fc
+  data.tar.gz: 1d0be765842755f575ec0619162adeab18c827d57c402f9e854f68ba8691030c657bab2f520e033bacb9be2e0ef16efbe5aedadfda4d16c1f81d63dc84071ae1

data/blobs.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "bundler", "~> 1.14"
+  spec.add_dependency "bundler", "~> 1.15"
   spec.add_dependency "rake", "~> 10.0"
   spec.add_dependency "httparty", "~> 0.13.7"
 end

data/lib/blobs/version.rb

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

data/lib/blobs.rb

@@ -7,9 +7,6 @@ require 'cgi'
 require 'yaml'
 require 'securerandom'
 
-# ENV['BLOB_STORE_API_BASE_URL'] = 'http://45.76.84.129'
-# ENV['MASTER_KEY'] = '6CU3xfUOtvvVBRPPOe5ShlCOAZ0Ht5k9'
-
 module Blobs
   DEBUG = false
 
@@ -31,17 +28,28 @@ module Blobs
 
     def login(email, password)
       auth = { username: email, password: password }
-      response = HTTParty.post("#{base_url}/auth?access_token=#{master_token}",
+      response = HTTParty.post("#{base_url}/auth",
         basic_auth: auth)
       if response.code == 201 and response.parsed_response
         log "#{response.parsed_response.inspect}"
         self.current_user = response.parsed_response['user']
         self.token = response.parsed_response['token']
         encryption_key
-        self.token
-      else
-        nil
+        return self.token
+      end
+      nil
+    end
+
+    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)
+      log "#{response.parsed_response.inspect}"
+      if response.code == 201 and response.parsed_response and response.parsed_response['email']
+        return response.parsed_response
       end
+      nil
     end
 
     def all(key = nil)
@@ -55,7 +63,8 @@ module Blobs
           id: blob['id'],
           created_at: blob['createdAt'],
           json: (blob['json'] ? (JSON.parse(decrypt(blob['json'])) rescue nil) : nil),
-          key: blob['key']
+          key: blob['key'],
+          file: blob['file'] ? blob['file'] : false
         }
       end
     end
@@ -68,12 +77,12 @@ module Blobs
       response.parsed_response ? JSON.parse(decrypt(response.parsed_response['json'])) : nil
     end
 
-    def create(json, key = 'default')
+    def create(json, key = 'default', is_file = false)
       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) } })
+        { body: { json: encrypt(json.to_json), key: sha256(key), isFile: is_file } })
       log "Blob created: #{response.parsed_response.inspect}"
       response.parsed_response
     end
@@ -106,6 +115,44 @@ module Blobs
       export_file
     end
 
+    def file_to_json(file_path)
+      encoded_string = Base64.encode64(File.open(file_path, 'rb').read)
+      { file: encoded_string, file_name: file_path.split('/').last,
+        file_size: File.size(file_path) }
+    end
+
+    def file_from_json(file_json, path = '/tmp', blob_id = nil)
+      if file_json and file_json['file'] and file_json['file_name']
+        decoded_string = Base64.decode64(file_json['file'])
+        blob_file_path = "#{path}/#{blob_id ? "#{blob_id}-" : ''}#{file_json['file_name']}"
+        File.open(blob_file_path, 'wb') do |f|
+          f.write(decoded_string)
+          f.close
+        end
+        blob_file_path
+      end
+    end
+
+    def add_file(file_path, key = 'default')
+      raise 'No file path given!' unless file_path
+      raise "File doesn't exist!" unless File.file?(file_path)
+      resp = create(file_to_json(file_path), key, true)
+      resp ? resp['id'] : nil
+    end
+
+    def update_file(blob_id, file_path, key = 'default')
+      raise 'No file path given!' unless file_path
+      raise "File doesn't exist!" unless File.file?(file_path)
+      update(blob_id, file_to_json(file_path), key)
+    end
+
+    def get_file(blob_id, path = '/tmp')
+      if (blob = find(blob_id))
+        return file_from_json(blob, path, blob_id) if blob['file'] and blob['file_name']
+      end
+      nil
+    end
+
     private
     def sha256(str)
       Base64.encode64(Digest::SHA256.digest(str)).strip

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blobs
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Oliver Kiessler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement