solr_wrapper 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5611bbe18707e3c1151ebc12b5534beddaaf2bbf
-  data.tar.gz: 4ff113c6e11117820fcfce18c8314c2a1c9d5714
+  metadata.gz: 8e4d41ab3bd1b628c5f948717dcf7f48d76d1106
+  data.tar.gz: 204dcf436957092b4f9e787f60ebcd3af028b390
 SHA512:
-  metadata.gz: 57e9df554289cddd628c8b3a87926119821fd7ca66c41ab4444208b409df33663142b4d787df79bf7116b8280458e77e5fe5e4e7fd28615d98ad0914df6730e9
-  data.tar.gz: c9d28c85027dc87f57b584190e4a2257cb2af14df5cf5cd3825e10a9eed98955f8509e565238b42dc02c99de01092e276736bf628c76ee176d42a0769a7ee91e
+  metadata.gz: d234f9ac3315f4a09edd69c759c174305e81ac55ff50165cffcb4a62d2a275fde28acb1c36dd500da796f24120e6ecc668ef70f130a0b9b2a003974e96673893
+  data.tar.gz: 2df041374409128b007c738f2824806bd249a3fce6a10c6400bd2da2273fbe2bb75dd63dc7848c977b57cc2b0e7c54e3b4117c485f7b519b71b99926817d389d

data/lib/solr_wrapper/configuration.rb

@@ -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,8 +78,17 @@ module SolrWrapper
       options[:version_file]
     end
 
+    def collection_options
+      hash = options.fetch(:collection, {})
+      Configuration.slice(convert_keys(hash), :name, :dir)
+    end
+
     private
 
+      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)
@@ -97,7 +106,11 @@ module SolrWrapper
           $stderr.puts "Unable to parse config #{config_file}" if verbose
           return {}
         end
-        config.each_with_object({}) { |(k, v), h| h[k.to_sym] = v.to_s }
+        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

data/lib/solr_wrapper/instance.rb

@@ -146,6 +146,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/version.rb

@@ -1,3 +1,3 @@
 module SolrWrapper
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'
 end

data/spec/fixtures/sample_config.yml

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

data/spec/lib/solr_wrapper/configuration_spec.rb

@@ -30,6 +30,15 @@ describe SolrWrapper::Configuration do
     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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solr_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip