hatenablog 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b71f66f0d8e827aa61f9c9298682f0a1a9c5de8
-  data.tar.gz: 2d52e581da4e418ddae1877409b8826e46491e10
+  metadata.gz: cf376e1c7bc165c96b04d31cdca1c7ad519eee6d
+  data.tar.gz: 47dbbe4a2e6e7efff7208a418424a224e74a2ee0
 SHA512:
-  metadata.gz: 0f4dbffdfb7822e0ccd725a9a3813638b69fb01037bb098bd839a95c304d40987ec731172f7adb59d020f9e57e5152573a9dd36bcfa81a87c3d248b4ca04aa6a
-  data.tar.gz: f18c984318d3d9991ac17dc1c2ede1b44beb42d87638ebecda60a92faefee249b8a14a4e1785245e42ef5d0993884bd3957b0f1d803cd230ac992e5fd97300fe
+  metadata.gz: 1a20f773e2c91639daa1f3c446edcaae4206f83f547ae552381afbd3d6912565b75d87f2dd8cdae3ee7bed4bd773b81f4c97f2319e5041d924a263fc6d8e4d2a
+  data.tar.gz: a839ae31b99284ea6b40e9d736d1375afa90ccd66fcabb872decdb5ad727fd838ee46daaabb507ca702840b2a35b024e0f8cc1d561f18db94b0bf0039051b1a9

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 2.1.0
+  - 2.2.0

data/README.md

@@ -1,7 +1,7 @@
 # Hatenablog
 
 A library for Hatenablog AtomPub API.
-This library supports following operations through OAuth authorization:
+This gem supports following operations using OAuth authorization:
 
 - Get blog feeds, entries and categories
 - Post blog entries
@@ -26,7 +26,7 @@ Or install it yourself as:
 
 ### Get OAuth keys and tokens
 
-You need to set up OAuth 1.0a keys and tokens before using the gem.
+You need to set up OAuth 1.0a keys and tokens before using this gem.
 
 #### 1. Get consumer key and consumer key secret
 
@@ -44,7 +44,7 @@ Execute this command:
 
 #### 3. Set up the YAML configuration file
 
-The default file name is `conf.yml`:
+The default configuration file name is `conf.yml`:
 
 ```yml
 consumer_key: <Hatena application consumer key>
@@ -61,7 +61,7 @@ blog_id: <Hatenablog ID>
 require 'hatenablog'
 
 # Read the OAuth configuration from 'conf.yml'
-Hatenablog.create do |blog|
+Hatenablog::Client.create do |blog|
   # Get each entry's content
   blog.entries.each do |entry|
     puts entry.content
@@ -73,12 +73,12 @@ Hatenablog.create do |blog|
 								 ['Test', 'Programming'])  # categories
 
   # Update entry
-  posted_entry = blog.update_entry(posted_entry.id,
-                                   'Revised Entry Title',
-							       posted_entry.content,
-							       posted_entry.categories)
+  updated_entry = blog.update_entry(posted_entry.id,
+                                    'Revised Entry Title',
+							        posted_entry.content,
+							        posted_entry.categories)
 
   # Delete entry
-  blog.delete_entry(posted_entry.id)
+  blog.delete_entry(updated_entry.id)
 end
 ```

data/Rakefile

@@ -2,9 +2,18 @@
 
 require 'bundler/gem_tasks'
 require 'rake/testtask'
+require 'yard'
+require 'yard/rake/yardoc_task'
+
+task :default => :test
 
 Rake::TestTask.new do |t|
   t.libs << "test"
-  t.test_files = Dir["test/*_test.rb"]
+  t.test_files = Dir["test/hatenablog/*_test.rb"]
   t.verbose = true
 end
+
+YARD::Rake::YardocTask.new do |t|
+  t.files = Dir["lib/*.rb"]
+  t.options = %w(--debug --verbose) if $trace
+end

data/hatenablog.gemspec

@@ -19,8 +19,15 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 2.0'
+
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rr", "~> 1.1.2"
+  spec.add_development_dependency "test-unit", "~> 3.1.4"
+  spec.add_development_dependency "test-unit-rr", "~> 1.0.3"
+  spec.add_development_dependency "yard", "~> 0.8.7"
 
-  spec.add_dependency "oauth"
+  spec.add_dependency "nokogiri", "~> 1.6.6"
+  spec.add_dependency "oauth", "~> 0.4.7"
 end

data/lib/hatenablog.rb

