cleversafe 1.0.2 → 1.0.7

data/lib/cleversafe/connection.rb

@@ -3,10 +3,10 @@ module Cleversafe
     attr_reader   :username
     attr_accessor :password
     attr_accessor :host
-    attr_accessor :proto
+    attr_accessor :protocol
     attr_accessor :vault
     attr_accessor :method
-        
+
     def initialize(*args)
       if args[0].is_a?(Hash)
         options = args[0]
@@ -14,37 +14,47 @@ module Cleversafe
         @password = options[:password]
         @host = options[:host]
         @protocol = options[:protocol] || "http"
+        @open_timeout = options[:open_timeout] || 10
       else
         @username = args[0]
         @password = args[1]
         @host = args[2]
         @protocol = args[3] || "http"
+        @open_timeout = args[4] || 10
       end
-      
+
       @connection ||= begin
         build_connection
       end
       return @connection
     end
-    
+
     def build_connection
-      RestClient::Resource.new(base_url, @username, @password)
+      RestClient::Resource.new(base_url, :user => @username, :password => @password,
+        :raw_response => true, :open_timeout => @open_timeout)
     end
-    
+
     def base_url
       "#{@protocol}://#{@host}/"
     end
 
+    def url_for(vault, objectname, options={})
+      protocol = options.fetch(:protocol, @protocol)
+      host     = options.fetch(:host, @host)
+
+      "#{protocol}://#{host}/#{vault}/#{objectname}"
+    end
+
     def vault(name)
       Cleversafe::Vault.new(self, name)
     end
 
-    def vaults      
+    def vaults
       vaults = JSON.parse(get(nil))['vaults']
       vaults.collect{|v| v['vault_name']}
     end
-    
-    def vault_exists?(vault_name)     
+
+    def vault_exists?(vault_name)
       begin
         response = get(vault_name)
         true
@@ -52,22 +62,22 @@ module Cleversafe
         false
       end
     end
-    
+
     def get(path, options = {})
       @connection[path].get options
     end
-    
+
     def head(path, options = {})
       @connection[path].head options
     end
-    
+
     def put(path, payload, options = {})
       @connection[path].put payload, options
     end
-    
+
     def delete(path)
       @connection[path].delete
     end
-    
+
   end
-end
+end

data/lib/cleversafe/errors.rb

@@ -0,0 +1,6 @@
+module Cleversafe
+  module Error
+    class Base < RuntimeError; end
+    class NotFound < Base; end
+  end
+end

data/lib/cleversafe/object.rb

@@ -1,6 +1,8 @@
+require 'fileutils'
+
 module Cleversafe
   class Object
-    
+
     attr_reader :name
     attr_reader :vault
 
@@ -9,26 +11,71 @@ module Cleversafe
       @name = objectname
       @connection = vault.connection
     end
-    
-    def data(options ={})
-      begin
-        @connection.get("#{@vault}/#{@name}", options).body
-      rescue RestClient::Exception => e
-        raise "#{e.http_code.to_s}: Object #{@name} does not exist" if (e.http_code.to_s == "404")
+
+    def url(options={})
+      @connection.url_for(@vault, @name, options)
+    end
+
+    def delete
+      handle_errors do
+        @connection.delete("#{@vault}/#{@name}")
+      end
+    end
+
+    def exists?
+      metadata
+      true
+    rescue Error::NotFound
+      false
+    end
+
+    def data(options={})
+      handle_errors do
+        @connection.get("#{@vault}/#{@name}", options).to_s
       end
     end
-    
-    def object_metadata
-      begin
-        @object_metadata ||= @connection.head("#{@vault}/#{@name}").headers
-      rescue RestClient::Exception => e
-        raise "#{e.http_code.to_s}: Object #{@name} does not exist" if (e.http_code.to_s == "404")
+
+    def open(options={})
+      handle_errors do
+        response = @connection.get("#{@vault}/#{@name}", options)
+        begin
+          yield response.file.open
+        ensure
+          response.file.unlink
+        end
       end
     end
-    
+
+    def write_to(filename, options={})
+      handle_errors do
+        response = @connection.get("#{@vault}/#{@name}", options)
+        FileUtils.cp(response.file.path, filename)
+        FileUtils.rm(response.file.path)
+      end
+    end
+
+    def metadata
+      @metadata ||= handle_errors { @connection.head("#{@vault}/#{@name}").headers }
+    end
+
     def etag
-      self.object_metadata[:etag]
+      metadata[:etag]
+    end
+
+    def size
+      metadata[:content_length].to_i
+    end
+
+    private
+
+    def handle_errors
+      yield
+    rescue RestClient::Exception => e
+      if (e.http_code.to_s == "404")
+        raise Error::NotFound, "object `#{@name}' does not exist", caller[0..-2]
+      else
+        raise
+      end
     end
-    
   end
-end
+end

data/lib/cleversafe/vault.rb

@@ -1,60 +1,45 @@
 module Cleversafe
   class Vault
-    
+
     attr_reader :name
     attr_reader :connection
-    
+
     def initialize(connection, name)
       @connection = connection
       @name = name
     end
-    
-    def vault_metadata
+
+    def metadata
       @metadata ||= JSON.parse(@connection.get(@name))
     end
-    
+
     def bytes_used
-      self.vault_metadata['vault_usage']['used_size']
+      metadata['vault_usage']['used_size']
     end
-    
+
     def object(objectname)
       Cleversafe::Object.new(self, objectname)
     end
-    
+    alias [] object
+
     def objects(params = {})
       options = {}
       options['X-Operation'] = "list"
       options['X-List-Length-Limit'] = params[:limit] if params[:limit]
-      options['X-Start-Id'] = params[:start_id] if params[:start_id]     
-      @connection.get(@name, options).split("\n")      
+      options['X-Start-Id'] = params[:start_id] if params[:start_id]
+      @connection.get(@name, options).to_s.split("\n")
     end
-    
-    def object_exists?(objectname)
-      begin
-        response = @connection.head("#{@name}/#{objectname}")
-        true
-      rescue => e
-        false
-      end
-    end
-    
+
     def create_object(payload, options = {})
       response = @connection.put("#{@name}", payload, options)
-      digest_header = "x_content_digest"
+      id = response.to_s.strip
+
       if response.headers[:x_content_digest]
-        {:id => response.body, :x_content_digest => response.headers[:x_content_digest] }
+        {:id => id, :x_content_digest => response.headers[:x_content_digest] }
       else
-        response.body
-      end
-    end
-    
-    def delete_object(objectname)
-      begin
-        @connection.delete("#{@name}/#{objectname}")
-      rescue RestClient::Exception => e
-        raise "#{e.http_code.to_s}: Object #{objectname} does not exist" if (e.http_code.to_s == "404")
+        id
       end
     end
-    
+
   end
-end
+end

data/lib/cleversafe.rb

@@ -4,6 +4,7 @@
   require 'json'
 
   $:.unshift(File.dirname(__FILE__))
+  require 'cleversafe/errors'
   require 'cleversafe/vault'
   require 'cleversafe/object'
-  require 'cleversafe/connection'
+  require 'cleversafe/connection'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - John Williams
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-27 00:00:00 -06:00
+date: 2013-04-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,6 +39,7 @@ extra_rdoc_files: []
 
 files: 
 - lib/cleversafe/connection.rb
+- lib/cleversafe/errors.rb
 - lib/cleversafe/object.rb
 - lib/cleversafe/vault.rb
 - lib/cleversafe.rb