duracloud-client 0.3.0 → 0.4.0

data/spec/unit/bit_integrity_report_spec.rb

@@ -1,9 +1,13 @@
+require 'support/shared_examples_for_tsv'
+
 module Duracloud
   RSpec.describe BitIntegrityReport do
 
+    subject { described_class.new("myspace") }
+
     let(:path) { File.expand_path('../../fixtures/bit_integrity_report.tsv', __FILE__) }
 
-    subject { described_class.new("myspace") }
+    it_behaves_like "a TSV"
 
     describe "#csv" do
       before do
@@ -17,19 +21,5 @@ module Duracloud
       }
     end
 
-    describe "#load_tsv" do
-      it "loads a string" do
-        tsv = File.read(path)
-        subject.load_tsv(tsv)
-        expect(subject.tsv).to eq(tsv)
-      end
-      it "loads an IO" do
-        tsv = File.read(path)
-        tsv_io = File.new(path, "rb")
-        subject.load_tsv(tsv)
-        expect(subject.tsv.to_s).to eq(tsv)
-      end
-    end
-
   end
 end

data/spec/unit/content_manifest_spec.rb

@@ -0,0 +1,17 @@
+module Duracloud
+  RSpec.describe ContentManifest do
+
+    describe "source" do
+      let(:manifest) { described_class.new(space_id: 'foo', manifest_id: 'bar') }
+      subject { manifest.source }
+      before do
+        allow(manifest).to receive(:xml) { File.read(File.expand_path("../../fixtures/content_manifest.xml", __FILE__)) }
+      end
+      its(:md5) { is_expected.to eq "164e9aee34c0c42915716e11d5d539b5" }
+      its(:size) { is_expected.to eq 4227858432 }
+      its(:content_type) { is_expected.to eq "application/octet-stream" }
+      its(:content_id) { is_expected.to eq "datastreamStore/8/b/d4/info%3Afedora%2Fduke%3A447146%2Fcontent%2Fcontent.0" }
+    end
+
+  end
+end

data/spec/unit/content_spec.rb

@@ -2,16 +2,32 @@ module Duracloud
   RSpec.describe Content do
 
     let(:url) { "https://example.com/durastore/foo/bar" }
+    let(:manifest_url) { "#{url}.dura-manifest" }
 
     describe ".find" do
       describe "when it exists" do
-        before { stub_request(:head, url) }
-        specify {
-          expect(Content.find(space_id: "foo", content_id: "bar")).to be_a(Content)
-        }
+        subject { described_class.find(space_id: "foo", content_id: "bar") }
+        describe "and it is not chunked" do
+          before { stub_request(:head, url) }
+          it { is_expected.to be_a described_class }
+        end
+        describe "and it is chunked" do
+          let(:manifest_xml) { File.read(File.expand_path("../../fixtures/content_manifest.xml", __FILE__)) }
+          before do
+            stub_request(:head, url).to_return(status: 404)
+            stub_request(:head, manifest_url)
+            stub_request(:get, manifest_url).to_return(body: manifest_xml)
+          end
+          it { is_expected.to be_a described_class }
+          its(:md5) { is_expected.to eq "164e9aee34c0c42915716e11d5d539b5" }
+          its(:content_type) { is_expected.to eq "application/octet-stream" }
+        end
       end
       describe "when it does not exist" do
-        before { stub_request(:head, url).to_return(status: 404) }
+        before do
+          stub_request(:head, url).to_return(status: 404)
+          stub_request(:head, manifest_url).to_return(status: 404)
+        end
         specify {
           expect { Content.find(space_id: "foo", content_id: "bar") }.to raise_error(NotFoundError)
         }
@@ -35,13 +51,28 @@ module Duracloud
 
     describe ".exist?" do
       describe "when it exists" do
