elasticsearch-rails 0.1.0.rc1 → 0.1.0

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in elasticsearch-rails.gemspec
 gemspec
+
+if File.exists? File.expand_path("../../elasticsearch-model", __FILE__)
+  gem 'elasticsearch-model', :path => File.expand_path("../../elasticsearch-model", __FILE__), :require => true
+end

data/README.md

@@ -10,7 +10,7 @@ The library is compatible with Ruby 1.9.3 and higher.
 
 Install the package from [Rubygems](https://rubygems.org):
 
-    gem install elasticsearch-rails --pre
+    gem install elasticsearch-rails
 
 To use an unreleased version, either add it to your `Gemfile` for [Bundler](http://bundler.io):
 
@@ -23,7 +23,58 @@ or install it from a source code checkout:
     bundle install
     rake install
 
-## Usage
+## Features
+
+### Rake Tasks
+
+To facilitate importing data from your models into Elasticsearch, require the task definition in your application,
+eg. in the `lib/tasks/elasticsearch.rake` file:
+
+```ruby
+require 'elasticsearch/rails/tasks/import'
+```
+
+To import the records from your `Article` model, run:
+
+```bash
+$ bundle exec rake environment elasticsearch:import:model CLASS='Article'
+```
+
+Run this command to display usage instructions:
+
+```bash
+$ bundle exec rake -D elasticsearch
+```
+
+### ActiveSupport Instrumentation
+
+To display information about the search request (duration, search definition) during development,
+and to include the information in the Rails log file, require the component in your `application.rb` file:
+
+```ruby
+require 'elasticsearch/rails/instrumentation'
+```
+
+You should see an output like this in your application log in development environment:
+
+    Article Search (321.3ms) { index: "articles", type: "article", body: { query: ... } }
+
+Also, the total duration of the request to Elasticsearch is displayed in the Rails request breakdown:
+
+    Completed 200 OK in 615ms (Views: 230.9ms | ActiveRecord: 0.0ms | Elasticsearch: 321.3ms)
+
+There's a special component for the [Lograge](https://github.com/roidrage/lograge) logger.
+Require the component in your `application.rb` file (and set `config.lograge.enabled`):
+
+```ruby
+require 'elasticsearch/rails/lograge'
+```
+
+You should see the duration of the request to Elasticsearch as part of each log event:
+
+    method=GET path=/search ... status=200 duration=380.89 view=99.64 db=0.00 es=279.37
+
+### Rails Application Templates
 
 You can generate a fully working example Ruby on Rails application, with an `Article` model and a search form,
 to play with (it even downloads _Elasticsearch_ itself, generates the application skeleton and leaves you with
@@ -33,8 +84,8 @@ a _Git_ repository to explore the steps and the code):
 rails new searchapp --skip --skip-bundle --template https://raw.github.com/elasticsearch/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/01-basic.rb
 ```
 
-Run the same command with the `02-pretty` template to add features such as a custom `Article.search` method,
-result highlighting and [_Bootstrap_](http://getbootstrap.com) integration:
+Run the same command again, in the same folder, with the `02-pretty` template to add features such as
+a custom `Article.search` method, result highlighting and [_Bootstrap_](http://getbootstrap.com) integration:
 
 ```bash
 rails new searchapp --skip --skip-bundle --template https://raw.github.com/elasticsearch/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/02-pretty.rb

data/elasticsearch-rails.gemspec

@@ -24,6 +24,13 @@ Gem::Specification.new do |s|
   s.add_development_dependency "bundler", "~> 1.3"
   s.add_development_dependency "rake"
 
+  s.add_development_dependency "elasticsearch-extensions"
+
+  s.add_development_dependency "oj"
+  s.add_development_dependency "rails",  "> 3.0"
+
+  s.add_development_dependency "lograge"
+
   s.add_development_dependency "shoulda-context"
   s.add_development_dependency "mocha"
   s.add_development_dependency "turn"
@@ -36,6 +43,5 @@ Gem::Specification.new do |s|
     s.add_development_dependency "simplecov"
     s.add_development_dependency "cane"
     s.add_development_dependency "require-prof"
-    s.add_development_dependency "coveralls"
   end
 end

data/lib/elasticsearch/rails/instrumentation.rb

@@ -0,0 +1,36 @@
+require 'elasticsearch/rails/instrumentation/railtie'
+require 'elasticsearch/rails/instrumentation/publishers'
+
+module Elasticsearch
+  module Rails
+
+    # This module adds support for displaying statistics about search duration in the Rails application log
+    # by integrating with the `ActiveSupport::Notifications` framework and `ActionController` logger.
+    #
+    # == Usage
+    #
+    # Require the component in your `application.rb` file:
+    #
+    #     require 'elasticsearch/rails/instrumentation'
+    #
+    # You should see an output like this in your application log in development environment:
+    #
+    #     Article Search (321.3ms) { index: "articles", type: "article", body: { query: ... } }
+    #
+    # Also, the total duration of the request to Elasticsearch is displayed in the Rails request breakdown:
+    #
+    #     Completed 200 OK in 615ms (Views: 230.9ms | ActiveRecord: 0.0ms | Elasticsearch: 321.3ms)
+    #
+    # @note The displayed duration includes the HTTP transfer -- the time it took Elasticsearch
+    #       to process your request is available in the `response.took` property.
+    #
+    # @see Elasticsearch::Rails::Instrumentation::Publishers
+    # @see Elasticsearch::Rails::Instrumentation::Railtie
+    #
+    # @see http://api.rubyonrails.org/classes/ActiveSupport/Notifications.html
+    #
+    #
+    module Instrumentation
+    end
+  end
+end

data/lib/elasticsearch/rails/instrumentation/controller_runtime.rb

@@ -0,0 +1,41 @@
+require 'active_support/core_ext/module/attr_internal'
+
+module Elasticsearch
+  module Rails
+    module Instrumentation
+
+      # Hooks into ActionController to display Elasticsearch runtime
+      #
+      # @see https://github.com/rails/rails/blob/master/activerecord/lib/active_record/railties/controller_runtime.rb
+      #
+      module ControllerRuntime
+        extend ActiveSupport::Concern
+
+        protected
+
+        attr_internal :elasticsearch_runtime
+
+        def cleanup_view_runtime
+          elasticsearch_rt_before_render = Elasticsearch::Rails::Instrumentation::LogSubscriber.reset_runtime
+          runtime = super
+          elasticsearch_rt_after_render = Elasticsearch::Rails::Instrumentation::LogSubscriber.reset_runtime
+          self.elasticsearch_runtime = elasticsearch_rt_before_render + elasticsearch_rt_after_render
+          runtime - elasticsearch_rt_after_render
+        end
+
+        def append_info_to_payload(payload)
+          super
+          payload[:elasticsearch_runtime] = (elasticsearch_runtime || 0) + Elasticsearch::Rails::Instrumentation::LogSubscriber.reset_runtime
+        end
+
+        module ClassMethods
+          def log_process_action(payload)
+            messages, elasticsearch_runtime = super, payload[:elasticsearch_runtime]
+            messages << ("Elasticsearch: %.1fms" % elasticsearch_runtime.to_f) if elasticsearch_runtime
+            messages
+          end
+        end
+      end
+    end
+  end
+end

data/lib/elasticsearch/rails/instrumentation/log_subscriber.rb

@@ -0,0 +1,41 @@
+module Elasticsearch
+  module Rails
+    module Instrumentation
+
+      # A log subscriber to attach to Elasticsearch related events
+      #
+      # @see https://github.com/rails/rails/blob/master/activerecord/lib/active_record/log_subscriber.rb
+      #
+      class LogSubscriber < ActiveSupport::LogSubscriber
+        def self.runtime=(value)
+          Thread.current["elasticsearch_runtime"] = value
+        end
+
+        def self.runtime
+          Thread.current["elasticsearch_runtime"] ||= 0
+        end
+
+        def self.reset_runtime
+          rt, self.runtime = runtime, 0
+          rt
+        end
+
+        # Intercept `search.elasticsearch` events, and display them in the Rails log
+        #
+        def search(event)
+          self.class.runtime += event.duration
+          return unless logger.debug?
+
+          payload = event.payload
+          name    = "#{payload[:klass]} #{payload[:name]} (#{event.duration.round(1)}ms)"
+          search  = payload[:search].inspect.gsub(/:(\w+)=>/, '\1: ')
+
+          debug %Q|  #{color(name, GREEN, true)} #{colorize_logging ? "\e[2m#{search}\e[0m" : search}|
+        end
+      end
+
+    end
+  end
+end
+
+Elasticsearch::Rails::Instrumentation::LogSubscriber.attach_to :elasticsearch

data/lib/elasticsearch/rails/instrumentation/publishers.rb

@@ -0,0 +1,32 @@
+module Elasticsearch
+  module Rails
+    module Instrumentation
+      module Publishers
+
+        # Wraps the `SearchRequest` methods to perform the instrumentation
+        #
+        # @see SearchRequest#execute_with_instrumentation!
+        # @see http://api.rubyonrails.org/classes/ActiveSupport/Notifications.html
+        #
+        module SearchRequest
+          extend ActiveSupport::Concern
+
+          included do
+            alias_method_chain :execute!, :instrumentation
+          end
+
+          # Wrap `Search#execute!` and perform instrumentation
+          #
+          def execute_with_instrumentation!
+            ActiveSupport::Notifications.instrument "search.elasticsearch",
+              name:   'Search',
+              klass:  (self.klass.is_a?(Elasticsearch::Model::Proxy::ClassMethodsProxy) ? self.klass.target.to_s : self.klass.to_s),
+              search: self.definition do
+              execute_without_instrumentation!
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/elasticsearch/rails/instrumentation/railtie.rb

@@ -0,0 +1,27 @@
+module Elasticsearch
+  module Rails
+    module Instrumentation
+
+      # Rails initializer class to require Elasticsearch::Rails::Instrumentation files,
+      # set up Elasticsearch::Model and hook into ActionController to display Elasticsearch-related duration
+      #
+      # @see http://edgeguides.rubyonrails.org/active_support_instrumentation.html
+      #
+      class Railtie < ::Rails::Railtie
+        initializer "elasticsearch.instrumentation" do |app|
+          require 'elasticsearch/rails/instrumentation/log_subscriber'
+          require 'elasticsearch/rails/instrumentation/controller_runtime'
+
+          Elasticsearch::Model::Searching::SearchRequest.class_eval do
+            include Elasticsearch::Rails::Instrumentation::Publishers::SearchRequest
+          end
+
+          ActiveSupport.on_load(:action_controller) do
+            include Elasticsearch::Rails::Instrumentation::ControllerRuntime
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/elasticsearch/rails/lograge.rb

@@ -0,0 +1,40 @@
+module Elasticsearch
+  module Rails
+    module Lograge
+
+      # Rails initializer class to require Elasticsearch::Rails::Instrumentation files,
+      # set up Elasticsearch::Model and add Lograge configuration to display Elasticsearch-related duration
+      #
+      # Require the component in your `application.rb` file and enable Lograge:
+      #
+      #     require 'elasticsearch/rails/lograge'
+      #
+      # You should see the full duration of the request to Elasticsearch as part of each log event:
+      #
+      #     method=GET path=/search ... status=200 duration=380.89 view=99.64 db=0.00 es=279.37
+      #
+      # @see https://github.com/roidrage/lograge
+      #
+      class Railtie < ::Rails::Railtie
+        initializer "elasticsearch.lograge" do |app|
+          require 'elasticsearch/rails/instrumentation/publishers'
+          require 'elasticsearch/rails/instrumentation/log_subscriber'
+          require 'elasticsearch/rails/instrumentation/controller_runtime'
+
+          config.lograge.custom_options = lambda do |event|
+            { es: event.payload[:elasticsearch_runtime].to_f.round(2) }
+          end
+
+          Elasticsearch::Model::Searching::SearchRequest.class_eval do
+            include Elasticsearch::Rails::Instrumentation::Publishers::SearchRequest
+          end
+
+          ActiveSupport.on_load(:action_controller) do
+            include Elasticsearch::Rails::Instrumentation::ControllerRuntime
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/elasticsearch/rails/tasks/import.rb

@@ -0,0 +1,105 @@
+# A collection of Rake tasks to facilitate importing data from yout models into Elasticsearch.
+#
+# Add this e.g. into the `lib/tasks/elasticsearch.rake` file in your Rails application:
+#
+#     require 'elasticsearch/rails/tasks/import'
+#
+# To import the records from your `Article` model, run:
+#
+#     $ bundle exec rake environment elasticsearch:import:model CLASS='MyModel'
+#
+# Run this command to display usage instructions:
+#
+#     $ bundle exec rake -D elasticsearch
+#
+STDOUT.sync = true
+STDERR.sync = true
+
+begin; require 'ansi/progressbar'; rescue LoadError; end
+
+namespace :elasticsearch do
+
+  task :import => 'import:model'
+
+  namespace :import do
+    desc <<-DESC.gsub(/    /, '')
+      Import data from your model (pass name as CLASS environment variable).
+
+        $ rake environment elasticsearch:import:model CLASS='MyModel'
+
+      Force rebuilding the index (delete and create):
+        $ rake environment elasticsearch:import:model CLASS='Article' FORCE=y
+
+      Customize the batch size:
+        $ rake environment elasticsearch:import:model CLASS='Article' BATCH=100
+
+      Set target index name:
+        $ rake environment elasticsearch:import:model CLASS='Article' INDEX='articles-new'
+    DESC
+    task :model do
+      if ENV['CLASS'].to_s == ''
+        puts '='*90, 'USAGE', '='*90, import_model_desc, ""
+        exit(1)
+      end
+
+      klass  = eval(ENV['CLASS'].to_s)
+      total  = klass.count rescue nil
+      pbar   = ANSI::Progressbar.new(klass.to_s, total) rescue nil
+      pbar.__send__ :show if pbar
+
+      unless ENV['DEBUG']
+        begin
+          klass.__elasticsearch__.client.transport.logger.level = Logger::WARN
+        rescue NoMethodError; end
+        begin
+          klass.__elasticsearch__.client.transport.tracer.level = Logger::WARN
+        rescue NoMethodError; end
+      end
+
+      klass.import force:      ENV.fetch('FORCE', false),
+                   batch_size: ENV.fetch('BATCH', 1000).to_i,
+                   index:      ENV.fetch('INDEX', nil),
+                   type:       ENV.fetch('TYPE',  nil) do |response|
+        pbar.inc response['items'].size if pbar
+        STDERR.flush
+        STDOUT.flush
+      end
+      pbar.finish if pbar
+
+      puts '[IMPORT] Done'
+    end
+
+    desc <<-DESC.gsub(/    /, '')
+      Import all indices from `app/models` (or use DIR environment variable).
+
+        $ rake environment elasticsearch:import:all DIR=app/models
+    DESC
+    task :all do
+      dir    = ENV['DIR'].to_s != '' ? ENV['DIR'] : Rails.root.join("app/models")
+
+      puts "[IMPORT] Loading models from: #{dir}"
+      Dir.glob(File.join("#{dir}/**/*.rb")).each do |path|
+        model_filename = path[/#{Regexp.escape(dir.to_s)}\/([^\.]+).rb/, 1]
+
+        next if model_filename.match(/^concerns\//i) # Skip concerns/ folder
+
+        begin
+          klass = model_filename.camelize.constantize
+        rescue NameError
+          require(path) ? retry : raise(RuntimeError, "Cannot load class '#{klass}'")
+        end
+
+        # Skip if the class doesn't have Elasticsearch integration
+        next unless klass.respond_to?(:__elasticsearch__)
+
+        puts "[IMPORT] Processing model: #{klass}..."
+
+        ENV['CLASS'] = klass.to_s
+        Rake::Task["elasticsearch:import:model"].invoke
+        puts
+      end
+    end
+
+  end
+
+end

data/lib/elasticsearch/rails/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Rails
-    VERSION = "0.1.0.rc1"
+    VERSION = "0.1.0"
   end
 end

data/lib/rails/templates/01-basic.rb

@@ -130,9 +130,9 @@ puts
 say_status  "Rubygems", "Adding Elasticsearch libraries into Gemfile...\n", :yellow
 puts        '-'*80, ''; sleep 0.75
 
-gem 'elasticsearch',       git: 'git@github.com:elasticsearch/elasticsearch-ruby.git'
-gem 'elasticsearch-model', git: 'git@github.com:elasticsearch/elasticsearch-rails.git'
-gem 'elasticsearch-rails', git: 'git@github.com:elasticsearch/elasticsearch-rails.git'
+gem 'elasticsearch',       git: 'git://github.com/elasticsearch/elasticsearch-ruby.git'
+gem 'elasticsearch-model', git: 'git://github.com/elasticsearch/elasticsearch-rails.git'
+gem 'elasticsearch-rails', git: 'git://github.com/elasticsearch/elasticsearch-rails.git'
 
 # ----- Install gems ------------------------------------------------------------------------------
 

data/test/test_helper.rb

@@ -0,0 +1,57 @@
+RUBY_1_8 = defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
+
+exit(0) if RUBY_1_8
+
+require 'simplecov' and SimpleCov.start { add_filter "/test|test_/" } if ENV["COVERAGE"]
+
+# Register `at_exit` handler for integration tests shutdown.
+# MUST be called before requiring `test/unit`.
+at_exit { Elasticsearch::Test::IntegrationTestCase.__run_at_exit_hooks }
+
+puts '-'*80
+
+require 'test/unit'
+require 'shoulda-context'
+require 'mocha/setup'
+require 'turn' unless ENV["TM_FILEPATH"] || ENV["NOTURN"] || RUBY_1_8
+
+require 'ansi'
+require 'oj'
+
+require 'rails/version'
+require 'active_record'
+require 'active_model'
+
+require 'elasticsearch/model'
+require 'elasticsearch/rails'
+
+require 'elasticsearch/extensions/test/cluster'
+require 'elasticsearch/extensions/test/startup_shutdown'
+
+module Elasticsearch
+  module Test
+    class IntegrationTestCase < ::Test::Unit::TestCase
+      extend Elasticsearch::Extensions::Test::StartupShutdown
+
+      startup  { Elasticsearch::Extensions::Test::Cluster.start(nodes: 1) if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running? }
+      shutdown { Elasticsearch::Extensions::Test::Cluster.stop if ENV['SERVER'] && started? }
+      context "IntegrationTest" do; should "noop on Ruby 1.8" do; end; end if RUBY_1_8
+
+      def setup
+        ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :database => ":memory:" )
+        logger = ::Logger.new(STDERR)
+        logger.formatter = lambda { |s, d, p, m| "#{m.ansi(:faint, :cyan)}\n" }
+        ActiveRecord::Base.logger = logger unless ENV['QUIET']
+
+        ActiveRecord::LogSubscriber.colorize_logging = false
+        ActiveRecord::Migration.verbose = false
+
+        tracer = ::Logger.new(STDERR)
+        tracer.formatter = lambda { |s, d, p, m| "#{m.gsub(/^.*$/) { |n| '   ' + n }.ansi(:faint)}\n" }
+
+        Elasticsearch::Model.client = Elasticsearch::Client.new host: "localhost:#{(ENV['TEST_CLUSTER_PORT'] || 9250)}",
+                                                                tracer: (ENV['QUIET'] ? nil : tracer)
+      end
+    end
+  end
+end

data/test/unit/instrumentation/instrumentation_test.rb

@@ -0,0 +1,61 @@
+require 'test_helper'
+
+require 'rails/railtie'
+require 'active_support/log_subscriber/test_helper'
+
+require 'elasticsearch/rails/instrumentation'
+
+class Elasticsearch::Rails::InstrumentationTest < Test::Unit::TestCase
+  include ActiveSupport::LogSubscriber::TestHelper
+
+  context "ActiveSupport::Instrumentation integration" do
+    class ::DummyInstrumentationModel
+      extend Elasticsearch::Model::Searching::ClassMethods
+
+      def self.index_name;    'foo'; end
+      def self.document_type; 'bar'; end
+    end
+
+    RESPONSE = { 'took' => '5ms', 'hits' => { 'total' => 123, 'max_score' => 456, 'hits' => [] } }
+
+    setup do
+      @search   = Elasticsearch::Model::Searching::SearchRequest.new ::DummyInstrumentationModel, '*'
+      @response = Elasticsearch::Model::Response::Response.new ::DummyInstrumentationModel, @search
+
+      @client = stub('client', search: @response)
+      DummyInstrumentationModel.stubs(:client).returns(@client)
+
+      Elasticsearch::Rails::Instrumentation::Railtie.run_initializers
+    end
+
+    should "wrap SearchRequest#execute! with instrumentation" do
+      s = Elasticsearch::Model::Searching::SearchRequest.new ::DummyInstrumentationModel, 'foo'
+      assert_respond_to s, :execute_without_instrumentation!
+      assert_respond_to s, :execute_with_instrumentation!
+    end
+
+    should "publish the notification" do
+      @query = { query: { match: { foo: 'bar' } } }
+
+      ActiveSupport::Notifications.expects(:instrument).with do |name, payload|
+        assert_equal "search.elasticsearch", name
+        assert_equal 'DummyInstrumentationModel', payload[:klass]
+        assert_equal @query, payload[:search][:body]
+      end
+
+      s = ::DummyInstrumentationModel.search @query
+      s.response
+    end
+
+    should "print the debug information to the Rails log" do
+      s = ::DummyInstrumentationModel.search query: { match: { moo: 'bam' } }
+      s.response
+
+      logged = @logger.logged(:debug).first
+
+      assert_not_nil logged
+      assert_match /DummyInstrumentationModel Search \(\d+\.\d+ms\)/,  logged
+      assert_match /body\: \{query\: \{match\: \{moo\: "bam"\}\}\}\}/, logged
+    end
+  end
+end

data/test/unit/instrumentation/lograge_test.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+
+require 'rails/railtie'
+require 'lograge'
+
+require 'elasticsearch/rails/lograge'
+
+class Elasticsearch::Rails::LogrageTest < Test::Unit::TestCase
+  context "Lograge integration" do
+    setup do
+      Elasticsearch::Rails::Lograge::Railtie.run_initializers
+    end
+
+    should "customize the Lograge configuration" do
+      assert_not_nil Elasticsearch::Rails::Lograge::Railtie.initializers
+                       .select { |i| i.name == 'elasticsearch.lograge' }
+                       .first
+    end
+  end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0.rc1
-  prerelease: 6
+  version: 0.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda-context
+  name: elasticsearch-extensions
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -76,7 +76,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: turn
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: lograge
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -92,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -108,7 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-prof
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -124,7 +140,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: turn
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -140,7 +156,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ci_reporter
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -156,7 +172,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -172,7 +188,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cane
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -188,7 +204,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: require-prof
+  name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -204,7 +220,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cane
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: require-prof
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -235,10 +283,20 @@ files:
 - Rakefile
 - elasticsearch-rails.gemspec
 - lib/elasticsearch/rails.rb
+- lib/elasticsearch/rails/instrumentation.rb
+- lib/elasticsearch/rails/instrumentation/controller_runtime.rb
+- lib/elasticsearch/rails/instrumentation/log_subscriber.rb
+- lib/elasticsearch/rails/instrumentation/publishers.rb
+- lib/elasticsearch/rails/instrumentation/railtie.rb
+- lib/elasticsearch/rails/lograge.rb
+- lib/elasticsearch/rails/tasks/import.rb
 - lib/elasticsearch/rails/version.rb
 - lib/rails/templates/01-basic.rb
 - lib/rails/templates/02-pretty.rb
 - lib/rails/templates/03-expert.rb
+- test/test_helper.rb
+- test/unit/instrumentation/instrumentation_test.rb
+- test/unit/instrumentation/lograge_test.rb
 homepage: https://github.com/elasticsearch/elasticsearch-rails/
 licenses:
 - Apache 2
@@ -256,14 +314,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby on Rails integrations for Elasticsearch.
-test_files: []
+test_files:
+- test/test_helper.rb
+- test/unit/instrumentation/instrumentation_test.rb
+- test/unit/instrumentation/lograge_test.rb
 has_rdoc: