elastic_record 1.2.4 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba55aa7317d9ac4acbace9b59e95969d5759a2bf
-  data.tar.gz: 9a930c1afe32ed4195e3184854b74d07937e38f7
+  metadata.gz: 35228738d6b8875529106acd57dee54d4492725b
+  data.tar.gz: 5290db2983590a68dbecad15428f8d5286087c6c
 SHA512:
-  metadata.gz: 5d058e47f7764a219af8abafcd0efce38f0beebd18730cb99d3223b0c4a1b0801dfa1531946c505e147882004a54d3b4014b0158eb1beeeca62bc0e307ec7d74
-  data.tar.gz: 87fc7daa4404ed7fc49518e4ea0516e7b0911a49756b523b4f4342e63bb4898e6a6cfd42f14c8ade579e1385608d9864188c467993b3ac79a4852231da3bd174
+  metadata.gz: f4e7fb32dd4c5a2dff74347ba348e6f7a7ec86660971f5316d336446bd343618938239dac1940ad456a9baa3bba0a0a48f524b889ac083c01fb45a2012aa633f
+  data.tar.gz: 3c955ea6ed44496b97ad7ee4d92aa5764e3ff50d0c11c999f7582a6197970eed98d2f829d6ab54424f3b428c7331541307b647eeed30ce67a2176b8dad3d4601

data/Gemfile

@@ -2,9 +2,9 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'activerecord'
+gem 'activerecord', '~> 4.1.0'
 gem 'fakeweb'
 gem 'rake'
 
 gem 'mysql2'
-gem 'pg'
+gem 'pg'

data/elastic_record.gemspec

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

data/lib/elastic_record/config.rb

@@ -17,6 +17,14 @@ module ElasticRecord
       def models
         @models ||= model_names.map { |model_name| model_name.constantize }
       end
+
+      def settings=(settings)
+        self.servers = settings['servers']
+        self.connection_options = settings['options']
+        if scroll_keep_alive = settings['scroll_keep_alive'].presence
+          self.scroll_keep_alive = scroll_keep_alive
+        end
+      end
     end
   end
 end

data/lib/elastic_record/connection.rb

@@ -12,7 +12,7 @@ module ElasticRecord
       self.current_server     = next_server
       self.request_count      = 0
       self.max_request_count  = 100
-      self.options            = options
+      self.options            = options.symbolize_keys
       self.bulk_stack        = []
     end
 
@@ -111,4 +111,4 @@ module ElasticRecord
         end
       end
   end
-end
+end

data/lib/elastic_record/railtie.rb

@@ -4,6 +4,19 @@ module ElasticRecord
       require 'elastic_record/log_subscriber'
     end
 
+    initializer "elastic_record.config" do |app|
+      pathname = Rails.root.join('config', 'elasticsearch.yml')
+      if pathname.exist?
+        config = YAML.load(pathname.read)
+
+        if config = config[Rails.env]
+          ElasticRecord::Config.settings = config
+        else
+          raise "Missing environment #{Rails.env} in superstore.yml"
+        end
+      end
+    end
+
     rake_tasks do
       load "elastic_record/tasks/index.rake"
     end

data/test/elastic_record/config_test.rb

@@ -10,4 +10,8 @@ class ElasticRecord::ConfigTest < MiniTest::Unit::TestCase
 
     assert_equal [Warehouse, Widget], ElasticRecord::Config.models
   end
+
+  def test_settings
+    
+  end
 end

data/test/elastic_record/connection_test.rb

@@ -6,6 +6,11 @@ class ElasticRecord::ConnectionTest < MiniTest::Unit::TestCase
     assert_equal ['foo', 'bar'], ElasticRecord::Connection.new(['foo', 'bar']).servers
   end
 
+  def test_options
+    expected = {lol: 'rofl'}
+    assert_equal expected, ElasticRecord::Connection.new('foo', 'lol' => 'rofl').options
+  end
+
   def test_head
     FakeWeb.register_uri(:head, %r[/success], status: ["200", "OK"])
     assert_equal "200", connection.head("/success")
@@ -57,4 +62,4 @@ class ElasticRecord::ConnectionTest < MiniTest::Unit::TestCase
     def connection
       ElasticRecord::Connection.new(ElasticRecord::Config.servers)
     end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_record
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.0
 platform: ruby
 authors:
 - Infogroup
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arelastic
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Use Elastic Search with your objects