rhaiker 0.1.0 → 0.1.1

data/History.ja.txt

@@ -1,3 +1,7 @@
+== 0.1.1 2009-5-25
+
+* エラー処理、定数名など修正を行う
+
 == 0.0.2 2009-02-17
 
 * 多言語化対応

data/History.txt

@@ -1,3 +1,9 @@
+== 0.1.1 2009-05-26
+
+* 1 minor enhancement:
+  * [bug][fix]error case handling.
+  * [bug][fix]const-name changed.
+
 == 0.1.0 2009-02-17
 
 * 1 minor enhancement:

data/lib/rhaiker.rb

@@ -26,7 +26,7 @@ class Rhaiker
   attr_accessor :source
 
   # Hatena::Haiku::API BaseURL
-  BaseAddress = 'http://h.hatena.ne.jp/api/'
+  BASE_ADDRESS = 'http://h.hatena.ne.jp/api/'
   # Utilities.
   include Utils
   # Customized XML Parser for
@@ -44,7 +44,7 @@ Description::
   Hatena::Haiku::API[http://h.hatena.ne.jp/api#statuses-public_timeline]
 
 Return::
-  timeline ([{:id => 12345, ...}, ...]) or false
+  timeline ([{:id => 12345, ...}, ...])
 
 RelatedMethods::
   Utils#create_uri,
@@ -54,16 +54,12 @@ RelatedMethods::
 =end
   def get_public_timeline
     uri = create_uri(
-      BaseAddress + 
+      BASE_ADDRESS + 
       'statuses/public_timeline.xml'
     )
     request = create_request(:get, uri)
     document = http_access(uri, request)
-    if document
-      return parse_timeline(document)
-    else
-      return false
-    end
+    return parse_timeline(document)
   end
 
 =begin rdoc
@@ -76,7 +72,7 @@ Params::
   options ({:count => 20, [...]})]
 
 Return::
-  timeline ([{:id => 12345, ...}, ...]) or false
+  timeline ([{:id => 12345, ...}, ...])
 
 RelatedMethods::
   Utils#create_uri,
@@ -86,17 +82,13 @@ RelatedMethods::
   XML_Parser#parse_timeline,
 =end
   def get_friends_timeline(user_id = nil, options = nil)
-    uri_base = BaseAddress + 'statuses/friends_timeline'
+    uri_base = BASE_ADDRESS + 'statuses/friends_timeline'
     uri_base += user_id ? "/#{user_id}.xml" : '.xml'
     uri_base += parse_options(options) if options
     uri = create_uri(uri_base)
     request = create_request(:get, uri, user_id.nil?)
     document = http_access(uri, request)
-    if document
-      return parse_timeline(document)
-    else
-      return false
-    end
+    return parse_timeline(document)
   end
 
 =begin rdoc
@@ -109,7 +101,7 @@ Params::
   options ({:count => 20, [...]})]
 
 Return:: 
-  timeline ([{:id => 12345, ...}, ...]) or false
+  timeline ([{:id => 12345, ...}, ...])
 
 RelatedMethods::
   Utils#create_uri,
@@ -119,17 +111,13 @@ RelatedMethods::
   XML_Parser#parse_timeline,
 =end
   def get_user_timeline(user_id = nil, options = nil)
-    uri_base = BaseAddress + 'statuses/user_timeline'
+    uri_base = BASE_ADDRESS + 'statuses/user_timeline'
     uri_base += user_id ? "/#{user_id}.xml" : '.xml'
     uri_base += parse_options(options) if options
     uri = create_uri(uri_base)
     request = create_request(:get, uri, user_id.nil?)
     document = http_access(uri, request)
-    if document
-      return parse_timeline(document)
-    else
-      return false
-    end
+    return parse_timeline(document)
   end
 
 =begin rdoc
@@ -142,7 +130,7 @@ Params::
   options ({:count => 20, [...]})]
 
 Return::
-  timeline ([{:id => 12345, ...}, ...]) or false
+  timeline ([{:id => 12345, ...}, ...])
 
 RelatedMethods::
   Utils#create_uri,
@@ -152,18 +140,14 @@ RelatedMethods::
   XML_Parser#parse_timeline
 =end
   def get_keyword_timeline(keyword, options = nil)
