duracloud-client 0.9.1 → 0.10.0

data/lib/duracloud/version.rb

@@ -1,3 +1,3 @@
 module Duracloud
-  VERSION = "0.9.1"
+  VERSION = "0.10.0"
 end

data/spec/spec_helper.rb

@@ -16,12 +16,10 @@ WebMock::Util::Headers.class_eval do
   end
 end
 
-Duracloud::Client.configure do |config|
-  config.host = "example.com"
-  config.user = "testuser"
-  config.password = "testpass"
-  config.silence_logging!
-end
+Duracloud.host = "example.com"
+Duracloud.user = "testuser"
+Duracloud.password = "testpass"
+Duracloud.silence_logging!
 
 RSpec.configure do |config|
   # rspec-expectations config goes here. You can use an alternate

data/spec/unit/cli_spec.rb

@@ -1,26 +1,30 @@
 module Duracloud
   RSpec.describe CLI do
 
-    subject { described_class.new(**opts) }
+    subject { described_class.new(*opts) }
 
     describe "find item" do
-      let(:opts) { {command: "find", space_id: "foo", content_id: "bar"} }
+      let(:opts) { %w(find -s foo -c bar) }
       specify {
-        expect(Commands::FindItem).to receive(:call).with(subject) { nil }
+        stub = stub_request(:head, "https://example.com/durastore/foo/bar")
+        expect(Commands::FindItem).to receive(:call).with(subject).and_call_original
         subject.execute
+        expect(stub).to have_been_requested
       }
     end
 
     describe "find space" do
-      let(:opts) { {command: "find", space_id: "foo"} }
+      let(:opts) { %w(find -s foo) }
       specify {
-        expect(Commands::FindSpace).to receive(:call).with(subject) { nil }
+        stub = stub_request(:head, "https://example.com/durastore/foo")
+        expect(Commands::FindSpace).to receive(:call).with(subject).and_call_original
         subject.execute
+        expect(stub).to have_been_requested
       }
     end
 
     describe "find items" do