@@ -1,272 +1,5 @@
-require 'rexml/document'
-require 'oauth'
-
-require 'blog_entry'
-require 'blog_feed'
-require 'configuration'
-
-class Hatenablog
-  DEFAULT_CONFIG_PATH = './config.yml'
-
-  COLLECTION_URI = "https://blog.hatena.ne.jp/%s/%s/atom/entry"
-  MEMBER_URI     = "https://blog.hatena.ne.jp/%s/%s/atom/entry/%s"
-  CATEGORY_URI   = "https://blog.hatena.ne.jp/%s/%s/atom/category"
-
-  attr_writer :access_token
-
-  # Create a new hatenablog AtomPub client from a configuration file.
-  # @param [String] config_file configuration file path
-  # @return [Hatenablog] created hatenablog client
-  def self.create(config_file = DEFAULT_CONFIG_PATH)
-    config = Configuration.new(config_file)
-    blog = Hatenablog.new(config.consumer_key, config.consumer_secret,
-                          config.access_token, config.access_token_secret,
-                          config.user_id, config.blog_id)
-    return blog unless block_given?
-    yield blog
-  end
-
-  # Get a blog title.
-  # @return [String] blog title
-  def title
-    feed = BlogFeed.load_xml(get_collection(collection_uri).body)
-    feed.title
-  end
-
-  # Get a author name.
-  # @return [String] blog author name
-  def author_name
-    feed = BlogFeed.load_xml(get_collection(collection_uri).body)
-    feed.author_name
-  end
-
-  # Get blog entries array.
-  # @param [Fixnum] page page number to get
-  # @return [Array] blog entries
-  def entries(page = 0)
-    next_page_uri = collection_uri
-    current_page = 0
-    entries = []
-    while current_page <= page
-      feed = BlogFeed.load_xml(get_collection(next_page_uri).body)
-      entries += feed.entries
-
-      break unless feed.has_next?
-      next_page_uri = feed.next_uri
-      current_page += 1
-    end
-    entries
-  end
-
-  # Get blog categories array.
-  # @return [Array] blog categories
-  def categories
-    categories_doc = REXML::Document.new(get_category_doc.body)
-    categories_list = []
-    categories_doc.elements.each('//atom:category') do |cat|
-      categories_list << cat.attribute('term').to_s
-    end
-    categories_list
-  end
-
-  # Get a blog entry specified by its ID.
-  # @param [String] entry_id entry ID
-  # @return [BlogEntry] entry
-  def get_entry(entry_id)
-    response = get(member_uri(entry_id))
-    BlogEntry.load_xml(response.body)
-  end
-
-  # Post a blog entry.
-  # @param [String] title entry title
-  # @param [String] content entry content
-  # @param [Array] categories entry categories
-  # @param [String] draft this entry is draft if 'yes', otherwise it is not draft
-  # @return [BlogEntry] posted entry
-  def post_entry(title = '', content = '', categories = [], draft = 'no')
-    entry_xml = entry_xml(title, content, categories, draft)
-    response = post(entry_xml)
-    BlogEntry.load_xml(response.body)
-  end
-
-  # Update a blog entry specified by its ID.
-  # @param [String] entry_id updated entry ID
-  # @param [String] title entry title
-  # @param [String] content entry content
-  # @param [Array] categories entry categories
-  # @param [String] draft this entry is draft if 'yes', otherwise it is not draft
-  # @return [BlogEntry] updated entry
-  def update_entry(entry_id, title = '', content = '', categories = [], draft = 'no')
-    entry_xml = entry_xml(title, content, categories, draft)
-    response = put(entry_xml, member_uri(entry_id))
-    BlogEntry.load_xml(response.body)
-  end
-
-  # Delete a blog entry specified by its ID.
-  # @param [String] entry_id deleted entry ID
-  def delete_entry(entry_id)
-    delete(member_uri(entry_id))
-  end
-
-  # Get Hatenablog AtomPub collection URI.
-  # @param [String] user_id Hatena user ID
-  # @param [String] blog_id Hatenablog ID
-  # @return [String] Hatenablog AtomPub collection URI
-  def collection_uri(user_id = @user_id, blog_id = @blog_id)
-    COLLECTION_URI % [user_id, blog_id]
-  end
-
-  # Get Hatenablog AtomPub member URI.
-  # @param [String] entry_id entry ID
-  # @param [String] user_id Hatena user ID
-  # @param [String] blog_id Hatenablog ID
-  # @return [String] Hatenablog AtomPub member URI
-  def member_uri(entry_id, user_id = @user_id, blog_id = @blog_id)
-    MEMBER_URI % [user_id, blog_id, entry_id]
-  end
-
-  # Get Hatenablog AtomPub category document URI.
-  # @param [String] user_id Hatena user ID
-  # @param [String] blog_id Hatenablog ID
-  # @return [String] Hatenablog AtomPub category document URI
-  def category_doc_uri(user_id = @user_id, blog_id = @blog_id)
-    CATEGORY_URI % [user_id, blog_id]
-  end
-
-  # Build a entry XML from arguments.
-  # @param [String] title entry title
-  # @param [String] content entry content
-  # @param [Array] categories entry categories
-  # @param [String] draft this entry is draft if 'yes', otherwise it is not draft
-  # @param [String] author_name entry author name
-  # @return [String] XML string
-  def entry_xml(title = '', content = '', categories = [], draft = 'no', author_name = @user_id)
-    xml = <<XML
-<?xml version="1.0" encoding="utf-8"?>
-<entry xmlns="http://www.w3.org/2005/Atom"
-       xmlns:app="http://www.w3.org/2007/app">
-  <title>%s</title>
-  <author><name>%s</name></author>
-  <content type="text/x-markdown">%s</content>
-  %s
-  <app:control>
-    <app:draft>%s</app:draft>
-  </app:control>
-</entry>
-XML
-
-    categories_tag = categories.inject('') do |s, c|
-      s + "<category term=\"#{c}\" />\n"
-    end
-    xml % [title, author_name, content, categories_tag, draft]
-  end
-
-
-  private
-
-  def initialize(consumer_key, consumer_secret, access_token, access_token_secret,
-                 user_id, blog_id)
-    consumer = OAuth::Consumer.new(consumer_key, consumer_secret)
-    @access_token = OAuthAccessToken.new(OAuth::AccessToken.new(consumer,
-                                                                access_token,
-                                                                access_token_secret))
-
-    @user_id = user_id
-    @blog_id = blog_id
-  end
-
-
-  def get(uri)
-    @access_token.get(uri)
-  end
-
-  def get_collection(uri = collection_uri)
-    unless uri.include?(collection_uri)
-      raise ArgumentError.new('Invalid collection URI: ' + uri)
-    end
-    get(uri)
-  end
-
-  def get_category_doc
-    get(category_doc_uri)
-  end
-
-  def post(entry_xml, uri = collection_uri)
-    @access_token.post(uri, entry_xml)
-  end
-
-  def put(entry_xml, uri)
-    @access_token.put(uri, entry_xml)
-  end
-
-  def delete(uri)
-    @access_token.delete(uri)
-  end
-end
-
-class OAuthAccessToken
-
-  # Create a new OAuth 1.0a access token.
-  # @param [OAuth::AccessToken] access_token access token object
-  def initialize(access_token)
-    @access_token = access_token
-  end
-
-  # HTTP GET method
-  # @param [string] uri target URI
-  # @return [Net::HTTPResponse] HTTP response
-  def get(uri)
-    begin
-      response = @access_token.get(uri)
-    rescue => problem
-      raise 'Fail to GET: ' + problem.to_s
-    end
-    response
-  end
-
-  # HTTP POST method
-  # @param [string] uri target URI
-  # @param [string] body HTTP request body
-  # @param [string] headers HTTP request headers
-  # @return [Net::HTTPResponse] HTTP response
-  def post(uri,
-           body = '',
-           headers = { 'Content-Type' => 'application/atom+xml; type=entry' } )
-    begin
-      response = @access_token.post(uri, body, headers)
-    rescue => problem
-      raise 'Fail to POST: ' + problem.to_s
-    end
-    response
-  end
-
-  # HTTP PUT method
-  # @param [string] uri target URI
-  # @param [string] body HTTP request body
-  # @param [string] headers HTTP request headers
-  # @return [Net::HTTPResponse] HTTP response
-  def put(uri,
-          body = '',
-          headers = { 'Content-Type' => 'application/atom+xml; type=entry' } )
-    begin
-      response = @access_token.put(uri, body, headers)
-    rescue => problem
-      raise 'Fail to PUT: ' + problem.to_s
-    end
-    response
-  end
-
-  # HTTP DELETE method
-  # @param [string] uri target URI
-  # @param [string] headers HTTP request headers
-  # @return [Net::HTTPResponse] HTTP response
-  def delete(uri,
-             headers = { 'Content-Type' => 'application/atom+xml; type=entry' })
-    begin
-      response = @access_token.delete(uri, headers)
-    rescue => problem
-      raise 'Fail to DELETE: ' + problem.to_s
-    end
-    response
-  end
-end
+require 'hatenablog/category'
+require 'hatenablog/client'
+require 'hatenablog/configuration'
+require 'hatenablog/entry'
+require 'hatenablog/feed'

data/lib/hatenablog/category.rb

@@ -0,0 +1,47 @@
+require 'nokogiri'
+
+module Hatenablog
+  class Category
+
+    # Create a new blog categories from a XML string.
+    # @param [String] xml XML string representation
+    # @return [Hatenablog::Category]
+    def self.load_xml(xml)
+      Hatenablog::Category.new(xml)
+    end
+
+    # @return [Array]
+    def categories
+      @categories.dup
+    end
+
+    def each
+      @categories.each do |category|
+        yield category
+      end
+    end
+
+    # If fixed, only categories in this categories can be used for a blog entry.
+    # @return [Boolean]
+    def fixed?
+      @fixed == 'yes'
+    end
+
+
+    private
+
+    def initialize(xml)
+      @document = Nokogiri::XML(xml)
+      parse_document
+    end
+
+    def parse_document
+      @categories = @document.css('atom|category').inject([]) do |categories, category|
+        categories << category['term'].to_s
+      end
+
+      @fixed = @document.at_css('app|categories')['fixed'].to_s
+      @fixed = 'no' if @fixed.nil?
+    end
+  end
+end

data/lib/hatenablog/client.rb

@@ -0,0 +1,272 @@
+require 'oauth'
+
+require 'hatenablog/category'
+require 'hatenablog/entry'
+require 'hatenablog/feed'
+require 'hatenablog/configuration'
+
+module Hatenablog
+  class Client
+    DEFAULT_CONFIG_PATH = './config.yml'.freeze
+
+    COLLECTION_URI = "https://blog.hatena.ne.jp/%s/%s/atom/entry".freeze
+    MEMBER_URI     = "https://blog.hatena.ne.jp/%s/%s/atom/entry/%s".freeze
+    CATEGORY_URI   = "https://blog.hatena.ne.jp/%s/%s/atom/category".freeze
+
+    attr_writer :access_token
+
+    # Create a new hatenablog AtomPub client from a configuration file.
+    # @param [String] config_file configuration file path
+    # @return [Hatenablog::Client] created hatenablog client
+    def self.create(config_file = DEFAULT_CONFIG_PATH)
+      config = Configuration.new(config_file)
+      blog = Hatenablog::Client.new(config.consumer_key, config.consumer_secret,
+                                    config.access_token, config.access_token_secret,
+                                    config.user_id, config.blog_id)
+      return blog unless block_given?
+      yield blog
+    end
+
+    # Get a blog title.
+    # @return [String] blog title
+    def title
+      feed = Feed.load_xml(get_collection(collection_uri).body)
+      feed.title
+    end
+
+    # Get a author name.
+    # @return [String] blog author name
+    def author_name
+      feed = Feed.load_xml(get_collection(collection_uri).body)
+      feed.author_name
+    end
+
+    # Get blog entries array.
+    # @param [Fixnum] page page number to get
+    # @return [Array] blog entries
+    def entries(page = 0)
+      next_page_uri = collection_uri
+      current_page = 0
+      entries = []
+      while current_page <= page
+        feed = Feed.load_xml(get_collection(next_page_uri).body)
+        entries += feed.entries
+
+        break unless feed.has_next?
+        next_page_uri = feed.next_uri
+        current_page += 1
+      end
+      entries
+    end
+
+    # Get blog categories array.
+    # @return [Array] blog categories
+    def categories
+      categories_doc = Category.new(get_category_doc.body)
+      categories_doc.categories
+    end
+
+    # Get a blog entry specified by its ID.
+    # @param [String] entry_id entry ID
+    # @return [Hatenablog::BlogEntry] entry
+    def get_entry(entry_id)
+      response = get(member_uri(entry_id))
+      Entry.load_xml(response.body)
+    end
+
+    # Post a blog entry.
+    # @param [String] title entry title
+    # @param [String] content entry content
+    # @param [Array] categories entry categories
+    # @param [String] draft this entry is draft if 'yes', otherwise it is not draft
+    # @return [Hatenablog::BlogEntry] posted entry
+    def post_entry(title = '', content = '', categories = [], draft = 'no')
+      entry_xml = entry_xml(title, content, categories, draft)
+      response = post(entry_xml)
+      Entry.load_xml(response.body)
+    end
+
+    # Update a blog entry specified by its ID.
+    # @param [String] entry_id updated entry ID
+    # @param [String] title entry title
+    # @param [String] content entry content
+    # @param [Array] categories entry categories
+    # @param [String] draft this entry is draft if 'yes', otherwise it is not draft
+    # @return [Hatenablog::BlogEntry] updated entry
+    def update_entry(entry_id, title = '', content = '', categories = [], draft = 'no')
+      entry_xml = entry_xml(title, content, categories, draft)
+      response = put(entry_xml, member_uri(entry_id))
+      Entry.load_xml(response.body)
+    end
+
+    # Delete a blog entry specified by its ID.
+    # @param [String] entry_id deleted entry ID
+    def delete_entry(entry_id)
+      delete(member_uri(entry_id))
+    end
+
+    # Get Hatenablog AtomPub collection URI.
+    # @param [String] user_id Hatena user ID
+    # @param [String] blog_id Hatenablog ID
+    # @return [String] Hatenablog AtomPub collection URI
+    def collection_uri(user_id = @user_id, blog_id = @blog_id)
+      COLLECTION_URI % [user_id, blog_id]
+    end
+
+    # Get Hatenablog AtomPub member URI.
+    # @param [String] entry_id entry ID
+    # @param [String] user_id Hatena user ID
+    # @param [String] blog_id Hatenablog ID
+    # @return [String] Hatenablog AtomPub member URI
+    def member_uri(entry_id, user_id = @user_id, blog_id = @blog_id)
+      MEMBER_URI % [user_id, blog_id, entry_id]
+    end
+
+    # Get Hatenablog AtomPub category document URI.
+    # @param [String] user_id Hatena user ID
+    # @param [String] blog_id Hatenablog ID
+    # @return [String] Hatenablog AtomPub category document URI
+    def category_doc_uri(user_id = @user_id, blog_id = @blog_id)
+      CATEGORY_URI % [user_id, blog_id]
+    end
+
+    # Build a entry XML from arguments.
+    # @param [String] title entry title
+    # @param [String] content entry content
+    # @param [Array] categories entry categories
+    # @param [String] draft this entry is draft if 'yes', otherwise it is not draft
+    # @param [String] author_name entry author name
+    # @return [String] XML string
+    def entry_xml(title = '', content = '', categories = [], draft = 'no', author_name = @user_id)
+      xml = <<XML
+<?xml version="1.0" encoding="utf-8"?>
+<entry xmlns="http://www.w3.org/2005/Atom"
+       xmlns:app="http://www.w3.org/2007/app">
+  <title>%s</title>
+  <author><name>%s</name></author>
+  <content type="text/x-markdown">%s</content>
+  %s
+  <app:control>
+    <app:draft>%s</app:draft>
+  </app:control>
+</entry>
+XML
+
+      categories_tag = categories.inject('') do |s, c|
+        s + "<category term=\"#{c}\" />\n"
+      end
+      xml % [title, author_name, content, categories_tag, draft]
+    end
+
+
+    private
+
+    def initialize(consumer_key, consumer_secret, access_token, access_token_secret,
+                   user_id, blog_id)
+      consumer = OAuth::Consumer.new(consumer_key, consumer_secret)
+      @access_token = OAuthAccessToken.new(OAuth::AccessToken.new(consumer,
+                                                                  access_token,
+                                                                  access_token_secret))
+
+      @user_id = user_id
+      @blog_id = blog_id
+    end
+
+
+    def get(uri)
+      @access_token.get(uri)
+    end
+
+    def get_collection(uri = collection_uri)
+      unless uri.include?(collection_uri)
+        raise ArgumentError.new('Invalid collection URI: ' + uri)
+      end
+      get(uri)
+    end
+
+    def get_category_doc
+      get(category_doc_uri)
+    end
+
+    def post(entry_xml, uri = collection_uri)
+      @access_token.post(uri, entry_xml)
+    end
+
+    def put(entry_xml, uri)
+      @access_token.put(uri, entry_xml)
+    end
+
+    def delete(uri)
+      @access_token.delete(uri)
+    end
+  end
+
+  class OAuthAccessToken
+
+    # Create a new OAuth 1.0a access token.
+    # @param [OAuth::AccessToken] access_token access token object
+    def initialize(access_token)
+      @access_token = access_token
+    end
+
+    # HTTP GET method
+    # @param [string] uri target URI
+    # @return [Net::HTTPResponse] HTTP response
+    def get(uri)
+      begin
+        response = @access_token.get(uri)
+      rescue => problem
+        raise OAuthError, 'Fail to GET: ' + problem.to_s
+      end
+      response
+    end
+
+    # HTTP POST method
+    # @param [string] uri target URI
+    # @param [string] body HTTP request body
+    # @param [string] headers HTTP request headers
+    # @return [Net::HTTPResponse] HTTP response
+    def post(uri,
+             body = '',
+             headers = { 'Content-Type' => 'application/atom+xml; type=entry' } )
+      begin
+        response = @access_token.post(uri, body, headers)
+      rescue => problem
+        raise OAuthError, 'Fail to POST: ' + problem.to_s
+      end
+      response
+    end
+
+    # HTTP PUT method
+    # @param [string] uri target URI
+    # @param [string] body HTTP request body
+    # @param [string] headers HTTP request headers
+    # @return [Net::HTTPResponse] HTTP response
+    def put(uri,
+            body = '',
+            headers = { 'Content-Type' => 'application/atom+xml; type=entry' } )
+      begin
+        response = @access_token.put(uri, body, headers)
+      rescue => problem
+        raise OAuthError, 'Fail to PUT: ' + problem.to_s
+      end
+      response
+    end
+
+    # HTTP DELETE method
+    # @param [string] uri target URI
+    # @param [string] headers HTTP request headers
+    # @return [Net::HTTPResponse] HTTP response
+    def delete(uri,
+               headers = { 'Content-Type' => 'application/atom+xml; type=entry' })
+      begin
+        response = @access_token.delete(uri, headers)
+      rescue => problem
+        raise OAuthError, 'Fail to DELETE: ' + problem.to_s
+      end
+      response
+    end
+  end
+
+  class OAuthError < StandardError; end
+end

data/lib/hatenablog/configuration.rb

@@ -0,0 +1,31 @@
+require 'yaml'
+
+module Hatenablog
+  class Configuration
+    # For OAuth authorization.
+    attr_reader :consumer_key, :consumer_secret, :access_token, :access_token_secret
+
+    attr_reader :user_id, :blog_id
+
+    # Create a new configuration.
+    # @param [String] config_file configuration file path
+    # @return [Hatenablog::Configuration]
+    def initialize(config_file)
+      config = YAML.load_file(config_file)
+      unless config.has_key?('consumer_key') && config.has_key?('consumer_secret')     &&
+             config.has_key?('access_token') && config.has_key?('access_token_secret') &&
+             config.has_key?('user_id')      && config.has_key?('blog_id')
+        raise ConfigurationError, 'the configure file is incorrect'
+      end
+
+      @consumer_key        = config['consumer_key']
+      @consumer_secret     = config['consumer_secret']
+      @access_token        = config['access_token']
+      @access_token_secret = config['access_token_secret']
+      @user_id             = config['user_id']
+      @blog_id             = config['blog_id']
+    end
+  end
+
+  class ConfigurationError < StandardError; end
+end

data/lib/hatenablog/entry.rb

@@ -0,0 +1,98 @@
+require 'nokogiri'
+
+module Hatenablog
+  class Entry
+    attr_reader :uri, :edit_uri, :id, :author_name, :title, :content
+
+    # Create a new blog entry from a XML string.
+    # @param [String] xml XML string representation
+    # @return [Hatenablog::Entry]
+    def self.load_xml(xml)
+      Hatenablog::Entry.new(xml)
+    end
+
+    # Create a new blog entry from arguments.
+    # @param [String] uri entry URI
+    # @param [String] edit_uri entry URI for editing
+    # @param [String] author_name entry author name
+    # @param [String] title entry title
+    # @param [String] content entry content
+    # @param [String] draft this entry is draft if 'yes', otherwise it is not draft
+    # @param [Array] categories categories array
+    # @return [Hatenablog::Entry]
+    def self.create(uri: '', edit_uri: '', author_name: '', title: '',
+                    content: '', draft: 'no', categories: [])
+      Hatenablog::Entry.new(self.build_xml(uri, edit_uri, author_name, title,
+                            content, draft, categories))
+    end
+
+    # @return [Boolean]
+    def draft?
+      @draft == 'yes'
+    end
+
+    # @return [Array]
+    def categories
+      @categories.dup
+    end
+
+    def each_category
+      @categories.each do |category|
+        yield category
+      end
+    end
+
+    # @return [String]
+    def to_xml
+      @document.to_s.gsub(/\"/, "'")
+    end
+
+
+    private
+
+    def self.build_xml(uri, edit_uri, author_name, title, content, draft, categories)
+      xml = <<XML
+<?xml version='1.0' encoding='UTF-8'?>
+<entry xmlns:app='http://www.w3.org/2007/app' xmlns='http://www.w3.org/2005/Atom'>
+<link href='%s' rel='edit'/>
+<link href='%s' rel='alternate' type='text/html'/>
+<author><name>%s</name></author>
+<title>%s</title>
+<content type='text/x-markdown'>%s</content>
+%s
+<app:control>
+  <app:draft>%s</app:draft>
+</app:control>
+</entry>
+XML
+
+      categories_tag = categories.inject('') do |s, c|
+        s + "<category term=\"#{c}\" />\n"
+      end
+      xml % [edit_uri, uri, author_name, title, content, categories_tag, draft]
+    end
+
+    def initialize(xml)
+      @document = Nokogiri::XML(xml)
+      parse_document
+    end
+
+    def parse_document
+      @uri         = @document.at_css('link[@rel="alternate"]')['href'].to_s
+      @edit_uri    = @document.at_css('link[@rel="edit"]')['href'].to_s
+      @id          = @edit_uri.split('/').last
+      @author_name = @document.at_css('author name').content
+      @title       = @document.at_css('title').content
+      @content     = @document.at_css('content').content
+      @draft       = @document.at_css('entry app|control app|draft').content
+      @categories  = parse_categories
+    end
+
+    def parse_categories
+      categories = @document.css('category').inject([]) do |categories, category|
+        categories << category['term'].to_s
+      end
+      categories
+    end
+  end
+end

data/lib/hatenablog/feed.rb

@@ -0,0 +1,63 @@
+require 'nokogiri'
+require 'time'
+
+require 'hatenablog/entry'
+
+module Hatenablog
+  class Feed
+    attr_reader :uri, :next_uri, :title, :author_name, :updated
+
+    # Create a new blog feed from a XML string.
+    # @param [String] xml XML string representation
+    # @return [Hatenablog::Feed]
+    def self.load_xml(xml)
+      Hatenablog::Feed.new(xml)
+    end
+
+    # @return [Array]
+    def entries
+      @entries.dup
+    end
+
+    def each_entry
+      @entries.each do |entry|
+        yield entry
+      end
+    end
+
+    # Return true if this feed has next feed.
+    # @return [Boolean]
+    def has_next?
+      @next_uri != ''
+    end
+
+
+    private
+
+    def initialize(xml)
+      @document = Nokogiri::XML(xml)
+      parse_document
+    end
+
+    def parse_document
+      @uri         = @document.at_css("feed link[@rel='alternate']")['href'].to_s
+      @next_uri    = if @document.css("feed link[@rel='next']").empty?
+                       ''
+                     else
+                       @document.at_css("feed link[@rel='next']")['href'].to_s
+                     end
+      @title       = @document.at_css('feed title').content
+      @author_name = @document.at_css('author name').content
+      @updated     = Time.parse(@document.at_css('feed updated').content)
+      parse_entry
+    end
+
+    def parse_entry
+      @entries = @document.css('feed > entry').inject([]) do |entries, entry|
+        # add namespace 'app' to recognize XML correctly
+        entry['xmlns:app'] = 'http://www.w3.org/2007/app'
+        entries << Hatenablog::Entry.load_xml(entry.to_s)
+      end
+    end
+  end
+end

data/lib/hatenablog/version.rb

@@ -1,3 +1,3 @@
 module Hatenablog
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hatenablog
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Kohei Yamamoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2015-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,20 +38,90 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.2
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.4
+- !ruby/object:Gem::Dependency
+  name: test-unit-rr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.6
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.7
 description: Hatenablog AtomPub API library
 email:
 - kymmt90@gmail.com
@@ -61,6 +131,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -69,11 +140,12 @@ files:
 - bin/setup
 - exe/get_access_token
 - hatenablog.gemspec
-- lib/blog_category.rb
-- lib/blog_entry.rb
-- lib/blog_feed.rb
-- lib/configuration.rb
 - lib/hatenablog.rb
+- lib/hatenablog/category.rb
+- lib/hatenablog/client.rb
+- lib/hatenablog/configuration.rb
+- lib/hatenablog/entry.rb
+- lib/hatenablog/feed.rb
 - lib/hatenablog/version.rb
 homepage: https://github.com/kymmt90/hatenablog
 licenses:
@@ -87,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -100,3 +172,4 @@ signing_key:
 specification_version: 4
 summary: Hatenablog AtomPub API library
 test_files: []
+has_rdoc: 

data/lib/blog_category.rb

@@ -1,46 +0,0 @@
-require 'rexml/document'
-
-class BlogCategory
-
-  # Create a new blog categories from a XML string.
-  # @param [String] xml XML string representation
-  # @return [BlogCategory]
-  def self.load_xml(xml)
-    BlogCategory.new(xml)
-  end
-
-  # @return [Array]
-  def categories
-    @categories.dup
-  end
-
-  def each
-    @categories.each do |category|
-      yield category
-    end
-  end
-
-  # If fixed, only categories in this categories can be used for a blog entry.
-  # @return [Boolean]
-  def fixed?
-    @fixed == 'yes'
-  end
-
-
-  private
-
-  def initialize(xml)
-    @document = REXML::Document.new(xml)
-    parse_document
-  end
-
-  def parse_document
-    @categories = []
-    @document.each_element("//atom:category") do |category|
-      @categories << category.attribute('term').to_s
-    end
-
-    @fixed = @document.elements["/app:categories"].attribute('fixed').to_s
-    @fixed = 'no' if @fixed.nil?
-  end
-end

data/lib/blog_entry.rb

@@ -1,97 +0,0 @@
-require 'rexml/document'
-
-class BlogEntry
-  attr_reader :uri, :edit_uri, :id, :author_name, :title, :content
-
-  # Create a new blog entry from a XML string.
-  # @param [String] xml XML string representation
-  # @return [BlogEntry]
-  def self.load_xml(xml)
-    BlogEntry.new(xml)
-  end
-
-  # Create a new blog entry from arguments.
-  # @param [String] uri entry URI
-  # @param [String] edit_uri entry URI for editing
-  # @param [String] author_name entry author name
-  # @param [String] title entry title
-  # @param [String] content entry content
-  # @param [String] draft this entry is draft if 'yes', otherwise it is not draft
-  # @param [Array] categories categories array
-  # @return [BlogEntry]
-  def self.create(uri: '', edit_uri: '', author_name: '', title: '',
-                  content: '', draft: 'no', categories: [])
-    BlogEntry.new(self.build_xml(uri, edit_uri, author_name, title,
-                                 content, draft, categories))
-  end
-
-  # @return [Boolean]
-  def draft?
-    @draft == 'yes'
-  end
-
-  # @return [Array]
-  def categories
-    @categories.dup
-  end
-
-  def each_category
-    @categories.each do |category|
-      yield category
-    end
-  end
-
-  # @return [String]
-  def to_xml
-    @document.to_s
-  end
-
-
-  private
-
-  def self.build_xml(uri, edit_uri, author_name, title, content, draft, categories)
-    xml = <<XML
-<?xml version='1.0' encoding='UTF-8'?>
-<entry xmlns:app='http://www.w3.org/2007/app' xmlns='http://www.w3.org/2005/Atom'>
-<link href='%s' rel='edit'/>
-<link href='%s' rel='alternate' type='text/html'/>
-<author><name>%s</name></author>
-<title>%s</title>
-<content type='text/x-markdown'>%s</content>
-%s
-<app:control>
-  <app:draft>%s</app:draft>
-</app:control>
-</entry>
-XML
-
-    categories_tag = categories.inject('') do |s, c|
-      s + "<category term=\"#{c}\" />\n"
-    end
-    xml % [edit_uri, uri, author_name, title, content, categories_tag, draft]
-  end
-
-  def initialize(xml)
-    @document = REXML::Document.new(xml)
-    parse_document
-  end
-
-  def parse_document
-    @uri = @document.elements["//link[@rel='alternate']"].attribute('href').to_s
-    @edit_uri = @document.elements["//link[@rel='edit']"].attribute('href').to_s
-    @id = @edit_uri.split('/').last
-    @author_name = @document.elements["//author/name"].text
-    @title = @document.elements["//title"].text
-    @content = @document.elements["//content"].text
-    @draft = @document.elements["//app:draft"].text
-    @categories = parse_categories
-  end
-
-  def parse_categories
-    categories = []
-    @document.each_element("//category") do |category|
-      categories << category.attribute('term').to_s
-    end
-    categories
-  end
-end

data/lib/blog_feed.rb

@@ -1,61 +0,0 @@
-require 'blog_entry'
-require 'rexml/document'
-require 'time'
-
-class BlogFeed
-  attr_reader :uri, :next_uri, :title, :author_name, :updated
-
-  # Create a new blog feed from a XML string.
-  # @param [String] xml XML string representation
-  # @return [BlogFeed]
-  def self.load_xml(xml)
-    BlogFeed.new(xml)
-  end
-
-  # @return [Array]
-  def entries
-    @entries.dup
-  end
-
-  def each_entry
-    @entries.each do |entry|
-      yield entry
-    end
-  end
-
-  # Return true if this feed has next feed.
-  # @return [Boolean]
-  def has_next?
-    @next_uri != ''
-  end
-
-
-  private
-
-  def initialize(xml)
-    @document = REXML::Document.new(xml)
-    parse_document
-  end
-
-  def parse_document
-    @uri = @document.elements["/feed/link[@rel='alternate']"].attribute('href').to_s
-    @next_uri = if @document.elements["/feed/link[@rel='next']"].nil?
-                  ''
-                else
-                  @document.elements["/feed/link[@rel='next']"].attribute('href').to_s
-                end
-    @title = @document.elements["/feed/title"].text
-    @author_name = @document.elements["//author/name"].text
-    @updated = Time.parse(@document.elements["/feed/updated"].text)
-    parse_entry
-  end
-
-  def parse_entry
-    @entries = []
-    @document.elements.collect("//entry") do |entry|
-      # add namespace 'app' to recognize XML correctly
-      entry.add_attribute('xmlns:app', 'http://www.w3.org/2007/app')
-      @entries << BlogEntry.load_xml(entry.to_s)
-    end
-  end
-end

data/lib/configuration.rb

@@ -1,21 +0,0 @@
-require 'yaml'
-
-class Configuration
-  # For OAuth authorization.
-  attr_reader :consumer_key, :consumer_secret, :access_token, :access_token_secret
-
-  attr_reader :user_id, :blog_id
-
-  # Create a new configuration.
-  # @param [String] config_file configuration file path
-  # @return [Configuration]
-  def initialize(config_file)
-    config = YAML.load_file(config_file)
-    @consumer_key        = config['consumer_key']
-    @consumer_secret     = config['consumer_secret']
-    @access_token        = config['access_token']
-    @access_token_secret = config['access_token_secret']
-    @user_id             = config['user_id']
-    @blog_id             = config['blog_id']
-  end
-end