rubydora 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd98e937d5d4111adfe04d29ff9222f04e350e2e
-  data.tar.gz: 112cb370a7149ba0421f145b099652a86a1b3ff0
+  metadata.gz: d68bb2a59b1fdc8fde14dca5e6a8c3f570d1beb5
+  data.tar.gz: e7d55248a5428826c53434e045f9b916584ea37e
 SHA512:
-  metadata.gz: 40f19e1bf21b91c1340b1bf240b200624853e450a6f84f31ba092de3ef951d9ed44743ae76636a128031a8538078a56e0b13d074bbbd8fba2d62e959a414b41c
-  data.tar.gz: ff8ac5c951403577be066a384edc28ef44fefd75ed162dcb9b468940cbaf0b9b16cdfaaa472107dff230d2684eb9650efe940a777556d5579af60166f530034f
+  metadata.gz: 0306cd415381d6925ccb5e4b2175b9404269a991d8d808df4b1d8ce235c17d54e9c82e0c22a86bd30b5a682e5ec67025b5b0ed7e04368da5a6e4fcc8d6cf33ba
+  data.tar.gz: 5062367721f76db12c88c62e2981665e40720a49c3fa233becf914e3d406a93a2b63dd313e4af543a688994f30b8954c07df16588a3b39cfaf7ca3f1b4a6fea4

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1
 
 gemfile:
   - gemfiles/gemfile.rails3

data/VERSION

@@ -1 +1 @@
-1.8.0
+1.8.1

data/lib/rubydora/datastream.rb

@@ -226,11 +226,14 @@ module Rubydora
     # @param [Integer] from (bytes) the starting point you want to return. 
     # 
     def stream (from = 0, length = nil)
-      raise "Can't determine dsSize" unless dsSize
-      length = dsSize - from unless length
       counter = 0
       Enumerator.new do |blk|
         repository.datastream_dissemination(:pid => pid, :dsid => dsid) do |response|
+          unless length
+            size = external? ? entity_size(response) : dsSize
+            raise "Can't determine content length" unless size
+            length = size - from
+          end
           response.read_body do |chunk|
             last_counter = counter
             counter += chunk.size
@@ -303,11 +306,14 @@ module Rubydora
       check_if_read_only
       run_callbacks :save do
         raise RubydoraError.new("Unable to save #{self.inspect} without content") unless has_content?
-        return create if new?
-        p = repository.modify_datastream(to_api_params.merge({ :pid => pid, :dsid => dsid })) || {}
-        reset_profile_attributes
-        self.profile= p unless p.empty?
-        self.class.new(digital_object, dsid, @options)
+        if new?
+          create 
+        else
+          p = repository.modify_datastream(to_api_params.merge({ :pid => pid, :dsid => dsid })) || {}
+          reset_profile_attributes
+          self.profile= p unless p.empty?
+          self.class.new(digital_object, dsid, @options)
+        end
       end
     end
 
@@ -409,5 +415,13 @@ module Rubydora
       check_if_read_only
       super
     end
+
+    def entity_size(response)
+      if content_length = response.headers[:content_length]
+        return content_length.to_i
+      end
+      response.body.length
+    end
+
   end
 end

data/spec/lib/datastream_spec.rb

@@ -27,45 +27,65 @@ describe Rubydora::Datastream do
     before do
       stub_response = double
       stub_response.stub(:read_body).and_yield("one1").and_yield('two2').and_yield('thre').and_yield('four')
+      allow(stub_response).to receive(:headers) { {content_length: "16"} }
       @mock_api.should_receive(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_yield(stub_response) 
-      prof = <<-XML
-        <datastreamProfile>
-          <dsSize>16</dsSize>
-        </datastreamProfile>
-      XML
       subject.profile = Rubydora::ProfileParser.parse_datastream_profile(prof)
     end
-    it "should send the whole thing" do
-      e = subject.stream()
-      result = ''
-      e.each do |blk|
-        result << blk
+    shared_examples "a streamable datastream" do
+      it "should send the whole thing" do
+        e = subject.stream()
+        result = ''
+        e.each do |blk|
+          result << blk
+        end
+        result.should == 'one1two2threfour'
       end
-      result.should == 'one1two2threfour'
-    end
-    it "should send the whole thing when the range is open ended" do
-      e = subject.stream(0)
-      result = ''
-      e.each do |blk|
-        result << blk
+      it "should send the whole thing when the range is open ended" do
+        e = subject.stream(0)
+        result = ''
+        e.each do |blk|
+          result << blk
+        end
+        result.should == 'one1two2threfour'
+      end
+      it "should get a range not starting at the beginning" do
+        e = subject.stream(3, 13)
+        result = ''
+        e.each do |blk|
+          result << blk
+        end
+        result.should == '1two2threfour'
+      end
+      it "should get a range not ending at the end" do
+        e = subject.stream(4, 8)
+        result = ''
+        e.each do |blk|
+          result << blk
+        end
+        result.should == 'two2thre'
       end
-      result.should == 'one1two2threfour'
     end
-    it "should get a range not starting at the beginning" do
-      e = subject.stream(3, 13)
-      result = ''
-      e.each do |blk|
-        result << blk
+    describe "default" do
+      let(:prof) do
+        <<-XML
+        <datastreamProfile>
+          <dsSize>16</dsSize>
+        </datastreamProfile>
+        XML
       end
-      result.should == '1two2threfour'
+      it_behaves_like "a streamable datastream"
     end
-    it "should get a range not ending at the end" do
-      e = subject.stream(4, 8)
-      result = ''
-      e.each do |blk|
-        result << blk
+    describe "controlGroup 'E'" do
+      let(:prof) do
+        <<-XML
+        <datastreamProfile>
+          <dsSize>0</dsSize>
+          <dsLocation>file:/path/to/some/file</dsLocation>
+          <dsControlGroup>E</dsControlGroup>
+        </datastreamProfile>
+        XML
       end
-      result.should == 'two2thre'
+      it_behaves_like "a streamable datastream"
     end
   end
 
@@ -837,5 +857,60 @@ describe Rubydora::Datastream do
       @datastream.url.should == "http://example.org/foo/content"
     end
   end
+
+  describe "callbacks" do
+    before(:all) do
+      class MyDatastream < Rubydora::Datastream
+        before_save :before_save_callback
+        def before_save_callback; end
+
+        after_save :after_save_callback
+        def after_save_callback; end
+
+        before_create :before_create_callback
+        def before_create_callback; end
+
+        after_create :after_create_callback
+        def after_create_callback; end
+      end
+    end
+
+    before(:each) { @datastream = MyDatastream.new @mock_object, 'dsid' }
+
+    after(:all) do
+      Object.send(:remove_const, :MyDatastream)
+    end
+    
+    describe "saving new datastream" do
+      before do
+        allow(@mock_api).to receive(:add_datastream).with(hash_including(:content => 'content', :pid => 'pid', :dsid => 'dsid', :controlGroup => 'M', :dsState => 'A')) { {} }
+      end
+      it "should fire save and create callbacks" do
+        @datastream = MyDatastream.new @mock_object, 'dsid'
+        expect(@datastream).to receive(:before_save_callback)
+        expect(@datastream).to receive(:after_save_callback)
+        expect(@datastream).to receive(:before_create_callback)
+        expect(@datastream).to receive(:after_create_callback)
+        @datastream.content = 'content'
+        @datastream.stub(:profile => {})
+        @datastream.save
+      end
+    end
+    describe "saving persisted datastream" do
+      before do
+        allow(@mock_api).to receive(:modify_datastream).with(hash_including(:content => 'content', :pid => 'pid', :dsid => 'dsid')) { {} }
+      end
+      it "should fire only save callbacks" do
+        expect(@datastream).to receive(:before_save_callback)
+        expect(@datastream).to receive(:after_save_callback)
+        expect(@datastream).not_to receive(:before_create_callback)
+        expect(@datastream).not_to receive(:after_create_callback)
+        @datastream.content = 'content'
+        @datastream.stub(:profile => {dsLabel: "label"})
+        @datastream.save
+      end
+    end
+  end
+
 end
 

data/spec/lib/rest_api_client_spec.rb

@@ -9,7 +9,6 @@ describe Rubydora::RestApiClient do
   end
   class MockRepository
     include Rubydora::RestApiClient
-    include Loggable
 
     attr_accessor :config
   end

data/spec/spec_helper.rb

@@ -11,7 +11,6 @@ if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.9/
 end
 
 require 'rspec/autorun'
-require 'loggable'
 require 'rubydora'
 require 'webmock/rspec'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubydora
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv