init.rb lib/satisfaction/reply.rb @@ -1,2 +1,3 @@ tmp/* -log/* \ No newline at end of file +log/* +pkg \ No newline at end of file .gitignore @@ -61,9 +61,10 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p| p.changes = p.paragraphs_of("History.txt", 0..1).join("\\n\\n") p.extra_deps = [ ['rspec', ">= 1.0.8"], - ['active_support', ">= 1.4.2"], + ['activesupport', ">= 1.4.2"], ['hpricot', ">= 0.6.0"], - ['memcache-client', ">= 1.5.0"] + ['memcache-client', ">= 1.5.0"], + ['oauth', ">= 0.2.0"], ] #p.spec_extras = {} # A hash of extra values to set in the gemspec. config/hoe.rb @@ -5,6 +5,10 @@ require 'json' gem('memcache-client') require 'memcache' +require 'oauth' +require 'oauth/signature/hmac/sha1' +require 'oauth/client/net_http' + require 'satisfaction/has_satisfaction' require 'satisfaction/loader' require 'satisfaction/associations' @@ -15,17 +19,25 @@ require 'satisfaction/person' require 'satisfaction/topic' # require 'satisfaction/tag' # require 'satisfaction/product' -# require 'satisfaction/reply' +require 'satisfaction/reply' class Satisfaction include Associations attr_reader :options attr_reader :loader + attr_reader :consumer + attr_reader :token def initialize(options={}) - @options = options.reverse_merge({:root => "http://api.getsatisfaction.com", :autoload => false}) + @options = options.reverse_merge({ + :root => "http://api.getsatisfaction.com", + :autoload => false, + :request_token_url => 'http://getsatisfaction.com/api/request_token', + :access_token_url => 'http://getsatisfaction.com/api/access_token', + :authorize_url => 'http://getsatisfaction.com/api/authorize', + }) @loader = Loader.new has_many :companies, :url => '/companies' @@ -43,12 +55,26 @@ class Satisfaction options[:autoload] end - def url(path) - URI.parse("#{@options[:root]}#{path}") + def set_consumer(key, secret) + @consumer = OAuth::Consumer.new(key, secret) + end + + def set_token(token, secret) + @token = OAuth::Token.new(token, secret) + end + + def request_token + @loader.get("#{options[:request_token_url]}", :force => true, :consumer => @consumer, :token => nil) + end + + + def url(path, query_string={}) + qs = query_string.map{|kv| URI.escape(kv.first.to_s) + "=" + URI.escape(kv.last.to_s)}.join("&") + URI.parse("#{@options[:root]}#{path}?#{qs}") end - def get(path) - url = self.url(path) + def get(path, query_string={}) + url = self.url(path, query_string) @loader.get(url) end lib/satisfaction.rb @@ -7,4 +7,13 @@ module Associations end EOS end + + # def belongs_to(resource, options={}) + # class_name = options[:class_name] || resource.to_s.classify + # eval <<-EOS + # def #{resource} + # @#{resource} ||= #{class_name}.new(#{resource}_id, self.satisfaction) + # end + # EOS + # end end \ No newline at end of file lib/satisfaction/associations.rb @@ -1,6 +1,6 @@ class Company < Resource - attributes :domain, :name, :logo + attributes :domain, :name, :logo, :description def path "/companies/#{@id}" lib/satisfaction/company.rb @@ -31,14 +31,19 @@ class Loader raise ArgumentError, "Invalid uri, please use a String or URI object" end - path = url.path.blank? ? '/' : url.path - request = Net::HTTP::Get.new(path) + request = Net::HTTP::Get.new(url.request_uri) cache_record = cache.get(url) if cache_record && !options[:force] request["If-None-Match"] = cache_record.etag end - response = execute(url, request) + http = Net::HTTP.new(url.host, url.port) + + consumer = options[:consumer] + token = options[:token] + request.oauth!(http, consumer, token) if consumer + + response = execute(http, request) case response when Net::HTTPNotModified @@ -55,8 +60,8 @@ class Loader end private - def execute(url, request) - Net::HTTP.start(url.host, url.port) {|http| http.request(request) } + def execute(http, request) + http.start{|http| http.request(request) } end end lib/satisfaction/loader.rb @@ -1,7 +1,10 @@ +require 'forwardable' + class Resource < HasSatisfaction require 'satisfaction/resource/attributes' include ::Associations include Attributes + attr_reader :id def initialize(id, satisfaction) super satisfaction @@ -24,7 +27,7 @@ class Resource < HasSatisfaction end def inspect - "<#{self.class.name} #{attributes.map{|k,v| "#{k}: #{v}"}.join(' ')}>" + "<#{self.class.name} #{attributes.map{|k,v| "#{k}: #{v}"}.join(' ') if !attributes.nil?}>" end end @@ -37,11 +40,8 @@ class ResourceCollection < HasSatisfaction @path = path end - def page(number) - results = satisfaction.get("#{@path}.json?page=#{number}") - JSON.parse(results).map do |result| - klass.decode_sfn(result, satisfaction) - end + def page(number, options={}) + Page.new(@klass, number, @path, satisfaction, options) end def get(id, options={}) @@ -50,18 +50,51 @@ class ResourceCollection < HasSatisfaction end class Page < HasSatisfaction - def initialize(klass, number, url, satisfaction) - super(satisfaction) - @loaded = false - - load if satisfaction.autoload? + attr_reader :total + + extend Forwardable + def_delegator :items, :first + def_delegator :items, :last + def_delegator :items, :each + def_delegator :items, :each_with_index + def_delegator :items, :inject + def_delegator :items, :reject + def_delegator :items, :select + def_delegator :items, :map + def_delegator :items, :[] + def_delegator :items, :length + def_delegator :items, :to_a + def_delegator :items, :empty? + + def initialize(klass, number, path, satisfaction, options) + super(satisfaction) + @klass = klass + @number = number + @path = path + @options = options + end + + # Retrieve the items for this page + # * Caches + def items + @data ||= load end def loaded? - @loaded + @data.nil? + end + + def next? + last_item = @number * length + @total > last_item end def load - + results = satisfaction.get("#{@path}.json", @options.merge(:page => @number)) + json = JSON.parse(results) + @total = json["total"] + json["data"].map do |result| + @klass.decode_sfn(result, satisfaction) + end end end \ No newline at end of file lib/satisfaction/resource.rb @@ -1,6 +1,7 @@ class Topic < Resource attributes :subject, :style, :content, :reply_count, :follower_count attribute :last_active_at, :type => Time + attribute :created_at, :type => Time attribute :author, :type => Person def path lib/satisfaction/topic.rb @@ -2,10 +2,7 @@ require 'spec_helper' describe "Company loader" do it "should work" do - p @satisfaction.companies.get("satisfaction").topics - t = @satisfaction.topics.get("256") - p t.last_active_at - p t.attributes - + @satisfaction.set_consumer('lmwjv4kzwi27', 'fiei6iv61jnoukaq1aylwd8vcmnkafrs') + p @satisfaction.request_token end end \ No newline at end of file spec/company_spec.rb 7aef97368ac810564dcdad78fb080a385ad9a24f Scott Fleckenstein nullstyle@gmail.com http://github.com/nullstyle/ruby-satisfaction/commit/750418b6b9d12f718c6ce342c1aab8d507dca07d 750418b6b9d12f718c6ce342c1aab8d507dca07d 2008-02-15T08:21:10-08:00 2008-02-15T08:21:10-08:00 Continued work on rubygem [FIXED] gem requirements [ADDED] pkg to gitignore [ADDED] reply support [ADDED] page object & total record counts [FIXED] query strings are ignored [ADDED] beginnings of oauth 0b2cb7069ef2e4670760e23b21105f8c1f161524 Scott Fleckenstein nullstyle@gmail.com