From f893cf3d7117c2b1eab4c6d6480f286d500537f1 Mon Sep 17 00:00:00 2001 From: Daniel Miranda Date: Sun, 17 Apr 2016 23:17:06 -0300 Subject: [PATCH] Update record #latest methods to be a bit more robust --- app/models/kalibro_configuration.rb | 11 +++++++---- app/models/project.rb | 5 ++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/models/kalibro_configuration.rb b/app/models/kalibro_configuration.rb index 4a5f9e4..6b25d58 100644 --- a/app/models/kalibro_configuration.rb +++ b/app/models/kalibro_configuration.rb @@ -19,6 +19,13 @@ class KalibroConfiguration < KalibroClient::Entities::Configurations::KalibroCon self.public_or_owned_by_user end + def self.latest(count = 1) + all.sort { |one, another| another.id <=> one.id }.select { |kalibro_configuration| + attributes = kalibro_configuration.attributes + attributes && attributes.public + }.first(count) + end + def attributes @attributes ||= KalibroConfigurationAttributes.find_by(kalibro_configuration_id: self.id) end @@ -28,8 +35,4 @@ class KalibroConfiguration < KalibroClient::Entities::Configurations::KalibroCon @attributes = nil super end - - def self.latest(count=1) - all.sort { |one, another| another.id <=> one.id }.select { |kalibro_configuration| kalibro_configuration.attributes.public }.first(count) - end end diff --git a/app/models/project.rb b/app/models/project.rb index 58e0664..45bd196 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -17,7 +17,10 @@ class Project < KalibroClient::Entities::Processor::Project end def self.latest(count = 1) - all.sort { |a, b| b.id <=> a.id }.select { |project| project.attributes.public }.first(count) + all.sort { |one, another| another.id <=> one.id }.select { |project| + attributes = project.attributes + attributes && attributes.public + }.first(count) end def attributes -- libgit2 0.21.2