elastic_record 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35228738d6b8875529106acd57dee54d4492725b
-  data.tar.gz: 5290db2983590a68dbecad15428f8d5286087c6c
+  metadata.gz: 6cafcc9bf248f805f94ae803aa56c68f5fc98fd4
+  data.tar.gz: 9a35cccb819ffa8d12dca1a46ebdd83196857184
 SHA512:
-  metadata.gz: f4e7fb32dd4c5a2dff74347ba348e6f7a7ec86660971f5316d336446bd343618938239dac1940ad456a9baa3bba0a0a48f524b889ac083c01fb45a2012aa633f
-  data.tar.gz: 3c955ea6ed44496b97ad7ee4d92aa5764e3ff50d0c11c999f7582a6197970eed98d2f829d6ab54424f3b428c7331541307b647eeed30ce67a2176b8dad3d4601
+  metadata.gz: de0b6cc1b50121db62927f58561b7e7f5f06251ef1250c6e91c30824aeff21c10edc5419f3e989fd028a0f4ad8023ccbe938538986fb77f2b1d11640d3440aa2
+  data.tar.gz: 101e114d54c18f9f0d04264e68191ed07b62415116ecda1c26c7428a82abad7b97a8f81e3f9bebbdb03101e0ede8230c7d0a1b3eec0098d23710cb6d21501f76

data/elastic_record.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'elastic_record'
-  s.version = '1.3.0'
+  s.version = '1.3.1'
   s.summary = 'Use Elastic Search with your objects'
   s.description = 'Find your records with elastic search'
 

data/lib/elastic_record/config.rb

@@ -2,8 +2,6 @@ require 'active_support/core_ext/class/attribute'
 
 module ElasticRecord
   class Config
-    class_attribute :servers
-
     class_attribute :connection_options
     self.connection_options = {}
 
@@ -18,9 +16,41 @@ module ElasticRecord
         @models ||= model_names.map { |model_name| model_name.constantize }
       end
 
+      def servers
+        @servers
+      end
+
+      def servers=(values)
+        unless values.is_a?(Array)
+          values = values.split(',')
+        end
+        @servers = values
+      end
+
       def settings=(settings)
         self.servers = settings['servers']
-        self.connection_options = settings['options']
+
+        if settings['options']
+          warn("**************************************",
+            "elasticsearch.yml/:options is deprecated. For example, the following:",
+            "development:",
+            "  servers: 127.0.0.1:9200",
+            "  options:",
+            "    timeout: 10",
+            "    retries: 2",
+            "",
+            "becomes:",
+            "",
+            "development:",
+            "  servers: 127.0.0.1:9200",
+            "  timeout: 10",
+            "  retries: 2",
+            "**************************************")
+          self.connection_options = settings['options']
+        else
+          self.connection_options = settings
+        end
+
         if scroll_keep_alive = settings['scroll_keep_alive'].presence
           self.scroll_keep_alive = scroll_keep_alive
         end

data/lib/elastic_record/railtie.rb

@@ -7,7 +7,8 @@ module ElasticRecord
     initializer "elastic_record.config" do |app|
       pathname = Rails.root.join('config', 'elasticsearch.yml')
       if pathname.exist?
-        config = YAML.load(pathname.read)
+        config = ERB.new(pathname.read).result
+        config = YAML.load(config)
 
         if config = config[Rails.env]
           ElasticRecord::Config.settings = config

data/test/elastic_record/config_test.rb

@@ -11,7 +11,24 @@ class ElasticRecord::ConfigTest < MiniTest::Unit::TestCase
     assert_equal [Warehouse, Widget], ElasticRecord::Config.models
   end
 
-  def test_settings
-    
+  def test_servers
+    with_servers ['abc.com', 'xyz.com'] do
+      assert_equal ['abc.com', 'xyz.com'], ElasticRecord::Config.servers
+    end
+
+    with_servers 'abc.com,xyz.com' do
+      assert_equal ['abc.com', 'xyz.com'], ElasticRecord::Config.servers
+    end
   end
+
+
+  private
+
+    def with_servers(values)
+      original = ElasticRecord::Config.servers
+      ElasticRecord::Config.servers = values
+      yield
+    ensure
+      ElasticRecord::Config.servers = original
+    end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_record
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Infogroup
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arelastic