chewy 0.1.0 → 0.2.0

data/spec/chewy/query_spec.rb

@@ -164,4 +164,64 @@ describe Chewy::Query do
     specify { subject.filter { name == 'name' }.merge(query.filter { age == 42 }).criteria.filters
       .should == [{term: {'name' => 'name'}}, {term: {'age' => 42}}] }
   end
+
+  describe 'to_a' do
+    before { stub_model(:city) }
+    let(:cities) { 3.times.map { |i| City.create! name: "name#{i}", rating: i } }
+
+    context do
+      before do
+        stub_index(:cities) do
+          define_type :city do
+            field :name
+            field :rating, type: 'integer'
+            field :nested, type: 'object', value: ->{ {name: name} }
+          end
+        end.tap(&:create!)
+      end
+
+      before { CitiesIndex::City.import cities }
+
+      specify { CitiesIndex.order(:rating).first.should be_a CitiesIndex::City }
+      specify { CitiesIndex.order(:rating).first.name.should == 'name0' }
+      specify { CitiesIndex.order(:rating).first.rating.should == 0 }
+      specify { CitiesIndex.order(:rating).first.nested.should == {'name' => 'name0'} }
+      specify { CitiesIndex.order(:rating).first.id.should == cities.first.id.to_s }
+
+      specify { CitiesIndex.order(:rating).only(:name).first.name.should == 'name0' }
+      specify { CitiesIndex.order(:rating).only(:name).first.rating.should be_nil }
+      specify { CitiesIndex.order(:rating).only(:nested).first.nested.should == {'name' => 'name0'} }
+
+      specify { CitiesIndex.order(:rating).first._score.should be_nil }
+      specify { CitiesIndex.all.first._score.should be > 0 }
+      specify { CitiesIndex.query(match: {name: 'name0'}).first._score.should be > 0 }
+
+      specify { CitiesIndex.order(:rating).first._explanation.should be_nil }
+      specify { CitiesIndex.order(:rating).explain.first._explanation.should be_present }
+    end
+
+    context 'sourceless' do
+      before do
+        stub_index(:cities) do
+          define_type :city do
+            root _source: {enabled: false} do
+              field :name
+              field :rating, type: 'integer'
+              field :nested, type: 'object', value: ->{ {name: name} }
+            end
+          end
+        end.tap(&:create!)
+      end
+      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/type/adapter/active_record_spec.rb

@@ -22,9 +22,6 @@ describe Chewy::Type::Adapter::ActiveRecord do
       result
     end
 
-    specify { subject.import(3.times.map { |i| City.create! }) { |data| true }.should be_true }
-    specify { subject.import(3.times.map { |i| City.create! }) { |data| false }.should be_false }
-
     context do
       let!(:cities) { 3.times.map { |i| City.create! } }
       let!(:deleted) { 3.times.map { |i| City.create!.tap(&:destroy!) } }
@@ -83,20 +80,82 @@ describe Chewy::Type::Adapter::ActiveRecord do
         {delete: [cities.last.id] + deleted.first(1).map(&:id)},
         {delete: deleted.last(1).map(&:id)}] }
     end
