active-fedora 8.4.2 → 8.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a785fa56e5709791afe64fc36b3eaf3f51fd5557
-  data.tar.gz: a4871a6e43d779bdfea81e96726532131d8bde9f
+  metadata.gz: 4974eb96df12d79e7d11f6fe3597c3dfb95fe017
+  data.tar.gz: b562792daabda45401cc1a203c426df2e3b75d62
 SHA512:
-  metadata.gz: 54a6209639d2a5f51d1d41b0478b5a712d8eeec86fb1358ff7ea5e567ae4ecc18a8e5c325c3f4fafff26277b0de3e472e61a84c235278cec783a8808fdd181b6
-  data.tar.gz: 086cbeb31c69b9c61ab31dd4750588dee86442f82fff454de9c096bc3f5aac7ef3f3d558f861aca90fd73d669731845c2f57275de0615141b36386f6ef561875
+  metadata.gz: 3653cf10baf9e0b68f500dff5feb7a7d38b0651159fb1a8f5493dbe68e20bb1b79d58eb53944c43a800ea47ed5d46fec7b144211149c7496048471df8f1d8def
+  data.tar.gz: adbd259ede621a91f344cceb56ed3e0f73ae37b9202ec91186d2b7bf8c079f723cf7a56589625da99c6a39cb7ef440b416d658ffbd1875593fcb144da786bf21

data/.travis.yml

@@ -1,14 +1,19 @@
 language: ruby
 rvm:
-  - 2.3.1
-
+  - 2.5.1
 
 matrix:
   include:
-    - rvm: 2.2.5
-      env: RAILS_VERSION=4.2.7.1
+    - rvm: 2.5.1
+      env: RAILS_VERSION=5.2.0
+    - rvm: 2.4.4
+      env: RAILS_VERSION=5.1.6
+    - rvm: 2.3.7
+      env: RAILS_VERSION=5.0.7
+    - rvm: 2.2.10
+      env: RAILS_VERSION=4.2.10
     - rvm: 2.1.10
-      env: RAILS_VERSION=4.2.7.1
+      env: RAILS_VERSION=4.2.10
 
 env:
   global:

data/active-fedora.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rsolr', ">= 1.0.11", '< 3'
   s.add_dependency 'om', '~> 3.1'
   s.add_dependency 'nom-xml', '>= 0.5.1'
-  s.add_dependency "activesupport", '>= 3.0.0'
+  s.add_dependency "activesupport", '>= 4.2.10'
   s.add_dependency "rubydora", '>= 1.8.0', '< 3'
   s.add_dependency "active-triples", '~> 0.4.0'
   s.add_dependency "rdf-rdfxml", '~> 1.1'

data/lib/active_fedora/attributes.rb

@@ -11,7 +11,7 @@ module ActiveFedora
       after_save :clear_changed_attributes
       def clear_changed_attributes
         @previously_changed = changes
-        @changed_attributes.clear
+        clear_attribute_changes(changes.keys)
       end
     end
 

data/lib/active_fedora/datastreams/nokogiri_datastreams.rb

@@ -66,16 +66,16 @@ module ActiveFedora
       
       # don't want content eagerly loaded by proxy, so implementing methods that would be implemented by define_attribute_methods 
       def ng_xml_will_change!
-        changed_attributes['ng_xml'] = nil
+        attributes_changed_by_setter[:ng_xml] = nil
       end
 
       def ng_xml_doesnt_change!
-        changed_attributes.delete('ng_xml')
+        clear_attribute_changes([:ng_xml])
       end
       
       # don't want content eagerly loaded by proxy, so implementing methods that would be implemented by define_attribute_methods 
       def ng_xml_changed?
-        changed_attributes.has_key? 'ng_xml'
+        changed_attributes.has_key? :ng_xml
       end
 
       def datastream_content

data/lib/active_fedora/om_datastream.rb

@@ -6,7 +6,11 @@ module ActiveFedora
     before_save do
       if content.blank?
         ActiveFedora::Base.logger.warn "Cowardly refusing to save a datastream with empty content: #{self.inspect}" if ActiveFedora::Base.logger
-        false
+        if ActiveSupport.version >= Gem::Version.new('5.0')
+          throw(:abort)
+        else
+          false
+        end
       end
     end
 
@@ -295,5 +299,10 @@ module ActiveFedora
       end
     end
 
+    def reset_profile_attributes
+      super
+      clear_attribute_changes([:ng_xml])
+    end
+
   end
 end

data/lib/active_fedora/rdf/rdf_datastream.rb

@@ -39,7 +39,11 @@ module ActiveFedora
     before_save do
       if content.blank?
         ActiveFedora::Base.logger.warn "Cowardly refusing to save a datastream with empty content: #{self.inspect}" if ActiveFedora::Base.logger
-        false
+        if ActiveSupport.version >= Gem::Version.new('5.0')
+          throw(:abort)
+        else
+          false
+        end
       end
     end
 

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "8.4.2"
+  VERSION = "8.5.0"
 end

data/spec/support/an_active_model.rb

@@ -10,6 +10,11 @@ shared_examples_for "An ActiveModel" do
   def assert_kind_of(klass, inspected_object)
     expect(inspected_object).to be_kind_of(klass)
   end
+
+  def assert_respond_to(obj, meth, msg = nil)
+    expect(obj).to respond_to meth
+  end
+
   include ActiveModel::Lint::Tests
 
   ActiveModel::Lint::Tests.public_instance_methods.map{|m| m.to_s}.grep(/^test/).each do |m|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 8.4.2
+  version: 8.5.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-13 00:00:00.000000000 Z
+date: 2018-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -66,14 +66,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.2.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.2.10
 - !ruby/object:Gem::Dependency
   name: rubydora
   requirement: !ruby/object:Gem::Requirement
@@ -563,7 +563,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.