solr_wrapper 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3991dd503c5902e6012328a4663edff78f669fbf
-  data.tar.gz: 7d17c2fcc21fa1e370a4903c393de8b3ae207f76
+  metadata.gz: 58da2cf39d47b880c7b1b3adbf446cb9e5d3dece
+  data.tar.gz: c1603b745a74afc2ab39a9ac8fd48954a17c51e3
 SHA512:
-  metadata.gz: 650abf178f6f41be0f6a96c01699edbdee09a82d6bcca41223ce0c185524bc0d59ec549c669232abab75e85ce187bdb03acf759f94033b0fb2cdd2071b0e1a99
-  data.tar.gz: 29f4b23edfee5ee869b1626c0f88775468106dff2ae5a2059ef1d805cc3d7f03e76d9c285f9e0822583026190160db0d1ae8a361745b8b45a599e70d01f35e1a
+  metadata.gz: 15233b1419a26bb1914d1826e4f5dcf46044c50a48a0d5693b05af257e7163bca147253ee4c9ee7565afbeec9b65a7d5e22790fddd41e1d01b09f00e8673c8a3
+  data.tar.gz: 9bd88c7b5fffb1f84ef5024cab91be4daf30732e30345fbec3eb7597f2048e233bcac6d5933c7122923b79020890b9f6f81ba59db2b0d2d76a862816f28fa7b3

data/lib/solr_wrapper/checksum_validator.rb

@@ -2,20 +2,18 @@ module SolrWrapper
   class ChecksumValidator
     attr_reader :config
 
-    ALGORITHM = 'sha1'
-
     def initialize(config)
       @config = config
     end
 
     def clean!
-      path = checksum_path(ALGORITHM)
+      path = checksum_path(algorithm)
       FileUtils.remove_entry(path) if File.exist? path
     end
 
     def validate?(file)
       return true if config.validate == false
-      Digest.const_get(ALGORITHM.upcase).file(file).hexdigest == expected_sum(ALGORITHM)
+      Digest.const_get(algorithm.upcase).file(file).hexdigest == expected_sum(algorithm)
     end
 
     def validate!(file)
@@ -53,5 +51,12 @@ module SolrWrapper
         end
         path
       end
+
+      def algorithm
+        return config.static_config.algorithm if config.static_config.algorithm
+        return 'sha1' if config.static_config.version =~ /^[1-6]/ || config.static_config.version =~ /^[7]\.[0-4]/
+
+        'sha512'
+      end
   end
 end

data/lib/solr_wrapper/configuration.rb

@@ -31,6 +31,10 @@ module SolrWrapper
       options[:checksum]
     end
 
+    def algorithm
+      options[:algorithm]
+    end
+
     def url
       options[:url]
     end

data/lib/solr_wrapper/version.rb

@@ -1,3 +1,3 @@
 module SolrWrapper
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

data/spec/lib/solr_wrapper/instance_spec.rb

@@ -83,7 +83,8 @@ describe SolrWrapper::Instance do
           solr.downconfig name: config_name, dir: dir
         end
         solr.with_collection(config_name: config_name) do |collection_name|
-          core = client.core(collection_name)
+          core_name = client.cores.select { |x| x =~ /^#{collection_name}/ }.first
+          core = client.core(core_name)
           unless defined? JRUBY_VERSION
             expect(core.all.size).to eq 0
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solr_wrapper
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-27 00:00:00.000000000 Z
+date: 2018-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday