@@ -1,3 +1,6 @@ += 0.0.3 2008-10-08 + * support attachment resource + = 0.0.2 2008-06-10 * gem published History.txt @@ -15,7 +15,7 @@ EXTRA_DEPENDENCIES = [ @config_file = "~/.rubyforge/user-config.yml" @config = nil -RUBYFORGE_USERNAME = "unknown" +RUBYFORGE_USERNAME = "deepblue" def rubyforge_username unless @config begin config/hoe.rb @@ -12,11 +12,12 @@ module Springnote attr_accessor :name, :config # config should have app_key, user_openid, user_key - def initialize(name, config) + def initialize(name, config = {}) @name, @config = name, config end def pages + raise ConfigurationMissing unless @config[:app_key] CallProxy.new(Page, self) end @@ -28,7 +29,7 @@ module Springnote @config[:user_key] ? "#{@config[:user_key]}.#{@config[:app_key]}" : @config[:app_key] end - def url(path = '/', params = {}) + def make_url(path = '/', params = {}) query = params.map{|k,v| "#{k}=#{CGI.escape(v.to_s)}"}.join('&') "http://api.springnote.com#{path}?domain=#{@name}&#{query}" end @@ -36,12 +37,30 @@ module Springnote class Page < Resource - def self.singular_name - 'page' + def self.singular_name; 'page' end + def self.collection_name; 'pages' end + + def attachments + CallProxy.new(Attachment, self) end - def self.collection_name - 'pages' - end + def make_url(path = '/', params = {}) + if self.hash + holder.make_url("/pages/#{self.hash['identifier']}#{path}", params) + else + holder.make_url(path, params) + end + end + end + + class Attachment < Resource + def self.singular_name; 'attachment' end + def self.collection_name; 'attachments' end end + + def make_url(path = '/', params = {}) + holder.make_url(path, params) + end + + class ConfigurationMissing < RuntimeError; end end lib/springnote_client.rb @@ -23,8 +23,8 @@ module Springnote class << self def build(hsh, holder) new_resource(collection_url(holder), holder, hsh) - end - + end + def new_resource(url, holder, hash = nil) ret = new(url, holder.username, holder.password) ret.holder = holder @@ -32,18 +32,20 @@ module Springnote if block_given? ret.hash = yield(ret) elsif hash + identifier = hash.delete('identifier') ret.hash = hash + ret.identifier = identifier if identifier end ret end def element_url(holder, id, params = {}) - holder.url("/#{collection_name}/#{id}", params) + holder.make_url("/#{collection_name}/#{id}", params) end def collection_url(holder, params = {}) - holder.url("/#{collection_name}", params) + holder.make_url("/#{collection_name}", params) end def find(*args) @@ -59,20 +61,34 @@ module Springnote Hash.from_xml(ret.get(:accept => XML))[ret.singular_name] end end + + def find_all(holder) + find_multi(holder) + end def find_some(ids, holder) - ret = new_resource(collection_url(holder, :identifiers => ids.join(','), :detail => true), holder).get(:accept => 'application/xml') + find_multi(holder, :identifiers => ids.join(','), :detail => true) + end + + def find_multi(holder, params = {}) + target = collection_url(holder, params) + ret = new_resource(target, holder).get(:accept => 'application/xml') + Hash.from_xml(ret)[collection_name].map do |item| new_resource(element_url(holder, item['identifier']), holder, item) end rescue RuntimeError [] end + + def search(query, holder) + find_multi(holder, :q => query) + end end - + def method_missing(method, *args) str = method.to_s - str[-1] == ?= ? + (str[-1].to_s == "=") ? @hash[str[0..-2]] = args[0] : @hash[str] end @@ -91,6 +107,17 @@ module Springnote self end + def delete + super + self.identifier = nil + end + + def identifier=(newval) + @hash['identifier'] = newval + self.url = element_url + newval + end + def element_url self.class.element_url(holder, @hash['identifier']) end lib/springnote_client/base.rb @@ -2,7 +2,7 @@ module SpringnoteClient #:nodoc: module VERSION #:nodoc: MAJOR = 0 MINOR = 0 - TINY = 2 + TINY = 3 STRING = [MAJOR, MINOR, TINY].join('.') end lib/springnote_client/version.rb fdff940e002743e60ff27fdc27daa9d4d302cb9f Bryan Kang deepblue@deepblue.local http://github.com/deepblue/springnote_client/commit/b9820c1134923cc6c73fcb7a73bdfaa6a874c7b2 b9820c1134923cc6c73fcb7a73bdfaa6a874c7b2 2008-10-07T17:29:02-07:00 2008-10-07T17:29:02-07:00 0.0.3 attachment resource b6d15da52c63fd00b6cf912150f66860a4d60aa2 Bryan Kang deepblue@deepblue.local