active_fedora-datastreams 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 046d91b4b339d4a8d607e9661bb0f65920aef226fab2e4501a924b7b5ed24791
-  data.tar.gz: 9a042abf3bd4b1362e867b8a2ab306cd874bb7e7c2a7b27ec647a394d704d352
+  metadata.gz: de7b2795b6188560ce51fefd0dc438041abe196f5955ac4d91a5a3a40de97049
+  data.tar.gz: adc5f9a68f7b5706e229ada269b7e10a46f5968cc9910c6b4937bba304104b97
 SHA512:
-  metadata.gz: 47c79389f4c376ed9fcad0aaa14099c9e1b2b8d4908e0b2c8b31daa57910e064778a6b5a504b49234e554666c089e51af714241eecd172f4ab737eb502418aad
-  data.tar.gz: 54f1923d8a551b984e170f2e2128e418794486d4c4021861ef964ad4d1d5ae4690048b3f79e567a4bb1b9a5bb1d6147b0c595a5b859e5c278313ca6037cb00ab
+  metadata.gz: 9c94dd7b0b5a68467a7861535fdf01b2ce4b1ec0726e83c730ff409500f03c079038b036438aa18b1d83514f1f6457a3c0eb995df4e203f60596b34dfcb3cf20
+  data.tar.gz: 691000ced9706509f8dc720e08bc7bd7362b659d9da7d70f792d4215c67b2bf49330a02d73c80559c6cff41731d9f70f73fe043178445a17213813ccbbc2cfc9

data/.circleci/config.yml

@@ -8,7 +8,7 @@ jobs:
         type: string
       bundler_version:
         type: string
-        default: 2.0.1
+        default: 2.4.5
       rails_version:
         type: string
       solr_port:
@@ -49,19 +49,26 @@ workflows:
   ci:
     jobs:
       - bundle_lint_test:
-          name: ruby2-7_rails5-2
-          ruby_version: 2.7.4
-          rails_version: 5.2.6
+          name: ruby3-2_rails7-0
+          ruby_version: 3.2.0
+          rails_version: 7.0.4.2
       - bundle_lint_test:
-          name: ruby2-6_rails5-2
-          ruby_version: 2.6.8
-          rails_version: 5.2.6
+          name: ruby3-2_rails6-1
+          ruby_version: 3.2.0
+          rails_version: 6.1.7.2
       - bundle_lint_test:
-          name: ruby2-5_rails5-2
-          ruby_version: 2.5.9
-          rails_version: 5.2.6
+          name: ruby3-1_rails6-0
+          ruby_version: 3.1.3
+          rails_version: 6.0.6.1
       - bundle_lint_test:
-          name: ruby2-4_rails5-2
-          ruby_version: 2.4.10
-          rails_version: 5.2.6
-
+          name: ruby3-0_rails6-0
+          ruby_version: 3.0.5
+          rails_version: 6.0.6.1
+      - bundle_lint_test:
+          name: ruby2-7_rails6-0
+          ruby_version: 2.7.7
+          rails_version: 6.0.6.1
+      - bundle_lint_test:
+          name: ruby2-7_rails5-2
+          ruby_version: 2.7.7
+          rails_version: 5.2.8.1

data/.rubocop.yml

@@ -1,13 +1,14 @@
+inherit_gem:
+  bixby: bixby_default.yml
+
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.6
   DisplayCopNames: true
-  Include:
-    - '**/Rakefile'
   Exclude:
     - 'script/**/*'
     - 'vendor/**/*'
 
-Lint/HandleExceptions:
+Lint/SuppressedException:
   Exclude:
     - 'spec/unit/**/*'
     - 'spec/integration/**/*'
@@ -15,7 +16,7 @@ Lint/HandleExceptions:
 Lint/AssignmentInCondition:
   Enabled: false
 
-Metrics/LineLength:
+Layout/LineLength:
   Enabled: false
 
 Metrics/AbcSize:
