cache client resources based on options as well

Author: steved

lib/zendesk_api/client.rb

@@ -31,8 +31,14 @@ class Client
  def method_missing(method, *args, &block)
  method = method.to_s
  options = args.last.is_a?(Hash) ? args.pop : {}
- return instance_variable_get("@#{method}") if !options.delete(:reload) && instance_variable_defined?("@#{method}")
- instance_variable_set("@#{method}", ZendeskAPI::Collection.new(self, ZendeskAPI.get_class(Inflection.singular(method)), options))
+
+ @resource_cache[method] ||= {}
+
+ if !options[:reload] && (cached = @resource_cache[method][options.hash])
+ cached
+ else
+ @resource_cache[method][options.hash] = ZendeskAPI::Collection.new(self, ZendeskAPI.get_class(Inflection.singular(method)), options)
+ end
  end
 
  # Returns the current user (aka me)
@@ -86,6 +92,8 @@ def initialize
 
  @callbacks = []
 
+ @resource_cache = {}
+
  if logger = config.logger
  insert_callback do |env|
  if warning = env[:response_headers]["X-Zendesk-API-Warn"]

spec/client_spec.rb

@@ -117,7 +117,7 @@ def build_connection
  context "with a logger" do
  let(:out){ StringIO.new }
  subject { Logger.new(out) }
- 
+
  it "should log" do
  @client.connection.builder.handlers.should include(ZendeskAPI::Middleware::Response::Logger)
  end
@@ -154,8 +154,19 @@ def build_connection
 
  context "resources" do
  it "should return an instance of ZendeskAPI::Collection if there is no method" do
+ subject.instance_variable_get(:@resource_cache)["tickets"].should be_nil
+
  subject.tickets.should be_instance_of(ZendeskAPI::Collection)
- subject.instance_variable_defined?(:@tickets).should be_true
+
+ subject.instance_variable_get(:@resource_cache)["tickets"].should_not be_empty
+ end
+
+ it "should not cache calls with different options" do
+ subject.search(:query => 'abc').should_not == subject.search(:query => '123')
+ end
+
+ it "should cache calls with the same options" do
+ subject.search(:query => 'abc').should == subject.search(:query => 'abc')
  end
  end