cleversafe 1.1.3 → 1.1.12

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 23cdeb4413138a140c55c5acc0212e31a314e24d
+  data.tar.gz: 7f48cd073f7d718acab1c7e5d777a467be03f606
+SHA512:
+  metadata.gz: fd07fddb0146cccbb6dcc80f86e80a7d17ed89c38890ad8898f36e44431717891fead101761783d5faee20804a1dca4835cd701705f84d7c476e868818812d66
+  data.tar.gz: a159ddfba16c2861efa06cf34eff9dd59863a5da1b545bfb5a90579fe15cc8b85a91f16109140a5b01ea8503687e8f871507dc40e560fe653a2dba783a143bcf

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
-gemspec
+source 'https://rubygems.org'
+gemspec

data/Gemfile.lock

@@ -1,24 +1,34 @@
 PATH
   remote: .
   specs:
-    cleversafe (1.1.1)
+    cleversafe (1.1.12)
       json
-      rest-client (~> 1.6.7)
+      rest-client (>= 1.6.8)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    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)
+    addressable (2.3.7)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
+    json (1.8.2)
+    mime-types (2.4.3)
+    minitest (5.5.1)
+    netrc (0.10.2)
+    rake (10.4.2)
+    rest-client (1.7.3)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    safe_yaml (1.0.4)
+    webmock (1.20.4)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   cleversafe!
-  minitest
+  minitest (~> 5)
   rake
+  webmock (~> 1.7)

data/README.md

@@ -10,47 +10,21 @@ This is a Ruby interface into the Cleversafe's SOH API.
 ## Todo
 * Support range requests for getting an object
 
-## Examples
+## Usage
 
 ```ruby
-#Setup Conection
-request = Cleversafe::Connection.new("USERNAME", "PASSWORD", "HOSTNAME")
+# Connect to Cleversafe
+connection = Cleversafe::Connection.new('http://127.0.0.1:1234')
 
-#Does a vault exist?
-request.vault_exists?("VAULTNAME")
+# Open a vault
+vault = connection.vault('pictures')
 
-# load vault
-vault = request.vault("VAULTNAME")
+# Upload, download, delete
+key = vault.create_object(open('~/cat.jpg'))
 
-# bytes used in vault
-vault.bytes_used
-
-# list objects in vault
-vault.objects(:limit => 10, :start_id => "1f1665dce23b515cedf29edaf1d033730000")
-
-# load object
-object = "1f1665dce23b515cedf29edaf1d033730000"
-
-# get etag of object
-vault.object(object).etag
-
-# download object
-File.open("downloaded.file", 'w') {|f| f.write(vault.object(object).data) }
-
-# upload object, don't use multipart, it is not supported
-uploaded_object = vault.create_object File.new("upload.file", "r"), :multipart => false, 'X-Digest' => "md5" 
-
-# uploaded object's digest
-uploaded_object[:id]
-
-# object's digest
-uploaded_object[:x_content_digest]
-
-# uploaded object exists?
-vault.object_exists?(uploaded_object[:id])
-
-# deleting the uploaded object
-vault.delete_object(uploaded_object[:id])
+vault[key].exists?
+vault[key].size
+vault[key].open { |io| ... }
+vault[key].delete
 
 ```
-

data/cleversafe.gemspec

@@ -3,13 +3,16 @@ 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.1.3"
+  s.version = "1.1.12"
 
   s.add_dependency 'json'
-  s.add_dependency 'rest-client', '~> 1.6.7'
+
+  # N.B. rest-client 1.7+ drops support for Ruby 1.8.
+  s.add_dependency 'rest-client', '>= 1.6.8'
 
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'minitest', '~> 5'
+  s.add_development_dependency 'webmock', '~> 1.7'
 
   s.files = Dir["#{File.dirname(__FILE__)}/**/*"]
 end

data/lib/cleversafe/connection.rb

@@ -1,57 +1,33 @@
 require 'json'
+require 'forwardable'
 
 module Cleversafe
   class Connection
-    def initialize(url, options = {})
-      @http = build_http_client(url, options)
-    end
+    extend Forwardable
 
-    def url
-      @http.url
-    end
-
-    def url_for(*paths)
-      [ url, *paths ].join('/')
-    end
-
-    def vault(name)
-      Cleversafe::Vault.new(self, name)
-    end
+    def_delegators :@http, :url, :url_for, :get, :head, :put, :delete
 
-    def vaults
-      @vaults ||= begin
-        data = JSON.parse get.to_s
-        data['vaults'].map { |v| v['vault_name'] }
-      end
+    def initialize(url, options = {})
+      @http = Cleversafe::HttpClient.new(url, options)
     end
 
     def ping
-      head
+      head '/'
       true
-    rescue RestClient::Exception
+    rescue Exception
       false
     end
 
-    def head(path = '', options = {})
-      @http[path].head options
-    end
-
-    def get(path = '', options = {})
-      @http[path].get options
+    def status
+      JSON.parse(get('/').to_s)
     end
 
-    def put(path, payload, options = {})
-      @http[path].put payload, options
+    def vaults
+      status['vaults'].map { |v| v['vault_name'] }
     end
 
-    def delete(path)
-      @http[path].delete
+    def vault(name)
+      Cleversafe::Vault.new(self, name)
     end
-
-    private
-      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/errors.rb

@@ -2,5 +2,6 @@ module Cleversafe
   module Errors
     class Base < RuntimeError; end
     class NotFound < Base; end
+    class VaultMisconfigured < Base; end
   end
 end

data/lib/cleversafe/http_client.rb

@@ -0,0 +1,48 @@
+module Cleversafe
+  class HttpClient
+    # Disable HTTP client timeouts by default. Older versions of RestClient
+    # use a value of `-1` to disable timeouts; recent versions use `nil`.
+    if RestClient.version < '1.6.9'
+      DEFAULTS = { :timeout => -1, :open_timeout => -1 }
+    else
+      DEFAULTS = { :timeout => nil, :open_timeout => nil }
+    end
+
+    attr_reader :url
+
+    def initialize(url, options = {})
+      @url = url
+      @defaults = DEFAULTS.merge(options)
+    end
+
+    def url_for(*path)
+      File.join(url, *path)
+    end
+
+    def head(path, options = {})
+      request :head, path, options
+    end
+
+    def get(path, options = {})
+      request :get, path, options
+    end
+
+    def post(path, payload, options = {})
+      request :post, path, options.merge(:payload => payload)
+    end
+
+    def put(path, payload, options = {})
+      request :put, path, options.merge(:payload => payload)
+    end
+
+    def delete(path, options = {})
+      request :delete, path, options
+    end
+
+    private
+      def request(method, path, options = {})
+        options = @defaults.merge(options).merge(:method => method, :url => url_for(path))
+        RestClient::Request.execute(options)
+      end
+  end
+end

data/lib/cleversafe/object.rb

@@ -1,28 +1,29 @@
 require 'fileutils'
+require 'cgi'
 
 module Cleversafe
   class Object
 
-    attr_reader :connection, :vault, :name
+    attr_reader :vault, :key, :connection
 
-    def initialize(vault, name)
-      raise ArgumentError, "name is required" unless name =~ /\S/
+    def initialize(vault, key)
+      raise ArgumentError, "key is required" unless key =~ /\S/
+      @vault = vault
+      @key = key
       @connection = vault.connection
-      @vault = vault.name
-      @name = name
     end
 
-    def key
-      "#{vault}/#{name}"
+    def path
+      "#{vault.path}/#{CGI.escape(key)}"
     end
 
     def url
-      connection.url_for(vault, name)
+      connection.url_for(path)
     end
 
     def delete
       handle_errors do
-        connection.delete(key)
+        connection.delete(path)
       end
     end
 
@@ -33,13 +34,13 @@ module Cleversafe
       false
     end
 
-    def data(options={})
+    def data(options = {})
       open(options) { |io| io.read }
     end
 
-    def open(options={})
+    def open(options = {})
       handle_errors do
-        response = connection.get(key, options)
+        response = connection.get(path, options.merge(:raw_response => true))
         begin
           file = response.file
           file.open
@@ -53,7 +54,7 @@ module Cleversafe
 
     def metadata
       @metadata ||= handle_errors do
-        connection.head(key).headers
+        connection.head(path).headers
       end
     end
 
@@ -66,11 +67,10 @@ module Cleversafe
     end
 
     private
-
-    def handle_errors
-      yield
-    rescue RestClient::ResourceNotFound
-      raise Cleversafe::Errors::NotFound, "object `#{name}' does not exist", caller[0..-2]
-    end
+      def handle_errors
+        yield
+      rescue RestClient::ResourceNotFound
+        raise Cleversafe::Errors::NotFound, "object `#{key}' does not exist", caller[0..-2]
+      end
   end
 end

data/lib/cleversafe/vault.rb

@@ -1,18 +1,21 @@
+require 'cgi'
+
 module Cleversafe
   class Vault
-    attr_reader :connection, :name
+    attr_reader :connection, :name, :path
 
     def initialize(connection, name)
       @connection = connection
       @name = name
+      @path = CGI.escape name
     end
 
     def metadata
-      @metadata ||= JSON.parse connection.get(name).to_s
+      @metadata ||= JSON.parse(connection.get(path).to_s)
     end
 
-    def bytes_used
-      metadata['vault_usage']['used_size']
+    def usage
+      metadata['vault_usage']
     end
 
     def object(key)
@@ -20,23 +23,34 @@ module Cleversafe
     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).to_s.split("\n")
+    def objects(options = {})
+      headers = {}
+
+      headers['X-Operation'] = 'list'
+      headers['X-Start-Id']  = options[:start_id] if options[:start_id]
+      headers['X-List-Length-Limit'] = options[:limit] if options[:limit]
+
+      connection.get(path, :headers => headers).to_s.split("\n")
     end
 
     def create_object(payload, options = {})
-      response = connection.put(name, payload, options)
-      id = response.to_s.strip
+      handle_errors do
+        response = connection.put(path, payload, options)
+        id = response.to_s.strip
 
-      if response.headers[:x_content_digest]
-        { :id => id, :x_content_digest => response.headers[:x_content_digest] }
-      else
-        id
+        if response.headers[:x_content_digest]
+          { :id => id, :x_content_digest => response.headers[:x_content_digest] }
+        else
+          id
+        end
       end
     end
+
+    private
+    def handle_errors
+      yield
+    rescue RestClient::MethodNotAllowed
+      raise Cleversafe::Errors::VaultMisconfigured, "Vault has not been added to accessers.", caller[0..-2]
+    end
   end
 end

data/lib/cleversafe.rb

@@ -1,9 +1,10 @@
-require 'cleversafe/errors'
+require 'rest-client'
+
+require 'cleversafe/connection'
+require 'cleversafe/http_client'
 require 'cleversafe/vault'
 require 'cleversafe/object'
-require 'cleversafe/connection'
-
-require 'rest-client'
+require 'cleversafe/errors'
 
 # Monkeypatch RestClient to prevent it from closing IO objects after they're
 # uploaded, which it really shouldn't do.

data/test/connection_test.rb

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

data/test/http_client_test.rb

@@ -0,0 +1,14 @@
+require 'cleversafe/test_helper'
+
+class HttpClientTest < Minitest::Test
+  def test_url_for
+    client = Cleversafe::HttpClient.new('http://example.com')
+
+    assert_equal 'http://example.com/',    client.url_for('')
+    assert_equal 'http://example.com/',    client.url_for('/')
+    assert_equal 'http://example.com/a/b', client.url_for('/a/b')
+    assert_equal 'http://example.com/a/b', client.url_for('a/b')
+    assert_equal 'http://example.com/a/b', client.url_for('a', 'b')
+    assert_equal 'http://example.com/a%2Fb', client.url_for('a%2Fb')
+  end
+end

data/test/lib/cleversafe/test_helper.rb

@@ -2,6 +2,5 @@ require 'rubygems'
 require 'bundler/setup'
 require 'cleversafe'
 
-require 'minitest/unit'
-
-MiniTest::Unit.autorun
+require 'minitest/autorun'
+require 'webmock/minitest'

data/test/object_test.rb

@@ -1,6 +1,6 @@
 require 'cleversafe/test_helper'
 
-class ObjectTest < MiniTest::Unit::TestCase
+class ObjectTest < Minitest::Test
   def setup
     connection = Cleversafe::Connection.new('http://test.host')
     @vault = Cleversafe::Vault.new(connection, 'test_vault')
@@ -11,4 +11,9 @@ class ObjectTest < MiniTest::Unit::TestCase
       Cleversafe::Object.new(@vault, '')
     end
   end
+
+  def test_path_is_escaped
+    object = Cleversafe::Object.new(@vault, 'foo/bar[1].png')
+    assert_equal 'test_vault/foo%2Fbar%5B1%5D.png', object.path
+  end
 end

data/test/vault_test.rb

@@ -1,7 +1,18 @@
 require 'cleversafe/test_helper'
 
-class VaultTest < MiniTest::Unit::TestCase
-  def test_truth
-    assert true
+class VaultTest < Minitest::Test
+  def setup
+    @connection = Cleversafe::Connection.new('http://test.host')
+  end
+
+  def test_path_is_escaped
+    assert_equal 'test%2Fvault', Cleversafe::Vault.new(@connection, 'test/vault').path
+  end
+  
+  def test_vault_is_configured_correctly
+    stub_request(:put, "http://test.host/assets").with(:body => "foo").to_return(:status => 405, :body => "", :headers => {})
+    vault = Cleversafe::Vault.new(@connection, 'assets')
+    error = assert_raises(Cleversafe::Errors::VaultMisconfigured) { vault.create_object('foo') }
+    assert_equal 'Vault has not been added to accessers.', error.message
   end
 end

metadata

@@ -1,124 +1,128 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cleversafe
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 3
-  version: 1.1.3
+version: !ruby/object:Gem::Version
+  version: 1.1.12
 platform: ruby
-authors: 
+authors:
 - John Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-05-14 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2022-07-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        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 
-        segments: 
-        - 1
-        - 6
-        - 7
-        version: 1.6.7
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.8
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: 1.6.8
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 description: 
 email: john@37signals.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- ./cleversafe.gemspec
-- ./Gemfile
-- ./Gemfile.lock
-- ./lib/cleversafe/connection.rb
-- ./lib/cleversafe/errors.rb
-- ./lib/cleversafe/object.rb
-- ./lib/cleversafe/vault.rb
-- ./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
+files:
+- "./Gemfile"
+- "./Gemfile.lock"
+- "./README.md"
+- "./Rakefile"
+- "./cleversafe.gemspec"
+- "./lib/cleversafe.rb"
+- "./lib/cleversafe/connection.rb"
+- "./lib/cleversafe/errors.rb"
+- "./lib/cleversafe/http_client.rb"
+- "./lib/cleversafe/object.rb"
+- "./lib/cleversafe/vault.rb"
+- "./test/connection_test.rb"
+- "./test/http_client_test.rb"
+- "./test/lib/cleversafe/test_helper.rb"
+- "./test/object_test.rb"
+- "./test/vault_test.rb"
 homepage: 
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 2.5.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Ruby API into Cleversafe's REST interface.
 test_files: []
-