active-fedora 12.0.2 → 12.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a7ba922e256bf6ab6c30a1fb1b429eadd7b7f789
-  data.tar.gz: 07a25b437b90dfadc943e2959795873bab912f7c
+SHA256:
+  metadata.gz: 74801c6b7c20e589016a06beb4bfb08b5cae15c8d2c9da1d3b90ba31da494b93
+  data.tar.gz: 3ba72febc4344898aedc515c07eea090bffe96748a5bab209745f0306e8cf5f9
 SHA512:
-  metadata.gz: 4913f62b406c940c6859bf453e398dce5ae5edaceed4c1a246cc2d4f70ee7535bc2bc4592990870b48297b2277b00f68560c9edd0ce09fc5562cc3cf3822f08a
-  data.tar.gz: 4288008e8df29353b7ce5e41888bc1888d458d4d77cf7822f3a9cf46a240509aaa91389d4f6f9e858e4a97b87772bc832eb9105698ffdf95f98c19e6884189e1
+  metadata.gz: 703f5492c6bf6b23c2c343d0a24039b15b2b7f02976d1603c8a49a12afc00eec10079da508e668e8dfca84bc63065e09f43b95441723326ef233d20d32489c8d
+  data.tar.gz: a0f39c00a6ef9a78c9f81fd96c364244e970a64ae8da4c706cb3052c26acfd3bf2f782bb2d0421cb1702f54176c38311081c03cc33530e0eb92411c9b3ce95e2

data/.circleci/config.yml

@@ -0,0 +1,47 @@
+version: 2.1
+orbs:
+  samvera: samvera/circleci-orb@0
+jobs:
+  bundle_lint_test:
+    parameters:
+      ruby_version:
+        type: string
+      bundler_version:
+        type: string
+        default: 1.17.3
+      rails_version:
+        type: string
+      solr_config_path:
+        type: string
+        default: lib/generators/active_fedora/config/solr/templates/solr/config
+    executor:
+      name: 'samvera/ruby_fcrepo_solr'
+      ruby_version: << parameters.ruby_version >>
+    environment:
+      RAILS_VERSION: << parameters.rails_version >>
+    steps:
+      - samvera/cached_checkout
+
+      - samvera/bundle_for_gem:
+          ruby_version: << parameters.ruby_version >>
+          bundler_version: << parameters.bundler_version >>
+          project: 'active-fedora'
+
+      - samvera/install_solr_core:
+          solr_config_path: << parameters.solr_config_path >>
+
+      - samvera/rubocop
+
+      - samvera/parallel_rspec
+
+workflows:
+  ci:
+    jobs:
+      - bundle_lint_test:
+          name: ruby2-5_rails5-1
+          ruby_version: 2.5.7
+          rails_version: 5.1.7
+      - bundle_lint_test:
+          name: ruby2-5_rails4-2
+          ruby_version: 2.5.7
+          rails_version: 4.2.8

data/Gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gemspec path: File.expand_path('..', __FILE__)
 
-gem 'byebug' unless ENV['TRAVIS']
+gem 'byebug' unless ENV['CI']
 gem 'pry-byebug' unless ENV['CI']
 
 gem 'activemodel', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
@@ -12,6 +12,7 @@ gem 'activemodel', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
 group :test do
   gem 'simplecov', require: false
   gem 'coveralls', require: false
+  gem 'rspec_junit_formatter'
 end
 
 gem 'jruby-openssl', platform: :jruby

data/active-fedora.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'faraday', '~> 0.12.1'
   s.add_dependency 'faraday-encoding', '0.0.4'
 
-  s.add_development_dependency "rails"
+  s.add_development_dependency "rails", ">= 4.2", "< 5.2"
   s.add_development_dependency "rdoc"
   s.add_development_dependency "yard"
   s.add_development_dependency "rake"

data/lib/active_fedora/file.rb

@@ -196,9 +196,7 @@ module ActiveFedora
       end
 
       def local_or_remote_content(ensure_fetch = true)
-        return @content if new_record?
-
-        @content ||= ensure_fetch ? remote_content : @ds_content
+        @content ||= ensure_fetch ? remote_content : @ds_content unless new_record?
         @content.rewind if behaves_like_io?(@content)
         @content
       end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "12.0.2".freeze
+  VERSION = "12.0.3".freeze
 end

data/spec/spec_helper.rb

@@ -13,7 +13,7 @@ require 'rspec'
 require 'rspec/its'
 require 'equivalent-xml/rspec_matchers'
 require 'logger'
-require 'pry' unless ENV['TRAVIS']
+require 'pry' unless ENV['CI']
 
 ActiveFedora::Base.logger = Logger.new(STDERR)
 ActiveFedora::Base.logger.level = Logger::WARN

data/spec/unit/file_spec.rb

@@ -192,6 +192,23 @@ describe ActiveFedora::File do
     end
   end
 
+  context 'when file is new and content behaves like io' do
+    let(:file_content) { "hello world" }
+
+    before do
+      af_file.uri = "http://localhost:8983/fedora/rest/test/1234/abcd"
+      af_file.content = StringIO.new(file_content)
+      allow(af_file).to receive(:new_record?).and_return(true)
+    end
+
+    describe "#content" do
+      it 'can be re-read' do
+        expect(af_file.content.read).to eq file_content
+        expect(af_file.content.read).to eq file_content
+      end
+    end
+  end
+
   describe "#mime_type" do
     let(:parent) { ActiveFedora::Base.create }
     before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 12.0.2
+  version: 12.0.3
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-21 00:00:00.000000000 Z
+date: 2020-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -188,14 +188,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -360,6 +366,7 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".mailmap"
@@ -367,7 +374,6 @@ files:
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".solr_wrapper"
-- ".travis.yml"
 - CONTRIBUTING.md
 - CONTRIBUTORS.md
 - Gemfile
@@ -743,8 +749,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.

data/.travis.yml

@@ -1,15 +0,0 @@
-language: ruby
-cache: bundler
-sudo: false
-rvm: 2.4.1
-matrix:
-  include:
-    - rvm: 2.3.4
-      env: "RAILS_VERSION=4.2.8"
-    - env: "RAILS_VERSION=5.1.1"
-global_env:
-  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
-before_install:
-  - gem update --system
-before_script:
-  - jdk_switcher use oraclejdk8