solr_wrapper 0.23.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97965764f9ff8aa0d2d5a1fbffa2b7c055035dde
-  data.tar.gz: 6bedb619fab3f16e6eecae2285aa75b8c0971491
+  metadata.gz: '092270d968ea024833bc6185caf854c05c8e623e'
+  data.tar.gz: 83d3dd71ca0de7c18ee9090a06ff051b174dbf4a
 SHA512:
-  metadata.gz: e92a5c190dc5341f7f43d2f832cd9bed1ddc5304ce15d9c6300919517e8b89b4c458d37bd8e85d9f4c49905f2a585d221a8c03195a2f17592f263f735691e9ac
-  data.tar.gz: cb358c689526083d2f7e9e6e2c8ce525f751d74d47fbc6a3a4957dcd765306f085fcd5619765a6558ec40fae3e73acc71cc3107a865dfb598bc6780cc750e058
+  metadata.gz: c4da5d83939b7d10b089d4453b79fb778aa499809cbd114d634fe8e7e790a21896c73320055fa43d3682559768fcb5729f2062bde7ab1ee9beeb92e967c1cf50
+  data.tar.gz: c7373e52dcd5520e541947655b1e95c6fcd53e9ccf7b356d7bf2efa37f60bb36555508451bc46546c92b3b1899859040453072802e54ba9fd59238fed106553d

data/.travis.yml

@@ -1,12 +1,13 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.2.5
-  - 2.3.1
-  - jruby-9.1.0.0
-cache:
-  directories:
-  - /tmp/solr-5.4.1
+  - 2.4.1
+  - 2.3.4
+  - jruby-9.1.8.0
 
 jdk:
-  - oraclejdk8
+  - oraclejdk8
+
+env:
+  global:
+    JRUBY_OPTS=-J-Xmx2g

data/lib/solr_wrapper.rb

@@ -8,7 +8,7 @@ require 'solr_wrapper/client'
 
 module SolrWrapper
   def self.default_solr_version
-    '6.5.0'
+    'latest'
   end
 
   def self.default_solr_port

data/lib/solr_wrapper/configuration.rb

@@ -1,3 +1,5 @@
+require 'faraday'
+
 module SolrWrapper
   class Configuration
     attr_reader :options
@@ -77,7 +79,14 @@ module SolrWrapper
     end
 
     def version
-      @version ||= options.fetch(:version, SolrWrapper.default_instance_options[:version])
+      @version ||= begin
+        config_version = options.fetch(:version, SolrWrapper.default_instance_options[:version])
+        if config_version == 'latest'
+          fetch_latest_version
+        else
+          config_version
+        end
+      end
     end
 
     def mirror_url
@@ -145,5 +154,10 @@ module SolrWrapper
       def default_configuration_paths
         ['~/.solr_wrapper.yml', '~/.solr_wrapper', '.solr_wrapper.yml', '.solr_wrapper']
       end
+
+      def fetch_latest_version
+        response = Faraday.get('https://svn.apache.org/repos/asf/lucene/cms/trunk/content/latestversion.mdtext')
+        response.body.strip
+      end
   end
 end

data/lib/solr_wrapper/version.rb

@@ -1,3 +1,3 @@
 module SolrWrapper
-  VERSION = '0.23.0'
+  VERSION = '1.0.0'
 end

data/solr_wrapper.gemspec

@@ -28,5 +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"
+  spec.add_development_dependency "webmock"
 end

data/spec/lib/solr_wrapper/client_spec.rb

@@ -5,18 +5,18 @@ describe SolrWrapper::Client do
 
   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": {} } }')
+      stub_request(:get, 'http://localhost:8983/solr/admin/collections?action=LIST&wt=json').to_return(body: '{ "collections": ["x", "y", "z"]}')
+      stub_request(:get, 'http://localhost:8983/solr/admin/cores?action=STATUS&wt=json&core=a').to_return(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."} }')
+      stub_request(:get, 'http://localhost:8983/solr/admin/collections?action=LIST&wt=json').to_return(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": {} } }')
+      stub_request(:get, 'http://localhost:8983/solr/admin/cores?action=STATUS&wt=json&core=x').to_return(body: '{ "status": { "x": { "name": "x" } } }')
+      stub_request(:get, 'http://localhost:8983/solr/admin/cores?action=STATUS&wt=json&core=a').to_return(body: '{ "status": { "a": {} } }')
 
       expect(subject.exists?('x')).to eq true
       expect(subject.exists?('a')).to eq false

data/spec/lib/solr_wrapper/configuration_spec.rb

@@ -61,4 +61,26 @@ describe SolrWrapper::Configuration do
       expect(config.configsets).to include(name: 'project-development-configset', dir: 'solr/config/')
     end
   end
+
+  describe '#version' do
+    context 'when it is a version number' do
+      let(:options) { { version: 'x.y.z' } }
+
+      it 'uses that version' do
+        expect(config.version).to eq 'x.y.z'
+      end
+    end
+
+    context 'when it is "latest"' do
+      let(:options) { { version: 'latest'} }
+
+      before do
+        stub_request(:get, 'https://svn.apache.org/repos/asf/lucene/cms/trunk/content/latestversion.mdtext').to_return(body: 'z.y.x')
+      end
+
+      it 'fetches the latest version number from apache' do
+        expect(config.version).to eq 'z.y.x'
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -5,7 +5,9 @@ require 'solr_wrapper'
 require 'simple_solr_client'
 
 require 'rspec'
-require 'fakeweb'
+require 'webmock/rspec'
+
+WebMock.allow_net_connect!
 
 FIXTURES_DIR = File.expand_path("fixtures", File.dirname(__FILE__))
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solr_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-27 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fakeweb
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Solr 5 service wrapper