hatenablog 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf376e1c7bc165c96b04d31cdca1c7ad519eee6d
-  data.tar.gz: 47dbbe4a2e6e7efff7208a418424a224e74a2ee0
+  metadata.gz: 8b3523997853851a6cfaf4a4d00230dd4f6b8b06
+  data.tar.gz: bcfa0433a24776cabbb92b16add175064bf7983d
 SHA512:
-  metadata.gz: 1a20f773e2c91639daa1f3c446edcaae4206f83f547ae552381afbd3d6912565b75d87f2dd8cdae3ee7bed4bd773b81f4c97f2319e5041d924a263fc6d8e4d2a
-  data.tar.gz: a839ae31b99284ea6b40e9d736d1375afa90ccd66fcabb872decdb5ad727fd838ee46daaabb507ca702840b2a35b024e0f8cc1d561f18db94b0bf0039051b1a9
+  metadata.gz: 83c65f0473fd3f11b137b329a7af1d14916262383ef090b4e11da81d9519820068971623b33459199e99b1be1ad0847150bec7230987fa8bd519f2ed2e7b9b61
+  data.tar.gz: 479bfb1f32b41e701f23ef8c3f5da750177d4894a4154a34f350fb681db8f5557d8bb80445e2c59c26577c86cdf61e856f112b14e6022cd87d72a209ba5f5d4b

data/.travis.yml

@@ -3,3 +3,5 @@ rvm:
   - 2.0.0
   - 2.1.0
   - 2.2.0
+env:
+  - TZ=Asia/Tokyo

data/README.md

@@ -1,4 +1,4 @@
-# Hatenablog
+# Hatenablog [![Build Status](https://travis-ci.org/kymmt90/hatenablog.svg?branch=master)](https://travis-ci.org/kymmt90/hatenablog)
 
 A library for Hatenablog AtomPub API.
 This gem supports following operations using OAuth authorization:
@@ -44,7 +44,7 @@ Execute this command:
 
 #### 3. Set up the YAML configuration file
 
-The default configuration file name is `conf.yml`:
+The default configuration file name is `config.yml`:
 
 ```yml
 consumer_key: <Hatena application consumer key>
@@ -60,7 +60,7 @@ blog_id: <Hatenablog ID>
 ```ruby
 require 'hatenablog'
 
-# Read the OAuth configuration from 'conf.yml'
+# Read the OAuth configuration from 'config.yml'
 Hatenablog::Client.create do |blog|
   # Get each entry's content
   blog.entries.each do |entry|

data/Rakefile

@@ -14,6 +14,6 @@ Rake::TestTask.new do |t|
 end
 
 YARD::Rake::YardocTask.new do |t|
-  t.files = Dir["lib/*.rb"]
+  t.files = Dir["lib/*.rb lib/hatenablog/*.rb"]
   t.options = %w(--debug --verbose) if $trace
 end

data/hatenablog.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.0'
 
-  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rr", "~> 1.1.2"
   spec.add_development_dependency "test-unit", "~> 3.1.4"

data/lib/hatenablog/client.rb

@@ -45,20 +45,28 @@ module Hatenablog
     # @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
+      feed = Feed.load_xml(get_collection(collection_uri).body)
+      entries = feed.entries
 
-        break unless feed.has_next?
-        next_page_uri = feed.next_uri
-        current_page += 1
+      (1..page).each do
+        feed = next_feed(feed)
+        break if feed.nil?
+        entries += feed.entries
       end
+
       entries
     end
 
+    # Get the next feed of the given feed.
+    # Return the first feed if no argument is passed.
+    # @param [Hatenablog::Feed] feed blog feed
+    # @return [Hatenablog::Feed] next blog feed
+    def next_feed(feed = nil)
+      return Feed.load_xml(get_collection(collection_uri).body) if feed.nil?
+      return nil unless feed.has_next?
+      Feed.load_xml(get_collection(feed.next_uri).body)
+    end
+
     # Get blog categories array.
     # @return [Array] blog categories
     def categories
@@ -92,9 +100,10 @@ module Hatenablog
     # @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] updated entry updated datetime (ISO 8601)
     # @return [Hatenablog::BlogEntry] updated entry
