lib/discerner/methods/models/parameter.rb in discerner-2.0.0 vs lib/discerner/methods/models/parameter.rb in discerner-2.0.1

- old
+ new

@@ -4,29 +4,29 @@ module Parameter def self.included(base) base.send :include, SoftDelete # Associations - base.send :belongs_to, :parameter_category, :inverse_of => :parameters - base.send :belongs_to, :parameter_type, :inverse_of => :parameters - base.send :has_many, :parameter_values, :inverse_of => :parameter, :dependent => :destroy - base.send :has_many, :search_parameters, :inverse_of => :parameter, :dependent => :destroy - base.send :has_many, :export_parameters, :inverse_of => :parameter, :dependent => :destroy - base.send :has_many, :parameter_value_categories, :inverse_of => :parameter, :dependent => :destroy + base.send :belongs_to, :parameter_category, inverse_of: :parameters + base.send :belongs_to, :parameter_type, inverse_of: :parameters + base.send :has_many, :parameter_values, inverse_of: :parameter, dependent: :destroy + base.send :has_many, :search_parameters, inverse_of: :parameter, dependent: :destroy + base.send :has_many, :export_parameters, inverse_of: :parameter, dependent: :destroy + base.send :has_many, :parameter_value_categories, inverse_of: :parameter, dependent: :destroy #Validations - base.send :validates, :name, :unique_identifier, :parameter_category, :presence => { :message => "for parameter can't be blank" } + base.send :validates, :name, :unique_identifier, :parameter_category, presence: { message: "for parameter can't be blank" } base.send :validate, :validate_unique_identifier base.send :validate, :validate_search_attributes base.send :validate, :validate_export_attributes # Scopes base.send(:scope, :searchable, -> {base.not_deleted.where('search_model is not null and search_method is not null')}) base.send(:scope, :exportable, -> {base.not_deleted.where('export_model is not null and export_method is not null')}) # Hooks - base.send :after_commit, :cascade_delete_parameter_values, :on => :update, :if => Proc.new { |record| record.previous_changes.include?('deleted_at') } + base.send :after_commit, :cascade_delete_parameter_values, on: :update, if: Proc.new { |record| record.previous_changes.include?('deleted_at') } end # Instance Methods def initialize(*args) super(*args) @@ -53,10 +53,10 @@ end def validate_unique_identifier return if self.parameter_category.blank? existing_parameters = Discerner::Parameter. - joins({ :parameter_category => :dictionary }). + joins({ parameter_category: :dictionary }). where('discerner_dictionaries.id = ? and discerner_parameters.unique_identifier = ?', self.parameter_category.dictionary.id, self.unique_identifier) existing_parameters = existing_parameters.where('discerner_parameters.id != ?', self.id) unless self.id.blank? errors.add(:base,"Unique identifier has to be unique within dictionary.") if existing_parameters.any? end