+
+    context 'error handling' do
+      let!(:cities) { 3.times.map { |i| City.create! } }
+      let!(:deleted) { 2.times.map { |i| City.create!.tap(&:destroy!) } }
+      let(:ids) { (cities + deleted).map(&:id) }
+      subject { described_class.new(City) }
+
+      let(:data_comparer) do
+        ->(id, data) { object = (data[:index] || data[:delete]).first; (object.try(:id) || object) != id }
+      end
+
+      context 'implicit scope' do
+        specify { subject.import { |data| true }.should be_true }
+        specify { subject.import { |data| false }.should be_false }
+        specify { subject.import(batch_size: 1, &data_comparer.curry[cities[0].id]).should be_false }
+        specify { subject.import(batch_size: 1, &data_comparer.curry[cities[1].id]).should be_false }
+        specify { subject.import(batch_size: 1, &data_comparer.curry[cities[2].id]).should be_false }
+        specify { subject.import(batch_size: 1, &data_comparer.curry[deleted[0].id]).should be_true }
+        specify { subject.import(batch_size: 1, &data_comparer.curry[deleted[1].id]).should be_true }
+      end
+
+      context 'explicit scope' do
+        let(:scope) { City.where(id: ids) }
+
+        specify { subject.import(scope) { |data| true }.should be_true }
+        specify { subject.import(scope) { |data| false }.should be_false }
+        specify { subject.import(scope, batch_size: 1, &data_comparer.curry[cities[0].id]).should be_false }
+        specify { subject.import(scope, batch_size: 1, &data_comparer.curry[cities[1].id]).should be_false }
+        specify { subject.import(scope, batch_size: 1, &data_comparer.curry[cities[2].id]).should be_false }
+        specify { subject.import(scope, batch_size: 1, &data_comparer.curry[deleted[0].id]).should be_true }
+        specify { subject.import(scope, batch_size: 1, &data_comparer.curry[deleted[1].id]).should be_true }
+      end
+
+      context 'objects' do
+        specify { subject.import(cities + deleted) { |data| true }.should be_true }
+        specify { subject.import(cities + deleted) { |data| false }.should be_false }
+        specify { subject.import(cities + deleted, batch_size: 1, &data_comparer.curry[cities[0].id]).should be_false }
+        specify { subject.import(cities + deleted, batch_size: 1, &data_comparer.curry[cities[1].id]).should be_false }
+        specify { subject.import(cities + deleted, batch_size: 1, &data_comparer.curry[cities[2].id]).should be_false }
+        specify { subject.import(cities + deleted, batch_size: 1, &data_comparer.curry[deleted[0].id]).should be_false }
+        specify { subject.import(cities + deleted, batch_size: 1, &data_comparer.curry[deleted[1].id]).should be_false }
+      end
+
+      context 'ids' do
+        specify { subject.import(ids) { |data| true }.should be_true }
+        specify { subject.import(ids) { |data| false }.should be_false }
+        specify { subject.import(ids, batch_size: 1, &data_comparer.curry[cities[0].id]).should be_false }
+        specify { subject.import(ids, batch_size: 1, &data_comparer.curry[cities[1].id]).should be_false }
+        specify { subject.import(ids, batch_size: 1, &data_comparer.curry[cities[2].id]).should be_false }
+        specify { subject.import(ids, batch_size: 1, &data_comparer.curry[deleted[0].id]).should be_false }
+        specify { subject.import(ids, batch_size: 1, &data_comparer.curry[deleted[1].id]).should be_false }
+      end
+    end
   end
 
   describe '#load' do
     let!(:cities) { 3.times.map { |i| City.create!(country_id: i/2) } }
     let!(:deleted) { 2.times.map { |i| City.create!.tap(&:destroy!) } }
+
+    let(:type) { double(type_name: 'user') }
+
     subject { described_class.new(City) }
 
-    specify { subject.load(cities.map { |c| double(id: c.id) }).should == cities }
-    specify { subject.load(cities.map { |c| double(id: c.id) }.reverse).should == cities.reverse }
-    specify { subject.load(deleted.map { |c| double(id: c.id) }).should == [nil, nil] }
-    specify { subject.load((cities + deleted).map { |c| double(id: c.id) }).should == [*cities, nil, nil] }
-    specify { subject.load(cities.map { |c| double(id: c.id) }, scope: ->(_) { where(country_id: 0) })
+    specify { subject.load(cities.map { |c| double(id: c.id) }, _type: type).should == cities }
+    specify { subject.load(cities.map { |c| double(id: c.id) }.reverse, _type: type).should == cities.reverse }
+    specify { subject.load(deleted.map { |c| double(id: c.id) }, _type: type).should == [nil, nil] }
+    specify { subject.load((cities + deleted).map { |c| double(id: c.id) }, _type: type).should == [*cities, nil, nil] }
+    specify { subject.load(cities.map { |c| double(id: c.id) }, _type: type, scope: ->{ where(country_id: 0) })
       .should == cities.first(2) + [nil] }
-    specify { subject.load(cities.map { |c| double(id: c.id) }, scope: City.where(country_id: 1))
+    specify { subject.load(cities.map { |c| double(id: c.id) },
+      _type: type, scope: ->{ where(country_id: 0) }, user: {scope: ->{ where(country_id: 1)}})
       .should == [nil, nil] + cities.last(1) }
+    specify { subject.load(cities.map { |c| double(id: c.id) }, _type: type, scope: City.where(country_id: 1))
+      .should == [nil, nil] + cities.last(1) }
+    specify { subject.load(cities.map { |c| double(id: c.id) },
+      _type: type, scope: City.where(country_id: 1), user: {scope: ->{ where(country_id: 0)}})
+      .should == cities.first(2) + [nil] }
   end
 end

data/spec/chewy/type/adapter/object_spec.rb

@@ -53,6 +53,24 @@ describe Chewy::Type::Adapter::Object do
       specify { import(products).should == [{index: products}] }
       specify { expect { import(products, non_product) {} }.to raise_error }
     end
+
+    context 'error handling' do
+      let(:products) { 3.times.map { |i| double.tap { |product| product.stub(rating: i.next) } } }
+      let(:deleted) { 2.times.map { |i| double(destroyed?: true, rating: i + 4) } }
+      subject { described_class.new('product') }
+
+      let(:data_comparer) do
+        ->(n, data) { (data[:index] || data[:delete]).first.rating != n }
+      end
+
+      specify { subject.import(products, deleted) { |data| true }.should be_true }
+      specify { subject.import(products, deleted) { |data| false }.should be_false }
+      specify { subject.import(products, deleted, batch_size: 1, &data_comparer.curry[1]).should be_false }
+      specify { subject.import(products, deleted, batch_size: 1, &data_comparer.curry[2]).should be_false }
+      specify { subject.import(products, deleted, batch_size: 1, &data_comparer.curry[3]).should be_false }
+      specify { subject.import(products, deleted, batch_size: 1, &data_comparer.curry[4]).should be_false }
+      specify { subject.import(products, deleted, batch_size: 1, &data_comparer.curry[5]).should be_false }
+    end
   end
 
   describe '#load' do

data/spec/chewy/type/import_spec.rb

@@ -3,6 +3,8 @@ require 'spec_helper'
 describe Chewy::Type::Import do
   include ClassHelpers
 
+  before { Chewy.client.indices.delete }
+
   before do
     stub_model(:city)
   end
@@ -18,6 +20,10 @@ describe Chewy::Type::Import do
   let!(:dummy_cities) { 3.times.map { |i| City.create(name: "name#{i}") } }
   let(:city) { CitiesIndex::City }
 
+  describe '.bulk' do
+
+  end
+
   describe '.import' do
     specify { city.import.should be_true }
     specify { city.import([]).should be_true }
@@ -48,11 +54,11 @@ describe Chewy::Type::Import do
     specify do
       dummy_cities.first.destroy
       expect(CitiesIndex.client).to receive(:bulk).with(hash_including(
-        body: [{delete: {_index: 'cities', _type: 'city', _id: dummy_cities.first.id}}]
+        body: [{delete: {_id: dummy_cities.first.id}}]
       ))
       dummy_cities.from(1).each.with_index do |c, i|
         expect(CitiesIndex.client).to receive(:bulk).with(hash_including(
-          body: [{index: {_id: c.id, _index: 'cities', _type: 'city', data: {'name' => "name#{i+1}"}}}]
+          body: [{index: {_id: c.id, data: {'name' => "name#{i+1}"}}}]
         ))
       end
       city.import dummy_cities.map(&:id), batch_size: 1
@@ -92,6 +98,85 @@ describe Chewy::Type::Import do
         city.import dummy_cities
         outer_payload.should == {type: CitiesIndex::City, import: {delete: 1, index: 2}}
       end
+
+      specify do
+        outer_payload = nil
+        ActiveSupport::Notifications.subscribe('import_objects.chewy') do |name, start, finish, id, payload|
+          outer_payload = payload
+        end
+
+        dummy_cities.first.destroy
+        city.import dummy_cities, batch_size: 1
+        outer_payload.should == {type: CitiesIndex::City, import: {delete: 1, index: 2}}
+      end
+
+      specify do
+        outer_payload = nil
+        ActiveSupport::Notifications.subscribe('import_objects.chewy') do |name, start, finish, id, payload|
+          outer_payload = payload
+        end
+
+        city.import dummy_cities, batch_size: 1
+        outer_payload.should == {type: CitiesIndex::City, import: {index: 3}}
+      end
+
+      context do
+        before do
+          stub_index(:cities) do
+            define_type City do
+              field :name, type: 'object'
+            end
+          end.tap(&:create!)
+        end
+
+        specify do
+          outer_payload = nil
+          ActiveSupport::Notifications.subscribe('import_objects.chewy') do |name, start, finish, id, payload|
+            outer_payload = payload
+          end
+
+          city.import dummy_cities, batch_size: 1
+          outer_payload.should == {
+            type: CitiesIndex::City,
+            errors: {
+              index: {
+                'MapperParsingException[object mapping for [city] tried to parse as object, but got EOF, has a concrete value been provided to it?]' => ['1', '2', '3']
+              }
+            },
+            import: {index: 3}
+          }
+        end
+      end
+    end
+
+    context 'error handling' do
+      context do
+        before do
+          stub_index(:cities) do
+            define_type City do
+              field :name, type: 'object'
+            end
+          end.tap(&:create!)
+        end
+
+        specify { city.import(dummy_cities).should be_false }
+        specify { city.import(dummy_cities.map(&:id)).should be_false }
+        specify { city.import(dummy_cities, batch_size: 1).should be_false }
+      end
+
+      context do
+        before do
+          stub_index(:cities) do
+            define_type City do
+              field :name, type: 'object', value: ->{ name == 'name1' ? name : {name: name} }
+            end
+          end.tap(&:create!)
+        end
+
+        specify { city.import(dummy_cities).should be_false }
+        specify { city.import(dummy_cities.map(&:id)).should be_false }
+        specify { city.import(dummy_cities, batch_size: 1).should be_false }
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -10,6 +10,7 @@ require 'support/class_helpers'
 require 'chewy/rspec'
 
 ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
+ActiveRecord::Base.logger = Logger.new('/dev/null')
 
 Kaminari::Hooks.init
 

metadata

@@ -1,37 +1,37 @@
 --- !ruby/object:Gem::Specification
 name: chewy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - pyromaniac
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  type: :development
   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: rspec
-  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.14'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -40,100 +40,100 @@ dependencies:
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  type: :development
   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: kaminari
-  type: :development
   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: activerecord
-  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  type: :development
   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: elasticsearch-extensions
-  type: :development
   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
-  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: elasticsearch
-  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Chewy provides functionality for Elasticsearch index handling, documents
@@ -162,10 +162,12 @@ files:
 - lib/chewy/fields/root.rb
 - lib/chewy/index.rb
 - lib/chewy/index/actions.rb
+- lib/chewy/index/aliases.rb
 - lib/chewy/index/search.rb
 - lib/chewy/query.rb
-- lib/chewy/query/context.rb
+- lib/chewy/query/compose.rb
 - lib/chewy/query/criteria.rb
+- lib/chewy/query/filters.rb
 - lib/chewy/query/loading.rb
 - lib/chewy/query/nodes/and.rb
 - lib/chewy/query/nodes/base.rb
@@ -174,6 +176,10 @@ files:
 - lib/chewy/query/nodes/exists.rb
 - lib/chewy/query/nodes/expr.rb
 - lib/chewy/query/nodes/field.rb
+- lib/chewy/query/nodes/has_child.rb
+- lib/chewy/query/nodes/has_parent.rb
+- lib/chewy/query/nodes/has_relation.rb
+- lib/chewy/query/nodes/match_all.rb
 - lib/chewy/query/nodes/missing.rb
 - lib/chewy/query/nodes/not.rb
 - lib/chewy/query/nodes/or.rb
@@ -203,15 +209,19 @@ files:
 - spec/chewy/fields/default_spec.rb
 - spec/chewy/fields/root_spec.rb
 - spec/chewy/index/actions_spec.rb
+- spec/chewy/index/aliases_spec.rb
 - spec/chewy/index/search_spec.rb
 - spec/chewy/index_spec.rb
-- spec/chewy/query/context_spec.rb
 - spec/chewy/query/criteria_spec.rb
+- spec/chewy/query/filters_spec.rb
 - spec/chewy/query/loading_spec.rb
 - spec/chewy/query/nodes/and_spec.rb
 - spec/chewy/query/nodes/bool_spec.rb
 - spec/chewy/query/nodes/equal_spec.rb
 - spec/chewy/query/nodes/exists_spec.rb
+- spec/chewy/query/nodes/has_child_spec.rb
+- spec/chewy/query/nodes/has_parent_spec.rb
+- spec/chewy/query/nodes/match_all_spec.rb
 - spec/chewy/query/nodes/missing_spec.rb
 - spec/chewy/query/nodes/not_spec.rb
 - spec/chewy/query/nodes/or_spec.rb
@@ -245,17 +255,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Elasticsearch ODM client wrapper
@@ -265,15 +275,19 @@ test_files:
 - spec/chewy/fields/default_spec.rb
 - spec/chewy/fields/root_spec.rb
 - spec/chewy/index/actions_spec.rb
+- spec/chewy/index/aliases_spec.rb
 - spec/chewy/index/search_spec.rb
 - spec/chewy/index_spec.rb
-- spec/chewy/query/context_spec.rb
 - spec/chewy/query/criteria_spec.rb
+- spec/chewy/query/filters_spec.rb
 - spec/chewy/query/loading_spec.rb
 - spec/chewy/query/nodes/and_spec.rb
 - spec/chewy/query/nodes/bool_spec.rb
 - spec/chewy/query/nodes/equal_spec.rb
 - spec/chewy/query/nodes/exists_spec.rb
+- spec/chewy/query/nodes/has_child_spec.rb
+- spec/chewy/query/nodes/has_parent_spec.rb
+- spec/chewy/query/nodes/match_all_spec.rb
 - spec/chewy/query/nodes/missing_spec.rb
 - spec/chewy/query/nodes/not_spec.rb
 - spec/chewy/query/nodes/or_spec.rb