-        before { stub_request(:head, url) }
-        specify {
-          expect(Content.exist?(space_id: "foo", content_id: "bar")).to be true
-        }
+        describe "and it is not chunked" do
+          before { stub_request(:head, url) }
+          specify {
+            expect(Content.exist?(space_id: "foo", content_id: "bar")).to be true
+          }
+        end
+        describe "and it is chunked" do
+          before do
+            stub_request(:head, url).to_return(status: 404)
+            stub_request(:head, manifest_url)
+            stub_request(:get, manifest_url)
+          end
+          specify {
+            expect(Content.exist?(space_id: "foo", content_id: "bar")).to be true
+          }
+        end
       end
       describe "when it does not exist" do
-        before { stub_request(:head, url).to_return(status: 404) }
+        before do
+          stub_request(:head, url).to_return(status: 404)
+          stub_request(:head, manifest_url).to_return(status: 404)
+        end
         specify {
           expect(Content.exist?(space_id: "foo", content_id: "bar")).to be false
         }
@@ -83,12 +114,12 @@ module Duracloud
             end
           end
           describe "and the space exists" do
-            before {
+            before do
               stub_request(:put, url)
                 .with(body: "Some file content",
                       headers: {"Content-MD5"=>"92bbcf620ceb5f5bf38f08e9a1f31e7b"})
                 .to_return(status: 201)
-            }
+            end
             it "stores the content" do
               subject.save
               expect(subject).to be_persisted
@@ -115,7 +146,6 @@ module Duracloud
         end
         describe "and the body has not changed" do
           before {
-            allow(subject).to receive(:body_changed?) { false }
             stub_request(:post, url)
               .with(headers: {'x-dura-meta-creator'=>'testuser'})
           }
@@ -173,33 +203,92 @@ module Duracloud
     end
 
     describe "#copy" do
-      let(:target) { "https://example.com/durastore/spam/eggs" }
       subject { Content.new(space_id: "foo", content_id: "bar") }
+      let(:target) { "https://example.com/durastore/spam/eggs" }
+      before do
+        stub_request(:put, target)
+          .with(headers: {'x-dura-meta-copy-source'=>'foo/bar'})
+        stub_request(:head, target).to_return(status: 404)
+        stub_request(:head, "#{target}.dura-manifest").to_return(status: 404)
+      end
       specify {
+        copied = subject.copy(space_id: "spam", content_id: "eggs")
+        expect(copied).to be_a(Content)
+      }
+      it "defaults target space to current space" do
+        target = "https://example.com/durastore/foo/eggs"
         stub1 = stub_request(:put, target)
                 .with(headers: {'x-dura-meta-copy-source'=>'foo/bar'})
-        stub2 = stub_request(:head, target)
-        copied = subject.copy(target_space_id: "spam", target_content_id: "eggs")
+        stub2 = stub_request(:head, target).to_return(status: 404)
+        stub3 = stub_request(:head, "#{target}.dura-manifest").to_return(status: 404)
+        copied = subject.copy(content_id: "eggs")
         expect(copied).to be_a(Content)
         expect(stub1).to have_been_requested
         expect(stub2).to have_been_requested
-      }
+        expect(stub3).to have_been_requested
+      end
+      describe "when the target exists" do
+        before do
+          stub_request(:head, target).to_return(status: 200)
+        end
+        describe "and force argument is true" do
+          it "overwrites the target" do
+            expect { subject.copy(space_id: "spam", content_id: "eggs", force: true) }.not_to raise_error
+          end
+        end
+        describe "and force argument is false" do
+          it "raises an exception" do
+            expect { subject.copy(space_id: "spam", content_id: "eggs", force: false) }.to raise_error(Content::CopyError)
+          end
+        end
+      end
     end
 
     describe "#move" do
       let(:target) { "https://example.com/durastore/spam/eggs" }
       subject { Content.new(space_id: "foo", content_id: "bar") }
