+2 -1

lib/cipher.rb

reviewed

··· 59 59 60 60 self.name = js.delete("Name") 61 61 self.notes = js.delete("Notes") 62 62 - self.fields = js.delete("Fields").try(:to_json) 62 62 + f = js.delete("Fields") 63 63 + self.fields = f ? f.to_json : nil 63 64 64 65 if self.type == TYPE_LOGIN 65 66 js["Uris"] = [

+3 -3

lib/dbmodel.rb

reviewed

··· 39 39 40 40 # transform ruby data into sql 41 41 def cast_data_for_column(data, col) 42 42 - if !@columns.try(:any?) 42 42 + if !@columns || !@columns.any? 43 43 raise "need to fetch columns but in a query" 44 44 end 45 45 ··· 62 62 end 63 63 64 64 def fetch_columns 65 65 - return if @columns.try(:any?) 65 65 + return if (@columns && @columns.any?) 66 66 67 67 @columns = {} 68 68 ··· 145 145 146 146 # transform database data into ruby 147 147 def uncast_data_from_column(data, col) 148 148 - if !@columns.try(:any?) 148 148 + if !@columns || !@columns.any? 149 149 raise "need to fetch columns but in a query" 150 150 end 151 151

-4

lib/helper.rb

reviewed

··· 32 32 def present? 33 33 false 34 34 end 35 35 - 36 36 - def try(*a, &b) 37 37 - nil 38 38 - end 39 35 end 40 36 41 37 class String