chewy 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37f0fefa72376c597d5ad48d1d6796371f15f809
-  data.tar.gz: 9f5400688fbdbd4e84022645c40aeeb9cafc665b
+  metadata.gz: 20296cb15e845cc45aacb4dddaebaa735b5f9d80
+  data.tar.gz: 2872561f5db73ad60dc96ef445de9bdd2da529db
 SHA512:
-  metadata.gz: 076944d46b1082021ad1966e4be3543e1ac0a71a559e7013bd6f95879446ba5810fe7304af7b4b4c05775ebbfcbe2f9df5954d4a287411f3bceeb86621fac6fa
-  data.tar.gz: b5b8ee2719b6d19c478d5ec9e7551340f83e7aeb71de2757dbea33781995ddb82f54b9fab98e006200f8c7344f36fbd79aa556eda5ec11b84506d9a1283005d1
+  metadata.gz: 487d34a9309473ae01af8e2f4f2fe4a4318501c83e6370121e97acaa736630ea2b8bfb129b499dc74a01f7899fd131f296ffa372ddfa6eba324a392cd79d6e34
+  data.tar.gz: 6387d3bcd0e6e1f48187a0bbcc00cfaaffb0069673e149cdf32b531f979843c3b47c3572e5fde6c5717bb21446cd2138deb703ae705969bad6568ff9efaeddea

data/.travis.yml

@@ -5,6 +5,6 @@ rvm:
   - 2.1.0
   # - rbx
 before_install:
-  - curl -# https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-0.90.10.tar.gz | tar xz -C /tmp
+  - curl -# https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.0.1.tar.gz | tar xz -C /tmp
 before_script:
-  - TEST_CLUSTER_COMMAND="/tmp/elasticsearch-0.90.10/bin/elasticsearch" rake elasticsearch:start
+  - TEST_CLUSTER_COMMAND="/tmp/elasticsearch-1.0.1/bin/elasticsearch" rake elasticsearch:start

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # master
 
+# Version 0.3.0
+
+  * Added `Chewy.configuration[:index]` config to setup common indexes options.
+
+  * `Chewy.client_options` replaced with `Chewy.configuration`
+
+  * Using source filtering instead of fields filter (http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-request-source-filtering.html).
+
 # Version 0.2.3
 
   * `.import!` indexes method, raises import errors.

data/README.md

@@ -41,11 +41,11 @@ Or install it yourself as:
 
 ### Client configuration
 
-There are 2 ways to configure Chewy client: `Chewy.client_options` hash and `chewy.yml`
+There are 2 ways to configure Chewy client: `Chewy.configuration` hash and `chewy.yml`
 
 ```ruby
 # config/initializers/chewy.rb
-Chewy.client_options = {host: 'localhost:9250'} # do not use environments
+Chewy.configuration = {host: 'localhost:9250'} # do not use environments
 ```
 
 ```yaml
@@ -61,7 +61,7 @@ development:
 The result config merges both hashes. Client options are passed as is to Elasticsearch::Transport::Client except the `:prefix` - it is used internally by chewy to create prefixed index names:
 
 ```ruby