-    uri_base = BaseAddress +
+    uri_base = BASE_ADDRESS +
       'statuses/keyword_timeline/' +
       keyword + '.xml'
     uri_base += parse_options(options) if options
     uri = create_uri(uri_base)
     request = create_request(:get, uri)
     document = http_access(uri, request)
-    if document
-      return parse_timeline(document)
-    else
-      return false
-    end
+    return parse_timeline(document)
   end
 
 =begin rdoc
@@ -175,7 +159,7 @@ Params::
   keyword (target keyword)
 
 Return::
-  timeline ([{:id => 12345, ...}, ...]) or false
+  timeline ([{:id => 12345, ...}, ...])
 
 RelatedMethods::
   Utils#create_uri,
@@ -185,16 +169,12 @@ RelatedMethods::
   XML_Parser#parse_timeline
 =end
   def get_album(keyword = nil)
-    uri_base = BaseAddress + 'statuses/album'
+    uri_base = BASE_ADDRESS + 'statuses/album'
     uri_base += keyword ? "/#{keyword}.xml" : '.xml'
     uri = create_uri(uri_base)
     request = create_request(:get, uri)
-    document = http_access(uri, request)
-    if document
-      return parse_timeline(document)
-    else
-      return false
-    end
+    http_access(uri, request)
+    return parse_timeline(document)
   end
 
 =begin rdoc
@@ -206,7 +186,7 @@ Params::
   status_id (target status_id)
 
 Return::
-  status ({:id => 12345, ...}) or false
+  status ({:id => 12345, ...})
 
 RelatedMethods::
   Utils#create_uri,
@@ -216,17 +196,13 @@ RelatedMethods::
 =end
   def get_status(status_id)
     uri = create_uri(
-      BaseAddress +
+      BASE_ADDRESS +
       'statuses/show/' +
       status_id.to_s + '.xml'
     )
     request = create_request(:get, uri)
     document = http_access(uri, request)
-    if document
-      return parse_status(document.root)
-    else
-      return false
-    end
+    return parse_status(document.root)
   end
 
 =begin rdoc
@@ -238,7 +214,7 @@ Params::
   user_id (target user_id)
 
 Return::
-  users ([{:name => 'hoge', ...}, ...]) or false
+  users ([{:name => 'hoge', ...}, ...])
 
 RelatedMethods::
   Utils#create_uri,
@@ -247,16 +223,12 @@ RelatedMethods::
   XML_Parser#parse_users
 =end
   def get_friends(user_id = nil)
-    uri_base = BaseAddress + 'statuses/friends'
+    uri_base = BASE_ADDRESS + 'statuses/friends'
     uri_base += user_id ? "/#{user_id}.xml" : '.xml'
     uri = create_uri(uri_base)
     request = create_request(:get, uri, user_id.nil?)
     document = http_access(uri, request)
-    if document
-      return parse_users(document)
-    else
-      return false
-    end
+    return parse_users(document)
   end
 
 =begin rdoc
@@ -268,7 +240,7 @@ Params::
   user_id (target user_id)
 
 Return::
-  users ([{:name => 'hoge', ...}, ...]) or false
+  users ([{:name => 'hoge', ...}, ...])
 
 RelatedMethods::
   Utils#create_uri,
@@ -277,16 +249,12 @@ RelatedMethods::
   XML_Parser#parse_users
 =end
   def get_followers(user_id = nil)
-    uri_base = BaseAddress + 'statuses/followers'
+    uri_base = BASE_ADDRESS + 'statuses/followers'
     uri_base += user_id ? "/#{user_id}.xml" : '.xml'
     uri = create_uri(uri_base)
     request = create_request(:get, uri, user_id.nil?)
     document = http_access(uri, request)
-    if document
-      return parse_users(document)
-    else
-      return false
-    end
+    return parse_users(document)
   end
 
 =begin rdoc
@@ -298,7 +266,7 @@ Params::
   user_id (target user_id)
 
 Return::
-  user ({:name => 'hoge', ...}) or false
+  user ({:name => 'hoge', ...})
 
 RelatedMethods::
   Utils#create_uri,
@@ -308,17 +276,13 @@ RelatedMethods::
 =end
   def get_friend(user_id)
     uri = create_uri(
-      BaseAddress +
+      BASE_ADDRESS +
       'friendships/show/' +
       user_id + '.xml'
     )
     request = create_request(:get, uri)
     document = http_access(uri, request)
-    if document
-      return parse_user(document.root)
-    else
-      return false
-    end
+    return parse_user(document.root)
   end
 
 =begin rdoc
@@ -327,7 +291,7 @@ Description::
   Hatena::Haiku::API[http://h.hatena.ne.jp/api#keywords-hot]
 
 Return::
-  keywords ([{:title => 'hoge', ...}, ...]) or false
+  keywords ([{:title => 'hoge', ...}, ...])
 
 RelatedMethods::
   Utils#create_uri,
@@ -336,14 +300,10 @@ RelatedMethods::
   XML_Parser#parse_keywords
 =end
   def get_hot_keywords
-    uri = create_uri(BaseAddress + 'keywords/hot.xml')
+    uri = create_uri(BASE_ADDRESS + 'keywords/hot.xml')
     request = create_request(:get, uri)
     document = http_access(uri, request)
-    if document
-      return parse_keywords(document)
-    else
-      return false
-    end
+    return parse_keywords(document)
   end
 
 =begin rdoc
@@ -355,7 +315,7 @@ Params::
   options => {:page => pagenum}
 
 Return::
-  keywords ([{:title => 'hoge', ...}, ...]) or false
+  keywords ([{:title => 'hoge', ...}, ...])
 
 RelatedMethods::
   Utils#create_uri,
@@ -365,16 +325,12 @@ RelatedMethods::
   XML_Parser#parse_keywords
 =end
   def get_keyword_list(options = nil)
-    uri_base = BaseAddress + 'keywords/list.xml'
+    uri_base = BASE_ADDRESS + 'keywords/list.xml'
     uri_base += parse_options(options) if options
     uri = create_uri(uri_base)
     request = create_request(:get, uri)
     document = http_access(uri, request)
-    if document
-      return parse_keywords(document)
-    else
-      return false
-    end
+    return parse_keywords(document)
   end
 
 =begin rdoc
@@ -386,7 +342,7 @@ Params::
   user_id (target user_id)
 
 Return::
-  keywords ([{:title => 'hoge', ...}, ...]) or false
+  keywords ([{:title => 'hoge', ...}, ...])
 
 RelatedMethods::
   Utils#create_uri
@@ -395,16 +351,12 @@ RelatedMethods::
   XML_Parser#parse_keywords
 =end
   def get_keywords(user_id = nil)
-    uri_base = BaseAddress + 'statuses/keywrods'
+    uri_base = BASE_ADDRESS + 'statuses/keywrods'
     uri_base += user_id ? "/#{user_id}.xml" : '.xml'
     uri = create_uri(uri_base)
     request = create_request(:get, uri, user_id.nil?)
     document = http_access(uri, request)
-    if document
-      return parse_timeline(document)
-    else
-      return false
-    end
+    return parse_timeline(document)
   end
 
 =begin rdoc
@@ -416,7 +368,7 @@ Params::
   keyword (target keyword)
 
 Return::
-  keyword ({:title => 'hoge', ...}) or false
+  keyword ({:title => 'hoge', ...})
 
 RelatedMethods::
   Utils#create_uri,
@@ -426,17 +378,13 @@ RelatedMethods::
 =end
   def get_keyword(keyword)
     uri = create_uri(
-      BaseAddress +
+      BASE_ADDRESS +
       'keywords/show/' +
       keyword + 'xml'
     )
     request = create_request(:get, uri)
     document = http_access(uri, request)
-    if document
-      return parse_keyword(document.root)
-    else
-      return false
-    end
+    return parse_keyword(document.root)
   end
 
 =begin rdoc
@@ -448,7 +396,7 @@ Params::
   options ({:status => 'hoge', ...}]
 
 Return::
-  status ({:text => 'hoge', ...}) or false
+  status ({:text => 'hoge', ...})
 
 RelatedMethods::
   Utils#create_uri,
@@ -461,17 +409,13 @@ Notes::
   Still does not support of 'Upload Image File'
 =end
   def status_update(options)
-    uri_base = BaseAddress + 'statuses/update.xml'
+    uri_base = BASE_ADDRESS + 'statuses/update.xml'
     uri_base += parse_options(options)
     uri_base += '&source=' + @source
     uri = create_uri(uri_base)
     request = create_request(:post, uri, true)
     document = http_access(uri, request)
-    if document
-      return parse_status(document.root)
-    else
-      return false
-    end
+    return parse_status(document.root)
   end
 
 =begin rdoc
@@ -483,7 +427,7 @@ Params::
   status_id (target status_id)
 
 Return::
-  status ({:text => 'hoge', ...}) or false
+  status ({:text => 'hoge', ...})
 
 RelationMethods::
   create_uri,
@@ -493,17 +437,13 @@ RelationMethods::
 =end
   def status_destroy(status_id)
     uri = create_uri(
-      BaseAddress +
+      BASE_ADDRESS +
       'statuses/status/destroy/' +
       status_id.to_s + '.xml'
     )
     request = create_request(:post, uri, true)
     document = http_access(uri, request)
-    if document
-      return parse_status(document.root)
-    else
-      return false
-    end
+    return parse_status(document.root)
   end
 
 =begin rdoc
@@ -515,7 +455,7 @@ Params::
   user_id (target user_id)
 
 Return::
-  user ({:id => 'hoge', ...}) or false
+  user ({:id => 'hoge', ...})
 
 RelatedMethods::
   Utils#create_uri,
@@ -525,17 +465,13 @@ RelatedMethods::
 =end
   def friendship_create(user_id)
     uri = create_uri(
-      BaseAddress +
+      BASE_ADDRESS +
       'friendships/create/' +
       user_id + '.xml'
     )
     request = create_request(:post, uri, true)
     document = http_access(uri, request)
-    if document
-      return parse_user(document.root)
-    else
-      return false
-    end
+    return parse_user(document.root)
   end
 
 =begin rdoc
@@ -547,7 +483,7 @@ Params::
   user_id (target user_id)
 
 Return::
-  user ({:id => 'hoge', ...}) or false
+  user ({:id => 'hoge', ...})
 
 RelatedMethods::
   Utils#create_uri,
@@ -557,17 +493,13 @@ RelatedMethods::
 =end
   def friendship_destroy(user_id)
     uri = create_uri(
-      BaseAddress +
+      BASE_ADDRESS +
       'friendships/destroy/' +
       user_id + '.xml'
     )
     request = create_request(:post, uri, true)
     document = http_access(uri, request)
-    if document
-      return parse_user(document.root)
-    else
-      return false
-    end
+    return parse_user(document.root)
   end
 
 =begin rdoc
@@ -579,7 +511,7 @@ Params::
   status_id (target status_id)
 
 Return::
-  status ({:text => 'hoge', ...}) or false
+  status ({:text => 'hoge', ...})
 
 RelatedMethods::
   Utils#create_uri,
@@ -589,17 +521,13 @@ RelatedMethods::
 =end
   def favorites_create(status_id)
     uri = create_uri(
-      BaseAddress +
+      BASE_ADDRESS +
       'favorites/create/' +
       status_id.to_s + '.xml'
     )
     request = create_request(:post, uri, true)
     document = http_access(uri, request)
-    if document
-      return parse_status(document.root)
-    else
-      return false
-    end
+    return parse_status(document.root)
   end
 
 =begin rdoc
@@ -611,7 +539,7 @@ Params::
   status_id (target status_id)
 
 Return::
-  status {:text => 'hoge', ...}) or false
+  status {:text => 'hoge', ...})
 
 RelatedMethods::
   Utils#create_uri,
@@ -621,17 +549,13 @@ RelatedMethods::
 =end
   def favorites_destroy(status_id)
     uri = create_uri(
-      BaseAddress +
+      BASE_ADDRESS +
       'favorites/destroy/' +
       status_id.to_s + '.xml'
     )
     request = create_request(:post, uri, true)
     document = http_access(uri, request)
-    if document
-      return parse_status(document.root)
-    else
-      return false
-    end
+    return parse_status(document.root)
   end
 
 =begin rdoc
@@ -643,7 +567,7 @@ Params::
   keyword (target keyword)
 
 Return::
-  keyword ({:title => 'hoge', ...} or false
+  keyword ({:title => 'hoge', ...}
 
 RelatedMethods::
   Utils#create_uri,
@@ -653,17 +577,13 @@ RelatedMethods::
 =end
   def keyword_create(keyword)
     uri = create_uri(
-      BaseAddress +
+      BASE_ADDRESS +
       'keywords/create/' +
       keyword + '.xml'
     )
     request = create_request(:post, uri, true)
     document = http_access(uri, request)
-    if document
-      return parse_keyword(document.root)
-    else
-      return false
-    end
+    return parse_keyword(document.root)
   end
 
 =begin rdoc
@@ -675,7 +595,7 @@ Params::
   keyword (target keyword)
 
 Return::
-  keyword ({:title => 'hoge', ...}) or false
+  keyword ({:title => 'hoge', ...})
 
 RelatedMethods::
   Utils#create_uri,
@@ -685,17 +605,13 @@ RelatedMethods::
 =end
   def keyword_destroy(keyword)
     uri = create_uri(
-      BaseAddress +
+      BASE_ADDRESS +
       'keywords/destroy/' +
       keyword + '.xml'
     )
     request = create_request(:post, uri, true)
     document = http_access(uri, request)
-    if document
-      return parse_keyword(document.root)
-    else
-      return false
-    end
+    return parse_keyword(document.root)
   end
 
 =begin rdoc
@@ -708,7 +624,7 @@ Params::
   word2 (target word)
 
 Return::
-  keyword ({:title => 'hoge', ...}) or false
+  keyword ({:title => 'hoge', ...})
 
 RelatedMethods::
   Utils#create_uri,
@@ -718,18 +634,14 @@ RelatedMethods::
 =end
   def keyword_relation_create(word1, word2)
     uri = create_uri(
-      BaseAddress +
+      BASE_ADDRESS +
       'keywords/relation/create.xml' +
       '?word1=' + word1 +
       '&word2=' + word2
     )
     request = create_request(:post, uri, true)
     document = http_access(uri, request)
-    if document
-      return parse_keyword(document.root)
-    else
-      return false
-    end
+    return parse_keyword(document.root)
   end
 
 =begin rdoc
@@ -742,7 +654,7 @@ Params::
   word2 (rarget word)
 
 Return::
-  keyword ({:title => 'hoge', ...}) or false
+  keyword ({:title => 'hoge', ...})
 
 RelatedMethods::
   Utils#create_uri,
@@ -752,17 +664,13 @@ RelatedMethods::
 =end
   def keyword_relation_destroy(word1, word2)
     uri = create_uri(
-      BaseAddress +
+      BASE_ADDRESS +
       'keywords/relation/destroy.xml' +
       '?word1=' + word1 +
       '&word2=' + word2
     )
     request = create_request(:post, uri, true)
     document = http_access(uri, request)
-    if document
-      return parse_keyword(document.root)
-    else
-      return false
-    end
+    return parse_keyword(document.root)
   end
 end

data/lib/rhaiker/utils.rb

@@ -35,6 +35,8 @@ RelatedMethods::
           request = Net::HTTP::Get.new(uri.request_uri)
         when :post
           request = Net::HTTP::Post.new(uri.request_uri)
+        else
+          raise ArgumentError, 'type must be :get or :post'
       end
       request['User-Agent'] = @user_agent
       request.basic_auth @user_id, @api_key if use_basic_auth
@@ -69,7 +71,7 @@ Params::
   request (Net::HTTPRequest-Instance)
 
 Return::
-  REXML::Document-Instance or false
+  REXML::Document-Instance
 
 RelatedMethods::
   create_uri,
@@ -84,7 +86,7 @@ RelatedMethods::
         if response.code == '200'
           return REXML::Document.new(response.body)
         else
-          return false
+          raise "HTTP access failed: status code #{response.code}"
         end
       }
     end

data/lib/rhaiker/version.rb

@@ -2,7 +2,7 @@ class Rhaiker
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/rhaiker_spec.rb

@@ -38,7 +38,7 @@ describe Rhaiker::Utils, " when use" do
 
   it 'create_uri should be URI instance' do
     @accessor.create_uri(
-      Rhaiker::BaseAddress +
+      Rhaiker::BASE_ADDRESS +
       'statuses/public_timeline.xml'
     ).should be_a_kind_of(URI)
   end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>rhaiker</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/rhaiker"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/rhaiker" class="numbers">0.0.1</a>
+      <a href="http://rubyforge.org/projects/rhaiker" class="numbers">0.1.1</a>
     </div>
     <h2>What</h2>
 <p>Rhaiker is Hatena::Haiku::<span class="caps">API</span> ruby binding.<br />

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rhaiker
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - saronpasu
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-17 00:00:00 +09:00
+date: 2009-05-25 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rhaiker
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Hatena::Haiku::API ruby binding