chewy 0.8.1 → 0.8.2

data/spec/chewy_spec.rb

@@ -57,9 +57,8 @@ describe Chewy do
     end
 
     context 'model scope', :orm do
-      before { stub_model(:country) }
-      before { stub_model(:city) { belongs_to :country } }
-      subject { described_class.create_type(CitiesIndex, City.includes(:country)) }
+      before { stub_model(:city) }
+      subject { described_class.create_type(CitiesIndex, City.where(rating: 1)) }
 
       it { is_expected.to be_a Class }
       it { is_expected.to be < Chewy::Type }

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ Bundler.require
 
 begin
   require 'active_record'
+  require 'sequel'
 rescue LoadError
 end
 
@@ -38,10 +39,12 @@ if defined?(::ActiveRecord)
   require 'support/active_record'
 elsif defined?(::Mongoid)
   require 'support/mongoid'
+elsif defined?(::Sequel)
+  require 'support/sequel'
 else
   RSpec.configure do |config|
-    config.filter_run_excluding :orm
-    config.filter_run_excluding :mongoid
-    config.filter_run_excluding :active_record
+    [:orm, :mongoid, :active_record, :sequel].each do |group|
+      config.filter_run_excluding(group)
+    end
   end
 end

data/spec/support/active_record.rb

@@ -21,16 +21,12 @@ end
 module ActiveRecordClassHelpers
   extend ActiveSupport::Concern
 
-  def stub_model name, superclass = nil, &block
-    stub_class(name, superclass || ActiveRecord::Base, &block)
-  end
-
-  def active_record?
-    true
+  def adapter
+    :active_record
   end
 
-  def mongoid?
-    false
+  def stub_model name, superclass = nil, &block
+    stub_class(name, superclass || ActiveRecord::Base, &block)
   end
 end
 
@@ -38,6 +34,7 @@ RSpec.configure do |config|
   config.include ActiveRecordClassHelpers
 
   config.filter_run_excluding :mongoid
+  config.filter_run_excluding :sequel
 
   config.before(:suite) do
     DatabaseCleaner.clean_with :truncation

data/spec/support/mongoid.rb

@@ -40,6 +40,10 @@ module MongoidClassHelpers
     end
   end
 
+  def adapter
+    :mongoid
+  end
+
   def stub_model name, superclass = nil, &block
     mixin = "MongoidClassHelpers::#{name.to_s.camelize}".safe_constantize || Mongoid::Document
     superclass ||= Class.new do
@@ -49,20 +53,13 @@ module MongoidClassHelpers
 
     stub_class(name, superclass, &block)
   end
-
-  def active_record?
-    false
-  end
-
-  def mongoid?
-    true
-  end
 end
 
 RSpec.configure do |config|
   config.include MongoidClassHelpers
 
   config.filter_run_excluding :active_record
+  config.filter_run_excluding :sequel
 
   config.before(:suite) do
     DatabaseCleaner.clean_with :truncation

data/spec/support/sequel.rb

@@ -0,0 +1,69 @@
+require 'database_cleaner'
+
+DB = Sequel.sqlite
+
+DB.create_table :countries do
+  primary_key :id
+  column :name, :string
+  column :country_code, :string
+  column :rating, :integer
+end
+
+DB.create_table :cities do
+  primary_key :id
+  column :country_id, :integer
+  column :name, :string
+  column :rating, :integer
+end
+
+Sequel::Model.plugin :chewy_observe
+
+module SequelClassHelpers
+  extend ActiveSupport::Concern
+
+  class AdaptedSequelModel < Sequel::Model
+    # Allow to set primary key using mass assignment.
+    unrestrict_primary_key
+
+    # Aliases for compatibility with specs that were written with ActiveRecord in mind...
+    alias_method :save!, :save
+    alias_method :update_attributes, :update
+    alias_method :update_attributes!, :update
+
+    class << self
+      alias_method :create!, :create
+    end
+  end
+
+  def adapter
+    :sequel
+  end
+
+  def stub_model(name, &block)
+    stub_class(name, AdaptedSequelModel, &block).tap do |klass|
+      # Sequel doesn't work well with dynamically created classes,
+      # so we must set the dataset (table) name manually.
+      klass.dataset = name.to_s.pluralize.to_sym
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.include SequelClassHelpers
+
+  config.filter_run_excluding :active_record
+  config.filter_run_excluding :mongoid
+
+  config.before(:suite) do
+    DatabaseCleaner.clean_with :truncation
+    DatabaseCleaner.strategy = :truncation
+  end
+
+  config.before do
+    DatabaseCleaner.start
+  end
+
+  config.after do
+    DatabaseCleaner.clean
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chewy
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - pyromaniac
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-30 00:00:00.000000000 Z
+date: 2015-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -205,6 +205,7 @@ files:
 - gemfiles/rails.4.2.mongoid.gemfile
 - gemfiles/rails.4.2.mongoid.kaminari.gemfile
 - gemfiles/rails.4.2.mongoid.will_paginate.gemfile
+- gemfiles/sequel.4.23.gemfile
 - lib/chewy.rb
 - lib/chewy/backports/deep_dup.rb
 - lib/chewy/backports/duplicable.rb
@@ -247,6 +248,7 @@ files:
 - lib/chewy/query/pagination/will_paginate.rb
 - lib/chewy/query/scoping.rb
 - lib/chewy/railtie.rb
+- lib/chewy/rake_helper.rb
 - lib/chewy/repository.rb
 - lib/chewy/rspec.rb
 - lib/chewy/rspec/update_index.rb
@@ -254,6 +256,7 @@ files:
 - lib/chewy/runtime/version.rb
 - lib/chewy/search.rb
 - lib/chewy/strategy.rb
+- lib/chewy/strategy/active_job.rb
 - lib/chewy/strategy/atomic.rb
 - lib/chewy/strategy/base.rb
 - lib/chewy/strategy/bypass.rb
@@ -267,6 +270,7 @@ files:
 - lib/chewy/type/adapter/mongoid.rb
 - lib/chewy/type/adapter/object.rb
 - lib/chewy/type/adapter/orm.rb
+- lib/chewy/type/adapter/sequel.rb
 - lib/chewy/type/crutch.rb
 - lib/chewy/type/import.rb
 - lib/chewy/type/mapping.rb
@@ -275,6 +279,7 @@ files:
 - lib/chewy/version.rb
 - lib/generators/chewy/install_generator.rb
 - lib/generators/templates/chewy.yml
+- lib/sequel/plugins/chewy_observe.rb
 - lib/tasks/chewy.rake
 - spec/chewy/config_spec.rb
 - spec/chewy/fields/base_spec.rb
@@ -312,6 +317,7 @@ files:
 - spec/chewy/runtime/version_spec.rb
 - spec/chewy/runtime_spec.rb
 - spec/chewy/search_spec.rb
+- spec/chewy/strategy/active_job_spec.rb
 - spec/chewy/strategy/resque_spec.rb
 - spec/chewy/strategy/sidekiq_spec.rb
 - spec/chewy/strategy_spec.rb
@@ -319,6 +325,7 @@ files:
 - spec/chewy/type/adapter/active_record_spec.rb
 - spec/chewy/type/adapter/mongoid_spec.rb
 - spec/chewy/type/adapter/object_spec.rb
+- spec/chewy/type/adapter/sequel_spec.rb
 - spec/chewy/type/import_spec.rb
 - spec/chewy/type/mapping_spec.rb
 - spec/chewy/type/observe_spec.rb
@@ -330,6 +337,7 @@ files:
 - spec/support/class_helpers.rb
 - spec/support/fail_helpers.rb
 - spec/support/mongoid.rb
+- spec/support/sequel.rb
 homepage: https://github.com/toptal/chewy
 licenses:
 - MIT
@@ -350,7 +358,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Elasticsearch ODM client wrapper
@@ -391,6 +399,7 @@ test_files:
 - spec/chewy/runtime/version_spec.rb
 - spec/chewy/runtime_spec.rb
 - spec/chewy/search_spec.rb
+- spec/chewy/strategy/active_job_spec.rb
 - spec/chewy/strategy/resque_spec.rb
 - spec/chewy/strategy/sidekiq_spec.rb
 - spec/chewy/strategy_spec.rb
@@ -398,6 +407,7 @@ test_files:
 - spec/chewy/type/adapter/active_record_spec.rb
 - spec/chewy/type/adapter/mongoid_spec.rb
 - spec/chewy/type/adapter/object_spec.rb
+- spec/chewy/type/adapter/sequel_spec.rb
 - spec/chewy/type/import_spec.rb
 - spec/chewy/type/mapping_spec.rb
 - spec/chewy/type/observe_spec.rb
@@ -409,3 +419,4 @@ test_files:
 - spec/support/class_helpers.rb
 - spec/support/fail_helpers.rb
 - spec/support/mongoid.rb
+- spec/support/sequel.rb