solr_wrapper 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76ae78f988ac44da700258433749f9af21e295c2
-  data.tar.gz: 17465fcf5dfddc6e79cb77e79daaefbe758285b9
+  metadata.gz: 26e84bf462a67bf41bcc28be718464861ce482d8
+  data.tar.gz: c38874bc575bfe27d3481ea5e6b61d8f9da28ca1
 SHA512:
-  metadata.gz: acd8180341d4acee240a201be0d85919b5ff5725388b43c8a24f0d9753147f495a094515d7a7b356215d1e1f84d1fdd667c9f27aab107169cbc548cd7a473d7b
-  data.tar.gz: 672f9d286d56d2ec8a2b77076b998a385b8de8e27ec85575d2f15d709ada04c14f862217ed79bfee1a74f6f023a8e3c9706da4c16c573d9a0b1033234d452afb
+  metadata.gz: 28ade5c8d559625c6d584202ecdd9ce5ca0bc55d2e49fe3bfe3480629df45e766311986cf8d0a1ba80d2f1b3826094c18014c8e2dd3e754702067391d726846f
+  data.tar.gz: fc164fb6434984bd6c6f05964a2755b08c71c303480542dea0da5149dc0c3e60d79eb61c74afaafb8aa44a591baba8a728bb4420f34ca91055918b7ee38c064a

data/.travis.yml

@@ -1,8 +1,12 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.2.0
+  - 2.2.4
+  - 2.3.0
   - jruby-9.0.1.0
 cache:
   directories:
-  - /tmp/solr-5.1.0
+  - /tmp/solr-5.4.1
+
+jdk:
+  - oraclejdk8

data/lib/solr_wrapper/configuration.rb

@@ -3,8 +3,8 @@ module SolrWrapper
     attr_reader :options
 
     def initialize(options)
-      @options = options
-      read_config
+      @options = read_config(options[:config], options[:verbose])
+             .merge options
     end
 
     def solr_xml
@@ -35,7 +35,7 @@ module SolrWrapper
       # Check if the port option has been explicitly set to nil.
       # this means to start solr wrapper on a random open port
       return nil if options.key?(:port) && !options[:port]
-      options[:port] || SolrWrapper.default_instance_options[:port]
+      options.fetch(:port) { SolrWrapper.default_instance_options[:port] }.to_s
     end
 
     def download_path
@@ -78,27 +78,43 @@ module SolrWrapper
       options[:version_file]
     end
 
+    def collection_options
+      hash = options.fetch(:collection, {})
+      Configuration.slice(convert_keys(hash), :name, :dir)
+    end
+
     private
 
-      def read_config
-        default_configuration_paths = ['.solr_wrapper', '~/.solr_wrapper']
+      def self.slice(source, *keys)
+        keys.each_with_object({}) { |k, hash| hash[k] = source[k] if source.has_key?(k) }
+      end
+
+      def read_config(config_file, verbose)
         default_configuration_paths.each do |p|
           path = File.expand_path(p)
-          options[:config] ||= path if File.exist? path
+          config_file ||= path if File.exist? path
+        end
+
+        unless config_file
+          $stdout.puts "No config specified" if verbose
+          return {}
         end
 
-        if options[:config]
-          $stdout.puts "Loading configuration from #{options[:config]}" if verbose?
-          config = YAML.load(ERB.new(IO.read(options[:config])).result(binding))
-          unless config
-            $stderr.puts "Unable to parse config #{options[:config]}" if verbose?
-            return
-          end
-          collection_config = config.delete(:collection) || {}
-          @options = config.merge(options)
-        elsif verbose?
-          $stdout.puts "No config specified"
+        $stdout.puts "Loading configuration from #{config_file}" if verbose
+        config = YAML.load(ERB.new(IO.read(config_file)).result(binding))
+        unless config
+          $stderr.puts "Unable to parse config #{config_file}" if verbose
+          return {}
         end
+        convert_keys(config)
+      end
+
+      def convert_keys(hash)
+        hash.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+      end
+
+      def default_configuration_paths
+        ['.solr_wrapper', '~/.solr_wrapper']
       end
   end
 end

data/lib/solr_wrapper/downloader.rb

@@ -1,17 +1,23 @@
+require 'ruby-progressbar'
+
 module SolrWrapper
   class Downloader
     def self.fetch_with_progressbar(url, output)
-      pbar = ProgressBar.create(title: File.basename(url), total: nil, format: "%t: |%B| %p%% (%e )")
-      open(url, content_length_proc: lambda do|t|
-        if t && 0 < t
-          pbar.total = t
-        end
-      end,
-                progress_proc: lambda do|s|
-                  pbar.progress = s
-                end) do |io|
+      pbar = SafeProgressBar.new(title: File.basename(url), total: nil, format: '%t: |%B| %p%% (%e )')
+      open(url, content_length_proc: ->(bytes) { pbar.total = bytes }, progress_proc: ->(bytes) { pbar.progress = bytes }) do |io|
         IO.copy_stream(io, output)
       end
     end