-      specify {
-        stub1 = stub_request(:put, target)
-                .with(headers: {'x-dura-meta-copy-source'=>'foo/bar'})
-        stub2 = stub_request(:head, target)
-        stub3 = stub_request(:delete, "https://example.com/durastore/foo/bar")
-        moved = subject.move(target_space_id: "spam", target_content_id: "eggs")
-        expect(moved).to be_a(Content)
-        expect(stub1).to have_been_requested
-        expect(stub2).to have_been_requested
-        expect(stub3).to have_been_requested
-      }
+      describe "when copy succeeds" do
+        it "deletes the source" do
+          stub1 = stub_request(:put, target)
+                  .with(headers: {'x-dura-meta-copy-source'=>'foo/bar'})
+          stub2 = stub_request(:head, target).to_return(status: 404)
+          stub2a = stub_request(:head, "#{target}.dura-manifest").to_return(status: 404)
+          stub3 = stub_request(:delete, "https://example.com/durastore/foo/bar")
+          moved = subject.move(space_id: "spam", content_id: "eggs")
+          expect(moved).to be_a(Content)
+          expect(stub1).to have_been_requested
+          expect(stub2).to have_been_requested
+          expect(stub2a).to have_been_requested
+          expect(stub3).to have_been_requested
+        end
+      end
+      describe "when copy fails" do
+        it "does not delete the source" do
+          allow(subject).to receive(:copy).with(space_id: "spam", content_id: "eggs").and_raise(Content::CopyError)
+          expect(subject).not_to receive(:delete)
+          expect { subject.move(space_id: "spam", content_id: "eggs") }.to raise_error(Content::CopyError)
+        end
+      end
+      describe "when target exists" do
+        before do
+          stub_request(:put, target)
+            .with(headers: {'x-dura-meta-copy-source'=>'foo/bar'})
+          stub_request(:delete, "https://example.com/durastore/foo/bar")
+          stub_request(:head, target).to_return(status: 200)
+          allow(Content).to receive(:exist?).with(space_id: "spam", content_id: "eggs") { true }
+        end
+        describe "and force argument is true" do
+          it "overwrites the target" do
+            expect(subject).to receive(:copy).and_call_original
+            subject.move(space_id: "spam", content_id: "eggs", force: true)
+          end
+        end
+        describe "and force argument is false" do
+          it "raises an exception" do
+            expect { subject.move(space_id: "spam", content_id: "eggs", force: false) }.to raise_error(Content::CopyError)
+          end
+        end
+      end
     end
 
   end

data/spec/unit/manifest_spec.rb

@@ -1,9 +1,14 @@
+require 'support/shared_examples_for_tsv'
+
 module Duracloud
   RSpec.describe Manifest do
 
     subject { described_class.new("myspace") }
+
     let(:path) { File.expand_path('../../fixtures/manifest.tsv', __FILE__) }
 
+    it_behaves_like "a TSV"
+
     describe "#csv" do
       before do
         allow(subject).to receive(:tsv) { File.read(path) }
@@ -16,19 +21,5 @@ module Duracloud
       }
     end
 
-    describe "#load_tsv" do
-      it "loads a string" do
-        tsv = File.read(path)
-        subject.load_tsv(tsv)
-        expect(subject.tsv).to eq(tsv)
-      end
-      it "loads an IO" do
-        tsv = File.read(path)
-        tsv_io = File.new(path, "rb")
-        subject.load_tsv(tsv)
-        expect(subject.tsv.to_s).to eq(tsv)
-      end
-    end
-
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duracloud-client
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - David Chandek-Stark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 2017-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -161,19 +161,20 @@ files:
 - gemfiles/Gemfile.activemodel-5.0
 - lib/duracloud-client.rb
 - lib/duracloud.rb
+- lib/duracloud/abstract_entity.rb
 - lib/duracloud/audit_log.rb
 - lib/duracloud/bit_integrity_report.rb
+- lib/duracloud/chunked_content.rb
 - lib/duracloud/client.rb
 - lib/duracloud/configuration.rb
 - lib/duracloud/connection.rb
 - lib/duracloud/content.rb
+- lib/duracloud/content_manifest.rb
 - lib/duracloud/content_properties.rb
 - lib/duracloud/durastore_request.rb
 - lib/duracloud/error.rb
 - lib/duracloud/error_handler.rb
-- lib/duracloud/has_properties.rb
 - lib/duracloud/manifest.rb
-- lib/duracloud/persistence.rb
 - lib/duracloud/properties.rb
 - lib/duracloud/request.rb
 - lib/duracloud/response.rb
