elastic_record 0.6.6 → 0.6.8

data/Gemfile

@@ -1,3 +1,5 @@
 source :rubygems
 gemspec
+
 gem 'rake'
+gem 'fakeweb'

data/elastic_record.gemspec

@@ -2,7 +2,7 @@
  
 Gem::Specification.new do |s|
   s.name = 'elastic_record'
-  s.version = '0.6.6'
+  s.version = '0.6.8'
   s.summary = 'Use Elastic Search with your objects'
   s.description = 'Find your records with elastic search'
 
@@ -20,4 +20,4 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'arelastic'
   s.add_dependency 'activemodel'
-end
+end

data/lib/elastic_record/connection.rb

@@ -1,13 +1,13 @@
 require 'net/http'
 
 module ElasticRecord
-  class Connection
-    # :timeout: 10
-    # :retries: 2
-    # :auto_discovery: false
+  class ConnectionError < StandardError
+  end
 
+  class Connection
     attr_accessor :servers, :options
     attr_accessor :request_count, :current_server
+    attr_accessor :max_request_count
     def initialize(servers, options = {})
       if servers.is_a?(Array)
         self.servers = servers
@@ -17,6 +17,7 @@ module ElasticRecord
 
       self.current_server = choose_server
       self.request_count = 0
+      self.max_request_count = 100
       self.options = options
     end
 
@@ -45,7 +46,7 @@ module ElasticRecord
       response = http_request(method, path, body)
 
       json = ActiveSupport::JSON.decode response.body
-      raise json['error'] if json['error']
+      raise ConnectionError.new(json['error']) if json['error']
 
       json
     end
@@ -61,11 +62,12 @@ module ElasticRecord
     def http_request(method, path, body = nil)
       request = METHODS[method].new(path)
       request.body = body
+      http = new_http
 
       ActiveSupport::Notifications.instrument("request.elastic_record") do |payload|
-        payload[:method]      = method
-        payload[:request_uri] = path
-        payload[:response]    = http.request(request)
+        payload[:http]      = http
+        payload[:request]   = request
+        payload[:response]  = http.request(request)
       end
     end
 
@@ -74,10 +76,10 @@ module ElasticRecord
         servers.sample
       end
 
-      def http
+      def new_http
         self.request_count += 1
 
-        if request_count > 100
+        if request_count > max_request_count{}
           self.current_server = choose_server
           self.request_count = 0
         end

data/lib/elastic_record/log_subscriber.rb

@@ -1,9 +1,14 @@
 module ElasticRecord
   class LogSubscriber < ActiveSupport::LogSubscriber
     def request(event)
-      response = event.payload[:response]
-      debug "#{event.payload[:method].to_s.upcase} #{event.payload[:request_uri]} (%.1fms)" % [event.duration] 
-      # info "--> %d %s %d (%.1fms)" % [response.code, response.message, response.body.to_s.length, event.duration]
+      payload = event.payload
+      request_log = "#{payload[:request].method} #{payload[:http].address}:#{payload[:http].port}#{payload[:request].path}"
+
+      if payload[:request].body
+        request_log << " '#{payload[:request].body}'"
+      end
+
+      debug "(%.1fms) #{request_log}" % [event.duration]
     end
 
     # def logger

data/lib/elastic_record/tasks/index.rake

@@ -59,7 +59,7 @@ namespace :index do
       end
 
       logger.info "  Reindexing into #{index_name}"
-      model.find_in_batches do |records|
+      model.find_in_batches(batch_size: 100) do |records|
         model.elastic_index.bulk_add(records, index_name)
       end
 

data/test/elastic_record/connection_test.rb

@@ -5,4 +5,38 @@ class ElasticRecord::ConnectionTest < MiniTest::Spec
     assert_equal ['foo', 'bar'], ElasticRecord::Connection.new('foo,bar').servers
     assert_equal ['foo', 'bar'], ElasticRecord::Connection.new(['foo', 'bar']).servers
   end
+
+  def test_head
+    FakeWeb.register_uri(:head, %r[/success], status: ["200", "OK"])
+    assert_equal "200", connection.head("/success")
+
+    FakeWeb.register_uri(:head, %r[/failure], status: ["404", "Not Found"])
+    assert_equal "404", connection.head("/failure")
+  end
+
+  def test_json_requests
+    expected = {'foo' => 'bar'}
+    FakeWeb.register_uri(:any, %r[/test], status: ["200", "OK"], body: ActiveSupport::JSON.encode(expected))
+
+    assert_equal expected, connection.json_delete("/test")
+    assert_equal expected, connection.json_get("/test")
+    assert_equal expected, connection.json_post("/test")
+    assert_equal expected, connection.json_put("/test")
+  end
+
+  def test_json_request_with_error
+    response_json = {'error' => 'Doing it wrong'}
+    FakeWeb.register_uri(:get, %r[/error], status: ["404", "Not Found"], body: ActiveSupport::JSON.encode(response_json))
+
+    error = assert_raises ElasticRecord::ConnectionError do
+      connection.json_get("/error")
+    end
+
+    assert_equal 'Doing it wrong', error.message
+  end
+
+  private
+    def connection
+      ElasticRecord::Connection.new(ElasticRecord::Config.servers)
+    end
 end

data/test/elastic_record/log_subscriber_test.rb

@@ -16,12 +16,13 @@ class ElasticRecord::LogSubscriberTest < ActiveSupport::TestCase
   # end
 
   def test_request_notification
-    Widget.elastic_connection.head "/widgets"
+    FakeWeb.register_uri(:any, %r[/test], status: ["200", "OK"], body: ActiveSupport::JSON.encode('the' => 'response'))
+    Widget.elastic_connection.json_get "/test", {'foo' => 'bar'}
 
     wait
 
-    assert_equal 1, @logger.logged(:info).size
-    assert_match "HEAD /widgets", @logger.logged(:info)[0]
-    # assert_match(/\-\-\> 200 200 33/, @logger.logged(:info)[1])
+    assert_equal 1, @logger.logged(:debug).size
+    assert_match /GET (.*)test/, @logger.logged(:debug)[0]
+    assert_match %r['#{ActiveSupport::JSON.encode('foo' => 'bar')}'], @logger.logged(:debug)[0]
   end
 end

data/test/helper.rb

@@ -6,7 +6,13 @@ require 'minitest/autorun'
 require 'support/widget'
 require 'support/connect'
 
+FakeWeb.allow_net_connect = %r[^https?://127.0.0.1]
+
 module MiniTest
   class Spec
+    def setup
+      super
+      FakeWeb.clean_registry
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_record
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-19 00:00:00.000000000 Z
+date: 2012-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arelastic