es-elasticity 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92bedfd2fa34df6c303c9c0945ba55c7613c7a31
-  data.tar.gz: bc68cc7bd8bd36ec8d195a53df1684871b20caec
+  metadata.gz: b092a148409adc4a7e11885a4be8a235d7933dcb
+  data.tar.gz: 8049626e93cbeb9f26d5f88859fa422b6425925c
 SHA512:
-  metadata.gz: 87b00d0798444997de4c2fe057a5cd1c7bd4990a38b3cecaa78795fb0dd1a069ab3aff3311df61abfd828175e1db9f7cebb66a36007c643d68b4a4cfc883b92e
-  data.tar.gz: ea32e3c290a7ec6238fc64e43f0b2792ea259ab444ac3868eb8a9ff1944ff05c59cd2fdd1de410a9353eb91db52d98a3a8cd811d7c7751534e884628ed30deb0
+  metadata.gz: fa7dd7e2e17f990df9a65fc62ca31b7c498374e35ff95051f77747a3d41ec859eb65ecef3bf33ebd9149eadf7781f4b6d1d94cd0e7b632314f0150e8007295d6
+  data.tar.gz: ec226e57b6332ee5734a91272e3939218d7d80dc71c4eebe60d86a275eebbea0563e52ced4f5452f4bad57ef4b079ffe6fcb5b9302e354ffa7e445807386c5e9

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 2.1.1
+  - 2.0.0
+services:
+  - elasticsearch
+env:
+  global:
+    - secure: "HZa3D2GGwC6Jl062LJulbWZLTCieeBFC3FOJrArC5ul7ACGR5CEtANe0/UTnIf/Ad40p7I5VhiTdNFTcHunTbNc7Ae7dE5fOkiBHtxo/zwgpvHZK0iPvIoxsSfdcHobHeaF7NvfcXUkYUKcdRUyplHdB56eHQqYPVsah66K/4XA="

data/README.md

@@ -1,8 +1,10 @@
 # Elasticity
 