-    def update_entry(entry_id, title = '', content = '', categories = [], draft = 'no')
-      entry_xml = entry_xml(title, content, categories, draft)
+    def update_entry(entry_id, title = '', content = '', categories = [], draft = 'no', updated = '')
+      entry_xml = entry_xml(title, content, categories, draft, updated)
       response = put(entry_xml, member_uri(entry_id))
       Entry.load_xml(response.body)
     end
@@ -135,9 +144,10 @@ module Hatenablog
     # @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] updated entry updated datetime (ISO 8601)
     # @param [String] author_name entry author name
     # @return [String] XML string
-    def entry_xml(title = '', content = '', categories = [], draft = 'no', author_name = @user_id)
+    def entry_xml(title = '', content = '', categories = [], draft = 'no', updated = '', author_name = @user_id)
       xml = <<XML
 <?xml version="1.0" encoding="utf-8"?>
 <entry xmlns="http://www.w3.org/2005/Atom"
@@ -145,17 +155,20 @@ module Hatenablog
   <title>%s</title>
   <author><name>%s</name></author>
   <content type="text/x-markdown">%s</content>
-  %s
+  %s%s
   <app:control>
     <app:draft>%s</app:draft>
   </app:control>
 </entry>
 XML
 
+      unless updated.empty?
+        updated = '<updated>' + updated + '</updated>'
+      end
       categories_tag = categories.inject('') do |s, c|
         s + "<category term=\"#{c}\" />\n"
       end
-      xml % [title, author_name, content, categories_tag, draft]
+      xml % [title, author_name, content, updated, categories_tag, draft]
     end
 
 

data/lib/hatenablog/entry.rb

@@ -2,7 +2,7 @@ require 'nokogiri'
 
 module Hatenablog
   class Entry
-    attr_reader :uri, :edit_uri, :id, :author_name, :title, :content
+    attr_reader :uri, :edit_uri, :id, :author_name, :title, :content, :updated
 
     # Create a new blog entry from a XML string.
     # @param [String] xml XML string representation
@@ -19,11 +19,12 @@ module Hatenablog
     # @param [String] content entry content
     # @param [String] draft this entry is draft if 'yes', otherwise it is not draft
     # @param [Array] categories categories array
+    # @param [String] updated entry updated datetime (ISO 8601)
     # @return [Hatenablog::Entry]
     def self.create(uri: '', edit_uri: '', author_name: '', title: '',
-                    content: '', draft: 'no', categories: [])
+                    content: '', draft: 'no', categories: [], updated: '')
       Hatenablog::Entry.new(self.build_xml(uri, edit_uri, author_name, title,
-                            content, draft, categories))
+                            content, draft, categories, updated))
     end
 
     # @return [Boolean]
@@ -50,7 +51,7 @@ module Hatenablog
 
     private
 
-    def self.build_xml(uri, edit_uri, author_name, title, content, draft, categories)
+    def self.build_xml(uri, edit_uri, author_name, title, content, draft, categories, updated)
       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'>
@@ -59,17 +60,20 @@ module Hatenablog
 <author><name>%s</name></author>
 <title>%s</title>
 <content type='text/x-markdown'>%s</content>
-%s
+%s%s
 <app:control>
   <app:draft>%s</app:draft>
 </app:control>
 </entry>
 XML
 
+      unless updated.nil?
+        updated = '<updated>' + updated + '</updated>'
+      end
       categories_tag = categories.inject('') do |s, c|
         s + "<category term=\"#{c}\" />\n"
       end
-      xml % [edit_uri, uri, author_name, title, content, categories_tag, draft]
+      xml % [edit_uri, uri, author_name, title, content, updated, categories_tag, draft]
     end
 
     def initialize(xml)
@@ -86,6 +90,9 @@ XML
       @content     = @document.at_css('content').content
       @draft       = @document.at_css('entry app|control app|draft').content
       @categories  = parse_categories
+      unless @document.at_css('entry updated').nil?
+        @updated = Time.parse(@document.at_css('entry updated').content)
+      end
     end
 
     def parse_categories

data/lib/hatenablog/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hatenablog
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Kohei Yamamoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-11 00:00:00.000000000 Z
+date: 2015-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Hatenablog AtomPub API library