From: Tom Clegg Date: Mon, 28 Jan 2013 23:10:23 +0000 (-0800) Subject: tweak eager loading X-Git-Tag: 1.1.0~3374^2~95 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/f2943f298104e4dd9f4f9a7cfc26cb6e3eaeabf4?hp=d411c441848f9f16eec1643f41c862cf328b652a tweak eager loading --- diff --git a/app/models/link.rb b/app/models/link.rb index 41102619d1..9c86e3171f 100644 --- a/app/models/link.rb +++ b/app/models/link.rb @@ -1,4 +1,6 @@ class Link < OrvosBase + attr_accessor :head + attr_accessor :tail def self.by_tail(t, opts={}) where(opts.merge :tail_kind => t.kind, :tail_uuid => t.uuid) end diff --git a/app/models/log.rb b/app/models/log.rb index 3e3e7d850e..f6280e3016 100644 --- a/app/models/log.rb +++ b/app/models/log.rb @@ -1,2 +1,3 @@ class Log < OrvosBase + attr_accessor :object end diff --git a/app/models/orvos_base.rb b/app/models/orvos_base.rb index e4eff9c93a..2a84f72b16 100644 --- a/app/models/orvos_base.rb +++ b/app/models/orvos_base.rb @@ -105,14 +105,14 @@ class OrvosBase < ActiveRecord::Base hash = $orvos_api_client.api(self.class, '/' + uuid_or_hash) end hash.each do |k,v| - if self.respond_to?((k.to_s + '=').to_s) + if self.respond_to?(k.to_s + '=') self.send(k.to_s + '=', v) else # When OrvosApiClient#schema starts telling us what to expect # in API responses (not just the server side database # columns), this sort of awfulness can be avoided: self.instance_variable_set('@' + k.to_s, v) - if !self.respond_to?(k.to_s) + if !self.respond_to? k singleton = class << self; self end singleton.send :define_method, k, lambda { instance_variable_get('@' + k.to_s) } end diff --git a/app/models/pipeline_invocation.rb b/app/models/pipeline_invocation.rb index 0da87090b7..851041a97d 100644 --- a/app/models/pipeline_invocation.rb +++ b/app/models/pipeline_invocation.rb @@ -1,2 +1,3 @@ class PipelineInvocation < OrvosBase + attr_accessor :pipeline end