duracloud-client 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45e670a025414a048dd0e4043e25a370ef6085ee
-  data.tar.gz: 43ec5144e26fa7fb3334652bece16f293ddf3324
+  metadata.gz: 328f7556852dc8ca4dbdf2fed3314aa6ca2c160b
+  data.tar.gz: d10ae8810f1e964d495b8b88142246d42fc2c410
 SHA512:
-  metadata.gz: cc638f78a134b5be821ceab5269ed84abe98d8f09bfa3d4122c1bf878dd1ab43d846fe8caf75c933e75fc868c9f3b80df8c7f98314702296535c7d6d10201c33
-  data.tar.gz: 84dbd31e44ebbc41c3f62ecbc2d9e2c1164f3ef5823818ebb88e4ec9c9051d4d6d15b6334210bf4a226f19851a1e40c3b2186dcd64a5ad568e53f2b19701a4ad
+  metadata.gz: efa0688d30ec628915d6497422377c9edf95c06233af784947103ab110a4ea8925b7ff99854ccf829e024414eba6b370edd409dc525ff81b14c8707c1f6ccd93
+  data.tar.gz: 08bfcbd0b87934908c9b229b09400648699f90dd32e903b77d362033b8dcdbb1c737e3727e095b4a1343b32930dac68066895e5b5edc84f3d4e04c6e6a2db8e5

data/lib/duracloud/audit_log.rb

@@ -11,11 +11,7 @@ module Duracloud
     end
 
     def tsv
-      response.body
-    end
-
-    def to_s
-      tsv
+      super || response.body
     end
 
     private

data/lib/duracloud/bit_integrity_report.rb

@@ -19,7 +19,7 @@ module Duracloud
     end
 
     def tsv
-      report.body
+      super || report.body
     end
 
     def completion_date

data/lib/duracloud/content.rb

@@ -107,6 +107,24 @@ module Duracloud
       @md5
     end
 
+    # @return [Duracloud::Content] the copied content
+    #   The current instance still represents the original content.
+    def copy(target_space_id:, target_content_id:, target_store_id: nil)
+      copy_headers = {'x-dura-meta-copy-source'=>[space_id, content_id].join('/')}
+      copy_headers['x-dura-meta-copy-source-store'] = store_id if store_id
+      options = { storeID: target_store_id, headers: copy_headers }
+      Client.copy_content(target_space_id, target_content_id, **options)
+      Content.find(space_id: target_space_id, content_id: target_content_id, store_id: target_store_id, md5: md5)
+    end
+
+    # @return [Duracloud::Content] the moved content
+    #   The current instance still represents the deleted content.
+    def move(**args)
+      copied = copy(**args)
+      delete
+      copied
+    end
+
     private
 
     def set_md5!(response)

data/lib/duracloud/manifest.rb

@@ -12,7 +12,7 @@ module Duracloud
     end
 
     def tsv
-      tsv_response.body
+      super || tsv_response.body
     end
 
     def bagit

data/lib/duracloud/properties.rb

@@ -19,7 +19,7 @@ module Duracloud
     SPACE_ACLS = /\A#{PREFIX}acl-/
 
     # Copy Content headers
-    COPY_CONTENT = /\A#{PREFIX}copy-source(-store)\z/
+    COPY_CONTENT = /\A#{PREFIX}copy-source(-store)?\z/
 
     # DuraCloud internal content properties
     INTERNAL = /\A#{PREFIX}content-(mimetype|size|checksum|modified)\z/

data/lib/duracloud/rest_methods.rb

@@ -49,9 +49,8 @@ module Duracloud
       durastore_content(:put, space_id, content_id, **options)
     end
 
-    def copy_content(space_id, content_id, **options)
-      raise NotImplementedError,
-            "The API method 'Copy Content' has not yet been implemented."
+    def copy_content(target_space_id, target_content_id, **options)
+      durastore_content(:put, target_space_id, target_content_id, **options)
     end
 
     def delete_content(space_id, content_id, **options)
@@ -91,7 +90,7 @@ module Duracloud
     end
 
     def durastore_content(http_method, space_id, content_id, **options)
-      escaped_content_id = content_id.gsub(/%/, "%25")
+      escaped_content_id = content_id.gsub(/%/, "%25").gsub(/ /, "%20")
       url = [ space_id, escaped_content_id ].join("/")
       durastore(http_method, url, **options)
     end

data/lib/duracloud/tsv.rb

@@ -2,31 +2,53 @@ require "csv"
 
 module Duracloud
   module TSV
-    # @return [CSV::Table]
+
     def csv
-      @csv ||= CSV::Table.new([]).tap do |csv|
-        header_line, rows = tsv.split(/\r?\n/, 2)
-        headers = header_line.split("\t").map { |h| h.downcase.gsub(/-/, "_") }
-        header_row = CSV::Row.new(headers, headers, true)
-        csv << header_row
-        rows.split(/\r?\n/).each do |row|
-          csv << row.split("\t")
-        end
-      end
+      @csv ||= CSV.new(tsv, csv_options)
     end
 
-    # @return [Enumerator] rows as hashes
     def rows
-      Enumerator.new do |e|
-        csv.by_row!.each do |row|
-          next if row.header_row?
-          e << row.to_hash
-        end
+      @rows ||= Enumerator.new do |e|
+        table.each { |row| e << row.to_hash }
       end
     end
 
+    def table
+      csv.rewind
+      csv.read
+    ensure
+      csv.rewind
+    end
+
     def tsv
-      raise NotImplementedError, "Including module must implement `tsv`."
+      @tsv
+    end
+
+    def load_tsv(io_or_str)
+      @tsv = io_or_str
+    end
+
+    def load_tsv_file(path)
+      load_tsv(File.new(path, "rb"))
     end
+
+    def to_s
+      tsv.to_s
+    end
+
+    private
+
+    def csv_options
+      { col_sep: "\t",
+        quote_char: "`",
+        headers: true,
+        header_converters: header_converters,
+      }
+    end
+
+    def header_converters
+      lambda { |h| h.downcase.gsub(/-/, "_") }
+    end
+
   end
 end

data/lib/duracloud/version.rb

@@ -1,3 +1,3 @@
 module Duracloud
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/unit/audit_log_spec.rb

@@ -1,22 +1,35 @@
 module Duracloud
   RSpec.describe AuditLog do
 
-    let(:tsv) { File.read(File.expand_path('../../fixtures/audit_log.tsv', __FILE__)) }
-
-    before {
-      allow(subject).to receive(:tsv) { tsv }
-    }
+    let(:path) { File.expand_path('../../fixtures/audit_log.tsv', __FILE__) }
 
     subject { described_class.new("myspace") }
 
-    describe "CSV" do
+    describe "#csv" do
+      before {
+        allow(subject).to receive(:tsv) { File.read(path) }
+        subject.csv.read
+      }
       specify {
         expect(subject.csv.headers).to eq(%w(account store_id space_id content_id content_md5 content_size content_mimetype content_properties space_acls source_space_id source_content_id timestamp action username))
-        expect(subject.csv.size).to eq(7)
-        expect(subject.csv.to_s.split("\n").first).to eq("account,store_id,space_id,content_id,content_md5,content_size,content_mimetype,content_properties,space_acls,source_space_id,source_content_id,timestamp,action,username")
-        expect(subject.rows.next).to eq({"account"=>"example", "store_id"=>"1065", "space_id"=>"myspace", "content_id"=>"", "content_md5"=>"", "content_size"=>"", "content_mimetype"=>"", "content_properties"=>"", "space_acls"=>"", "source_space_id"=>"", "source_content_id"=>"", "timestamp"=>"2016-04-27T18:34:18.018", "action"=>"CREATE_SPACE", "username"=>"bob@example.com"})
+        expect(subject.rows.to_a.size).to eq(6)
+        expect(subject.rows.first).to eq({"account"=>"example", "store_id"=>"1065", "space_id"=>"myspace", "content_id"=>nil, "content_md5"=>nil, "content_size"=>nil, "content_mimetype"=>nil, "content_properties"=>nil, "space_acls"=>nil, "source_space_id"=>nil, "source_content_id"=>nil, "timestamp"=>"2016-04-27T18:34:18.018", "action"=>"CREATE_SPACE", "username"=>"bob@example.com"})
       }
     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/bit_integrity_report_spec.rb

@@ -1,22 +1,35 @@
 module Duracloud
   RSpec.describe BitIntegrityReport do
 
-    let(:tsv) { File.read(File.expand_path('../../fixtures/bit_integrity_report.tsv', __FILE__)) }
-
-    before {
-      allow(subject).to receive(:tsv) { tsv }
-    }
+    let(:path) { File.expand_path('../../fixtures/bit_integrity_report.tsv', __FILE__) }
 
     subject { described_class.new("myspace") }
 
-    describe "CSV" do
+    describe "#csv" do
+      before do
+        allow(subject).to receive(:tsv) { File.read(path) }
+        subject.csv.read
+      end
       specify {
         expect(subject.csv.headers).to eq(%w(date_checked account store_id store_type space_id content_id result content_checksum provider_checksum manifest_checksum details))
-        expect(subject.csv.size).to eq(4)
-        expect(subject.csv.to_s.split("\n").first).to eq("date_checked,account,store_id,store_type,space_id,content_id,result,content_checksum,provider_checksum,manifest_checksum,details")
-        expect(subject.rows.next).to eq({"date_checked"=>"2016-05-15T04:11:14", "account"=>"example", "store_id"=>"1065", "store_type"=>"AMAZON_S3", "space_id"=>"myspace", "content_id"=>"BINARIES/00/00/e8/0000e819ac3e67d039d288adaab5b5e44c3c21d9", "result"=>"SUCCESS", "content_checksum"=>"27333f3c06a6d259863384799be68d30", "provider_checksum"=>"27333f3c06a6d259863384799be68d30", "manifest_checksum"=>"27333f3c06a6d259863384799be68d30", "details"=>"--"})
+        expect(subject.rows.to_a.size).to eq(3)
+        expect(subject.rows.first).to eq({"date_checked"=>"2016-05-15T04:11:14", "account"=>"example", "store_id"=>"1065", "store_type"=>"AMAZON_S3", "space_id"=>"myspace", "content_id"=>"BINARIES/00/00/e8/0000e819ac3e67d039d288adaab5b5e44c3c21d9", "result"=>"SUCCESS", "content_checksum"=>"27333f3c06a6d259863384799be68d30", "provider_checksum"=>"27333f3c06a6d259863384799be68d30", "manifest_checksum"=>"27333f3c06a6d259863384799be68d30", "details"=>"--"})
       }
     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/client_spec.rb

