active-fedora 12.1.1 → 12.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39f4306f380a75205db4e89173c7640cef6f8c1cbc2206f9738f93d6d3cce02c
-  data.tar.gz: cc5a995014b8f08ab1ac7682f4000ac751329ece7170db4f114ab1017b3f6b47
+  metadata.gz: 67b87aed8ed8788a3a2fc65662dc569e0d01f49880795e88c22d120132a57245
+  data.tar.gz: dffb8c5c4286c855ba631c2f23ca7bca8c4125eaa937822b1bb5729bb49dd7e4
 SHA512:
-  metadata.gz: f292ba19b60b37d2fd884c94fb359a64f33b4fa02e9fb9e922671fdff00cf969bbefe1fc51e58f9b956c8320d7ba0b8063d47b7eaf61577c3b51ea20ecf081b8
-  data.tar.gz: 57024bf075eb041d99eb47ec20c05e1c9df7cb038d4a73b873429f286cd5a9089ca2d5af7c3fd43e2a42dcd7d783500f03a0ab33d195c422d60b4989915f7c13
+  metadata.gz: 9180480c4806e794130ffb4403dad540e88d197af319fdd709e7f2bd493dc260356eebf87cda17595152e9f2932cdc4dc66844853669af07fd5a2009bae475f3
+  data.tar.gz: 362078e96780bd6b3a69aee573e747996969e7fe3abfa119709e67f41f8f7f91be4b883058b2b3472539247d212e832518408f602ca8173024e772268734a529

data/.circleci/config.yml

@@ -6,15 +6,14 @@ jobs:
     parameters:
       ruby_version:
         type: string
-        default: 2.5.5
       bundler_version:
         type: string
-        default: '2.0.1'
+        default: 2.0.1
       rails_version:
         type: string
-        default: '5.1.6.2'
       solr_config_path:
         type: string
+        default: lib/generators/active_fedora/config/solr/templates/solr/conf
     executor:
       name: 'samvera/ruby_fcrepo_solr'
       ruby_version: << parameters.ruby_version >>
@@ -39,31 +38,26 @@ workflows:
   ci:
     jobs:
       - bundle_lint_test:
-          ruby_version: "2.3.8"
-          name: "ruby2-3-8"
-          bundler_version: '1.17.3'
-          rails_version: '4.2.11.1'
-          solr_config_path: 'lib/generators/active_fedora/config/solr/templates/solr/config'
+          name: ruby2-6_rails5-2
+          ruby_version: 2.6.3
+          rails_version: 5.2.3
       - bundle_lint_test:
-          ruby_version: "2.5.5"
-          name: "ruby2-5-5"
-          solr_config_path: 'lib/generators/active_fedora/config/solr/templates/solr/config'
+          name: ruby2-5_rails5-2
+          ruby_version: 2.5.5
+          rails_version: 5.2.3
       - bundle_lint_test:
-          ruby_version: "2.6.2"
-          name: "ruby2-6-2"
-          solr_config_path: 'lib/generators/active_fedora/config/solr/templates/solr/config'
+          name: ruby2-4_rails5-2
+          ruby_version: 2.4.6
+          rails_version: 5.2.3
       - bundle_lint_test:
-          ruby_version: "2.4.5"
-          name: "ruby2-4-5_rails5.0"
-          rails_version: '5.0.7.2'
-          solr_config_path: 'lib/generators/active_fedora/config/solr/templates/solr/config'
+          name: ruby2-6_rails5-1
+          ruby_version: 2.6.3
+          rails_version: 5.1.7
       - bundle_lint_test:
-          ruby_version: "2.4.5"
-          name: "ruby2-4-5_rails5.1"
-          rails_version: '5.1.6.2'
-          solr_config_path: 'lib/generators/active_fedora/config/solr/templates/solr/config'
+          name: ruby2-5_rails5.1
+          ruby_version: 2.5.5
+          rails_version: 5.1.7
       - bundle_lint_test:
-          ruby_version: "2.4.5"
-          name: "ruby2-4-5_rails5.2"
-          rails_version: '5.2.2.1'
-          solr_config_path: 'lib/generators/active_fedora/config/solr/templates/solr/config'
+          name: ruby2-4_rails5-1
+          ruby_version: 2.4.6
+          rails_version: 5.1.7

data/.solr_wrapper

@@ -2,5 +2,5 @@
 # version: 6.1.0
 port: 8985
 collection:
-  dir: lib/generators/active_fedora/config/solr/templates/solr/config/
+  dir: lib/generators/active_fedora/config/solr/templates/solr/conf/
   name: hydra-test

data/active-fedora.gemspec

@@ -15,7 +15,6 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '~> 2.0'
 
   s.add_dependency 'rsolr', '>= 1.1.2', '< 3'
-  s.add_dependency 'solrizer', '>= 3.4', '< 5'
   s.add_dependency "activesupport", '>= 4.2.4', '< 5.3'
   s.add_dependency "activemodel", '>= 4.2.10', '< 5.3'
   s.add_dependency "active-triples", '>= 0.11.0', '< 2.0.0'

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/indexing.rb

@@ -21,6 +21,9 @@ module ActiveFedora
       autoload :Suffix
     end
 
+    # Error to be raised for encountering unsupported field types
+    class InvalidIndexDescriptor < RuntimeError; end
+
     included do
       # Because the previous method of setting indexer was to override
       # the class method, we must ensure that we aren't using the instance

data/lib/active_fedora/indexing/descriptor.rb

@@ -9,7 +9,7 @@ module ActiveFedora
           @type_required = opts[:requires_type]
         end
         @index_type = args
-        raise Solrizer::InvalidIndexDescriptor, "Invalid index type passed to Sorizer.solr_name.  It should be an array like [:string, :indexed, :stored, :multivalued]. You provided: `#{@index_type}'" unless index_type.is_a? Array
+        raise InvalidIndexDescriptor, "Invalid index type passed.  It should be an array like [:string, :indexed, :stored, :multivalued]. You provided: `#{@index_type}'" unless index_type.is_a? Array
       end
 
       def name_and_converter(field_name, args = nil)

data/lib/active_fedora/indexing/field_mapper.rb

@@ -89,7 +89,7 @@ module ActiveFedora
               values = (results[name] ||= [])
               values << value unless value.nil? || values.include?(value)
             else
-              Solrizer.logger.warn "Setting #{name} to `#{value}', but it already had `#{results[name]}'" if results[name] && Solrizer.logger
+              Rails.logger.warn "Setting #{name} to `#{value}', but it already had `#{results[name]}'" if results[name]
               results[name] = value
             end
           end
@@ -111,7 +111,7 @@ module ActiveFedora
                        when Descriptor
                          index_type
                        else
-                         raise Solrizer::InvalidIndexDescriptor, "#{index_type.class} is not a valid indexer_type. Use a String, Symbol or Descriptor."
+                         raise InvalidIndexDescriptor, "#{index_type.class} is not a valid indexer_type. Use a String, Symbol or Descriptor."
                        end
 
           raise InvalidIndexDescriptor, "index type should be an Descriptor, you passed: #{index_type.class}" unless index_type.is_a? Descriptor

data/lib/active_fedora/indexing/suffix.rb

@@ -28,7 +28,7 @@ module ActiveFedora
       end
 
       def to_s
-        raise Solrizer::InvalidIndexDescriptor, "Missing datatype for #{@fields}" unless data_type
+        raise InvalidIndexDescriptor, "Missing datatype for #{@fields}" unless data_type
 
         field_suffix = [config.suffix_delimiter]
 
@@ -66,8 +66,10 @@ module ActiveFedora
                                                      'b'
                                                    when :long
                                                      'lt'
+                                                   when :float, :big_decimal
+                                                     'f'
                                                    else
-                                                     raise Solrizer::InvalidIndexDescriptor, "Invalid datatype `#{type.inspect}'. Must be one of: :date, :time, :text, :text_en, :string, :symbol, :integer, :boolean"
+                                                     raise InvalidIndexDescriptor, "Invalid datatype `#{type.inspect}'. Must be one of: :date, :time, :text, :text_en, :string, :symbol, :integer, :boolean"
                                                    end
                                                  end),
                                    stored_suffix: 's',

data/lib/active_fedora/rake_support.rb

@@ -16,12 +16,12 @@ def with_server(environment)
 
   SolrWrapper.wrap(load_config(:solr, environment, solr_defaults)) do |solr|
     ENV["SOLR_#{environment.upcase}_PORT"] = solr.port.to_s
-    solr_config_path = File.join('solr', 'config')
+    solr_config_path = File.join('solr', 'conf')
     # Check to see if configs exist in a path relative to the working directory
     unless Dir.exist?(solr_config_path)
       $stderr.puts "Solr configuration not found at #{solr_config_path}. Using ActiveFedora defaults"
       # Otherwise use the configs delivered with ActiveFedora.
-      solr_config_path = File.join(File.expand_path("../..", File.dirname(__FILE__)), 'lib', 'generators', 'active_fedora', 'config', 'solr', 'templates', 'solr', 'config')
+      solr_config_path = File.join(File.expand_path("../..", File.dirname(__FILE__)), 'lib', 'generators', 'active_fedora', 'config', 'solr', 'templates', 'solr', 'conf')
     end
     solr.with_collection(name: "hydra-#{environment}", dir: solr_config_path) do
       FcrepoWrapper.wrap(load_config(:fcrepo, environment, fcrepo_defaults)) do |fcrepo|

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "12.1.1".freeze
+  VERSION = "12.2.1".freeze
 end

data/lib/generators/active_fedora/config/solr/templates/.solr_wrapper.yml