@@ -186,12 +187,15 @@ files:
 - lib/duracloud/version.rb
 - spec/fixtures/audit_log.tsv
 - spec/fixtures/bit_integrity_report.tsv
+- spec/fixtures/content_manifest.xml
 - spec/fixtures/lorem_ipsum.txt
 - spec/fixtures/manifest.tsv
 - spec/spec_helper.rb
+- spec/support/shared_examples_for_tsv.rb
 - spec/unit/audit_log_spec.rb
 - spec/unit/bit_integrity_report_spec.rb
 - spec/unit/client_spec.rb
+- spec/unit/content_manifest_spec.rb
 - spec/unit/content_spec.rb
 - spec/unit/manifest_spec.rb
 - spec/unit/properties_spec.rb
@@ -225,12 +229,15 @@ summary: Ruby client for communicating with DuraCloud
 test_files:
 - spec/fixtures/audit_log.tsv
 - spec/fixtures/bit_integrity_report.tsv
+- spec/fixtures/content_manifest.xml
 - spec/fixtures/lorem_ipsum.txt
 - spec/fixtures/manifest.tsv
 - spec/spec_helper.rb
+- spec/support/shared_examples_for_tsv.rb
 - spec/unit/audit_log_spec.rb
 - spec/unit/bit_integrity_report_spec.rb
 - spec/unit/client_spec.rb
+- spec/unit/content_manifest_spec.rb
 - spec/unit/content_spec.rb
 - spec/unit/manifest_spec.rb
 - spec/unit/properties_spec.rb

data/lib/duracloud/has_properties.rb

@@ -1,52 +0,0 @@
-module Duracloud
-  module HasProperties
-
-    def self.included(base)
-      base.class_eval do
-        include Persistence
-
-        before_delete :reset_properties
-        after_save :reset_properties
-      end
-    end
-
-    # Return the properties associated with this resource,
-    #   loading from Duracloud if necessary.
-    # @return [Duracloud::Properties] the properties
-    # @raise [Duracloud::NotFoundError] if the resource is marked persisted
-    #   but does not exist in Duracloud
-    def properties
-      load_properties if persisted? && @properties.nil?
-      @properties ||= properties_class.new
-    end
-
-    # @api private
-    # @raise [Duracloud::NotFoundError] the resource does not exist in DuraCloud.
-    def load_properties
-      response = get_properties_response
-      self.properties = response.headers
-      yield response if block_given?
-      persisted!
-    end
-
-    private
-
-    def properties=(props)
-      filtered = props ? properties_class.filter(props) : props
-      @properties = properties_class.new(filtered)
-    end
-
-    def reset_properties
-      @properties = nil
-    end
-
-    def properties_class
-      Properties
-    end
-
-    def get_properties_response
-      raise NotImplementedError, "Class must implement `get_properties_response`."
-    end
-
-  end
-end

data/lib/duracloud/persistence.rb

@@ -1,59 +0,0 @@
-require "active_model"
-
-module Duracloud
-  module Persistence
-
-    def self.included(base)
-      base.class_eval do
-        extend ActiveModel::Callbacks
-
-        define_model_callbacks :save, :delete
-      end
-    end
-
-    def save
-      raise Error, "Cannot save deleted #{self.class}." if deleted?
-      run_callbacks :save do
-        do_save
-        persisted!
-      end
-    end
-
-    def delete
-      raise Error, "Cannot delete, already deleted." if deleted?
-      run_callbacks :delete do
-        do_delete
-        deleted!
-        freeze
-      end
-    end
-
-    def persisted?
-      !!@persisted
-    end
-
-    def deleted?
-      !!@deleted
-    end
-
-    private
-
-    def persisted!
-      @persisted = true
-    end
-
-    def deleted!
-      @deleted = true
-      @persisted = false
-    end
-
-    def do_delete
-      raise NotImplementedError, "Classes must implement `do_delete`."
-    end
-
-    def do_save
-      raise NotImplementedError, "Classes must implement `do_save`."
-    end
-
-  end
-end