Commit 64321c962e0e29ee07d46aa945064319978f410c
1 parent
ff156351
Exists in
master
and in
1 other branch
Fix mongoid4 scopes
Showing
3 changed files
with
8 additions
and
10 deletions
Show diff stats
app/models/backtrace_line.rb
| @@ -10,7 +10,7 @@ class BacktraceLine | @@ -10,7 +10,7 @@ class BacktraceLine | ||
| 10 | 10 | ||
| 11 | embedded_in :backtrace | 11 | embedded_in :backtrace |
| 12 | 12 | ||
| 13 | - scope :in_app, where(:file => IN_APP_PATH) | 13 | + scope :in_app, ->{ where(:file => IN_APP_PATH) } |
| 14 | 14 | ||
| 15 | delegate :app, :to => :backtrace | 15 | delegate :app, :to => :backtrace |
| 16 | 16 | ||
| @@ -40,4 +40,3 @@ class BacktraceLine | @@ -40,4 +40,3 @@ class BacktraceLine | ||
| 40 | end | 40 | end |
| 41 | 41 | ||
| 42 | end | 42 | end |
| 43 | - |
app/models/notice.rb
| @@ -28,8 +28,8 @@ class Notice | @@ -28,8 +28,8 @@ class Notice | ||
| 28 | 28 | ||
| 29 | validates_presence_of :backtrace, :server_environment, :notifier | 29 | validates_presence_of :backtrace, :server_environment, :notifier |
| 30 | 30 | ||
| 31 | - scope :ordered, order_by(:created_at.asc) | ||
| 32 | - scope :reverse_ordered, order_by(:created_at.desc) | 31 | + scope :ordered, ->{ order_by(:created_at.asc) } |
| 32 | + scope :reverse_ordered, ->{ order_by(:created_at.desc) } | ||
| 33 | scope :for_errs, lambda {|errs| where(:err_id.in => errs.all.map(&:id))} | 33 | scope :for_errs, lambda {|errs| where(:err_id.in => errs.all.map(&:id))} |
| 34 | 34 | ||
| 35 | def user_agent | 35 | def user_agent |
| @@ -162,8 +162,8 @@ class Notice | @@ -162,8 +162,8 @@ class Notice | ||
| 162 | 162 | ||
| 163 | 163 | ||
| 164 | def sanitize_hash(h) | 164 | def sanitize_hash(h) |
| 165 | - h.recurse do | ||
| 166 | - |h| h.inject({}) do |h,(k,v)| | 165 | + h.recurse do |h| |
| 166 | + h.inject({}) do |h,(k,v)| | ||
| 167 | if k.is_a?(String) | 167 | if k.is_a?(String) |
| 168 | h[k.gsub(/\./,'.').gsub(/^\$/,'$')] = v | 168 | h[k.gsub(/\./,'.').gsub(/^\$/,'$')] = v |
| 169 | else | 169 | else |
app/models/problem.rb
| @@ -43,9 +43,9 @@ class Problem | @@ -43,9 +43,9 @@ class Problem | ||
| 43 | 43 | ||
| 44 | before_create :cache_app_attributes | 44 | before_create :cache_app_attributes |
| 45 | 45 | ||
| 46 | - scope :resolved, where(:resolved => true) | ||
| 47 | - scope :unresolved, where(:resolved => false) | ||
| 48 | - scope :ordered, order_by(:last_notice_at.desc) | 46 | + scope :resolved, ->{ where(:resolved => true) } |
| 47 | + scope :unresolved, ->{ where(:resolved => false) } | ||
| 48 | + scope :ordered, ->{ order_by(:last_notice_at.desc) } | ||
| 49 | scope :for_apps, lambda {|apps| where(:app_id.in => apps.all.map(&:id))} | 49 | scope :for_apps, lambda {|apps| where(:app_id.in => apps.all.map(&:id))} |
| 50 | 50 | ||
| 51 | validates_presence_of :last_notice_at, :first_notice_at | 51 | validates_presence_of :last_notice_at, :first_notice_at |
| @@ -184,4 +184,3 @@ class Problem | @@ -184,4 +184,3 @@ class Problem | ||
| 184 | Digest::MD5.hexdigest(value.to_s) | 184 | Digest::MD5.hexdigest(value.to_s) |
| 185 | end | 185 | end |
| 186 | end | 186 | end |
| 187 | - |