solr_wrapper 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02e09a40b71a00bd7d2d4781cfbc997755b05f7e
-  data.tar.gz: 6172a2f652b6fd0b731f7f9f7ca71dd28a190807
+  metadata.gz: 5611bbe18707e3c1151ebc12b5534beddaaf2bbf
+  data.tar.gz: 4ff113c6e11117820fcfce18c8314c2a1c9d5714
 SHA512:
-  metadata.gz: 29cc339f0a9e697345e832a03b1927e8f3749d7039d168f60cc7f13bed1920b94677a6821f8913b5c5faf39c84a45e39d0ca5a1ece16de23eb2bf8d82d956113
-  data.tar.gz: 451b5c6f30a7b3265abe2ee8ad117598497001b0b2deb8da31d0141c14633aa9b380e6358a18a4b06d233bf5925d97e353e9ab943944372315ed466e113f99b6
+  metadata.gz: 57e9df554289cddd628c8b3a87926119821fd7ca66c41ab4444208b409df33663142b4d787df79bf7116b8280458e77e5fe5e4e7fd28615d98ad0914df6730e9
+  data.tar.gz: c9d28c85027dc87f57b584190e4a2257cb2af14df5cf5cd3825e10a9eed98955f8509e565238b42dc02c99de01092e276736bf628c76ee176d42a0769a7ee91e

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
@@ -80,25 +80,28 @@ module SolrWrapper
 
     private
 
-      def read_config
-        default_configuration_paths = ['.solr_wrapper', '~/.solr_wrapper']
+      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
 
-        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"
+        unless config_file
+          $stdout.puts "No config specified" if verbose
+          return {}
         end
+
+        $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
+        config.each_with_object({}) { |(k, v), h| h[k.to_sym] = v.to_s }
+      end
+
+      def default_configuration_paths
+        ['.solr_wrapper', '~/.solr_wrapper']
       end
   end
 end

data/lib/solr_wrapper/version.rb

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

data/spec/fixtures/sample_config.yml

@@ -0,0 +1 @@
+port: 9999

data/spec/lib/solr_wrapper/configuration_spec.rb

@@ -21,4 +21,15 @@ 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
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solr_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-03-18 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.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Solr 5 service wrapper
@@ -183,7 +184,9 @@ 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: