duracloud-client 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aea6659762321bf17ab4ebb8e64267be0516cc0f
-  data.tar.gz: f156ad57e051818a4ceb30a0e1f9ecf43d875f7b
+  metadata.gz: 36e3c1de47db33c4726afabdafce50534028f1ab
+  data.tar.gz: 45d3130e4f61ff3dc6ef0d2575c6c59f18a882ae
 SHA512:
-  metadata.gz: ade9f4d0a1ffafff2b16e368c22a9e00a5bd714e300832ebf42cda0a99ac24c3f36e43fc542fafce5913e316feac47e14b0aaf8017473f0ce8a602073af79ad3
-  data.tar.gz: 310a399f320345f3c8ea7ba4e3187c97f82c2796f9e3c1b689065d1c36f8b171d4dc29d447393496faaa4010ceb984091d1ed57c417201a7c5a6282e95f8c456
+  metadata.gz: 38d9045baee5637769976908f3add414414b59e5b7aa2f5dd3011f0ad00c4fe601bf78fdfc3af90dd1bcdaf54e63434a8d90eeb8333708070894aae2b26267b3
+  data.tar.gz: c2efe8e7282a5e75d10b01db0a2561d770deb91043d89990c7820f62508e488e840cdc2819d90a05261571c32be1fa61d43f4b91e55cea4ec83e1dfc1c3bee04

data/lib/duracloud/content.rb

@@ -10,6 +10,8 @@ module Duracloud
     include Persistence
     include HasProperties
 
+    CHUNK_SIZE = 1024 * 16
+
     after_save :changes_applied
 
     # Does the content exist in DuraCloud?
@@ -64,7 +66,7 @@ module Duracloud
     # @raise [Duracloud::NotFoundError] the content does not exist in DuraCloud.
     def load_body
       response = Client.get_content(*args, **query)
-      set_body(response) # don't use setter b/c marks as dirty
+      @body = response.body # don't use setter b/c marks as dirty
       persisted!
     end
 
@@ -76,7 +78,7 @@ module Duracloud
     end
 
     def body=(str_or_io)
-      set_body(str_or_io)
+      @body = str_or_io
       body_will_change!
     end
 
@@ -104,8 +106,8 @@ module Duracloud
 
     private
 
-    def set_body(str_or_io)
-      @body = StringIO.new(read_string_or_io(str_or_io), "r")
+    def io_like?
+      body.respond_to?(:read) && body.respond_to?(:rewind)
     end
 
     def set_properties
@@ -126,10 +128,17 @@ module Duracloud
     end
 
     def md5
-      body.rewind
-      Digest::MD5.hexdigest(body.read)
-    ensure
-      body.rewind
+      digest = Digest::MD5.new
+      if io_like?
+        body.rewind
+        while chunk = body.read(CHUNK_SIZE) do
+          digest << chunk
+        end
+        body.rewind
+      else
+        digest << body
+      end
+      digest.hexdigest
     end
 
     def properties_class
@@ -154,25 +163,6 @@ module Duracloud
       end
     end
 
-    def read_string_or_io(str_or_io)
-      if str_or_io.respond_to?(:read)
-        read_io_like(str_or_io)
-      elsif str_or_io.respond_to?(:to_str)
-        str_or_io.to_str
-      else
-        raise ArgumentError, "IO-like or String-like argument required."
-      end
-    end
-
-    def read_io_like(io_like)
-      begin
-        io_like.rewind if io_like.respond_to?(:rewind)
-        io_like.read
-      ensure
-        io_like.rewind if io_like.respond_to?(:rewind)
-      end
-    end
-
     def args
       [ space_id, content_id ]
     end

data/lib/duracloud/version.rb

@@ -1,3 +1,3 @@
 module Duracloud
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/fixtures/lorem_ipsum.txt

@@ -0,0 +1 @@
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse in placerat sapien, quis vestibulum lectus. Cras ut vestibulum dolor. Nunc nunc urna, laoreet vitae lacinia at, cursus non lectus. Sed non orci feugiat, ullamcorper lacus non, gravida felis. Duis posuere dictum mi, id vehicula turpis ullamcorper eu. Nam egestas quam vel ultrices pharetra. Maecenas sollicitudin fermentum massa eu tincidunt. Nunc mollis metus in lorem aliquam, quis mattis leo condimentum.

data/spec/unit/audit_log_spec.rb

@@ -1,7 +1,7 @@
 module Duracloud
   RSpec.describe AuditLog do
 
-    let(:tsv) { File.read(File.join(File.expand_path('../../fixtures/audit_log.tsv', __FILE__))) }
+    let(:tsv) { File.read(File.expand_path('../../fixtures/audit_log.tsv', __FILE__)) }
 
     before {
       allow(subject).to receive(:tsv) { tsv }

data/spec/unit/bit_integrity_report_spec.rb

@@ -1,7 +1,7 @@
 module Duracloud
   RSpec.describe BitIntegrityReport do
 
-    let(:tsv) { File.read(File.join(File.expand_path('../../fixtures/bit_integrity_report.tsv', __FILE__))) }
+    let(:tsv) { File.read(File.expand_path('../../fixtures/bit_integrity_report.tsv', __FILE__)) }
 
     before {
       allow(subject).to receive(:tsv) { tsv }

data/spec/unit/content_spec.rb

@@ -88,6 +88,18 @@ module Duracloud
           end
         end
       end
+      describe "when the body is a file" do
+        let(:path) { File.expand_path('../../fixtures/lorem_ipsum.txt', __FILE__) }
+        let(:file) { File.new(path, "rb") }
+        before {
+          stub_request(:put, url).with(body: File.read(path))
+            .to_return(status: 201)
+        }
+        it "stores the file content" do
+          subject.body = file
+          subject.save
+        end
+      end
     end
 
     describe "#delete" do

data/spec/unit/manifest_spec.rb

@@ -1,7 +1,7 @@
 module Duracloud
   RSpec.describe Manifest do
 
-    let(:tsv) { File.read(File.join(File.expand_path('../../fixtures/manifest.tsv', __FILE__))) }
+    let(:tsv) { File.read(File.expand_path('../../fixtures/manifest.tsv', __FILE__)) }
 
     before {
       allow(subject).to receive(:tsv) { tsv }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duracloud-client
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - David Chandek-Stark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-27 00:00:00.000000000 Z
+date: 2016-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -180,6 +180,7 @@ files:
 - lib/duracloud/version.rb
 - spec/fixtures/audit_log.tsv
 - spec/fixtures/bit_integrity_report.tsv
+- spec/fixtures/lorem_ipsum.txt
 - spec/fixtures/manifest.tsv
 - spec/spec_helper.rb
 - spec/unit/audit_log_spec.rb
@@ -218,6 +219,7 @@ summary: Ruby client for communicating with DuraCloud
 test_files:
 - spec/fixtures/audit_log.tsv
 - spec/fixtures/bit_integrity_report.tsv
+- spec/fixtures/lorem_ipsum.txt
 - spec/fixtures/manifest.tsv
 - spec/spec_helper.rb
 - spec/unit/audit_log_spec.rb