autotest/discover.rb spec/highrise/cachable_spec.rb @@ -30,6 +30,7 @@ Highrise::Base.user = 'your_api_auth_token'q } gemspec.authors = ["Marcos Tapajós", "Ken Mayer"] gemspec.add_dependency('activeresource', '>=2.2') + gemspec.add_dependency('activesupport', '>=2.1') end rescue LoadError puts "Jeweler not available. Install it with: sudo gem install jeweler -s http://gems.github.com" Rakefile @@ -1,4 +1,4 @@ --- +:patch: 0 :major: 0 -:minor: 7 -:patch: 1 +:minor: 8 VERSION.yml @@ -7,11 +7,12 @@ require 'active_support/basic_object' require 'hpricot' require 'iconv' +require File.dirname(__FILE__) + '/highrise/base' +require File.dirname(__FILE__) + '/highrise/version' require File.dirname(__FILE__) + '/highrise/pagination' require File.dirname(__FILE__) + '/highrise/curly' require File.dirname(__FILE__) + '/highrise/curlhelper' require File.dirname(__FILE__) + '/highrise/taggable' -require File.dirname(__FILE__) + '/highrise/base' require File.dirname(__FILE__) + '/highrise/subject' require File.dirname(__FILE__) + '/highrise/comment' require File.dirname(__FILE__) + '/highrise/company' @@ -24,4 +25,3 @@ require File.dirname(__FILE__) + '/highrise/person' require File.dirname(__FILE__) + '/highrise/task' require File.dirname(__FILE__) + '/highrise/user' require File.dirname(__FILE__) + '/highrise/tag' -require File.dirname(__FILE__) + '/highrise/version' \ No newline at end of file lib/highrise.rb @@ -1,4 +1,46 @@ +require 'digest/sha1' + module Highrise class Base < ActiveResource::Base + class << self + def cache_store + if defined?(@cache_store) + @cache_store + elsif superclass != Object && superclass.cache_store + superclass.cache_store + end + end + + def cache_store=(store_option) + @cache_store = store_option.nil? ? nil : ActiveSupport::Cache.lookup_store(store_option) + end + + def is_caching? + !cache_store.nil? + end + + def find(*args) + find_with_cache(*args) + end + + private + + def find_with_cache(*args) + return find_without_cache(*args) unless is_caching? + fetch(args) { find_without_cache(*args) } + end + + def find_without_cache(*args) + superclass.find(*args) + end + + def cache_key(*args) + Digest::SHA1.hexdigest args.to_s + end + + def fetch(args, &block) + cache_store.fetch(cache_key(args), &block) + end + end end -end +end \ No newline at end of file lib/highrise/base.rb @@ -3,5 +3,4 @@ progress --loadby mtime ---reverse ---backtrace \ No newline at end of file +--reverse \ No newline at end of file spec.opts @@ -2,6 +2,9 @@ require File.dirname(__FILE__) + '/../../spec_helper' describe Highrise::Pagination do - it "should be tested" - + it "should be tested" do + Highrise::Person.should_receive(:find).with(:all,{:params=>{:n=>0}}).and_return(["people"]) + Highrise::Person.should_receive(:find).with(:all,{:params=>{:n=>1}}).and_return([]) + Highrise::Person.find_all_across_pages.should == ["people"] + end end spec/highrise/pagination_spec.rb 97fb462afa808efdc7943c0bdc5451a8b7c803d0 Kenneth Mayer kmayer@bitwrangler.com http://github.com/tapajos/highrise/commit/4df34aa743ee00bb95552ca54ff52dd4c746b5b2 4df34aa743ee00bb95552ca54ff52dd4c746b5b2 2009-05-01T16:07:23-07:00 2009-05-01T16:07:23-07:00 Version bump to 0.8.0 08fe02a8710957366648317ac57898052c7b2a56 Kenneth Mayer kmayer@bitwrangler.com