elastic_record 0.6.3 → 0.6.4

data/elastic_record.gemspec

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

data/lib/elastic_record/connection.rb

@@ -1,3 +1,5 @@
+require 'net/http'
+
 module ElasticRecord
   class Connection
     # :timeout: 10
@@ -16,40 +18,52 @@ module ElasticRecord
     end
 
     def head(path)
-      http_request(Net::HTTP::Head, path).code
+      http_request(:head, path).code
     end
 
     def json_get(path, json = nil)
-      json_request Net::HTTP::Get, path, json
+      json_request :get, path, json
     end
 
     def json_post(path, json = nil)
-      json_request Net::HTTP::Post, path, json
+      json_request :post, path, json
     end
 
     def json_put(path, json = nil)
-      json_request Net::HTTP::Put, path, json
+      json_request :put, path, json
     end
 
     def json_delete(path, json = nil)
-      json_request Net::HTTP::Delete, path, json
+      json_request :delete, path, json
     end
 
-    def json_request(request_klass, path, json)
+    def json_request(method, path, json)
       body = json.is_a?(Hash) ? ActiveSupport::JSON.encode(json) : json
-      response = http_request(request_klass, path, body)
-      json = ActiveSupport::JSON.decode response.body
+      response = http_request(method, path, body)
 
+      json = ActiveSupport::JSON.decode response.body
       raise json['error'] if json['error']
 
       json
     end
 
-    def http_request(request_klass, path, body = nil)
-      request = request_klass.new(path)
+    METHODS = {
+      head: Net::HTTP::Head,
+      get: Net::HTTP::Get,
+      post: Net::HTTP::Post,
+      put: Net::HTTP::Put,
+      delete: Net::HTTP::Delete
+    }
+
+    def http_request(method, path, body = nil)
+      request = METHODS[method].new(path)
       request.body = body
 
-      http.request(request)
+      ActiveSupport::Notifications.instrument("request.elastic_record") do |payload|
+        payload[:method]      = method
+        payload[:request_uri] = path
+        payload[:response]    = http.request(request)
+      end
     end
 
     private

data/lib/elastic_record/log_subscriber.rb

@@ -0,0 +1,15 @@
+module ElasticRecord
+  class LogSubscriber < ActiveSupport::LogSubscriber
+    def request(event)
+      response = event.payload[:response]
+      info "#{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]
+    end
+
+    # def logger
+    #   Rails.logger
+    # end
+  end
+end
+
+ElasticRecord::LogSubscriber.attach_to :elastic_record

data/lib/elastic_record/orm/active_record.rb

@@ -1,4 +1,7 @@
 module ElasticRecord
   module ActiveRecord
+    def initialize_from_elastic_search(results)
+      
+    end
   end
 end

data/lib/elastic_record/railtie.rb

@@ -1,5 +1,11 @@
 module ElasticRecord
   class Railtie < Rails::Railtie
-    rake_tasks { load "elastic_record/tasks/index.rake" }
+    initializer 'elastic_record.require_log_subscriber' do
+      require 'elastic_record/log_subscriber'
+    end
+
+    rake_tasks do
+      load "elastic_record/tasks/index.rake"
+    end
   end
 end

data/test/elastic_record/log_subscriber_test.rb

@@ -0,0 +1,27 @@
+require "helper"
+require "active_support/log_subscriber/test_helper"
+require "elastic_record/log_subscriber"
+
+class ElasticRecord::LogSubscriberTest < ActiveSupport::TestCase
+  include ActiveSupport::LogSubscriber::TestHelper
+
+  def setup
+    super
+
+    ElasticRecord::LogSubscriber.attach_to :elastic_record
+  end
+
+  # def set_logger(logger)
+  #   ElasticRecord::Model.logger = logger
+  # end
+
+  def test_request_notification
+    Widget.elastic_connection.head "/widgets"
+
+    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])
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_record
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -66,6 +66,7 @@ files:
 - lib/elastic_record/index/manage.rb
 - lib/elastic_record/index/mapping.rb
 - lib/elastic_record/index/percolator.rb
+- lib/elastic_record/log_subscriber.rb
 - lib/elastic_record/model.rb
 - lib/elastic_record/orm/active_record.rb
 - lib/elastic_record/railtie.rb
@@ -86,6 +87,7 @@ files:
 - test/elastic_record/index/mapping_test.rb
 - test/elastic_record/index/percolator_test.rb
 - test/elastic_record/index_test.rb
+- test/elastic_record/log_subscriber_test.rb
 - test/elastic_record/model_test.rb
 - test/elastic_record/relation/batches_test.rb
 - test/elastic_record/relation/delegation_test.rb