chewy 0.4.1 → 0.5.0

data/spec/chewy/type/import_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe Chewy::Type::Import do
-  include ClassHelpers
-
   before { Chewy.client.indices.delete index: '*' }
 
   before do
@@ -188,7 +186,7 @@ describe Chewy::Type::Import do
         end
       end
 
-      specify { expect { city.import!(dummy_cities) }.to raise_error Chewy::FailedImport }
+      specify { expect { city.import!(dummy_cities) }.to raise_error Chewy::ImportFailed }
     end
   end
 end

data/spec/chewy/type/mapping_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe Chewy::Type::Mapping do
-  include ClassHelpers
-
   let(:product) { ProductsIndex::Product }
 
   before do
@@ -23,13 +21,13 @@ describe Chewy::Type::Mapping do
 
   describe '.field' do
     specify { product.root_object.nested.keys.should =~ [:name, :surname, :title, :price] }
-    specify { product.root_object.nested.values.should satisfy { |v| v.all? { |f| f.is_a? Chewy::Fields::Default } } }
+    specify { product.root_object.nested.values.should satisfy { |v| v.all? { |f| f.is_a? Chewy::Fields::Base } } }
 
     specify { product.root_object.nested[:title].nested.keys.should == [:subfield1] }
-    specify { product.root_object.nested[:title].nested[:subfield1].should be_a Chewy::Fields::Default }
+    specify { product.root_object.nested[:title].nested[:subfield1].should be_a Chewy::Fields::Base }
 
     specify { product.root_object.nested[:price].nested.keys.should == [:subfield2] }
-    specify { product.root_object.nested[:price].nested[:subfield2].should be_a Chewy::Fields::Default }
+    specify { product.root_object.nested[:price].nested[:subfield2].should be_a Chewy::Fields::Base }
   end
 
   describe '.mappings_hash' do
@@ -49,6 +47,6 @@ describe Chewy::Type::Mapping do
     end
 
     specify { product.root_object.nested[:title].nested.keys.should == [:subfield1] }
-    specify { product.root_object.nested[:title].nested[:subfield1].should be_a Chewy::Fields::Default }
+    specify { product.root_object.nested[:title].nested[:subfield1].should be_a Chewy::Fields::Base }
   end
 end

data/spec/chewy/type/observe_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe Chewy::Type::Import do
-  include ClassHelpers
-
   describe '.update_index' do
     before do
       stub_index(:dummies) do

data/spec/chewy/type/wrapper_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe Chewy::Type::Wrapper do
-  include ClassHelpers
-
   before do
     stub_model(:city)
     stub_index(:cities) do

data/spec/chewy/type_spec.rb

@@ -1,12 +1,8 @@
 require 'spec_helper'
 
 describe Chewy::Type do
-  include ClassHelpers
-
   describe '.new' do
-    before do
-      stub_index(:cities)
-    end
+    before { stub_index(:cities) }
 
     context 'Symbol' do
       subject { described_class.new(CitiesIndex, :city) }
@@ -39,5 +35,30 @@ describe Chewy::Type do
       its(:index) { should == CitiesIndex }
       its(:type_name) { should == 'city' }
     end
+
+    context 'Namespaced index' do
+      before { stub_model(:city) }
+      before { stub_index('namespace/cities') }
+
+      subject { described_class.new(Namespace::CitiesIndex, City) }
+
+      it { should be_a Class }
+      it { should be < Chewy::Type::Base }
+      its(:name) { should == 'Namespace::CitiesIndex::City' }
+      its(:index) { should == Namespace::CitiesIndex }
+      its(:type_name) { should == 'city' }
+    end
+
+    context 'Namespaced model' do
+      before { stub_model('namespace/city') }
+
+      subject { described_class.new(CitiesIndex, Namespace::City) }
+
+      it { should be_a Class }
+      it { should be < Chewy::Type::Base }
+      its(:name) { should == 'CitiesIndex::City' }
+      its(:index) { should == CitiesIndex }
+      its(:type_name) { should == 'city' }
+    end
   end
 end

data/spec/chewy_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe Chewy do
-  include ClassHelpers
-
   it 'should have a version number' do
     expect(Chewy::VERSION).not_to be nil
   end

data/spec/spec_helper.rb

@@ -9,11 +9,11 @@ require 'support/class_helpers'
 
 require 'chewy/rspec'
 
+Kaminari::Hooks.init
+
 ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
 ActiveRecord::Base.logger = Logger.new('/dev/null')
 
-Kaminari::Hooks.init
-
 ActiveRecord::Schema.define do
   create_table :countries do |t|
     t.column :name, :string

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chewy
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - pyromaniac
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-18 00:00:00.000000000 Z
+date: 2014-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +52,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: kaminari
-  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
   requirement: !ruby/object:Gem::Requirement
@@ -158,10 +144,11 @@ files:
 - gemfiles/Gemfile.rails-3.2
 - gemfiles/Gemfile.rails-4.0
 - lib/chewy.rb
+- lib/chewy/backports/deep_dup.rb
+- lib/chewy/backports/duplicable.rb
 - lib/chewy/config.rb
 - lib/chewy/errors.rb
 - lib/chewy/fields/base.rb
-- lib/chewy/fields/default.rb
 - lib/chewy/fields/root.rb
 - lib/chewy/index.rb
 - lib/chewy/index/actions.rb
@@ -194,9 +181,12 @@ files:
 - lib/chewy/query/nodes/regexp.rb
 - lib/chewy/query/nodes/script.rb
 - lib/chewy/query/pagination.rb
+- lib/chewy/query/pagination/kaminari.rb
 - lib/chewy/railtie.rb
 - lib/chewy/rspec.rb
 - lib/chewy/rspec/update_index.rb
+- lib/chewy/runtime.rb
+- lib/chewy/runtime/version.rb
 - lib/chewy/type.rb
 - lib/chewy/type/adapter/active_record.rb
 - lib/chewy/type/adapter/base.rb
@@ -210,7 +200,6 @@ files:
 - 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/aliases_spec.rb
@@ -236,9 +225,12 @@ files:
 - 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/kaminari_spec.rb
 - spec/chewy/query/pagination_spec.rb
 - spec/chewy/query_spec.rb
 - spec/chewy/rspec/update_index_spec.rb
+- spec/chewy/runtime/version_spec.rb
+- spec/chewy/runtime_spec.rb
 - spec/chewy/type/adapter/active_record_spec.rb
 - spec/chewy/type/adapter/object_spec.rb
 - spec/chewy/type/import_spec.rb
@@ -277,7 +269,6 @@ summary: Elasticsearch ODM client wrapper
 test_files:
 - 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/aliases_spec.rb
@@ -303,9 +294,12 @@ test_files:
 - 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/kaminari_spec.rb
 - spec/chewy/query/pagination_spec.rb
 - spec/chewy/query_spec.rb
 - spec/chewy/rspec/update_index_spec.rb
+- spec/chewy/runtime/version_spec.rb
+- spec/chewy/runtime_spec.rb
 - spec/chewy/type/adapter/active_record_spec.rb
 - spec/chewy/type/adapter/object_spec.rb
 - spec/chewy/type/import_spec.rb

data/lib/chewy/fields/default.rb

@@ -1,10 +0,0 @@
-module Chewy
-  module Fields
-    class Default < Chewy::Fields::Base
-      def initialize(name, options = {})
-        options.reverse_merge!(type: 'string')
-        super(name, options)
-      end
-    end
-  end
-end

data/spec/chewy/fields/default_spec.rb

@@ -1,6 +0,0 @@
-require 'spec_helper'
-
-describe Chewy::Fields::Default do
-  specify { described_class.new('name').options[:type].should == 'string' }
-  # TODO: add 'should_behave_like base_field'
-end