hatenablog 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b3523997853851a6cfaf4a4d00230dd4f6b8b06
-  data.tar.gz: bcfa0433a24776cabbb92b16add175064bf7983d
+  metadata.gz: f87d69430e84141add234b284afe132a93b62ec2
+  data.tar.gz: 917bc1f2cfdb6a26c892db351b2826f2ee0a03cb
 SHA512:
-  metadata.gz: 83c65f0473fd3f11b137b329a7af1d14916262383ef090b4e11da81d9519820068971623b33459199e99b1be1ad0847150bec7230987fa8bd519f2ed2e7b9b61
-  data.tar.gz: 479bfb1f32b41e701f23ef8c3f5da750177d4894a4154a34f350fb681db8f5557d8bb80445e2c59c26577c86cdf61e856f112b14e6022cd87d72a209ba5f5d4b
+  metadata.gz: 274d6839f11d6cf7d74329986e99d09f319137d9fbe751138f645e82e7fe8ccdaa75bb0a8bac3d43a3156cc10866dc5c7c81b4989a46869b4d1e98b3afba152d
+  data.tar.gz: fdc4ce8d677bcd77edde50acc4f8b743b68fedd841157d076de8d2cfbe9b89bd1d5191f5eb1c55a4e00f88a5b78a884e48bad67dd51e01730b81fe4ef3ccb6ea

data/lib/hatenablog/client.rb

@@ -148,27 +148,25 @@ module Hatenablog
     # @param [String] author_name entry author name
     # @return [String] XML string
     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"
-       xmlns:app="http://www.w3.org/2007/app">
-  <title>%s</title>
-  <author><name>%s</name></author>
-  <content type="text/x-markdown">%s</content>
-  %s%s
-  <app:control>
-    <app:draft>%s</app:draft>
-  </app:control>
-</entry>
-XML
-
-      unless updated.empty?
-        updated = '<updated>' + updated + '</updated>'
+      builder = Nokogiri::XML::Builder.new(encoding: 'utf-8') do |xml|
+        xml.entry('xmlns'     => 'http://www.w3.org/2005/Atom',
+                  'xmlns:app' => 'http://www.w3.org/2007/app') do
+          xml.title title
+          xml.author do
+            xml.name author_name
+          end
+          xml.content(content, type: 'text/x-markdown')
+          xml.updated updated unless updated.empty? || updated.nil?
+          categories.each do |category|
+            xml.category(term: category)
+          end
+          xml['app'].control do
+            xml['app'].draft draft
+          end
+        end
       end
-      categories_tag = categories.inject('') do |s, c|
-        s + "<category term=\"#{c}\" />\n"
-      end
-      xml % [title, author_name, content, updated, categories_tag, draft]
+
+      builder.to_xml
     end
 
 

data/lib/hatenablog/entry.rb

@@ -1,8 +1,45 @@
 require 'nokogiri'
+require 'time'
 
 module Hatenablog
+  module AfterHook
+    # Register a hooking method for given methods.
+    # The hook method is executed after calling given methods.
+    # @param [Symbol] hooking method name
+    # @param [Array] hooked methods name array
+    def after_hook(hook, *methods)
+      methods.each do |method|
+        origin_method = "#{method}_origin".to_sym
+        if instance_methods.include? origin_method
+          raise NameError, "#{origin_method} isn't a unique name"
+        end
+
+        alias_method origin_method, method
+
+        define_method(method) do |*args, &block|
+          result = send(origin_method, *args, &block)
+          send(hook)
+        end
+      end
+    end
+  end
+
   class Entry
-    attr_reader :uri, :edit_uri, :id, :author_name, :title, :content, :updated
+    extend AfterHook
+
+    attr_accessor :uri, :author_name, :title, :content, :draft, :categories
+    attr_reader   :edit_uri, :id, :updated
+
+    def updated=(date)
+      @updated = Time.parse(date)
+    end
+
+    def edit_uri=(uri)
+      @edit_uri = uri
+      @id       = uri.split('/').last
+    end
+
+    after_hook :update_xml, :uri=, :edit_uri=, :author_name=, :title=, :content=, :updated=, :draft=, :categories=
 
     # Create a new blog entry from a XML string.
     # @param [String] xml XML string representation
@@ -23,8 +60,10 @@ module Hatenablog
     # @return [Hatenablog::Entry]
     def self.create(uri: '', edit_uri: '', author_name: '', title: '',
                     content: '', draft: 'no', categories: [], updated: '')
-      Hatenablog::Entry.new(self.build_xml(uri, edit_uri, author_name, title,
-                            content, draft, categories, updated))
+      entry = Hatenablog::Entry.new(self.build_xml(uri, edit_uri, author_name, title,
+                                                   content, draft, categories, updated))
+      yield entry if block_given?
+      entry
     end
 
     # @return [Boolean]
@@ -48,34 +87,35 @@ module Hatenablog
       @document.to_s.gsub(/\"/, "'")
     end
 
-
-    private
-
     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'>
-<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%s
-<app:control>
-  <app:draft>%s</app:draft>
-</app:control>
-</entry>
-XML
-
-      unless updated.nil?
-        updated = '<updated>' + updated + '</updated>'
+      builder = Nokogiri::XML::Builder.new(encoding: 'utf-8') do |xml|
+        xml.entry('xmlns'     => 'http://www.w3.org/2005/Atom',
+                  'xmlns:app' => 'http://www.w3.org/2007/app') do
+          xml.link(href: edit_uri, rel: 'edit')
+          xml.link(href: uri,      rel: 'alternate', type: 'text/html')
+          xml.author do
+            xml.name author_name
+          end
+          xml.title title
+          xml.content(content, type: 'text/x-markdown')
+          xml.updated updated unless updated.nil? || updated.empty?
+          unless categories.nil?
+            categories.each do |category|
+              xml.category(term: category)
+            end
+          end
+          xml['app'].control do
+            xml['app'].draft draft
+          end
+        end
       end
-      categories_tag = categories.inject('') do |s, c|
-        s + "<category term=\"#{c}\" />\n"
-      end
-      xml % [edit_uri, uri, author_name, title, content, updated, categories_tag, draft]
+
+      builder.to_xml
     end
 
+
+    private
+
     def initialize(xml)
       @document = Nokogiri::XML(xml)
       parse_document
@@ -101,5 +141,39 @@ XML
       end
       categories
     end
+
+    def update_xml
+      @document.at_css('author name').content                 = @author_name
+      @document.at_css('title').content                       = @title
+      @document.at_css('link[@rel="alternate"]')['href']      = @uri
+      @document.at_css('link[@rel="edit"]')['href']           = @edit_uri
+      @document.at_css('content').content                     = @content
+      @document.at_css('entry app|control app|draft').content = @draft
+
+      unless @updated.nil? || @document.at_css('entry updated').nil?
+        @document.at_css('entry updated').content = @updated.iso8601
+      end
+
+      unless @categories.nil?
+        old_categories = @document.css('category')
+        return if old_categories.empty? || !categories_modified?(old_categories, @categories)
+
+        prev_node = @document.at_css('category').previous
+        old_categories.each do |category|
+          category.remove
+        end
+
+        @categories.each do |category|
+          prev_node.next = @document.create_element('category', term: category)
+          prev_node = prev_node.next
+        end
+      end
+    end
+
+    def categories_modified?(old_categories, new_categories)
+      old_set = Set.new(old_categories.map { |category| category['term'] })
+      new_set = Set.new(new_categories)
+      old_set != new_set
+    end
   end
 end

data/lib/hatenablog/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hatenablog
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Kohei Yamamoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-17 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Hatenablog AtomPub API library