@@ -130,9 +130,9 @@ module Duracloud
         subject.get_content_properties("foo", "bar")
         expect(stub).to have_been_requested
       }
-      it "escapes percent signs in the content id" do
-        stub = stub_request(:head, "https://example.com/durastore/foo/z/z/bar%252Fbaz")
-        subject.get_content_properties("foo", "z/z/bar%2Fbaz")
+      it "escapes percent signs and spaces in the content id" do
+        stub = stub_request(:head, "https://example.com/durastore/foo/z/z/bar%252Fbaz%20spam%20eggs")
+        subject.get_content_properties("foo", "z/z/bar%2Fbaz spam eggs")
         expect(stub).to have_been_requested
       end
       specify {
@@ -240,8 +240,10 @@ module Duracloud
 
     describe "copy_content" do
       specify {
-        expect { subject.copy_content("foo", "bar", headers: {'x-dura-meta-copy-source'=>'space-id/content-id'}) }
-          .to raise_error(NotImplementedError)
+        stub = stub_request(:put, "https://example.com/durastore/spam/eggs")
+               .with(headers: {'x-dura-meta-copy-source'=>'foo/bar'})
+        subject.copy_content("spam", "eggs", headers: {'x-dura-meta-copy-source'=>'foo/bar'})
+        expect(stub).to have_been_requested
       }
     end
 

data/spec/unit/content_spec.rb

@@ -159,19 +159,48 @@ module Duracloud
     end
 
     describe "#properties" do
-      before {
-        allow(Client).to receive(:get_content_properties)
-                          .with("foo", "bar", hash_including(storeID: nil)) {
-          double(headers: {'x-dura-meta-creator'=>'testuser'},
-                 content_type: 'text/plain',
-                 md5: '08a008a01d498c404b0c30852b39d3b8')
-        }
-      }
+      before do
+        stub_request(:head, url)
+          .to_return(headers: {'x-dura-meta-creator'=>'testuser',
+                               'Content-Type'=>'text/plain',
+                               'Content-MD5'=>'08a008a01d498c404b0c30852b39d3b8'})
+      end
       specify {
+        pending "Research Webmock problem with return headers"
         content = Content.find(space_id: "foo", content_id: "bar")
         expect(content.properties.x_dura_meta_creator).to eq('testuser')
       }
     end
 
+    describe "#copy" 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)
+        copied = subject.copy(target_space_id: "spam", target_content_id: "eggs")
+        expect(copied).to be_a(Content)
+        expect(stub1).to have_been_requested
+        expect(stub2).to have_been_requested
+      }
+    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
+      }
+    end
+
   end
 end

data/spec/unit/manifest_spec.rb

@@ -1,22 +1,34 @@
 module Duracloud
   RSpec.describe Manifest do
 
-    let(:tsv) { File.read(File.expand_path('../../fixtures/manifest.tsv', __FILE__)) }
-
-    before {
-      allow(subject).to receive(:tsv) { tsv }
-    }
-
     subject { described_class.new("myspace") }
+    let(:path) { File.expand_path('../../fixtures/manifest.tsv', __FILE__) }
 
-    describe "CSV" do
+    describe "#csv" do
+      before do
+        allow(subject).to receive(:tsv) { File.read(path) }
+        subject.csv.read
+      end
       specify {
         expect(subject.csv.headers).to eq(%w(space_id content_id md5))
-        expect(subject.csv.size).to eq(4)
-        expect(subject.csv.to_s.split("\n").first).to eq("space_id,content_id,md5")
-        expect(subject.rows.next).to eq({"space_id"=>"myspace", "content_id"=>"METADATA/d6/42/0c/9c/d6420c9c-82f8-4f6a-baf7-37b9be7f4c5f/20160502_172925/manifest-md5.txt", "md5"=>"21fef474787860ccfb67bdd99ddee93a"})
+        expect(subject.rows.to_a.size).to eq(3)
+        expect(subject.rows.first).to eq({"space_id"=>"myspace", "content_id"=>"METADATA/d6/42/0c/9c/d6420c9c-82f8-4f6a-baf7-37b9be7f4c5f/20160502_172925/manifest-md5.txt", "md5"=>"21fef474787860ccfb67bdd99ddee93a"})
       }
     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.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - David Chandek-Stark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie