solr_wrapper 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2b6e62bcacc07ce12d539a363e03a8ba2085182
-  data.tar.gz: cd34f5d47c88c8ad1b2c17aaab715399b942bcdc
+  metadata.gz: 46083a390cb490449cea481a9ea8b3e994d0ad5f
+  data.tar.gz: be741be5a4f756ed77ea3a689dc7b74daa8fdedc
 SHA512:
-  metadata.gz: 27633dca7e0813c4cc0f3b2ffdc4669af52d927f12039be3ecc0431445e91166d1f2552e7c8829f8fe0b5efab6d59e23d95168f1124e16321ffb41e0bee40cc8
-  data.tar.gz: 7a3ebf96abce2e38db1af4f0612e22e4364797229f750866fbbc714e0f5771d790bee8e89660e85e0f4fe00939b9670c86f10edf3e653c1f62ae6499e2577187
+  metadata.gz: 278a2fbd55ade0e57220c315a82d7dc403583821e6692393b41edea331e9aafe7d48a8e9847fa76cc87911aa9c41adf79241a5572dea5ac49829b6cca31d5f9f
+  data.tar.gz: 3de884dae0e77ca16d8eab23a45b6e159282e87ad3a8c4a373e1a5c376abbf68d370f031acce31c39c40e56734e2326ece54ae4c75cc6d1e8565b92ef194b7cc

data/lib/solr_wrapper.rb

@@ -4,10 +4,11 @@ require 'solr_wrapper/settings'
 require 'solr_wrapper/md5'
 require 'solr_wrapper/downloader'
 require 'solr_wrapper/instance'
+require 'solr_wrapper/client'
 
 module SolrWrapper
   def self.default_solr_version
-    '6.0.1'
+    '6.1.0'
   end
 
   def self.default_solr_port

data/lib/solr_wrapper/client.rb

@@ -0,0 +1,36 @@
+require 'faraday'
+require 'json'
+
+module SolrWrapper
+  # Solr REST API client to get status information
+  class Client
+    attr_reader :url
+
+    def initialize(url)
+      @url = url
+    end
+
+    # Check if a core or collection exists
+    def exists?(core_or_collection_name)
+      collection?(core_or_collection_name) || core?(core_or_collection_name)
+    end
+
+    private
+
+    def collection?(name)
+      response = conn.get('admin/collections?action=LIST&wt=json')
+      data = JSON.parse(response.body)
+      return if data['error'] && data['error']['msg'] == 'Solr instance is not running in SolrCloud mode.'
+      data['collections'].include? name
+    end
+
+    def core?(name)
+      response = conn.get('admin/cores?action=STATUS&wt=json&core=' + name)
+      !JSON.parse(response.body)['status'][name].empty?
+    end
+
+    def conn
+      @conn ||= Faraday.new(url: url)
+    end
+  end
+end

data/lib/solr_wrapper/instance.rb

@@ -147,6 +147,10 @@ module SolrWrapper
       create_options[:c] = options[:name] if options[:name]
       create_options[:n] = options[:config_name] if options[:config_name]
       create_options[:d] = options[:dir] if options[:dir]
+
+      # short-circuit if we're using persisted data with an existing core/collection
+      return if options[:persist] && create_options[:c] && client.exists?(create_options[:c])
+
       exec("create", create_options)
 
       options[:name]
@@ -381,6 +385,10 @@ module SolrWrapper
       "#{config.zookeeper_host}:#{config.zookeeper_port}" if config.cloud
     end
 
+    def client
+      SolrWrapper::Client.new(url)
+    end
+
     def raise_error_unless_extracted
       raise RuntimeError, "there is no solr instance at #{config.instance_dir}.  Run SolrWrapper.extract first." unless extracted?
     end

data/lib/solr_wrapper/settings.rb

@@ -1,4 +1,5 @@
 require 'delegate'
+require 'faraday'
 
 module SolrWrapper
   # Configuraton that comes from static and dynamic sources.
@@ -108,15 +109,26 @@ module SolrWrapper
         @download_dir
       end
 
-
       def default_download_url
         @default_url ||= begin
           json = open(static_config.mirror_url).read
           doc = JSON.parse(json)
-          doc['preferred'] + doc['path_info']
+          url = doc['preferred'] + doc['path_info']
+
+          response = Faraday.head(url)
+
+          if response.success?
+            url
+          else
+            archive_download_url
+          end
         end
-      rescue SocketError
-        "http://www.us.apache.org/dist/lucene/solr/#{static_config.version}/solr-#{static_config.version}.zip"
+      rescue SocketError, Faraday::Error
+        archive_download_url
+      end
+
+      def archive_download_url
+        "http://archive.apache.org/dist/lucene/solr/#{static_config.version}/solr-#{static_config.version}.zip"
       end
 
       def random_open_port

data/lib/solr_wrapper/version.rb

@@ -1,3 +1,3 @@
 module SolrWrapper
-  VERSION = '0.12.1'
+  VERSION = '0.13.0'
 end

data/solr_wrapper.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "faraday"
   spec.add_dependency "rubyzip"
   spec.add_dependency "ruby-progressbar"
 
@@ -27,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "simple_solr_client"
   spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "fakeweb"
 end

data/spec/lib/solr_wrapper/client_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe SolrWrapper::Client do
+  subject { described_class.new('http://localhost:8983/solr/') }
+
+  describe '#exists?' do
+    it 'checks if a solrcloud collection exists' do
+      FakeWeb.register_uri(:get, 'http://localhost:8983/solr/admin/collections?action=LIST&wt=json', body: '{ "collections": ["x", "y", "z"]}')
+      FakeWeb.register_uri(:get, 'http://localhost:8983/solr/admin/cores?action=STATUS&wt=json&core=a', body: '{ "status": { "a": {} } }')
+
+      expect(subject.exists?('x')).to eq true
+      expect(subject.exists?('a')).to eq false
+    end
+
+    it 'checks if a solr core exists' do
+      FakeWeb.register_uri(:get, 'http://localhost:8983/solr/admin/collections?action=LIST&wt=json', body: '{ "error": { "msg": "Solr instance is not running in SolrCloud mode."} }')
+
+      FakeWeb.register_uri(:get, 'http://localhost:8983/solr/admin/cores?action=STATUS&wt=json&core=x', body: '{ "status": { "x": { "name": "x" } } }')
+      FakeWeb.register_uri(:get, 'http://localhost:8983/solr/admin/cores?action=STATUS&wt=json&core=a', body: '{ "status": { "a": {} } }')
+
+      expect(subject.exists?('x')).to eq true
+      expect(subject.exists?('a')).to eq false
+    end
+  end
+end

data/spec/lib/solr_wrapper/instance_spec.rb

@@ -42,6 +42,35 @@ describe SolrWrapper::Instance do
         expect(solr_instance).not_to receive(:delete)
         solr_instance.with_collection(name: 'project-development', dir: 'solr/config/', persist: true) {}
       end
+
+      describe 'single solr node' do
+        it 'allows persistent collection on restart' do
+          subject.wrap do |solr|
+            solr.with_collection(name: 'solr-node-persistent-core', dir: File.join(FIXTURES_DIR, 'basic_configs'), persist: true) {}
+          end
+
+          subject.wrap do |solr|
+            solr.with_collection(name: 'solr-node-persistent-core', dir: File.join(FIXTURES_DIR, 'basic_configs'), persist: true) {}
+            solr.delete 'solr-node-persistent-core'
+          end
+        end
+      end
+
+      describe 'solr cloud' do
+        let(:options) { { cloud: true } }
+
+        it 'allows persistent collection on restart' do
+          subject.wrap do |solr|
+            config_name = solr.upconfig dir: File.join(FIXTURES_DIR, 'basic_configs')
+            solr.with_collection(name: 'solr-cloud-persistent-collection', config_name: config_name, persist: true) {}
+          end
+
+          subject.wrap do |solr|
+            solr.with_collection(name: 'solr-cloud-persistent-collection', persist: true) {}
+            solr.delete 'solr-cloud-persistent-collection'
+          end
+        end
+      end
     end
   end
 
@@ -123,7 +152,7 @@ describe SolrWrapper::Instance do
 
   describe "#version" do
     subject { solr_instance.version }
-    it { is_expected.to eq '6.0.1' }
+    it { is_expected.to eq '6.1.0' }
   end
 
   describe "#md5" do

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'solr_wrapper'
 require 'simple_solr_client'
 
 require 'rspec'
+require 'fakeweb'
 
 FIXTURES_DIR = File.expand_path("fixtures", File.dirname(__FILE__))
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: solr_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-31 00:00:00.000000000 Z
+date: 2016-06-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  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'
 description: 
 email:
 - chris@cbeer.info
@@ -129,6 +157,7 @@ files:
 - coveralls.yml
 - exe/solr_wrapper
 - lib/solr_wrapper.rb
+- lib/solr_wrapper/client.rb
 - lib/solr_wrapper/configuration.rb
 - lib/solr_wrapper/downloader.rb
 - lib/solr_wrapper/instance.rb
@@ -147,6 +176,7 @@ files:
 - spec/fixtures/basic_configs/stopwords.txt
 - spec/fixtures/basic_configs/synonyms.txt
 - spec/fixtures/sample_config.yml
+- spec/lib/solr_wrapper/client_spec.rb
 - spec/lib/solr_wrapper/configuration_spec.rb
 - spec/lib/solr_wrapper/instance_spec.rb
 - spec/lib/solr_wrapper_spec.rb
@@ -171,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Solr 5 service wrapper
@@ -185,7 +215,9 @@ test_files:
 - spec/fixtures/basic_configs/stopwords.txt
 - spec/fixtures/basic_configs/synonyms.txt
 - spec/fixtures/sample_config.yml
+- spec/lib/solr_wrapper/client_spec.rb
 - spec/lib/solr_wrapper/configuration_spec.rb
 - spec/lib/solr_wrapper/instance_spec.rb
 - spec/lib/solr_wrapper_spec.rb
 - spec/spec_helper.rb
+has_rdoc: