duracloud-client 0.9.1 → 0.10.0

data/lib/duracloud/client.rb

@@ -1,46 +1,17 @@
-require "forwardable"
-
 module Duracloud
   class Client
-    extend Forwardable
     extend RestMethods
     include RestMethods
 
-    def self.execute(request_class, http_method, url, **options, &block)
-      new.execute(request_class, http_method, url, **options, &block)
-    end
-
-    def self.configure
-      yield Configuration
+    def self.execute(http_method, url, **options, &block)
+      new.execute(http_method, url, **options, &block)
     end
 
-    attr_reader :config
-
-    delegate [:host, :port, :user, :password, :base_url, :logger] => :config
-
-    def initialize(**options)
-      @config = Configuration.new(**options)
-    end
-
-    def execute(request_class, http_method, url, **options, &block)
-      request = request_class.new(self, http_method, url, **options)
-      response = request.execute(&block)
-      handle_response(response)
-      response
-    end
-
-    private
-
-    def handle_response(response)
-      logger.debug([self.class.to_s, response.request_method, response.url, response.request_query,
-                    response.status, response.reason].join(' '))
-      if response.error?
-        ErrorHandler.call(response)
-      elsif %w(POST PUT DELETE).include?(response.request_method) &&
-            response.plain_text? &&
-            response.has_body?
-        logger.info(response.body)
+    def execute(http_method, url, **options, &block)
+      Request.execute(http_method, url, **options, &block).tap do |response|
+        ResponseHandler.call(response)
       end
     end
+
   end
 end

data/lib/duracloud/command_options.rb

@@ -4,10 +4,14 @@ require 'hashie'
 module Duracloud
   class CommandOptions < Hashie::Mash
 
-    def initialize(*args)
-      super()
+    def self.parse(*args)
+      new.parse(*args)
+    end
+
+    def parse(*args)
       self.command = args.shift if CLI::COMMANDS.include?(args.first)
       parser.parse!(args)
+      to_hash(symbolize_keys: true)
     end
 
     def print_version
@@ -113,6 +117,11 @@ module Duracloud
         opts.on("--[no-]all-spaces", "Get report for all spaces") do |v|
           self.all_spaces = v
         end
+
+        opts.on("-t", "--content-type CONTENT_TYPE",
+                "Media type of content to store") do |v|
+          self.content_type = v
+        end
       end
     end
 

data/lib/duracloud/commands.rb

@@ -33,6 +33,10 @@ module Duracloud
       ListItems.call(cli)
     end
 
+    def store(cli)
+      StoreContent.call(cli)
+    end
+
   end
 end
 

data/lib/duracloud/commands/store_content.rb

@@ -0,0 +1,13 @@
+module Duracloud::Commands
+  class StoreContent < Command
+
+    def call
+      File.open(infile, "rb") do |body|
+        Duracloud::Content.create(space_id: space_id, store_id: store_id,
+                                  content_id: content_id, body: body,
+                                  md5: md5, content_type: content_type)
+      end
+    end
+
+  end
+end

data/lib/duracloud/content.rb

@@ -1,5 +1,3 @@
-require "active_model"
-
 module Duracloud
   #
   # A piece of content in DuraCloud
@@ -13,6 +11,17 @@ module Duracloud
     COPY_SOURCE_STORE_HEADER = "x-dura-meta-copy-source-store"
     MANIFEST_EXT = ".dura-manifest"
 
+    property :space_id, required: true
+    property :content_id, required: true
+    property :store_id
+    property :body
+    property :md5
+    property :content_type
+    property :size
+    property :modified
+
+    alias_method :id, :content_id
+
     # Does the content exist in DuraCloud?
     # @return [Boolean] whether the content exists.
     # @raise [Duracloud::MessageDigestError] the provided digest in the :md5 keyword option,
@@ -45,10 +54,14 @@ module Duracloud
       new(**kwargs).save
     end
 
-    attr_accessor :space_id, :content_id, :store_id,
-                  :body, :md5, :content_type, :size, :modified
-    alias_method :id, :content_id
-    validates_presence_of :space_id, :content_id
+    # Delete content from DuraCloud.
+    # @return [Duraclound::Content] the deleted content.
+    # @raise [Duracloud::NotFoundError] the space, content or store (if given) does not exist.
+    # @raise [Duracloud::MessageDigestError] the provided digest in the :md5 keyword option,
+    #   if given, does not match the stored value.
+    def self.delete(**kwargs)
+      find(**kwargs).delete
+    end
 
     # Return the space associated with this content.
     # @return [Duracloud::Space] the space.
@@ -81,7 +94,7 @@ module Duracloud
     #   The current instance still represents the original content.
     # @raise [Duracloud::Error]
     def copy(**args)
-      dest = args.except(:force)
+      dest = args.reject { |k, v| k == :force }
       dest[:space_id]   ||= space_id
       dest[:store_id]   ||= store_id
       dest[:content_id] ||= content_id

data/lib/duracloud/content_manifest.rb

@@ -1,13 +1,12 @@
 require 'nokogiri'
-require 'active_model'
+require 'hashie'
 
 module Duracloud
-  class ContentManifest
-    include ActiveModel::Model
+  class ContentManifest < Hashie::Dash
 
-    validates_presence_of :space_id, :manifest_id
-
-    attr_accessor :space_id, :manifest_id, :store_id
+    property :space_id, required: true
+    property :manifest_id, required: true
+    property :store_id
 
     def self.find(**kwargs)
       new(**kwargs).tap do |manifest|

data/lib/duracloud/request.rb

@@ -1,29 +1,47 @@
 require 'addressable/uri'
+require 'httpclient'
 
 module Duracloud
   class Request
-    attr_reader :client, :url, :http_method, :body, :headers, :query
 
-    # @param client [Duracloud::Client] the client
+    attr_reader :url, :http_method, :body, :headers, :query
+
+    def self.execute(http_method, url, **options, &block)
+      request = new(http_method, url, **options)
+      request.execute(&block)
+    end
+
     # @param http_method [Symbol] the lower-case symbol corresponding to HTTP method
     # @param url [String] relative or absolute URL
     # @param body [String] the body of the request
     # @param headers [Hash] HTTP headers
     # @param query [Hash] Query string parameters
     # def initialize(client, http_method, url, body: nil, headers: nil, query: nil)
-    def initialize(client, http_method, url, **options)
-      @client      = client
+    def initialize(http_method, url, **options)
       @http_method = http_method
       @url         = Addressable::URI.parse(url).normalize.to_s
       set_options(options.dup)
     end
 
     def execute(&block)
-      response_class.new original_response(&block)
+      Response.new(original_response(&block)).tap do |response|
+        log_request(response)
+      end
     end
 
     private
 
+    def log_request(response)
+      message = [ self.class.to_s,
+                  response.request_method,
+                  response.request_uri,
+                  response.request_query,
+                  response.status,
+                  response.reason
+                ].join(' ')
+      Duracloud.logger.debug(message)
+    end
+
     def original_response(&block)
       connection.send(http_method,
                       url,
@@ -41,16 +59,14 @@ module Duracloud
       @query = query.merge(options).reject { |k, v| v.to_s.empty? }
     end
 
-    def base_path
-      '/'
-    end
-
-    def response_class
-      Response
-    end
-
+    # @return [HTTPClient] An HTTP connection to DuraCloud.
+    # @note We are using HTTPClient because Net::HTTP capitalizes
+    # request header names which is incompatible with DuraCloud's
+    # custom case-sensitive content property headers (x-dura-meta-*).
     def connection
-      @connection ||= Connection.new(client, base_path)
+      HTTPClient.new(base_url: Duracloud.base_url, force_basic_auth: Duracloud.auth?).tap do |conn|
+        conn.set_auth(Duracloud.base_url, Duracloud.user, Duracloud.password) if Duracloud.auth?
+      end
     end
   end
 end

data/lib/duracloud/response.rb

@@ -8,12 +8,10 @@ module Duracloud
     attr_reader :original_response
 
     delegate [:header, :body, :code, :ok?, :redirect?, :status, :reason] => :original_response,
-             :content_type => :header,
+             [:content_type, :request_method, :request_uri, :request_query] => :header,
              :empty? => :body
 
     def_delegator :header, :request_uri, :url
-    def_delegator :header, :request_method
-    def_delegator :header, :request_query
 
     def initialize(original_response)
       @original_response = original_response
@@ -49,5 +47,6 @@ module Duracloud
     def modified
       DateTime.parse(header["last-modified"].first) rescue nil
     end
+
   end
 end

data/lib/duracloud/response_handler.rb

@@ -0,0 +1,63 @@
+module Duracloud
+  class ResponseHandler
+
+    def self.call(response)
+      new(response).call
+    end
+
+    attr_reader :response
+
+    def initialize(response)
+      @response = response
+    end
+
+    def call
+      handle_error
+      log_response
+    end
+
+    def log_response
+      if loggable_response_body?
+        Duracloud.logger.info(response.body)
+      end
+    end
+
+    def loggable_response_body?
+      %w(POST PUT DELETE).include?(response.request_method) &&
+        response.plain_text? &&
+        response.has_body?
+    end
+
+    def handle_error
+      if response.error?
+        raise exception, error_message
+      end
+    end
+
+    def error_message
+      if response.plain_text? && response.has_body?
+        response.body
+      else
+        [ response.status, response.reason ].join(' ')
+      end
+    end
+
+    def exception
+      case response.status
+      when 400
+        BadRequestError
+      when 404
+        NotFoundError
+      when 409
+        ConflictError
+      else
+        if response.status >= 500
+          ServerError
+        else
+          Error
+        end
+      end
+    end
+
+  end
+end

data/lib/duracloud/rest_methods.rb

@@ -125,8 +125,9 @@ module Duracloud
 
     private
 
-    def durastore(*args, &block)
-      execute(DurastoreRequest, *args, &block)
+    def durastore(http_method, url_path, **options, &block)
+      url = [ "durastore", url_path ].join("/")
+      execute(http_method, url, **options, &block)
     end
 
     def durastore_content(http_method, space_id, content_id, **options, &block)

data/lib/duracloud/space.rb

@@ -1,5 +1,5 @@
-require "date"
-require "nokogiri"
+require 'date'
+require 'nokogiri'
 
 module Duracloud
   #
@@ -7,7 +7,10 @@ module Duracloud
   #
   class Space < AbstractEntity
 
-    after_save :reset_acls
+    property :space_id, required: true
+    property :store_id
+
+    alias_method :id, :space_id
 
     # Max size of content item list for one request.
     #   This limit is imposed by Duracloud.
@@ -117,12 +120,6 @@ module Duracloud
       end
     end
 
-    attr_accessor :space_id, :store_id
-    alias_method :id, :space_id
-
-    after_save :reset_acls
-    before_delete :reset_acls
-
     # @param space_id [String] the space ID
     # @param store_id [String] the store ID (optional)
     def initialize(space_id, store_id = nil)
@@ -249,11 +246,13 @@ module Duracloud
     end
 
     def do_delete
+      reset_acls
       Client.delete_space(id, **query)
     end
 
     def do_save
       persisted? ? update : create
+      reset_acls
     end
 
     def query

data/lib/duracloud/storage_report.rb

@@ -1,5 +1,4 @@
 require 'hashie'
-require 'active_support'
 
 module Duracloud
   class StorageReport < Hashie::Trash
@@ -15,17 +14,13 @@ module Duracloud
       @time ||= Time.at(timestamp / 1000.0).utc
     end
 
-    def human_size
-      ActiveSupport::NumberHelper.number_to_human_size(byte_count, prefix: :si)
-    end
-
     def to_s
       <<-EOS
 Date:       #{time}
 Space ID:   #{space_id || "(all)"}
 Store ID:   #{store_id}
 Objects:    #{object_count}
-Total size: #{human_size} (#{byte_count} bytes)
+Total size: #{byte_count} bytes
       EOS
     end
 

data/lib/duracloud/sync_validation.rb

@@ -1,11 +1,10 @@
-require 'active_model'
 require 'tempfile'
 require 'csv'
 require 'fileutils'
+require 'hashie'
 
 module Duracloud
-  class SyncValidation
-    include ActiveModel::Model
+  class SyncValidation < Hashie::Dash
 
     TWO_SPACES = '  '
     MD5_CSV_OPTS = { col_sep: TWO_SPACES }.freeze
@@ -15,7 +14,10 @@ module Duracloud
     CHANGED = "CHANGED"
     FOUND   = "FOUND"
 
-    attr_accessor :space_id, :content_dir, :store_id, :work_dir, :fast
+    property :space_id, required: true
+    property :content_dir, required: true
+    property :store_id
+    property :work_dir
 
     def self.call(*args)
       new(*args).call