+[![Build Status](https://travis-ci.org/doximity/es-elasticity.svg)](https://travis-ci.org/doximity/es-elasticity) [![Test Coverage](https://codeclimate.com/github/doximity/es-elasticity/badges/coverage.svg)](https://codeclimate.com/github/doximity/es-elasticity) [![Code Climate](https://codeclimate.com/github/doximity/es-elasticity/badges/gpa.svg)](https://codeclimate.com/github/doximity/es-elasticity) [![Dependency Status](https://gemnasium.com/doximity/es-elasticity.svg)](https://gemnasium.com/doximity/es-elasticity)
+
 Elasticity provides a higher level abstraction on top of [elasticsearch-ruby](https://github.com/elasticsearch/elasticsearch-ruby) gem.
 
-Mainly, it provides a model-oriented approach to ElasticSearch, similar to what [ActiveRecord](https://github.com/rails/rails/tree/master/activerecord) provides to relational databases. It leverages [ActiveModel](https://github.com/rails/rails/tree/master/activemodel) to provide a familiar format for Rails developers.
+Mainly, it provides a model-oriented approach to Elasticsearch, similar to what [ActiveRecord](https://github.com/rails/rails/tree/master/activerecord) provides to relational databases. It leverages [ActiveModel](https://github.com/rails/rails/tree/master/activemodel) to provide a familiar format for Rails developers.
 
 ## Installation
 
@@ -97,25 +99,27 @@ adults.active_recors(Database::User) # => Array of Database::User instances
 
 ## Design Goals
 
-- Provide model specific for ElasticSearch documents instead of an ActiveRecord mixin;
+- Provide model specific for Elasticsearch documents instead of an ActiveRecord mixin;
 - proper separation of concerns and de-coupling;
 - lazy search evaluation and easy composition of multi-searches;
 - easy of debug;
-- higher level API that resembles ElasticSearch API;
+- higher level API that resembles Elasticsearch API;
 
 ## Roadmap
 
+- [ ] Index aliasing support
+  - [ ] Index hot swapping support
 - [ ] Use mapping instead of mappings, we wanna be consistent to ES not to elasticsearch-ruby
-- [ ] Better automatic index name and document type
-- [ ] Support for multiple document types
+- [ ] Define from_active_record interface
 - [ ] Write more detailed documentation section for:
   - [ ] Model definition
   - [ ] Indexing, Bulk Indexing and Delete By Query
   - [ ] Search and Multi Search
   - [ ] ActiveRecord integration
+- [ ] Better automatic index name and document type
+- [ ] Support for multiple document types
 - [ ] Get rid of to_document, generate automatically based on attributes
 - [ ] Add some delegations on Document to Index
-- [ ] Define from_active_record interface
 
 ## Contributing
 

data/Rakefile

@@ -2,3 +2,5 @@ require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new
+
+task default: :spec

data/elasticity.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = Elasticity::VERSION
   spec.authors       = ["Rodrigo Kochenburger"]
   spec.email         = ["rodrigo@doximity.com"]
-  spec.summary       = %q{ActiveModel-based library for working with ElasticSearch}
+  spec.summary       = %q{ActiveModel-based library for working with Elasticsearch}
   spec.description   = %q{Elasticity provides a higher level abstraction on top of [elasticsearch-ruby](https://github.com/elasticsearch/elasticsearch-ruby) gem}
   spec.homepage      = ""
   spec.license       = "MIT"
@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov", "~> 0.7.1"
   spec.add_development_dependency "oj"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "codeclimate-test-reporter"
 
   spec.add_dependency "activesupport", "~> 4.0"
   spec.add_dependency "activemodel",   "~> 4.0"

data/lib/elasticity/document.rb

@@ -59,7 +59,7 @@ module Elasticity
     end
 
     # Searches the index using the parameters provided in the body hash, following the same
-    # structure ElasticSearch expects.
+    # structure Elasticsearch expects.
     # Returns a DocumentSearch object.
     def self.search(body)
       DocumentSearchProxy.new(Search.new(index, document_type, body), self)
@@ -117,7 +117,7 @@ module Elasticity
 
     # IMPLEMENT
     # Returns a hash with the attributes as they should be stored in the index.
-    # This will be stored as _source attributes on ElasticSearch.
+    # This will be stored as _source attributes on Elasticsearch.
     def to_document
       raise NotImplementedError, "to_document needs to be implemented for #{self.class}"
     end

data/lib/elasticity/index.rb

@@ -90,7 +90,7 @@ module Elasticity
     private
 
     def instrument(name, extra = {})
-      ActiveSupport::Notifications.instrument("elasticity.#{name}", args: extra) do
+      ActiveSupport::Notifications.instrument("#{name}.elasticity", args: extra) do
         yield
       end
     end

data/lib/elasticity/multi_search.rb

@@ -32,10 +32,12 @@ module Elasticity
         { index: search.index.name, type: search.document_type, search: search.body }
       end
 
-      results = {}
+      response = ActiveSupport::Notifications.instrument("multi_search.elasticity", args: { body: multi_body }) do
+        Elasticity.config.client.msearch(body: multi_body)
+      end
 
-      responses = Array(Elasticity.config.client.msearch(body: multi_body)["responses"])
-      responses.each_with_index do |resp, idx|
+      results = {}
+      Array(response["responses"]).each_with_index do |resp, idx|
         name, search, mapper = @searches[idx]
         results[name] = Search::Result.new(resp, mapper)
       end

data/lib/elasticity/railtie.rb

@@ -0,0 +1,19 @@
+module Elasticity
+  class Railtie < Rails::Railtie
+    initializer 'elasticity.initialize_logging' do
+      ActiveSupport::Notifications.subscribe(/\.elasticity$/) do |name, start, finish, id, payload|
+        puts name
+        time = (finish - start)*1000
+
+        if logger = Elasticity.config.logger
+          logger.debug "#{name} #{"%.2f" % time}ms #{MultiJson.dump(payload[:args], pretty: Elasticity.config.pretty_json)}"
+
+          exception, message = payload[:exception]
+          if exception
+            logger.error "#{name} #{exception}: #{message}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/elasticity/search.rb

@@ -1,5 +1,5 @@
 module Elasticity
-  # Search provides a simple interface for defining a search against an ElasticSearch
+  # Search provides a simple interface for defining a search against an Elasticsearch
   # index and fetching the results in different ways and mappings.
   #
   # Example:
@@ -12,7 +12,7 @@ module Elasticity
     # search is not performend until methods are called, each method represents a different
     # way of fetching and mapping the data.
     #
-    # The body parameter is a hash following the exact same syntax as ElasticSearch's JSON
+    # The body parameter is a hash following the exact same syntax as Elasticsearch's JSON
     # query language.
     def initialize(index, document_type, body)
       @index          = index
@@ -20,7 +20,7 @@ module Elasticity
       @body           = body.freeze
     end
 
-    # Execute the search, fetching only ids from ElasticSearch and then mapping the results
+    # Execute the search, fetching only ids from Elasticsearch and then mapping the results
     # into ActiveRecord models using the provided relation.
     def active_records(relation)
       return @active_record if defined?(@active_record)

data/lib/elasticity/version.rb

@@ -1,3 +1,3 @@
 module Elasticity
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/lib/elasticity_base.rb

@@ -7,13 +7,22 @@ require "active_support/core_ext"
 require "active_model"
 require "elasticsearch"
 
+if defined?(Rails)
+  require "elasticity/railtie"
+end
+
 module Elasticity
   class Config
     attr_writer :logger, :client, :settings, :namespace, :pretty_json
 
     def logger
       return @logger if defined?(@logger)
-      @logger = Logger.new(STDOUT)
+
+      if defined?(Rails)
+        @logger = Rails.logger
+      else
+        @logger = Logger.new(STDOUT)
+      end
     end
 
     def client
@@ -45,16 +54,3 @@ module Elasticity
     @config = Config.new
   end
 end
-
-ActiveSupport::Notifications.subscribe(/^elasticity\./) do |name, start, finish, id, payload|
-  time = (finish - start)*1000
-
-  if logger = Elasticity.config.logger
-    logger.debug "#{name} #{"%.2f" % time}ms #{MultiJson.dump(payload[:args], pretty: Elasticity.config.pretty_json)}"
-
-    exception, message = payload[:exception]
-    if exception
-      logger.error "#{name} #{exception}: #{message}"
-    end
-  end
-end

data/spec/rspec_config.rb

@@ -1,6 +1,10 @@
 require "elasticity_base"
+require "codeclimate-test-reporter"
 require "simplecov"
 require "oj"
+
+CodeClimate::TestReporter.start
+
 require "elasticity"
 
 def elastic_search_client

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: es-elasticity
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Rodrigo Kochenburger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-10 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -147,6 +161,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".simplecov"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -158,6 +173,7 @@ files:
 - lib/elasticity/document.rb
 - lib/elasticity/index.rb
 - lib/elasticity/multi_search.rb
+- lib/elasticity/railtie.rb
 - lib/elasticity/search.rb
 - lib/elasticity/version.rb
 - lib/elasticity_base.rb
@@ -189,7 +205,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: ActiveModel-based library for working with ElasticSearch
+summary: ActiveModel-based library for working with Elasticsearch
 test_files:
 - spec/rspec_config.rb
 - spec/units/document_spec.rb