@@ -4,5 +4,5 @@
 instance_dir: tmp/solr-development
 collection:
   persist: true
-  dir: solr/config/
+  dir: solr/conf/
   name: hydra-development

data/lib/generators/active_fedora/config/solr/templates/solr_wrapper_test.yml

@@ -4,5 +4,5 @@ port: 8985
 instance_dir: tmp/solr-test
 collection:
     persist: false
-    dir: solr/config
+    dir: solr/conf
     name: hydra-test

data/spec/unit/active_fedora/indexing/inserter_spec.rb

@@ -27,4 +27,9 @@ RSpec.describe ActiveFedora::Indexing::Inserter do
     described_class.create_and_insert_terms('my_name', Date.parse('2013-01-10'), [:sortable], solr_doc)
     expect(solr_doc).to eq('my_name_dti' => '2013-01-10T00:00:00Z')
   end
+
+  it "handles floating point integers" do
+    described_class.create_and_insert_terms('my_number', (6.022140857*10**23).to_f, [:displayable, :searchable], solr_doc)
+    expect(solr_doc).to eq('my_number_ssm' => ['6.0221408569999995e+23'], 'my_number_fim' => ['6.0221408569999995e+23'])
+  end
 end

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.1.1
+  version: 12.2.1
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-04 00:00:00.000000000 Z
+date: 2020-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -32,26 +32,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
-- !ruby/object:Gem::Dependency
-  name: solrizer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -574,22 +554,22 @@ files:
 - lib/generators/active_fedora/config/solr/solr_generator.rb
 - lib/generators/active_fedora/config/solr/templates/.solr_wrapper.yml
 - lib/generators/active_fedora/config/solr/templates/solr.yml
-- lib/generators/active_fedora/config/solr/templates/solr/config/_rest_managed.json
-- lib/generators/active_fedora/config/solr/templates/solr/config/admin-extra.html
-- lib/generators/active_fedora/config/solr/templates/solr/config/elevate.xml
-- lib/generators/active_fedora/config/solr/templates/solr/config/mapping-ISOLatin1Accent.txt
-- lib/generators/active_fedora/config/solr/templates/solr/config/protwords.txt
-- lib/generators/active_fedora/config/solr/templates/solr/config/schema.xml
-- lib/generators/active_fedora/config/solr/templates/solr/config/scripts.conf
-- lib/generators/active_fedora/config/solr/templates/solr/config/solrconfig.xml
-- lib/generators/active_fedora/config/solr/templates/solr/config/spellings.txt
-- lib/generators/active_fedora/config/solr/templates/solr/config/stopwords.txt
-- lib/generators/active_fedora/config/solr/templates/solr/config/stopwords_en.txt
-- lib/generators/active_fedora/config/solr/templates/solr/config/synonyms.txt
-- lib/generators/active_fedora/config/solr/templates/solr/config/xslt/example.xsl
-- lib/generators/active_fedora/config/solr/templates/solr/config/xslt/example_atom.xsl
-- lib/generators/active_fedora/config/solr/templates/solr/config/xslt/example_rss.xsl
-- lib/generators/active_fedora/config/solr/templates/solr/config/xslt/luke.xsl
+- lib/generators/active_fedora/config/solr/templates/solr/conf/_rest_managed.json
+- lib/generators/active_fedora/config/solr/templates/solr/conf/admin-extra.html
+- lib/generators/active_fedora/config/solr/templates/solr/conf/elevate.xml
+- lib/generators/active_fedora/config/solr/templates/solr/conf/mapping-ISOLatin1Accent.txt
+- lib/generators/active_fedora/config/solr/templates/solr/conf/protwords.txt
+- lib/generators/active_fedora/config/solr/templates/solr/conf/schema.xml
+- lib/generators/active_fedora/config/solr/templates/solr/conf/scripts.conf
+- lib/generators/active_fedora/config/solr/templates/solr/conf/solrconfig.xml
+- lib/generators/active_fedora/config/solr/templates/solr/conf/spellings.txt
+- lib/generators/active_fedora/config/solr/templates/solr/conf/stopwords.txt
+- lib/generators/active_fedora/config/solr/templates/solr/conf/stopwords_en.txt
+- lib/generators/active_fedora/config/solr/templates/solr/conf/synonyms.txt
+- lib/generators/active_fedora/config/solr/templates/solr/conf/xslt/example.xsl
+- lib/generators/active_fedora/config/solr/templates/solr/conf/xslt/example_atom.xsl
+- lib/generators/active_fedora/config/solr/templates/solr/conf/xslt/example_rss.xsl
+- lib/generators/active_fedora/config/solr/templates/solr/conf/xslt/luke.xsl
 - lib/generators/active_fedora/config/solr/templates/solr_wrapper_test.yml
 - lib/generators/active_fedora/model/USAGE
 - lib/generators/active_fedora/model/model_generator.rb
@@ -752,8 +732,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.