Use only new hash syntax

This commit is contained in:
Artem Chernikov 2014-07-21 14:49:05 +02:00
parent 3901973fd6
commit 5289f41eb5
72 changed files with 179 additions and 181 deletions

View file

@ -2,7 +2,7 @@ class Answer < ActiveRecord::Base
attr_accessible :title
has_many :qanswers
has_many :questions, :through => :qanswers
has_many :questions, through: :qanswers
validates :title, :presence => true
validates :title, presence: true
end

View file

@ -5,7 +5,7 @@ class CallForPapers < ActiveRecord::Base
belongs_to :conference
validates_presence_of :start_date, :end_date
validates :rating, :numericality => { :greater_than_or_equal_to => 0, :less_than_or_equal_to => 10 }
validates :rating, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 10 }
##
# Calculates how many weeks the call for paper is.

View file

@ -1,5 +1,5 @@
class Comment < ActiveRecord::Base
acts_as_nested_set :scope => [:commentable_id, :commentable_type]
acts_as_nested_set scope: [:commentable_id, :commentable_type]
attr_accessible :commentable, :body, :user_id
validates_presence_of :body
validates_presence_of :user
@ -8,7 +8,7 @@ class Comment < ActiveRecord::Base
# want user to vote on the quality of comments.
#acts_as_votable
belongs_to :commentable, :polymorphic => true
belongs_to :commentable, polymorphic: true
# NOTE: Comments belong to a user
belongs_to :user
@ -18,9 +18,9 @@ class Comment < ActiveRecord::Base
# example in readme
def self.build_from(obj, user_id, comment)
new \
:commentable => obj,
:body => comment,
:user_id => user_id
commentable: obj,
body: comment,
user_id: user_id
end
#helper method to check if a comment has children
@ -31,13 +31,13 @@ class Comment < ActiveRecord::Base
# Helper class method to lookup all comments assigned
# to all commentable types for a given user.
scope :find_comments_by_user, lambda { |user|
where(:user_id => user.id).order('created_at DESC')
where(user_id: user.id).order('created_at DESC')
}
# Helper class method to look up all comments for
# commentable class name and commentable id.
scope :find_comments_for_commentable, lambda { |commentable_str, commentable_id|
where(:commentable_type => commentable_str.to_s, :commentable_id => commentable_id).order('created_at DESC')
where(commentable_type: commentable_str.to_s, commentable_id: commentable_id).order('created_at DESC')
}
# Helper class method to look up a commentable object

View file

@ -89,7 +89,7 @@ class Conference < ActiveRecord::Base
format: URI::regexp(%w(http https)), allow_blank: true
validates_uniqueness_of :short_title
validates_format_of :short_title, :with => /\A[a-zA-Z0-9_-]*\z/
validates_format_of :short_title, with: /\A[a-zA-Z0-9_-]*\z/
before_create :generate_guid
before_create :create_venue
before_create :create_event_types

View file

@ -4,5 +4,5 @@ class DifficultyLevel < ActiveRecord::Base
belongs_to :conference
has_many :events
validates :title, :presence => true
validates :title, presence: true
end

View file

@ -4,7 +4,7 @@ class EventAttachment < ActiveRecord::Base
belongs_to :event
attr_accessible :public, :attachment, :event_id, :title
has_attached_file :attachment, :path => ":rails_root/storage/:rails_env/attachments/:id/:style/:basename.:extension"
has_attached_file :attachment, path: ":rails_root/storage/:rails_env/attachments/:id/:style/:basename.:extension"
include Rails.application.routes.url_helpers
def to_jq_upload

View file

@ -4,7 +4,7 @@ class EventType < ActiveRecord::Base
belongs_to :conference
validates :title, presence: true
validates :length, :numericality => {:greater_than => 0}
validates :length, numericality: {greater_than: 0}
validates :minimum_abstract_length, presence: true
validates :maximum_abstract_length, presence: true

View file

@ -2,7 +2,7 @@ class Qanswer < ActiveRecord::Base
attr_accessible :question_id, :answer_id
belongs_to :question
belongs_to :answer, :dependent => :delete
belongs_to :answer, dependent: :delete
has_and_belongs_to_many :registrations
end

View file

@ -4,11 +4,11 @@ class Question < ActiveRecord::Base
belongs_to :question_type
has_and_belongs_to_many :conferences
has_many :qanswers, :dependent => :delete_all
has_many :answers, :through => :qanswers, :dependent => :delete_all
has_many :qanswers, dependent: :delete_all
has_many :answers, through: :qanswers, dependent: :delete_all
validates :title, :presence => true
validates :answers, :presence => true
validates :title, presence: true
validates :answers, presence: true
accepts_nested_attributes_for :answers, :allow_destroy => true
accepts_nested_attributes_for :answers, allow_destroy: true
end

View file

@ -4,5 +4,5 @@ class Vday < ActiveRecord::Base
belongs_to :conference
has_many :vchoices
has_many :vpositions, :through => :vchoices, :dependent => :destroy
has_many :vpositions, through: :vchoices, dependent: :destroy
end

View file

@ -20,7 +20,7 @@ class Venue < ActiveRecord::Base
def generate_guid
loop do
@guid = SecureRandom.urlsafe_base64
break if !Venue.where(:guid => guid).any?
break if !Venue.where(guid: guid).any?
end
self.guid = @guid
end

View file

@ -4,7 +4,7 @@ class Vposition < ActiveRecord::Base
belongs_to :conference
has_many :vchoices
has_many :vdays, :through => :vchoices
has_many :vdays, through: :vchoices
validates_presence_of :title, :vdays
end