active_fedora-datastreams 0.1.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1bd06d5a97b4fd602e01da55dabd0eb63223606b
-  data.tar.gz: 5e7b41bf053c7fdd2021af984ce0a31207bdb77c
+SHA256:
+  metadata.gz: aa947dc2634f37e84f14ccbd616c9d1e7e6590a6ca3688ab924c187d1a7bf652
+  data.tar.gz: d9de5c6aead32799f30acf90f64e1e0e7e42860cf4e3801b53dc1b4099417810
 SHA512:
-  metadata.gz: 51cb0a96ba7c135ce6454cf0b8a65b91849e8ecf0b040613a40a69628ab6c44b0cd9f4d2b14229fcb71667b4fbcc363fc7e21177cd7449073175e1f3db971062
-  data.tar.gz: 98d586bf304ed09a8c546157a44cfffb1d2db256349a97fdcc042c477f8537b95d0c5f691c6f7588a22604e5c20fe24f1dfb4dcd421220d771d74cd46da45644
+  metadata.gz: c20d66986785b7dab17021b0d46a4d507bc44429f7c6d406cfb1d5f71fd9cf126b38fd5f917acbf6ba88338ed755d2d582d31794939c8a2ed3b4056e0d30d651
+  data.tar.gz: fba2e3bc273344b15d7e6164137ed3ef76ec17fd95d72b89fd1c2c9552477d57f20dc497fd2580c7eb5334596b0cc1882ef5603fb1ec1f6179a949eacd3b60ec

data/.circleci/config.yml

@@ -0,0 +1,66 @@
+version: 2.1
+orbs:
+  samvera: samvera/circleci-orb@1
+jobs:
+  bundle_lint_test:
+    parameters:
+      ruby_version:
+        type: string
+      bundler_version:
+        type: string
+        default: 2.0.1
+      rails_version:
+        type: string
+      solr_port:
+        type: string
+        default: '8985'
+    executor:
+      name: 'samvera/ruby_fcrepo_solr'
+      ruby_version: << parameters.ruby_version >>
+      solr_version: 7-slim
+    environment:
+      RAILS_VERSION: << parameters.rails_version >>
+      SOLR_TEST_PORT: << parameters.solr_port >>
+    steps:
+      - samvera/cached_checkout
+      - checkout
+      - run:
+          name: Check for 'master' branch
+          command: |
+              git fetch --all --quiet --prune --prune-tags
+              if [[ -n "$(git branch --all --list master */master)" ]]; then
+                  echo "A branch named 'master' was found. Please remove it."
+                  echo "$(git branch --all --list master */master)"
+              fi
+              [[ -z "$(git branch --all --list master */master)" ]]
+              
+      - samvera/bundle:
+          ruby_version: << parameters.ruby_version >>
+          bundler_version: << parameters.bundler_version >>
+
+      - samvera/install_solr_core
+
+      # Skip rubocop for now
+      #- samvera/rubocop
+
+      - samvera/parallel_rspec
+
+workflows:
+  ci:
+    jobs:
+      - bundle_lint_test:
+          name: ruby2-7_rails6-0
+          ruby_version: 2.7.4
+          rails_version: 6.0.4.6
+      - bundle_lint_test:
+          name: ruby2-7_rails5-2
+          ruby_version: 2.7.4
+          rails_version: 5.2.6
+      - bundle_lint_test:
+          name: ruby2-6_rails5-2
+          ruby_version: 2.6.8
+          rails_version: 5.2.6
+      - bundle_lint_test:
+          name: ruby2-5_rails5-2
+          ruby_version: 2.5.9
+          rails_version: 5.2.6

data/.travis.yml

@@ -1,5 +1,21 @@
 sudo: false
+cache: bundler
 language: ruby
-rvm:
-  - 2.3.1
-before_install: gem install bundler -v 1.12.5
+rvm: 2.4
+matrix:
+  include:
+    - rvm: 2.3
+      env: RAILS_VERSION=4.2.10
+           BUNDLER_VERSION=1.17.3
+    - env: RAILS_VERSION=5.0.7
+    - env: RAILS_VERSION=5.1.6
+    - rvm: 2.5
+    - env: RAILS_VERSION=5.2.1
+    - rvm: 2.6
+global_env:
+  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+before_install:
+  - gem update --system
+  - if [ ! -z $BUNDLER_VERSION ]; then gem install bundler -v $BUNDLER_VERSION; else gem install bundler; fi
+before_script:
+  - jdk_switcher use oraclejdk8

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'activemodel', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
+
 # Specify your gem's dependencies in active_fedora-datastreams.gemspec
 gemspec

data/README.md

@@ -30,5 +30,8 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/active_fedora-datastreams. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+If you're working on a PR for this project, create a feature branch off of `main`.
 
+This repository follows the [Samvera Community Code of Conduct](https://samvera.atlassian.net/wiki/spaces/samvera/pages/405212316/Code+of+Conduct) and [language recommendations](https://github.com/samvera/maintenance/blob/main/templates/CONTRIBUTING.md#language).  Please ***do not*** create a branch called `master` for this repository or as part of your pull request; the branch will either need to be removed or renamed before it can be considered for inclusion in the code base and history of this repository.
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/samvera-labs/active_fedora-datastreams. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/active_fedora-datastreams.gemspec

@@ -17,15 +17,19 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "active-fedora", ">= 11.0.0.pre", "< 12"
+  spec.add_dependency "active-fedora", ">= 11.0.0.pre", "< 14"
+  spec.add_dependency "activemodel", "< 6.1" # Pin this because there are test failures with rails 6.1
   spec.add_dependency "om", "~> 3.1"
   spec.add_dependency "nom-xml", ">= 0.5.1"
   spec.add_dependency "rdf-rdfxml", '~> 2.0'
-  spec.add_development_dependency "bundler", "~> 1.12"
+  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 "solr_wrapper", "~> 0.4"
-  spec.add_development_dependency 'fcrepo_wrapper', '~> 0.2'
+  spec.add_development_dependency 'rspec_junit_formatter'
+  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"

data/config/fedora.yml

@@ -1,14 +1,14 @@
 development:
   user: fedoraAdmin
   password: fedoraAdmin
-  url: http://127.0.0.1:<%= ENV['FCREPO_DEVELOPMENT_PORT'] || 8984 %>/rest
-  base_path: /dev
+  url: http://<%= ENV['FCREPO_HOST'] || 'localhost' %>:<%= ENV['FCREPO_DEVELOPMENT_PORT'] || ENV['FCREPO_PORT'] || 8984 %>/<%= ENV['FCREPO_REST_PATH'] || 'rest' %>
+  base_path: <%= ENV['FCREPO_BASE_PATH'] || '/dev' %>
 test:
   user: fedoraAdmin
   password: fedoraAdmin
-  url: http://localhost:<%= ENV['FCREPO_TEST_PORT'] || 8986 %>/rest
-  base_path: /test
+  url: http://<%= ENV['FCREPO_HOST'] || 'localhost' %>:<%= ENV['FCREPO_TEST_PORT'] || ENV['FCREPO_PORT'] || 8986 %>/<%= ENV['FCREPO_REST_PATH'] || 'rest' %>
+  base_path: <%= ENV['FCREPO_BASE_PATH'] || '/test' %>
 production:
   user: fedoraAdmin
   password: fedoraAdmin
-  url: http://127.0.0.1:8983/fedora/rest
+  url: http://<%= ENV['FCREPO_HOST'] || 'localhost' %>:<%= ENV['FCREPO_PORT'] || 8983 %>/<%= ENV['FCREPO_REST_PATH'] || 'rest' %>

data/lib/active_fedora/datastreams/nokogiri_datastreams.rb

@@ -44,22 +44,22 @@ module ActiveFedora
       end
 
       def refresh_attributes
-        changed_attributes.clear
+        clear_attribute_changes(changes.keys)
         @ng_xml = nil
       end
 
       # 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
+        attribute_will_change!("ng_xml")
       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.key? 'ng_xml'
+        changed_attributes.include?("ng_xml")
       end
 
       def remote_content
@@ -108,7 +108,7 @@ module ActiveFedora
       end
 
       def autocreate?
-        changed_attributes.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.1.0".freeze
+    VERSION = "0.4.0".freeze
   end
 end

data/lib/active_fedora/rdf/rdf_datastream.rb

@@ -1,3 +1,5 @@
+require 'tempfile'
+
 module ActiveFedora
   class RDFDatastream < File
     include ActiveTriples::NestedAttributes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_fedora-datastreams
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2022-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -19,7 +19,7 @@ dependencies:
         version: 11.0.0.pre
     - - "<"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,21 @@ dependencies:
         version: 11.0.0.pre
     - - "<"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '14'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: om
   requirement: !ruby/object:Gem::Requirement
@@ -73,19 +87,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.12'
-  type: :development
+        version: '3.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -114,34 +128,76 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: fcrepo_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -191,6 +247,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -232,8 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Datastreams for ActiveFedora