cleversafe 1.0.8 → 1.1.3

data/Gemfile.lock

@@ -1,13 +1,17 @@
 PATH
   remote: .
   specs:
-    cleversafe (1.0.7)
+    cleversafe (1.1.1)
+      json
       rest-client (~> 1.6.7)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    mime-types (1.22)
+    json (1.7.7)
+    mime-types (1.23)
+    minitest (4.5.0)
+    rake (10.0.3)
     rest-client (1.6.7)
       mime-types (>= 1.16)
 
@@ -16,3 +20,5 @@ PLATFORMS
 
 DEPENDENCIES
   cleversafe!
+  minitest
+  rake

data/Rakefile

@@ -1,4 +1,11 @@
+require 'rubygems'
+require 'bundler/setup'
+require 'rake'
 require 'rake/testtask'
 
-Rake::TestTask.new
-task :default => :test
+task :default => :test
+
+Rake::TestTask.new do |t|
+  t.libs << 'test/lib'
+  t.pattern = 'test/*_test.rb'
+end

data/cleversafe.gemspec

@@ -3,9 +3,13 @@ Gem::Specification.new do |s|
   s.summary = "A Ruby API into Cleversafe's REST interface."
   s.author  = "John Williams"
   s.email   = "john@37signals.com"
-  s.version = "1.0.8"
+  s.version = "1.1.3"
 
+  s.add_dependency 'json'
   s.add_dependency 'rest-client', '~> 1.6.7'
 
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'minitest'
+
   s.files = Dir["#{File.dirname(__FILE__)}/**/*"]
 end

data/lib/cleversafe.rb

@@ -1,7 +1,13 @@
-require 'rest-client'
-require 'json'
-
 require 'cleversafe/errors'
 require 'cleversafe/vault'
 require 'cleversafe/object'
 require 'cleversafe/connection'
+
+require 'rest-client'
+
+# Monkeypatch RestClient to prevent it from closing IO objects after they're
+# uploaded, which it really shouldn't do.
+class RestClient::Payload::Streamed
+  def close
+  end
+end

data/lib/cleversafe/connection.rb

@@ -1,33 +1,17 @@
+require 'json'
+
 module Cleversafe
   class Connection
-    attr_reader :username, :password, :host, :protocol, :open_timeout
-
-    def initialize(*args)
-      if args[0].is_a?(Hash)
-        options = args[0]
-        @username = options[:username]
-        @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
+    def initialize(url, options = {})
+      @http = build_http_client(url, options)
     end
 
-    def base_url
-      "#{protocol}://#{host}/"
+    def url
+      @http.url
     end
 
-    def url_for(vault, objectname, options={})
-      protocol = options.fetch(:protocol, protocol)
-      host     = options.fetch(:host, host)
-
-      "#{protocol}://#{host}/#{vault}/#{objectname}"
+    def url_for(*paths)
+      [ url, *paths ].join('/')
     end
 
     def vault(name)
@@ -35,41 +19,39 @@ module Cleversafe
     end
 
     def vaults
-      vaults = JSON.parse(get(nil))['vaults']
-      vaults.collect{|v| v['vault_name']}
+      @vaults ||= begin
+        data = JSON.parse get.to_s
+        data['vaults'].map { |v| v['vault_name'] }
+      end
     end
 
-    def vault_exists?(vault_name)
-      get(vault_name)
+    def ping
+      head
       true
-    rescue RestClient::ResourceNotFound
+    rescue RestClient::Exception
       false
     end
 
-    def get(path, options = {})
-      connection[path].get options
+    def head(path = '', options = {})
+      @http[path].head options
     end
 
-    def head(path, options = {})
-      connection[path].head options
+    def get(path = '', options = {})
+      @http[path].get options
     end
 
     def put(path, payload, options = {})
-      connection[path].put payload, options
+      @http[path].put payload, options
     end
 
     def delete(path)
-      connection[path].delete
+      @http[path].delete
     end
 
     private
-      def connection
-        @connection ||= RestClient::Resource.new(base_url,
-          :user         => username,
-          :password     => password,
-          :open_timeout => open_timeout,
-          :raw_response => true
-        )
+      def build_http_client(url, options = {})
+        defaults = { :open_timeout => 0.5 }
+        RestClient::Resource.new(url, defaults.merge(options).merge(:raw_response => true))
       end
   end
 end