-  Chewy.client_options = {prefix: 'testing'}
+  Chewy.configuration = {prefix: 'testing'}
   UsersIndex.index_name # => 'testing_users'
 ```
 

data/lib/chewy/config.rb

@@ -3,7 +3,7 @@ module Chewy
     include Singleton
 
     attr_reader :analyzers, :tokenizers, :filters, :char_filters
-    attr_accessor :client_options, :urgent_update, :query_mode, :filter_mode, :logger
+    attr_accessor :configuration, :urgent_update, :query_mode, :filter_mode, :logger
 
     def self.delegated
       public_instance_methods - self.superclass.public_instance_methods - Singleton.public_instance_methods
@@ -21,7 +21,7 @@ module Chewy
 
     def initialize
       @urgent_update = false
-      @client_options = {}
+      @configuration = {}
       @query_mode = :must
       @filter_mode = :and
       @analyzers = {}
@@ -63,8 +63,8 @@ module Chewy
     #
     repository :char_filter
 
-    def client_options
-      options = @client_options.merge(yaml_options)
+    def configuration
+      options = @configuration.deep_symbolize_keys.merge(yaml_options)
       options.merge!(logger: logger) if logger
       options
     end
@@ -74,7 +74,7 @@ module Chewy
     end
 
     def client
-      Thread.current[:chewy_client] ||= ::Elasticsearch::Client.new client_options
+      Thread.current[:chewy_client] ||= ::Elasticsearch::Client.new configuration
     end
 
     def atomic?

data/lib/chewy/fields/base.rb

@@ -19,7 +19,7 @@ module Chewy
           object.send(name)
         end
 
-        result = if result.is_a?(Enumerable)
+        result = if result.is_a?(Enumerable) && !result.is_a?(Hash)
           result.map { |object| nested_compose(object) }
         else
           nested_compose(result)

data/lib/chewy/index.rb

@@ -30,12 +30,12 @@ module Chewy
     #
     def self.index_name(suggest = nil)
       if suggest
-        @index_name = build_index_name(suggest, prefix: Chewy.client_options[:prefix])
+        @index_name = build_index_name(suggest, prefix: Chewy.configuration[:prefix])
       else
         @index_name ||= begin
           build_index_name(
             name.gsub(/Index\Z/, '').demodulize.underscore,
-            prefix: Chewy.client_options[:prefix]
+            prefix: Chewy.configuration[:prefix]
           ) if name
         end
       end

data/lib/chewy/index/settings.rb

@@ -29,12 +29,15 @@ module Chewy
       end
 
       def to_hash
-        return {} unless @params.present?
+        settings = @params.deep_symbolize_keys
 
-        params = @params.deep_dup
-        params[:analysis] = resolve_analysis(params[:analysis]) if params[:analysis]
+        settings[:analysis] = resolve_analysis(settings[:analysis]) if settings[:analysis]
+        if settings[:index] || Chewy.configuration[:index]
+          settings[:index] = (Chewy.configuration[:index] || {})
+            .deep_merge((settings[:index] || {}).deep_symbolize_keys)
+        end
 
-        {settings: params}
+        settings.present? ? {settings: settings} : {}
       end
 
     private

data/lib/chewy/query.rb

@@ -463,7 +463,7 @@ module Chewy
 
     def _results
       @_results ||= (criteria.none? ? [] : _response['hits']['hits']).map do |hit|
-        attributes = hit['_source'] || hit['fields'] || {}
+        attributes = hit['_source'] || {}
         attributes.reverse_merge!(id: hit['_id'])
           .merge!(_score: hit['_score'], _explanation: hit['_explanation'])
         index.type_hash[hit['_type']].new attributes

data/lib/chewy/query/criteria.rb

@@ -82,7 +82,7 @@ module Chewy
         body = (_composed_query(_request_query, _request_filter) || {}).tap do |body|
           body.merge!(facets: facets) if facets?
           body.merge!(sort: sort) if sort?
-          body.merge!(fields: fields) if fields?
+          body.merge!(_source: fields) if fields?
         end
 
         {body: body.merge!(_request_options)}

data/lib/chewy/version.rb

@@ -1,3 +1,3 @@
 module Chewy
-  VERSION = '0.2.4'
+  VERSION = '0.3.0'
 end

data/spec/chewy/config_spec.rb

@@ -7,7 +7,7 @@ describe Chewy::Config do
   its(:query_mode) { should == :must }
   its(:filter_mode) { should == :and }
   its(:logger) { should be_nil }
-  its(:client_options) { should_not have_key :logger }
+  its(:configuration) { should_not have_key :logger }
   its(:analyzers) { should == {} }
   its(:tokenizers) { should == {} }
   its(:filters) { should == {} }
@@ -57,7 +57,7 @@ describe Chewy::Config do
     before { subject.logger = double(:logger) }
 
     its(:logger) { should_not be_nil }
-    its(:client_options) { should have_key :logger }
+    its(:configuration) { should have_key :logger }
   end
 
   describe '#atomic?' do

data/spec/chewy/fields/base_spec.rb

@@ -39,6 +39,18 @@ describe Chewy::Fields::Base do
 
       specify { field.compose(double(name: 'Alex')).should == {name: 'Alex'} }
     end
+
+    context do
+      let(:field) { described_class.new(:name, type: 'object') }
+      let(:object) { double(name: { key1: 'value1', key2: 'value2' }) }
+
+      before do
+        field.nested(described_class.new(:key1, value: ->(h){ h[:key1] }))
+        field.nested(described_class.new(:key2, value: ->(h){ h[:key2] }))
+      end
+
+      specify{ field.compose(object).should == { name: { 'key1' => 'value1', 'key2' => 'value2' } } }
+    end
   end
 
   describe '#nested' do

data/spec/chewy/index/actions_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Chewy::Index::Actions do
   include ClassHelpers
-  before { Chewy::Index.client.indices.delete }
+  before { Chewy.client.indices.delete index: '*' }
 
   before { stub_index :dummies }
 

data/spec/chewy/index/aliases_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Chewy::Index::Aliases do
   include ClassHelpers
-  before { Chewy::Index.client.indices.delete }
+  before { Chewy.client.indices.delete index: '*' }
 
   before { stub_index :dummies }
 

data/spec/chewy/index/settings_spec.rb

@@ -66,5 +66,19 @@ describe Chewy::Index::Settings do
           tokenizer: {tokenizer1: {options: 43}}
         }}} }
     end
+
+    context ':index' do
+      specify { described_class.new(index: {number_of_shards: 3}).to_hash
+        .should == {settings: {index: {number_of_shards: 3}}} }
+
+      context do
+        before { Chewy.configuration = {index: {number_of_shards: 7, number_of_replicas: 2}} }
+
+        specify { described_class.new.to_hash
+          .should == {settings: {index: {number_of_shards: 7, number_of_replicas: 2}}} }
+        specify { described_class.new(index: {number_of_shards: 3}).to_hash
+          .should == {settings: {index: {number_of_shards: 3, number_of_replicas: 2}}} }
+      end
+    end
   end
 end

data/spec/chewy/index_spec.rb

@@ -83,7 +83,7 @@ describe Chewy::Index do
     specify { stub_const('DevelopersIndex', Class.new(Chewy::Index)).index_name.should == 'developers' }
 
     context do
-      before { Chewy.stub(client_options: {prefix: 'testing'}) }
+      before { Chewy.stub(configuration: {prefix: 'testing'}) }
       specify { DummiesIndex.index_name.should == 'testing_dummies' }
       specify { stub_index(:dummies) { index_name :users }.index_name.should == 'testing_users' }
     end
@@ -98,6 +98,8 @@ describe Chewy::Index do
   end
 
   describe '.index_params' do
+    before { Chewy.stub(config: Chewy::Config.send(:new)) }
+
     specify { stub_index(:documents).index_params.should == {} }
     specify { stub_index(:documents) { settings number_of_shards: 1 }.index_params.keys.should == [:settings] }
     specify { stub_index(:documents) do
@@ -114,6 +116,8 @@ describe Chewy::Index do
   end
 
   describe '.settings_hash' do
+    before { Chewy.stub(config: Chewy::Config.send(:new)) }
+
     specify { stub_index(:documents).settings_hash.should == {} }
     specify { stub_index(:documents) { settings number_of_shards: 1 }.settings_hash.should == {settings: {number_of_shards: 1}} }
   end

data/spec/chewy/query/criteria_spec.rb

@@ -144,7 +144,7 @@ describe Chewy::Query::Criteria do
     specify { request_body { update_queries(:query) }.should == {body: {query: :query}} }
     specify { request_body {
       update_options(from: 10); update_sort(:field); update_fields(:field); update_queries(:query)
-    }.should == {body: {query: :query, from: 10, sort: [:field], fields: ['field']}} }
+    }.should == {body: {query: :query, from: 10, sort: [:field], _source: ['field']}} }
   end
 
   describe '#_composed_query' do

data/spec/chewy/query/loading_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Chewy::Query::Loading do
   include ClassHelpers
-  before { Chewy::Index.client.indices.delete }
+  before { Chewy.client.indices.delete index: '*' }
 
   before do
     stub_model(:city)
@@ -24,10 +24,7 @@ describe Chewy::Query::Loading do
       end
     end
 
-    before do
-      PlacesIndex::City.import(cities)
-      PlacesIndex::Country.import(countries)
-    end
+    before { PlacesIndex.import!(cities: cities, countries: countries) }
 
     specify { PlacesIndex.order(:rating).limit(6).load.total_count.should == 12 }
     specify { PlacesIndex.order(:rating).limit(6).load.should =~ cities.first(3) + countries.first(3) }

data/spec/chewy/query/pagination_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Chewy::Query::Pagination do
   include ClassHelpers
-  before { Chewy::Index.client.indices.delete }
+  before { Chewy.client.indices.delete index: '*' }
 
   before do
     stub_index(:products) do
@@ -13,7 +13,7 @@ describe Chewy::Query::Pagination do
   end
   let(:data) { 10.times.map { |i| {id: i.next.to_s, name: "Name#{i.next}", age: 10 * i.next}.stringify_keys! } }
 
-  before { ProductsIndex::Product.import(data.map { |h| double(h) }) }
+  before { ProductsIndex::Product.import!(data.map { |h| double(h) }) }
   before { Kaminari.config.stub(default_per_page: 3) }
 
   let(:search) { ProductsIndex.order(:age) }

data/spec/chewy/query_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe Chewy::Query do
   include ClassHelpers
+  before { Chewy.client.indices.delete index: '*' }
 
-  before { Chewy::Index.client.indices.delete }
   before do
     stub_index(:products) do
       define_type :product do
@@ -20,9 +20,11 @@ describe Chewy::Query do
     let(:products) { 3.times.map { |i| {id: i.next.to_s, name: "Name#{i.next}", age: 10 * i.next}.stringify_keys! } }
     let(:cities) { 3.times.map { |i| {id: i.next.to_s}.stringify_keys! } }
     let(:countries) { 3.times.map { |i| {id: i.next.to_s}.stringify_keys! } }
-    before { ProductsIndex::Product.import(products.map { |h| double(h) }) }
-    before { ProductsIndex::City.import(cities.map { |h| double(h) }) }
-    before { ProductsIndex::Country.import(countries.map { |h| double(h) }) }
+    before do
+      ProductsIndex::Product.import!(products.map { |h| double(h) })
+      ProductsIndex::City.import!(cities.map { |h| double(h) })
+      ProductsIndex::Country.import!(countries.map { |h| double(h) })
+    end
 
     specify { subject.count.should == 9 }
     specify { subject.limit(6).count.should == 6 }
@@ -35,7 +37,7 @@ describe Chewy::Query do
 
   describe '#==' do
     let(:data) { 3.times.map { |i| {id: i.next.to_s, name: "Name#{i.next}", age: 10 * i.next}.stringify_keys! } }
-    before { ProductsIndex::Product.import(data.map { |h| double(h) }) }
+    before { ProductsIndex::Product.import!(data.map { |h| double(h) }) }
 
     specify { subject.query(match: 'hello').should == subject.query(match: 'hello') }
     specify { subject.query(match: 'hello').should_not == subject.query(match: 'world') }
@@ -194,7 +196,7 @@ describe Chewy::Query do
         end.tap(&:create!)
       end
 
-      before { CitiesIndex::City.import cities }
+      before { CitiesIndex::City.import! cities }
 
       specify { CitiesIndex.order(:rating).first.should be_a CitiesIndex::City }
       specify { CitiesIndex.order(:rating).first.name.should == 'name0' }
@@ -226,16 +228,12 @@ describe Chewy::Query do
           end
         end.tap(&:create!)
       end
-      before { CitiesIndex::City.import cities }
+      before { CitiesIndex::City.import! cities }
 
       specify { CitiesIndex.order(:rating).first.should be_a CitiesIndex::City }
       specify { CitiesIndex.order(:rating).first.name.should be_nil }
       specify { CitiesIndex.order(:rating).first.rating.should be_nil }
       specify { CitiesIndex.order(:rating).first.nested.should be_nil }
-
-      specify { CitiesIndex.order(:rating).only(:name).first.name.should be_nil }
-      specify { CitiesIndex.order(:rating).only(:name).first.rating.should be_nil }
-      specify { CitiesIndex.order(:rating).only(:nested).first.nested.should be_nil }
     end
   end
 end

data/spec/chewy/rspec/update_index_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe :update_index do
   include ClassHelpers
-  before { Chewy::Index.client.indices.delete }
+  before { Chewy.client.indices.delete index: '*' }
 
   before do
     stub_index(:dummies) do

data/spec/chewy/type/import_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Chewy::Type::Import do
   include ClassHelpers
 
-  before { Chewy.client.indices.delete }
+  before { Chewy.client.indices.delete index: '*' }
 
   before do
     stub_model(:city)

data/spec/spec_helper.rb

@@ -27,7 +27,7 @@ ActiveRecord::Schema.define do
   end
 end
 
-Chewy.client_options = { host: 'localhost:9250' }
+Chewy.configuration = {host: 'localhost:9250', index: {number_of_shards: 1, number_of_replicas: 0}}
 
 RSpec.configure do |config|
   config.mock_with :rspec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chewy
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - pyromaniac
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-27 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake