lib/exts/request_with_oauth.rb @@ -1,3 +1,6 @@ +== 0.6.0 / 2008-5-6 +* Support OAuth protocol. Old authententication method will be removed very soon. You should set access_token, access_token_secret, consumer_token, consumer_secret instead of app_key, user_openid, user_key + == 0.5.1 / 2008-4-8 * protocol configuration added. History.txt @@ -13,6 +13,8 @@ * activesupport * activeresource +* oauth +* ruby-hmac == 설치: README.korean.txt @@ -11,6 +11,8 @@ ActiveResource wrapper library for Springnote.com's REST API * activesupport * activeresource +* oauth +* ruby-hmac == INSTALL: README.txt @@ -11,6 +11,7 @@ Hoe.new("springnote_resources", Springnote::VERSION) do |p| p.email = 'byblue@gmail.com' p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n") p.need_zip = true + p.extra_deps = %w(activeresource) # ruby-hmac oauth end task :update_manifest do Rakefile @@ -1,5 +1,5 @@ module Springnote - VERSION = "0.5.1" + VERSION = "0.6" class Base < ActiveResource::Base extend ActiveResourceExtension lib/springnote/base.rb @@ -4,18 +4,15 @@ module Springnote class MissingConfiguration < RuntimeError; end class Configuration - attr_writer :app_key, :user_key, :user_openid, :protocol - attr_reader :domain + attr_accessor :consumer_token, :consumer_secret + attr_accessor :access_token, :access_secret + attr_accessor :protocol, :domain SERVER_URL = "api.springnote.com" def protocol - @protocol || 'https' - end - - def site - "#{protocol}://#{username}:#{password}@#{SERVER_URL}/" - end + @protocol || 'http' + end def load(file) set YAML.load(File.read(file)) @@ -26,6 +23,28 @@ module Springnote Springnote::Base.site = self.site self end + + def domain=(name = nil) + ActiveResource::Connection.common_params[:domain] = name + end + + def site + @app_key ? + "#{protocol}://#{username}:#{password}@#{SERVER_URL}/" : + "#{protocol}://#{SERVER_URL}/" + end + + def token + @token ||= OAuth::Token.new @access_token, @access_secret if @access_token && @access_secret + end + + def consumer + @consumer ||= OAuth::Consumer.new @consumer_token, @consumer_secret, :site => "https://api.openmaru.com" if @consumer_token && @consumer_secret + end + + # deprecated + attr_writer :app_key, :user_key + attr_writer :user_openid def username CGI.escape(@user_openid || 'anonymous') @@ -36,11 +55,7 @@ module Springnote end def app_key - @app_key or raise MissingConfiguration - end - - def domain=(name = nil) - ActiveResource::Connection.common_params[:domain] = name - end + @app_key + end end end # module Springnote lib/springnote/configuration.rb @@ -1,17 +1,21 @@ $:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__))) +require 'rubygems' +require 'oauth' +require 'oauth/consumer' + unless defined?(ActiveResource) begin $:.unshift(File.dirname(__FILE__) + "/../vendor/activeresource/lib") require 'active_resource' rescue LoadError - require 'rubygems' require 'activeresource' end end # extend activeresource +require 'exts/request_with_oauth' require 'exts/common_parameters' require 'exts/active_resource_extension' @@ -24,3 +28,5 @@ require 'springnote/page' require 'springnote/attachment' require 'springnote/lock' require 'springnote/revision' + +ActiveResource::Connection.oauth_configuration = Springnote::Base.configuration \ No newline at end of file lib/springnote_resources.rb 021055e5c2246e6e8b323bcc87869e815065f7fb Bryan Kang deepblue@deepblue.local http://github.com/deepblue/springnote_resources/commit/f20959b7bd5217a510847e8ffd850e926d8adcf6 f20959b7bd5217a510847e8ffd850e926d8adcf6 2008-05-06T05:47:27-07:00 2008-05-06T05:47:27-07:00 Support OAuth protocol. Old authententication method will be removed very soon. You should set access_token, access_token_secret, consumer_token, consumer_secret instead of app_key, user_openid, user_key 95411a547763266246f3a68bce3ef2518652256c Bryan Kang deepblue@deepblue.local