data/lib/cleversafe/object.rb

@@ -5,7 +5,8 @@ module Cleversafe
 
     attr_reader :connection, :vault, :name
 
-    def initialize(vault, name = {})
+    def initialize(vault, name)
+      raise ArgumentError, "name is required" unless name =~ /\S/
       @connection = vault.connection
       @vault = vault.name
       @name = name
@@ -15,8 +16,8 @@ module Cleversafe
       "#{vault}/#{name}"
     end
 
-    def url(options={})
-      connection.url_for(vault, name, options)
+    def url
+      connection.url_for(vault, name)
     end
 
     def delete
@@ -33,30 +34,23 @@ module Cleversafe
     end
 
     def data(options={})
-      handle_errors do
-        connection.get(key, options).to_s
-      end
+      open(options) { |io| io.read }
     end
 
     def open(options={})
       handle_errors do
         response = connection.get(key, options)
         begin
-          yield response.file.open
+          file = response.file
+          file.open
+          file.binmode
+          yield file
         ensure
-          response.file.unlink
+          file.unlink
         end
       end
     end
 
-    def write_to(filename, options={})
-      handle_errors do
-        response = connection.get(key, options)
-        FileUtils.cp(response.file.path, filename)
-        FileUtils.rm(response.file.path)
-      end
-    end
-
     def metadata
       @metadata ||= handle_errors do
         connection.head(key).headers

data/lib/cleversafe/vault.rb

@@ -8,15 +8,15 @@ module Cleversafe
     end
 
     def metadata
-      @metadata ||= JSON.parse(connection.get(name))
+      @metadata ||= JSON.parse connection.get(name).to_s
     end
 
     def bytes_used
       metadata['vault_usage']['used_size']
     end
 
-    def object(objectname)
-      Cleversafe::Object.new(self, objectname)
+    def object(key)
+      Cleversafe::Object.new(self, key)
     end
     alias [] object
 
@@ -38,6 +38,5 @@ module Cleversafe
         id
       end
     end
-
   end
 end

data/test/connection_test.rb

@@ -0,0 +1,7 @@
+require 'cleversafe/test_helper'
+
+class ConnectionTest < MiniTest::Unit::TestCase
+  def test_truth
+    assert true
+  end
+end

data/test/lib/cleversafe/test_helper.rb

@@ -0,0 +1,7 @@
+require 'rubygems'
+require 'bundler/setup'
+require 'cleversafe'
+
+require 'minitest/unit'
+
+MiniTest::Unit.autorun

data/test/object_test.rb

@@ -0,0 +1,14 @@
+require 'cleversafe/test_helper'
+
+class ObjectTest < MiniTest::Unit::TestCase
+  def setup
+    connection = Cleversafe::Connection.new('http://test.host')
+    @vault = Cleversafe::Vault.new(connection, 'test_vault')
+  end
+
+  def test_name_is_required
+    assert_raises ArgumentError do
+      Cleversafe::Object.new(@vault, '')
+    end
+  end
+end

data/test/vault_test.rb

@@ -0,0 +1,7 @@
+require 'cleversafe/test_helper'
+
+class VaultTest < MiniTest::Unit::TestCase
+  def test_truth
+    assert true
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 0
-  - 8
-  version: 1.0.8
+  - 1
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - John Williams
@@ -14,13 +14,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-16 00:00:00 -05:00
+date: 2013-05-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rest-client
+  name: json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rest-client
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -30,7 +42,31 @@ dependencies:
         - 7
         version: 1.6.7
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: 
 email: john@37signals.com
 executables: []
@@ -40,7 +76,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- ./cleversafe-1.0.7.gem
 - ./cleversafe.gemspec
 - ./Gemfile
 - ./Gemfile.lock
@@ -51,6 +86,10 @@ files:
 - ./lib/cleversafe.rb
 - ./Rakefile
 - ./README.md
+- ./test/connection_test.rb
+- ./test/lib/cleversafe/test_helper.rb
+- ./test/object_test.rb
+- ./test/vault_test.rb
 has_rdoc: true
 homepage: 
 licenses: []