@@ -38,7 +39,7 @@ Metrics/ClassLength:
 Metrics/MethodLength:
   Enabled: false
 
-Style/PredicateName:
+Naming/PredicateName:
   Exclude:
     - 'lib/active_fedora/om_datastream.rb'
 
@@ -46,11 +47,14 @@ Style/BlockDelimiters:
   Exclude:
     - 'spec/**/*'
 
-Style/BlockEndNewline:
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Layout/BlockEndNewline:
   Exclude:
     - 'spec/**/*'
 
-Style/MultilineBlockLayout:
+Layout/MultilineBlockLayout:
   Exclude:
     - 'spec/**/*'
 
@@ -62,12 +66,12 @@ Style/Lambda:
   Exclude:
     - 'spec/**/*'
     
-Style/FileName:
+Naming/FileName:
   Exclude:
     - 'spec/samples/hydra-mods_article_datastream.rb'
 
-Style/IndentationConsistency:
-  EnforcedStyle: rails
+Layout/IndentationConsistency:
+  EnforcedStyle: indented_internal_methods
 
 Style/CollectionMethods:
   PreferredMethods:
@@ -105,10 +109,7 @@ Style/SignalException:
 Rails:
   Enabled: true
 
-Rails/Date:
-  Enabled: false
-
-Rails/TimeZone:
+Rails/RakeEnvironment:
   Enabled: false
 
 RSpec/AnyInstance:
@@ -137,4 +138,4 @@ RSpec/NotToNot:
   Enabled: false
 
 RSpec/ExampleLength:
-  Enabled: false
+  Enabled: false

data/Gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'activemodel', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
+gem 'om', git: 'https://github.com/avalonmediasystem/om.git', branch: 'ruby3'
 
 # Specify your gem's dependencies in active_fedora-datastreams.gemspec
 gemspec

data/active_fedora-datastreams.gemspec

@@ -9,28 +9,28 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Justin Coyne"]
   spec.email         = ["jcoyne@justincoyne.com"]
 
-  spec.summary       = %q{Datastreams for ActiveFedora}
-  spec.description   = %q{XML and RDF datastreams for ActiveFedora}
+  spec.summary       = 'Datastreams for ActiveFedora'
+  spec.description   = 'XML and RDF datastreams for ActiveFedora'
   spec.homepage      = "https://github.com/projecthydra-labs/active_fedora-datastreams"
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "active-fedora", ">= 11.0.0.pre", "< 14"
-  spec.add_dependency "activemodel", "< 6.0" # Pin this because there are test failures with rails 6.1
+  spec.add_dependency "active-fedora", ">= 11.0.0.pre"
+  spec.add_dependency "activemodel", ">= 5.2"
   spec.add_dependency "om", "~> 3.1"
   spec.add_dependency "nom-xml", ">= 0.5.1"
-  spec.add_dependency "rdf-rdfxml", '~> 2.0'
-  spec.add_dependency "rdf", "< 3.2" # Pin this to avoid a breaking change introduced in 3.2.0
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency 'rspec_junit_formatter'
+  spec.add_dependency "rdf-rdfxml", '~> 3.2'
+  spec.add_dependency "rdf", "~> 3.2"
+  spec.add_development_dependency "bixby"
+  spec.add_development_dependency "byebug"
   spec.add_development_dependency 'coveralls'
-  spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency "solr_wrapper", "~> 2.1"
-  spec.add_development_dependency 'fcrepo_wrapper', '~> 0.9'
-  spec.add_development_dependency "rubocop", '~> 0.42'
-  spec.add_development_dependency "rubocop-rspec", '~> 1.4'
   spec.add_development_dependency "equivalent-xml"
+  spec.add_development_dependency 'fcrepo_wrapper'
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency 'rspec_junit_formatter'
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency "solr_wrapper"
 end

data/lib/active_fedora/datastreams/nokogiri_datastreams.rb

@@ -50,16 +50,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!
-        attributes_changed_by_setter['ng_xml'] = nil
+        attribute_will_change!("ng_xml")
       end
 
       def ng_xml_doesnt_change!