+
+    class SafeProgressBar < ProgressBar::Base
+      def progress=(new_progress)
+        self.total = new_progress if total <= new_progress
+        super
+      end
+
+      def total=(new_total)
+        super if new_total && new_total > 0
+      end
+    end
   end
 end

data/lib/solr_wrapper/instance.rb

@@ -2,7 +2,6 @@ require 'digest'
 require 'fileutils'
 require 'json'
 require 'open-uri'
-require 'ruby-progressbar'
 require 'securerandom'
 require 'socket'
 require 'stringio'
@@ -146,6 +145,7 @@ module SolrWrapper
     # @option options [String] :name
     # @option options [String] :dir
     def with_collection(options = {})
+      options = config.collection_options.merge(options)
       return yield if options.empty?
 
       name = create(options)

data/lib/solr_wrapper/settings.rb

@@ -1,3 +1,5 @@
+require 'delegate'
+
 module SolrWrapper
   # Configuraton that comes from static and dynamic sources.
   class Settings < Delegator

data/lib/solr_wrapper/version.rb

@@ -1,3 +1,3 @@
 module SolrWrapper
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

data/lib/solr_wrapper.rb

@@ -7,7 +7,7 @@ require 'solr_wrapper/instance'
 
 module SolrWrapper
   def self.default_solr_version
-    '5.4.1'
+    '6.0.0'
   end
 
   def self.default_instance_options

data/spec/fixtures/sample_config.yml

@@ -0,0 +1,4 @@
+port: 9999
+collection:
+  dir: solr/config/
+  name: project-development

data/spec/lib/solr_wrapper/configuration_spec.rb

@@ -21,4 +21,24 @@ describe SolrWrapper::Configuration do
       it { is_expected.to eq '8888' }
     end
   end
+
+  describe "#read_config" do
+    before do
+      allow(config).to receive(:default_configuration_paths).and_return([])
+    end
+    let(:options) { { config: 'spec/fixtures/sample_config.yml' } }
+    it "uses values from the config file" do
+      expect(config.port).to eq '9999'
+    end
+  end
+
+  describe "#collection_options" do
+    before do
+      allow(config).to receive(:default_configuration_paths).and_return([])
+    end
+    let(:options) { { config: 'spec/fixtures/sample_config.yml' } }
+    it "uses values from the config file" do
+      expect(config.collection_options).to eq(name: 'project-development', dir: 'solr/config/')
+    end
+  end
 end

data/spec/lib/solr_wrapper/instance_spec.rb

@@ -6,17 +6,32 @@ describe SolrWrapper::Instance do
   let(:client) { SimpleSolrClient::Client.new(subject.url) }
 
   describe "#with_collection" do
-    it "creates a new anonymous collection" do
-      subject.wrap do |solr|
-        solr.with_collection(dir: File.join(FIXTURES_DIR, "basic_configs")) do |collection_name|
-          core = client.core(collection_name)
-          unless defined? JRUBY_VERSION
-            expect(core.schema.field('id').name).to eq 'id'
-            expect(core.schema.field('id').stored).to eq true
+    context "without a name" do
+      it "creates a new anonymous collection" do
+        subject.wrap do |solr|
+          solr.with_collection(dir: File.join(FIXTURES_DIR, "basic_configs")) do |collection_name|
+            core = client.core(collection_name)
+            unless defined? JRUBY_VERSION
+              expect(core.schema.field('id').name).to eq 'id'
+              expect(core.schema.field('id').stored).to eq true
+            end
           end
         end
       end
     end
+    context "with a config file" do
+      before do
+        allow(solr_instance.config).to receive(:collection_options)
+          .and_return(name: 'project-development', dir: 'solr/config/')
+        allow(solr_instance).to receive(:delete)
+      end
+
+      it "creates a new collection with options from the config" do
+        expect(solr_instance).to receive(:create).with(
+          hash_including(name: "project-development", dir: anything))
+        solr_instance.with_collection(dir: File.join(FIXTURES_DIR, "basic_configs")) {}
+      end
+    end
   end
 
   describe 'exec' do
@@ -58,7 +73,7 @@ describe SolrWrapper::Instance do
 
   describe "#version" do
     subject { solr_instance.version }
-    it { is_expected.to eq '5.4.1' }
+    it { is_expected.to eq '6.0.0' }
   end
 
   describe "#md5" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solr_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -146,6 +146,7 @@ files:
 - spec/fixtures/basic_configs/solrconfig.xml
 - spec/fixtures/basic_configs/stopwords.txt
 - spec/fixtures/basic_configs/synonyms.txt
+- spec/fixtures/sample_config.yml
 - spec/lib/solr_wrapper/configuration_spec.rb
 - spec/lib/solr_wrapper/instance_spec.rb
 - spec/lib/solr_wrapper_spec.rb
@@ -170,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Solr 5 service wrapper
@@ -183,8 +184,8 @@ test_files:
 - spec/fixtures/basic_configs/solrconfig.xml
 - spec/fixtures/basic_configs/stopwords.txt
 - spec/fixtures/basic_configs/synonyms.txt
+- spec/fixtures/sample_config.yml
 - 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: