chewy 0.0.1 → 0.1.0

data/spec/chewy/type/import_spec.rb

@@ -19,6 +19,11 @@ describe Chewy::Type::Import do
   let(:city) { CitiesIndex::City }
 
   describe '.import' do
+    specify { city.import.should be_true }
+    specify { city.import([]).should be_true }
+    specify { city.import(dummy_cities).should be_true }
+    specify { city.import(dummy_cities.map(&:id)).should be_true }
+
     specify { expect { city.import([]) }.not_to update_index(city) }
     specify { expect { city.import }.to update_index(city).and_reindex(dummy_cities) }
     specify { expect { city.import dummy_cities }.to update_index(city).and_reindex(dummy_cities) }
@@ -53,6 +58,16 @@ describe Chewy::Type::Import do
       city.import dummy_cities.map(&:id), batch_size: 1
     end
 
+    specify do
+      expect(CitiesIndex.client).to receive(:bulk).with(hash_including(refresh: true))
+      city.import dummy_cities
+    end
+
+    specify do
+      expect(CitiesIndex.client).to receive(:bulk).with(hash_including(refresh: false))
+      city.import dummy_cities, refresh: false
+    end
+
     context 'scoped' do
       before do
         stub_index(:cities) do
@@ -62,7 +77,21 @@ describe Chewy::Type::Import do
         end
       end
 
-      specify { expect { CitiesIndex.import }.to update_index(city).and_reindex(dummy_cities.first(2)) }
+      specify { expect { city.import }.to update_index(city).and_reindex(dummy_cities.first(2)) }
+      specify { expect { city.import City.where(id: dummy_cities.first.id) }.to update_index(city).and_reindex(dummy_cities.first).only }
+    end
+
+    context 'instrumentation payload' do
+      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
+        outer_payload.should == {type: CitiesIndex::City, import: {delete: 1, index: 2}}
+      end
     end
   end
 end

data/spec/chewy/type/mapping_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Chewy::Type::Mapping do
   include ClassHelpers
 
-  let(:product) { ProductsIndex.product }
+  let(:product) { ProductsIndex::Product }
 
   before do
     stub_index(:products) do

data/spec/chewy/type/observe_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 describe Chewy::Type::Import do
   include ClassHelpers
-  before { Chewy.stub(observing_enabled: true) }
 
   describe '.update_index' do
     before do
@@ -13,26 +12,28 @@ describe Chewy::Type::Import do
 
     let(:backreferenced) { 3.times.map { |i| double(id: i) } }
 
+    specify { expect { DummiesIndex.dummy.update_index(backreferenced, urgent: true) }
+      .to update_index('dummies#dummy', atomic: false).and_reindex(backreferenced) }
     specify { expect { DummiesIndex.dummy.update_index(backreferenced) }
-        .to update_index(DummiesIndex.dummy).and_reindex(backreferenced) }
+      .not_to update_index('dummies#dummy', atomic: false) }
     specify { expect { DummiesIndex.dummy.update_index([]) }
-      .not_to update_index(DummiesIndex.dummy) }
+      .not_to update_index('dummies#dummy') }
     specify { expect { DummiesIndex.dummy.update_index(nil) }
-      .not_to update_index(DummiesIndex.dummy) }
+      .not_to update_index('dummies#dummy') }
   end
 
   context 'integration' do
     before do
       stub_model(:city) do
         belongs_to :country
-        update_elasticsearch('cities#city') { self }
-        update_elasticsearch('countries#country') { country }
+        update_index('cities#city') { self }
+        update_index 'countries#country', :country
       end
 
       stub_model(:country) do
         has_many :cities
-        update_elasticsearch('cities#city') { cities }
-        update_elasticsearch('countries#country') { self }
+        update_index('cities#city') { cities }
+        update_index 'countries#country', :self, urgent: true
       end
 
       stub_index(:cities) do
@@ -47,9 +48,42 @@ describe Chewy::Type::Import do
     let(:city) { City.create!(country: Country.create!) }
     let(:country) { Country.create!(cities: 2.times.map { City.create! }) }
 
-    specify { expect { city.save! }.to update_index(CitiesIndex.city).and_reindex(city) }
-    specify { expect { city.save! }.to update_index(CountriesIndex.country).and_reindex(city.country) }
-    specify { expect { country.save! }.to update_index(CitiesIndex.city).and_reindex(country.cities) }
-    specify { expect { country.save! }.to update_index(CountriesIndex.country).and_reindex(country) }
+    specify { expect { city.save! }.not_to update_index('cities#city', atomic: false) }
+    specify { expect { country.save! }.to update_index('countries#country').and_reindex(country) }
+
+    context do
+      specify { expect { city.save! }.to update_index('cities#city').and_reindex(city) }
+      specify { expect { city.save! }.to update_index('countries#country').and_reindex(city.country) }
+      specify { expect { country.save! }.to update_index('cities#city').and_reindex(country.cities) }
+      specify { expect { country.save! }.to update_index('countries#country').and_reindex(country) }
+    end
+
+    context do
+      let(:other_city) { City.create! }
+
+      specify do
+        expect(CitiesIndex::City).not_to receive(:import)
+        [city, other_city].map(&:save!)
+      end
+
+      specify do
+        expect(CitiesIndex::City).to receive(:import).with([city.id, other_city.id]).once
+        Chewy.atomic { [city, other_city].map(&:save!) }
+      end
+    end
+
+    context do
+      let(:other_country) { Country.create! }
+
+      specify do
+        expect(CountriesIndex::Country).to receive(:import).at_least(2).times
+        [country, other_country].map(&:save!)
+      end
+
+      specify do
+        expect(CountriesIndex::Country).to receive(:import).with([country.id, other_country.id]).once
+        Chewy.atomic { [country, other_country].map(&:save!) }
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ Bundler.require
 
 require 'active_record'
 require 'database_cleaner'
+
 require 'support/fail_helpers'
 require 'support/class_helpers'
 
@@ -10,6 +11,8 @@ require 'chewy/rspec'
 
 ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
 
+Kaminari::Hooks.init
+
 ActiveRecord::Schema.define do
   create_table :countries do |t|
     t.column :name, :string
@@ -23,13 +26,14 @@ ActiveRecord::Schema.define do
   end
 end
 
-Kaminari::Hooks.init
-
-Chewy.client_options = { port: 9250 }
+Chewy.client_options = { host: 'localhost:9250' }
 
 RSpec.configure do |config|
   config.mock_with :rspec
 
+  config.include FailHelpers
+  config.include ClassHelpers
+
   config.before(:suite) do
     DatabaseCleaner.clean_with :truncation
     DatabaseCleaner.strategy = :transaction
@@ -42,7 +46,4 @@ RSpec.configure do |config|
   config.after do
     DatabaseCleaner.clean
   end
-
-  config.include FailHelpers
-  config.include ClassHelpers
 end

data/spec/support/class_helpers.rb

@@ -10,7 +10,7 @@ module ClassHelpers
       .tap { |i| i.class_eval(&block) if block }
   end
 
-  def stub_class name, superclass, &block
-    stub_const(name.to_s.camelize, Class.new(superclass, &block))
+  def stub_class name, superclass = nil, &block
+    stub_const(name.to_s.camelize, Class.new(superclass || Object, &block))
   end
 end

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: chewy
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - pyromaniac
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2014-01-23 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  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: 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: '0'
-  type: :development
+        version: '2.14'
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        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'
+  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'
   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
@@ -146,14 +146,15 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
-- .rvmrc
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - chewy.gemspec
+- filters
 - lib/chewy.rb
 - lib/chewy/config.rb
 - lib/chewy/fields/base.rb
@@ -161,16 +162,34 @@ files:
 - lib/chewy/fields/root.rb
 - lib/chewy/index.rb
 - lib/chewy/index/actions.rb
-- lib/chewy/index/client.rb
 - lib/chewy/index/search.rb
 - lib/chewy/query.rb
+- lib/chewy/query/context.rb
 - lib/chewy/query/criteria.rb
 - lib/chewy/query/loading.rb
+- lib/chewy/query/nodes/and.rb
+- lib/chewy/query/nodes/base.rb
+- lib/chewy/query/nodes/bool.rb
+- lib/chewy/query/nodes/equal.rb
+- lib/chewy/query/nodes/exists.rb
+- lib/chewy/query/nodes/expr.rb
+- lib/chewy/query/nodes/field.rb
+- lib/chewy/query/nodes/missing.rb
+- lib/chewy/query/nodes/not.rb
+- lib/chewy/query/nodes/or.rb
+- lib/chewy/query/nodes/prefix.rb
+- lib/chewy/query/nodes/query.rb
+- lib/chewy/query/nodes/range.rb
+- lib/chewy/query/nodes/raw.rb
+- lib/chewy/query/nodes/regexp.rb
+- lib/chewy/query/nodes/script.rb
 - lib/chewy/query/pagination.rb
+- lib/chewy/railtie.rb
 - lib/chewy/rspec.rb
 - lib/chewy/rspec/update_index.rb
 - lib/chewy/type.rb
 - lib/chewy/type/adapter/active_record.rb
+- lib/chewy/type/adapter/base.rb
 - lib/chewy/type/adapter/object.rb
 - lib/chewy/type/base.rb
 - lib/chewy/type/import.rb
@@ -178,19 +197,35 @@ files:
 - lib/chewy/type/observe.rb
 - lib/chewy/type/wrapper.rb
 - lib/chewy/version.rb
+- lib/tasks/chewy.rake
 - spec/chewy/config_spec.rb
 - spec/chewy/fields/base_spec.rb
 - spec/chewy/fields/default_spec.rb
 - spec/chewy/fields/root_spec.rb
 - spec/chewy/index/actions_spec.rb
-- spec/chewy/index/client_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/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/missing_spec.rb
+- spec/chewy/query/nodes/not_spec.rb
+- spec/chewy/query/nodes/or_spec.rb
+- spec/chewy/query/nodes/prefix_spec.rb
+- spec/chewy/query/nodes/query_spec.rb
+- spec/chewy/query/nodes/range_spec.rb
+- spec/chewy/query/nodes/raw_spec.rb
+- spec/chewy/query/nodes/regexp_spec.rb
+- spec/chewy/query/nodes/script_spec.rb
 - spec/chewy/query/pagination_spec.rb
 - spec/chewy/query_spec.rb
 - spec/chewy/rspec/update_index_spec.rb
+- spec/chewy/type/adapter/active_record_spec.rb
+- spec/chewy/type/adapter/object_spec.rb
 - spec/chewy/type/import_spec.rb
 - spec/chewy/type/mapping_spec.rb
 - spec/chewy/type/observe_spec.rb
@@ -210,17 +245,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.11
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Elasticsearch ODM client wrapper
@@ -230,14 +265,29 @@ test_files:
 - spec/chewy/fields/default_spec.rb
 - spec/chewy/fields/root_spec.rb
 - spec/chewy/index/actions_spec.rb
-- spec/chewy/index/client_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/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/missing_spec.rb
+- spec/chewy/query/nodes/not_spec.rb
+- spec/chewy/query/nodes/or_spec.rb
+- spec/chewy/query/nodes/prefix_spec.rb
+- spec/chewy/query/nodes/query_spec.rb
+- spec/chewy/query/nodes/range_spec.rb
+- spec/chewy/query/nodes/raw_spec.rb
+- spec/chewy/query/nodes/regexp_spec.rb
+- spec/chewy/query/nodes/script_spec.rb
 - spec/chewy/query/pagination_spec.rb
 - spec/chewy/query_spec.rb
 - spec/chewy/rspec/update_index_spec.rb
+- spec/chewy/type/adapter/active_record_spec.rb
+- spec/chewy/type/adapter/object_spec.rb
 - spec/chewy/type/import_spec.rb
 - spec/chewy/type/mapping_spec.rb
 - spec/chewy/type/observe_spec.rb