rubydora 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f135092fa34c604d6cb3d8f32550fa05ad6c9cf0
-  data.tar.gz: 410e8527aff25c3cbd0af821feddb16e2e80b577
+SHA256:
+  metadata.gz: 283e07c7b8a3559fce167acad996756d217405f3463579795f6c8a6c6f535add
+  data.tar.gz: 5d61c1d7484ceb91828f5fa913dca3d727b0070f9679a2dc8ac3a500d8e9d407
 SHA512:
-  metadata.gz: 161d6e64dcf7ce12b490c215eb6d5c33609e526596a91dd0777f7d4c681c2a49435f2b4f04b307ff5701cfa47c0d3ee4fd385b58ef94fa12d93a302a76bc5097
-  data.tar.gz: b872044de36daf6c140e4b10caaa884a2408b06c2b10f9318fa0afb6ab05e8c83324268076401cac4cd012ef61ef4d8b3864eceb506a4061cc7411f3de86fd51
+  metadata.gz: 1691f6d6d653812b34d8fe683b5aa527e9f56f3d12b3acd14325ced70f3b386856d2678f48ae2cb5a3f3f158d53870a915f28beba5bfc111eebec96a547d20cf
+  data.tar.gz: 8b4f090c7b293a38ed49841af0532a4d87ab839f492ab659e2607f96ac3c36ffc77999984fb8d3d4d30b33e50bf4f7fb78bf753e22465dcf452a3a33da53a5c9

data/.travis.yml

@@ -1,11 +1,19 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.1.10
-  - 2.2.5
-  - 2.3.1
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
+
 jdk:
   - oraclejdk8
+
+matrix:
+  include:
+    - rvm: 2.5.1
+      env: ACTIVEMODEL_VERSION=5.1.6
+    - rvm: 2.2.10
+      env: ACTIVEMODEL_VERSION=4.2.10
 env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true

data/Gemfile

@@ -1,7 +1,12 @@
 source "https://rubygems.org"
 
+if ENV['ACTIVEMODEL_VERSION']
+  gem 'activemodel', ENV['ACTIVEMODEL_VERSION']
+end
 gemspec
 
 gem 'jruby-openssl', :platform => :jruby
-gem 'activesupport', '< 5' if RUBY_VERSION < '2.2.2'
+
+# We can remove this when we upgrade rspec.
+# See https://github.com/ruby/rake/issues/116
 gem 'rake', '< 12'

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.1.0

data/lib/rubydora/datastream.rb

@@ -387,7 +387,7 @@ module Rubydora
       @profile = nil
       @datastream_content = nil
       @content = nil
-      @changed_attributes = {}
+      clear_attribute_changes(DS_ATTRIBUTES.keys)
     end
 
     # repository reference from the digital object

data/lib/rubydora/digital_object.rb

@@ -198,7 +198,7 @@ module Rubydora
           p = to_api_params
           unless p.empty?
             mod_time = repository.modify_object p.merge(:pid => pid)
-            changed_attributes.clear
+            clear_changes_information
           end
         end
       end
@@ -206,7 +206,7 @@ module Rubydora
       # mod_time will be nil on new objects with no ds changes
       unless mod_time.nil?
         self.lastModifiedDate = mod_time
-        changed_attributes.delete 'lastModifiedDate'
+        clear_attribute_changes(['lastModifiedDate'])
       end
       self
     end

data/lib/rubydora/rest_api_client.rb

@@ -309,6 +309,7 @@ module Rubydora
       dsid = query_options.delete(:dsid)
       method = query_options.delete(:method)
       method ||= :get
+      request_headers = query_options.delete(:headers) || {}
       raise self.class.name + "#datastream_dissemination requires a DSID" unless dsid
       if block_given?
         resource = safe_subresource(datastream_content_url(pid, dsid, query_options), :block_response => block_response)
@@ -317,7 +318,7 @@ module Rubydora
       end
       val = nil
       benchmark "Loaded datastream content #{pid}/#{dsid}", :level=>:debug do
-        val = resource.send(method)
+        val = resource.send(method, request_headers)
       end
       val
     rescue Exception => exception

data/rubydora.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'equivalent-xml'
   s.add_dependency 'mime-types'
   s.add_dependency 'activesupport'
-  s.add_dependency 'activemodel'
+  s.add_dependency 'activemodel', '>= 4.2.10'
   s.add_dependency 'hooks', '~> 0.3'
   s.add_dependency 'deprecation'
 

data/spec/lib/rest_api_client_spec.rb

@@ -216,9 +216,15 @@ describe Rubydora::RestApiClient do
     end
   end
 
-  it "datastream_dissemination" do
-    RestClient::Request.should_receive(:execute).with(hash_including(:url => base_url + "/" + datastream_content_url('mypid', 'aaa')))
-    @mock_repository.datastream_dissemination :pid => 'mypid', :dsid => 'aaa'
+  describe "datastream_dissemination" do
+    it "works without request headers" do
+      RestClient::Request.should_receive(:execute).with(hash_including(:url => base_url + "/" + datastream_content_url('mypid', 'aaa')))
+      @mock_repository.datastream_dissemination :pid => 'mypid', :dsid => 'aaa'
+    end
+    it "works with request headers" do
+      RestClient::Request.should_receive(:execute).with(hash_including(:url => base_url + "/" + datastream_content_url('mypid', 'aaa'), :headers => {'Bat-Man' => 'Forever'}))
+      @mock_repository.datastream_dissemination :pid => 'mypid', :dsid => 'aaa', :headers => {'Bat-Man' => 'Forever'}
+    end
   end
   it "should allow http methods besides GET on datastream_dissemination" do
     RestClient::Request.should_receive(:execute).with(hash_including(:method => :head))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubydora
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2018-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.10
 - !ruby/object:Gem::Dependency
   name: hooks
   requirement: !ruby/object:Gem::Requirement
@@ -288,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.1
 signing_key: 
 specification_version: 4
 summary: Fedora Commons REST API ruby library