lib/garb/resource.rb in garb-0.6.0 vs lib/garb/resource.rb in garb-0.7.0

- old
+ new

@@ -39,20 +39,24 @@ def clear_filters @filter_parameters = FilterParameters.new end def results(profile, opts = {}, &block) - @profile = profile.is_a?(Profile) ? profile : Profile.first(profile) + @profile = profile.is_a?(Profile) ? profile : Profile.first(profile, opts.fetch(:session, Session)) - @start_date = opts.fetch(:start_date, Time.now - MONTH) - @end_date = opts.fetch(:end_date, Time.now) - @limit = opts.fetch(:limit, nil) - @offset = opts.fetch(:offset, nil) + if @profile + @start_date = opts.fetch(:start_date, Time.now - MONTH) + @end_date = opts.fetch(:end_date, Time.now) + @limit = opts.fetch(:limit, nil) + @offset = opts.fetch(:offset, nil) - instance_eval(&block) if block_given? + instance_eval(&block) if block_given? - ReportResponse.new(send_request_for_body).results + ReportResponse.new(send_request_for_body).results + else + [] + end end def page_params {'max-results' => @limit, 'start-index' => @offset}.reject{|k,v| v.nil?} end @@ -78,10 +82,10 @@ def format_time(t) t.strftime('%Y-%m-%d') end def send_request_for_body - request = DataRequest.new(URL, params) + request = DataRequest.new(@profile.session, URL, params) response = request.send_request response.body end end end