Skip to content

Change options validation method instead of altering constant for mongoid 6 #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IngusSkaistkalns wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Change options validation method instead of altering constant for mongoid 6 #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion lib/mongoid/core_ext/relations/options.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,21 @@
module Mongoid
module Relations
module Options
COMMON << :versioned
VERSIONED_OPTIONS = [:versioned].freeze

def validate!(options)
valid_options = options[:relation]::VALID_OPTIONS + COMMON + VERSIONED_OPTIONS
Copy link
Author

@IngusSkaistkalns IngusSkaistkalns Jul 17, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would like something like this here -> options[:relation]::VALID_OPTIONS + common_options(),
where

def self.common_options
    super + [:versioned]
end
# or maybe have DSL for extending common options dedicated for extnsions
Mongoid::Relations::Options.add_common_option(:versioned)

, but all that requires changes in mongoid itself....

Copy link

@ebeigarts ebeigarts Jul 19, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be less intrusive to use

alias_method :validate_without_versioned!, :validate!

def validate!(options)
  validate_without_versioned!(options - [:versioned])
end

Copy link
Author

@IngusSkaistkalns IngusSkaistkalns Jul 19, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ebeigarts yes, looks definetly cleaner, only in case of invalid option exception message contains all valid options, but in this case versioned wont be included in exception message.

options.keys.each do |key|
if !valid_options.include?(key)
raise Errors::InvalidOptions.new(
options[:name],
key,
valid_options
)
end
end
true
end
end
end
end