Skip to content

Commit 7da3be4

Browse files
committed
Begin encasulating configuration in a class
1 parent 4597126 commit 7da3be4

File tree

2 files changed

+37
-7
lines changed

2 files changed

+37
-7
lines changed

lib/meilisearch-rails.rb

+4-7
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
require 'meilisearch/rails/multi_search'
77
require 'meilisearch/rails/index_settings'
88
require 'meilisearch/rails/safe_index'
9+
require 'meilisearch/rails/model_configuration'
910

1011
if defined? Rails
1112
begin
@@ -73,7 +74,7 @@ class << base
7374
alias_method :must_reindex?, :ms_must_reindex? unless method_defined? :must_reindex?
7475
end
7576

76-
base.cattr_accessor :meilisearch_options, :meilisearch_settings
77+
base.cattr_accessor :meilisearch_options, :meilisearch_settings, :ms_config
7778
end
7879

7980
def meilisearch(options = {}, &block)
@@ -83,11 +84,9 @@ def meilisearch(options = {}, &block)
8384
per_page: meilisearch_settings.get_setting(:hitsPerPage) || 20, page: 1
8485
}.merge(options)
8586

86-
attr_accessor :formatted
87+
self.ms_config = ModelConfiguration.new(model_name.to_s.constantize, options)
8788

88-
if options.key?(:per_environment)
89-
raise BadConfiguration, ':per_environment option should be defined globally on MeiliSearch::Rails.configuration block.'
90-
end
89+
attr_accessor :formatted
9190

9291
if options[:synchronous] == true
9392
if defined?(::Sequel::Model) && self < Sequel::Model
@@ -104,8 +103,6 @@ def meilisearch(options = {}, &block)
104103
end
105104
end
106105
if options[:enqueue]
107-
raise ArgumentError, 'Cannot use a enqueue if the `synchronous` option is set' if options[:synchronous]
108-
109106
proc = if options[:enqueue] == true
110107
proc do |record, remove|
111108
if remove
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
module MeiliSearch
2+
module Rails
3+
class ModelConfiguration
4+
attr_reader :model
5+
6+
def initialize(model, options = {})
7+
@model = model
8+
parse_options(options)
9+
end
10+
11+
private
12+
13+
def parse_options(options)
14+
refute_global_options(options, [:per_environment])
15+
mutually_exclusive_options(options, [:enqueue, :synchronous])
16+
end
17+
18+
def refute_global_options(options, misapplied_global_opts)
19+
misapplied_global_opts.each do |opt|
20+
if options[opt]
21+
raise BadConfiguration, ":#{opt} option should be defined globally on MeiliSearch::Rails.configuration block."
22+
end
23+
end
24+
end
25+
26+
def mutually_exclusive_options(options, exclusives)
27+
first, second = exclusives.select { |opt| options[opt] }
28+
29+
raise ArgumentError, "Cannot use :#{first} if the :#{second} option is set" if second
30+
end
31+
end
32+
end
33+
end

0 commit comments

Comments
 (0)