-      let(:opts) { {command: "find", space_id: "foo", infile: "/foo/bar"} }
+      let(:opts) { %w( find -s foo -f /foo/bar ) }
       specify {
         expect(Commands::FindItems).to receive(:call).with(subject) { nil }
         subject.execute
@@ -28,15 +32,17 @@ module Duracloud
     end
 
     describe "count" do
-      let(:opts) { {command: "count", space_id: "foo"} }
+      let(:opts) { %w( count -s foo ) }
       specify {
-        expect(Commands::Count).to receive(:call).with(subject) { nil }
+        stub = stub_request(:head, "https://example.com/durastore/foo")
+        expect(Commands::Count).to receive(:call).with(subject).and_call_original
         subject.execute
+        expect(stub).to have_been_requested
       }
     end
 
     describe "sync" do
-      let(:opts) { {command: "sync", space_id: "foo", content_id: "bar", infile: "foo/bar"} }
+      let(:opts) { %w( sync -s foo -c bar -f /foo/bar ) }
       specify {
         expect(Commands::Sync).to receive(:call).with(subject) { nil }
         subject.execute
@@ -44,7 +50,7 @@ module Duracloud
     end
 
     describe "validate" do
-      let(:opts) { {command: "validate", space_id: "foo", content_dir: "/tmp"} }
+      let(:opts) { %w( validate -s foo -d /tmp ) }
       specify {
         expect(Commands::Validate).to receive(:call).with(subject) { nil }
         subject.execute
@@ -52,7 +58,7 @@ module Duracloud
     end
 
     describe "download_manifest" do
-      let(:opts) { {command: "download_manifest", space_id: "foo"} }
+      let(:opts) { %w( download_manifest -s foo ) }
       specify {
         expect(Commands::DownloadManifest).to receive(:call).with(subject) { nil }
         subject.execute
@@ -60,7 +66,7 @@ module Duracloud
     end
 
     describe "get_storage_report" do
-      let(:opts) { {command: "get_storage_report", space_id: "foo"} }
+      let(:opts) { %w( get_storage_report -s foo ) }
       specify {
         expect(Commands::GetStorageReport).to receive(:call).with(subject) { nil }
         subject.execute
@@ -68,7 +74,7 @@ module Duracloud
     end
 
     describe "list content ids" do
-      let(:opts) { {command: "list_content_ids", space_id: "foo"} }
+      let(:opts) { %w( list_content_ids -s foo ) }
       specify {
         expect(Commands::ListContentIds).to receive(:call).with(subject) { nil }
         subject.execute
@@ -76,12 +82,20 @@ module Duracloud
     end
 
     describe "list items" do
-      let(:opts) { {command: "list_items", space_id: "foo"} }
+      let(:opts) { %w( list_items -s foo ) }
       specify {
         expect(Commands::ListItems).to receive(:call).with(subject) { nil }
         subject.execute
       }
     end
 
+    describe "store" do
+      let(:opts) { %w( store -s foo -c bar -f /foo/bar -t image/jpeg ) }
+      specify {
+        expect(Commands::StoreContent).to receive(:call).with(subject) { nil }
+        subject.execute
+      }
+    end
+
   end
 end

data/spec/unit/content_spec.rb

@@ -201,8 +201,7 @@ module Duracloud
       describe "when found" do
         before { stub_request(:delete, url) }
         it "deletes the content" do
-          subject.delete
-          expect(subject).to be_deleted
+          expect { subject.delete }.to change(subject, :deleted?).from(false).to(true)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duracloud-client
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - David Chandek-Stark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2017-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -52,26 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -173,8 +153,6 @@ files:
 - Rakefile
 - bin/duracloud
 - duracloud.gemspec
-- gemfiles/Gemfile.activemodel-4.2
-- gemfiles/Gemfile.activemodel-5.0
 - lib/duracloud-client.rb
 - lib/duracloud.rb
 - lib/duracloud/abstract_entity.rb
@@ -199,20 +177,18 @@ files:
 - lib/duracloud/commands/get_storage_report_for_store.rb
 - lib/duracloud/commands/list_content_ids.rb
 - lib/duracloud/commands/list_items.rb
+- lib/duracloud/commands/store_content.rb
 - lib/duracloud/commands/sync.rb
 - lib/duracloud/commands/validate.rb
-- lib/duracloud/configuration.rb
-- lib/duracloud/connection.rb
 - lib/duracloud/content.rb
 - lib/duracloud/content_manifest.rb
-- lib/duracloud/durastore_request.rb
 - lib/duracloud/error.rb
-- lib/duracloud/error_handler.rb
 - lib/duracloud/fast_sync_validation.rb
 - lib/duracloud/manifest.rb
 - lib/duracloud/properties.rb
 - lib/duracloud/request.rb
 - lib/duracloud/response.rb
+- lib/duracloud/response_handler.rb
 - lib/duracloud/rest_methods.rb
 - lib/duracloud/space.rb
 - lib/duracloud/space_acls.rb

data/gemfiles/Gemfile.activemodel-4.2

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-gem "activemodel", "~> 4.2.7"
-gemspec path: "../"

data/gemfiles/Gemfile.activemodel-5.0

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-gem "activemodel", "~> 5.0.1"
-gemspec path: "../"

data/lib/duracloud/configuration.rb

@@ -1,42 +0,0 @@
-require "logger"
-require "uri"
-
-module Duracloud
-  class Configuration
-
-    class << self
-      attr_accessor :host, :port, :user, :password, :logger
-
-      def silence_logging!
-        self.logger = Logger.new(File::NULL)
-      end
-    end
-
-    attr_reader :host, :port, :user, :password, :logger
-
-    def initialize(host: nil, port: nil, user: nil, password: nil, logger: nil)
-      @host     = host     || default(:host)
-      @port     = port     || default(:port)
-      @user     = user     || default(:user)
-      @password = password || default(:password)
-      @logger   = logger   || self.class.logger || Logger.new(STDERR)
-      freeze
-    end
-
-    def base_url
-      URI::HTTPS.build(host: host, port: port)
-    end
-
-    def inspect
-      "#<#{self.class} host=#{host.inspect}, port=#{port.inspect}," \
-      " user=#{user.inspect}>"
-    end
-
-    private
-
-    def default(attr)
-      self.class.send(attr) || ENV["DURACLOUD_#{attr.to_s.upcase}"]
-    end
-
-  end
-end

data/lib/duracloud/connection.rb

@@ -1,18 +0,0 @@
-require 'httpclient'
-
-module Duracloud
-  #
-  # 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-*).
-  #
-  class Connection < HTTPClient
-    def initialize(client, base_path = '/')
-      base_url = client.base_url + base_path
-      super(base_url: base_url, force_basic_auth: true)
-      set_auth(client.base_url, client.user, client.password)
-    end
-  end
-end

data/lib/duracloud/durastore_request.rb

@@ -1,7 +0,0 @@
-module Duracloud
-  class DurastoreRequest < Request
-    def base_path
-      '/durastore/'
-    end
-  end
-end

data/lib/duracloud/error_handler.rb

@@ -1,56 +0,0 @@
-module Duracloud
-  class ErrorHandler
-    def self.call(response)
-      new(response).call
-    end
-
-    attr_reader :response
-
-    def initialize(response)
-      @response = response # XXX dup?
-    end
-
-    def call
-      message = response_has_error_message? ? response.body : status_message
-      raise handle_status, message
-    end
-
-    def status_message
-      [response.status, response.reason].join(' ')
-    end
-
-    def server_error?
-      response.status >= 500
-    end
-
-    def handle_status
-      send("handle_#{response.status}")
-    rescue NoMethodError
-      server_error? ? handle_server_error : handle_default
-    end
-
-    def handle_server_error
-      ServerError
-    end
-
-    def handle_default
-      Error
-    end
-
-    def handle_400
-      BadRequestError
-    end
-
-    def handle_404
-      NotFoundError
-    end
-
-    def handle_409
-      ConflictError
-    end
-
-    def response_has_error_message?
-      response.plain_text? && response.has_body?
-    end
-  end
-end