chewy 0.4.1 → 0.5.0

data/lib/chewy/type/wrapper.rb

@@ -3,7 +3,7 @@ module Chewy
     module Wrapper
       extend ActiveSupport::Concern
 
-      attr_accessor :attributes
+      attr_accessor :attributes, :_data, :_object
 
       def initialize(attributes = {})
         @attributes = attributes.stringify_keys

data/lib/chewy/version.rb

@@ -1,3 +1,3 @@
 module Chewy
-  VERSION = '0.4.1'
+  VERSION = '0.5.0'
 end

data/lib/tasks/chewy.rake

@@ -12,49 +12,68 @@ def subscribe_task_stats!
   end
 end
 
+def eager_load_chewy!
+  Rails.application.config.paths['app/chewy'].existent.each do |dir|
+    Dir.glob(File.join(dir, '**/*.rb')).each { |file| require file }
+  end
+end
+
+def normalize_index index
+  "#{index.to_s.gsub(/index$/i, '').camelize}Index".constantize
+end
+
+def reset_index index
+  index = normalize_index(index)
+  puts "Resetting #{index}"
+  index.reset! (Time.now.to_f * 1000).round
+end
+
+def reset_all
+  eager_load_chewy!
+  Chewy::Index.descendants.each { |index| reset_index index }
+end
+
+def update_index index
+  index = normalize_index(index)
+  puts "Updating #{index}"
+  if index.exists?
+    index.import
+  else
+    puts "Index `#{index.index_name}` does not exists. Use rake chewy:reset[#{index.index_name}] to create and update it."
+  end
+end
+
+def update_all
+  eager_load_chewy!
+  Chewy::Index.descendants.each { |index| update_index index }
+end
+
 namespace :chewy do
   desc 'Destroy, recreate and import data to specified index'
   task :reset, [:index] => :environment do |task, args|
     subscribe_task_stats!
-    "#{args[:index].camelize}Index".constantize.reset! (Time.now.to_f * 1000).round
+    args[:index].present? ? reset_index(args[:index]) : reset_all
   end
 
   namespace :reset do
     desc 'Destroy, recreate and import data for all found indexes'
     task all: :environment do
       subscribe_task_stats!
-      Rails.application.config.paths['app/chewy'].existent.each do |dir|
-        Dir.glob(File.join(dir, '**/*.rb')).each { |file| require file }
-      end
-
-      Chewy::Index.descendants.each do |index|
-        puts "Resetting #{index}"
-        index.reset! (Time.now.to_f * 1000).round
-      end
+      reset_all
     end
   end
 
   desc 'Updates data specified index'
   task :update, [:index] => :environment do |task, args|
     subscribe_task_stats!
-    index = "#{args[:index].camelize}Index".constantize
-    raise "Index `#{index.index_name}` does not exists. Use rake chewy:reset[#{index.index_name}] to create and update it." unless index.exists?
-    index.import
+    args[:index].present? ? update_index(args[:index]) : update_all
   end
 
   namespace :update do
     desc 'Updates data for all found indexes'
     task all: :environment do
       subscribe_task_stats!
-      Rails.application.config.paths['app/chewy'].existent.each do |dir|
-        Dir.glob(File.join(dir, '**/*.rb')).each { |file| require file }
-      end
-
-      Chewy::Index.descendants.each do |index|
-        puts "Updating #{index}"
-        puts "Index `#{index.index_name}` does not exists. Use rake chewy:reset[#{index.index_name}] to create and update it." unless index.exists?
-        index.import
-      end
+      update_all
     end
   end
 end

data/spec/chewy/config_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
 describe Chewy::Config do
-  include ClassHelpers
   subject { described_class.send(:new) }
 
   its(:query_mode) { should == :must }
   its(:filter_mode) { should == :and }
+  its(:post_filter_mode) { should be_nil }
   its(:logger) { should be_nil }
   its(:configuration) { should_not have_key :logger }
   its(:analyzers) { should == {} }

data/spec/chewy/fields/base_spec.rb

@@ -31,7 +31,7 @@ describe Chewy::Fields::Base do
     end
 
     context do
-      let(:field) { described_class.new(:name, type: 'multi_field') }
+      let(:field) { described_class.new(:name, type: 'string') }
       before do
         field.nested(described_class.new(:name))
         field.nested(described_class.new(:untouched))
@@ -61,7 +61,7 @@ describe Chewy::Fields::Base do
   end
 
   describe '#mappings_hash' do
-    let(:field) { described_class.new(:name, type: 'string') }
+    let(:field) { described_class.new(:name, type: :object) }
     let(:fields1) { 2.times.map { |i| described_class.new("name#{i+1}", type: "string#{i+1}") } }
     let(:fields2) { 2.times.map { |i| described_class.new("name#{i+3}", type: "string#{i+3}") } }
     before do
@@ -69,20 +69,285 @@ describe Chewy::Fields::Base do
       fields2.each { |m| fields1[0].nested(m) }
     end
 
-    specify { field.mappings_hash.should == {name: {type: 'string', properties: {
-      name1: {type: 'string1', properties: {
+    specify { field.mappings_hash.should == {name: {type: :object, properties: {
+      name1: {type: 'string1', fields: {
         name3: {type: 'string3'}, name4: {type: 'string4'}
       }}, name2: {type: 'string2'}
     }}} }
 
     context do
-      let(:field) { described_class.new(:name, type: 'multi_field') }
+      let(:field) { described_class.new(:name, type: :string) }
+      let(:fields1) { 2.times.map { |i| described_class.new("name#{i+1}") } }
 
-      specify { field.mappings_hash.should == {name: {type: 'multi_field', fields: {
-        name1: {type: 'string1', properties: {
+      specify { field.mappings_hash.should == {name: {type: :string, fields: {
+        name1: {type: 'object', properties: {
           name3: {type: 'string3'}, name4: {type: 'string4'}
-        }}, name2: {type: 'string2'}
+        }}, name2: {type: 'string'}
       }}} }
     end
   end
+
+  context 'integration' do
+    context 'objects, hashes and arrays' do
+      before do
+        stub_index(:events) do
+          define_type :event do
+            field :id
+            field :category do
+              field :id
+              field :licenses do
+                field :id
+                field :name
+              end
+            end
+          end
+        end
+      end
+
+      specify do
+        EventsIndex::Event.mappings_hash.should == { event: {
+          properties: {
+            id: { type: 'string' },
+            category: {
+              type: 'object',
+              properties: {
+                id: { type: 'string' },
+                licenses: {
+                  type: 'object',
+                  properties: {
+                    id: { type: 'string' },
+                    name: { type: 'string' } } } } } } } }
+      end
+
+      specify do
+        EventsIndex::Event.root_object.compose(
+          id: 1, category: { id: 2, licenses: { id: 3, name: 'Name' } }
+        ).should == {
+          event: { 'id' => 1, 'category' => { 'id' => 2, 'licenses' => {'id' => 3, 'name' => 'Name'}}}
+        }
+      end
+
+      specify do
+        EventsIndex::Event.root_object.compose(id: 1, category: [
+          { id: 2, 'licenses' => { id: 3, name: 'Name1' } },
+          { id: 4, licenses: nil}
+        ]).should == {
+          event: { 'id' => 1, 'category' => [
+            { 'id' => 2, 'licenses' => { 'id' => 3, 'name' => 'Name1' } },
+            {'id' => 4, 'licenses' => nil }
+          ] }
+        }
+      end
+
+      specify do
+        EventsIndex::Event.root_object.compose('id' => 1, category: { id: 2, licenses: [
+          { id: 3, name: 'Name1' }, { id: 4, name: 'Name2' }
+        ] }).should == {
+          event: { 'id' => 1, 'category' => { 'id' => 2, 'licenses' => [
+            {'id' => 3, 'name' => 'Name1'}, {'id' => 4, 'name' => 'Name2'}
+          ] } }
+        }
+      end
+
+      specify do
+        EventsIndex::Event.root_object.compose(id: 1, category: [
+          { id: 2, licenses: [
+            { id: 3, 'name' => 'Name1' }, { id: 4, name: 'Name2' }
+          ] },
+          { id: 5, licenses: [] }
+        ]).should == {
+          event: { 'id' => 1, 'category' => [
+            { 'id' => 2, 'licenses' => [
+              { 'id' => 3, 'name' => 'Name1' }, { 'id' => 4, 'name' => 'Name2' }
+            ] },
+            {'id' => 5, 'licenses' => [] }
+          ] }
+        }
+      end
+
+      specify do
+        EventsIndex::Event.root_object.compose(
+          double(id: 1, category: double(id: 2, licenses: double(id: 3, name: 'Name')))
+        ).should == {
+          event: { 'id' => 1, 'category' => { 'id' => 2, 'licenses' => {'id' => 3, 'name' => 'Name'}}}
+        }
+      end
+
+      specify do
+        EventsIndex::Event.root_object.compose(double(id: 1, category: [
+          double(id: 2, licenses: double(id: 3, name: 'Name1')),
+          double(id: 4, licenses: nil)
+        ])).should == {
+          event: { 'id' => 1, 'category' => [
+            { 'id' => 2, 'licenses' => { 'id' => 3, 'name' => 'Name1' } },
+            {'id' => 4, 'licenses' => nil }
+          ] }
+        }
+      end
+
+      specify do
+        EventsIndex::Event.root_object.compose(double(id: 1, category: double(id: 2, licenses: [
+          double(id: 3, name: 'Name1'), double(id: 4, name: 'Name2')
+        ]))).should == {
+          event: { 'id' => 1, 'category' => { 'id' => 2, 'licenses' => [
+            {'id' => 3, 'name' => 'Name1'}, {'id' => 4, 'name' => 'Name2'}
+          ] } }
+        }
+      end
+
+      specify do
+        EventsIndex::Event.root_object.compose(double(id: 1, category: [
+          double(id: 2, licenses: [
+            double(id: 3, name: 'Name1'), double(id: 4, name: 'Name2')
+          ]),
+          double(id: 5, licenses: [])
+        ])).should == {
+          event: { 'id' => 1, 'category' => [
+            { 'id' => 2, 'licenses' => [
+              { 'id' => 3, 'name' => 'Name1' }, { 'id' => 4, 'name' => 'Name2' }
+            ] },
+            {'id' => 5, 'licenses' => [] }
+          ] }
+        }
+      end
+    end
+
+    context 'custom methods' do
+      before do
+        stub_index(:events) do
+          define_type :event do
+            field :id
+            field :category, value: ->{ categories } do
+              field :id
+              field :licenses, value: ->{ license } do
+                field :id
+                field :name
+              end
+            end
+          end
+        end
+      end
+
+      specify do
+        EventsIndex::Event.root_object.compose(
+          double(id: 1, categories: double(id: 2, license: double(id: 3, name: 'Name')))
+        ).should == {
+          event: { 'id' => 1, 'category' => { 'id' => 2, 'licenses' => {'id' => 3, 'name' => 'Name'}}}
+        }
+      end
+    end
+
+    context 'objects and multi_fields' do
+      before do
+        stub_index(:events) do
+          define_type :event do
+            field :id
+            field :name, type: 'string' do
+              field :raw, analyzer: 'my_own'
+            end
+            field :category, type: 'object'
+          end
+        end
+      end
+
+      specify do
+        EventsIndex::Event.mappings_hash.should == { event: {
+          properties: {
+            id: { type: 'string' },
+            name: {
+              type: 'string',
+              fields: {
+                raw: { analyzer: 'my_own', type: 'string' }
+              }
+            },
+            category: { type: 'object' }
+          }
+        } }
+      end
+
+      specify do
+        EventsIndex::Event.root_object.compose(
+          double(id: 1, name: 'Jonny', category: double(id: 2, as_json: {name: 'Borogoves'}))
+        ).should == {
+          event: {
+            'id' => 1,
+            'name' => 'Jonny',
+            'category' => { 'name' => 'Borogoves' }
+          }
+        }
+      end
+
+      specify do
+        EventsIndex::Event.root_object.compose(
+          double(id: 1, name: 'Jonny', category: [
+            double(id: 2, as_json: { name: 'Borogoves1' }),
+            double(id: 3, as_json: { name: 'Borogoves2' })
+          ])
+        ).should == {
+          event: {
+            'id' => 1,
+            'name' => 'Jonny',
+            'category' => [
+              { 'name' => 'Borogoves1' },
+              { 'name' => 'Borogoves2' }
+            ]
+          }
+        }
+      end
+    end
+
+    context 'objects and scopes' do
+      before do
+        stub_model(:city) do
+          belongs_to :country
+        end
+
+        stub_model(:country) do
+          has_many :cities
+        end
+
+        stub_index(:countries) do
+          define_type Country do
+            field :id
+            field :cities do
+              field :id
+              field :name
+            end
+          end
+        end
+      end
+
+      specify do
+        CountriesIndex::Country.root_object.compose(
+          Country.create!(cities: [City.create!(name: 'City1'), City.create!(name: 'City2')])
+        ).should == {
+          country: { 'id' => 1, 'cities' => [
+            { 'id' => 1, 'name' => 'City1' }, { 'id' => 2, 'name' => 'City2' }
+          ] }
+        }
+      end
+
+      context 'nested object' do
+        before do
+          stub_index(:cities) do
+            define_type City do
+              field :id
+              field :country do
+                field :id
+                field :name
+              end
+            end
+          end
+        end
+
+        specify do
+          CitiesIndex::City.root_object.compose(
+            City.create!(country: Country.create!(name: 'Country'))
+          ).should == {
+            city: { 'id' => 1, 'country' => { 'id' => 1, 'name' => 'Country' } }
+          }
+        end
+      end
+    end
+  end
 end

data/spec/chewy/index/actions_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Chewy::Index::Actions do
-  include ClassHelpers
   before { Chewy.client.indices.delete index: '*' }
 
   before { stub_index :dummies }
@@ -311,7 +310,7 @@ describe Chewy::Index::Actions do
         end
       end
 
-      specify { expect { CitiesIndex.import!(city: dummy_cities) }.to raise_error Chewy::FailedImport }
+      specify { expect { CitiesIndex.import!(city: dummy_cities) }.to raise_error Chewy::ImportFailed }
     end
   end
 

data/spec/chewy/index/aliases_spec.rb

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