-        attributes_changed_by_setter.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?
-        attributes_changed_by_setter.key? 'ng_xml'
+        changed_attributes.include?("ng_xml")
       end
 
       def remote_content
@@ -108,7 +108,7 @@ module ActiveFedora
       end
 
       def autocreate?
-        attributes_changed_by_setter.key? :profile
+        changed_attributes.include? :profile
       end
 
       def xml_loaded

data/lib/active_fedora/datastreams/version.rb

@@ -1,5 +1,5 @@
 module ActiveFedora
   module Datastreams
-    VERSION = "0.3.0".freeze
+    VERSION = "0.5.0".freeze
   end
 end

data/lib/active_fedora/om_datastream.rb

@@ -59,15 +59,13 @@ module ActiveFedora
     #     </mods:name>
     #   </mods>
     def update_indexed_attributes(params = {}, _opts = {})
-      if self.class.terminology.nil?
-        raise "No terminology is set for this OmDatastream class.  Cannot perform update_indexed_attributes"
-      end
+      raise "No terminology is set for this OmDatastream class.  Cannot perform update_indexed_attributes" if self.class.terminology.nil?
       # remove any fields from params that this datastream doesn't recognize
       # make sure to make a copy of params so not to modify hash that might be passed to other methods
       current_params = params.clone
       current_params.delete_if do |term_pointer, new_values|
         if term_pointer.is_a?(String)
-          ActiveFedora::Base.logger.warn "WARNING: #{self.class.name} ignoring {#{term_pointer.inspect} => #{new_values.inspect}} because #{term_pointer.inspect} is a String (only valid OM Term Pointers will be used).  Make sure your html has the correct field_selector tags in it." if ActiveFedora::Base.logger
+          ActiveFedora::Base.logger&.warn "WARNING: #{self.class.name} ignoring {#{term_pointer.inspect} => #{new_values.inspect}} because #{term_pointer.inspect} is a String (only valid OM Term Pointers will be used).  Make sure your html has the correct field_selector tags in it."
           true
         else
           !self.class.terminology.has_term?(*OM.destringify(term_pointer))

data/lib/active_fedora/rdf/rdf_datastream.rb

@@ -47,7 +47,7 @@ module ActiveFedora
 
     before_save do
       if content.blank?
-        ActiveFedora::Base.logger.warn "Cowardly refusing to save a datastream with empty content: #{inspect}" if ActiveFedora::Base.logger
+        ActiveFedora::Base.logger&.warn "Cowardly refusing to save a datastream with empty content: #{inspect}"
         if ActiveSupport.respond_to?(:halt_callback_chains_on_return_false)
           # For Rails 5+
           throw :abort
@@ -110,7 +110,7 @@ module ActiveFedora
                                        predicate: config.predicate,
                                        class_name: config.class_name)
                       end
-                      klass.accepts_nested_attributes_for(*nested_attributes_options.keys) unless nested_attributes_options.blank?
+                      klass.accepts_nested_attributes_for(*nested_attributes_options.keys) if nested_attributes_options.present?
                       uri_stub = self.class.rdf_subject.call(self)
 
                       r = klass.new(uri_stub)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_fedora-datastreams
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Justin Coyne
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-04 00:00:00.000000000 Z
+date: 2023-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 11.0.0.pre
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,23 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 11.0.0.pre
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '14'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: om
   requirement: !ruby/object:Gem::Requirement
@@ -78,58 +72,58 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bixby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec_junit_formatter
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -143,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -157,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: fcrepo_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -171,63 +165,63 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: solr_wrapper
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: fcrepo_wrapper
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.42'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.42'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: equivalent-xml
+  name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -274,7 +268,7 @@ files:
 homepage: https://github.com/projecthydra-labs/active_fedora-datastreams
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -289,8 +283,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.4.1
+signing_key:
 specification_version: 4
 summary: Datastreams for ActiveFedora
 test_files: []