growi-client 0.9.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac56c4422e6572699058511873cfed8cf01f01fc15b688e4aa13bd8a19fb4592
-  data.tar.gz: 0eb97e2e86c0ec4fe870ff56e14fe2cf965d5a6d82314bd53465232412c5b9dc
+  metadata.gz: 1be36d8f24f482a6ef4619cdd24e2cb0eb9864c8942ca73460041afa7c4bda6e
+  data.tar.gz: 1313b309deaad58f062c61c71c1277e34c0b1f1b355bb3f9995946993befec13
 SHA512:
-  metadata.gz: ee9245bcda0307298726bda847805cf25b4f02c69e5304f4e7709c2f4142ed52401d118260ebcffeee3a01efb805a51b2da0cbf699e4961f3f607df4f935ee1a
-  data.tar.gz: 74c8108b80b7623f9494d224ada9404bc4671213bee37ad3679fe3689796c18ca50a9ed1a86ca4bc7fd88d4c9d4efc61abb6a004ff150c40883cf55004684835
+  metadata.gz: 129f361ed75e5787dd3e16ae6160a7a5bf65c32cf710531ba380087ec9bcc9334f61d2186fa2c10c647fd8e1187a5a342b67124fe113a12be790f5a58b507750
+  data.tar.gz: 0b7639ced1c08bda7d00fb1de4329658bbf73f7b3e1bdb2d3febbffcef8b7cab03d7a86ed4f543816f49576f3c808ecaaffa75d5174c1313b34b30e9f6ece84c

data/README.md

@@ -10,6 +10,7 @@ growi-client is passed the test of these Growi versions.
 
 |growi-client|Growi|
 | --- | --- |
+|1.0.0|3.3.3|
 |0.9.0|3.1.12|
 
 ## Installation
@@ -219,3 +220,7 @@ The gem is available as open source under the terms of the [MIT License](http://
 ## Code of Conduct
 
 Everyone interacting in the Growi::Client project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/ryu-satgrowiwi-client/blob/master/CODE_OF_CONDUCT.md).
+
+## TODO
+
+- [ ] pagenation に対応する

data/lib/growi/client/apireq/api_request_attachments.rb

@@ -23,7 +23,7 @@ class GApiRequestAttachmentsList < GApiRequestBase
     params = { method: :get, url: entry_point, headers: { params: @param } }.merge(rest_client_param)
     ret = JSON.parse RestClient::Request.execute params
     if (ret['ok'] == false)
-      return CPInvalidRequest.new "API return false with msg: #{ret['msg']}"
+      return GCInvalidRequest.new "API return false with msg: #{ret['msg']}"
     end
     attachments = []
     ret['attachments'].each do |attachment|
@@ -35,10 +35,10 @@ class GApiRequestAttachmentsList < GApiRequestBase
 protected
 
   # バリデーションエラーを取得する
-  # @return [nil/CPInvalidRequest] バリデーションエラー結果
+  # @return [nil/GCInvalidRequest] バリデーションエラー結果
   def _invalid
     if ! (@param[:page_id])
-      CPInvalidRequest.new 'Parameter page_id is required.'
+      GCInvalidRequest.new 'Parameter page_id is required.'
     end
   end
 
@@ -76,7 +76,7 @@ class GApiRequestAttachmentsAdd < GApiRequestBase
     }.merge(rest_client_param)
     ret = JSON.parse RestClient::Request.execute params
     if (ret['ok'] == false)
-      return CPInvalidRequest.new "API return false with msg: #{ret['msg']}"
+      return GCInvalidRequest.new "API return false with msg: #{ret['msg']}"
     end
     return GApiReturn.new(ok: ret['ok'], data: GrowiPage.new(ret['page']))
   end
@@ -84,10 +84,10 @@ class GApiRequestAttachmentsAdd < GApiRequestBase
 protected
 
   # バリデーションエラーを取得する
-  # @return [nil/CPInvalidRequest] バリデーションエラー結果
+  # @return [nil/GCInvalidRequest] バリデーションエラー結果
   def _invalid
     if ! (@param[:file] && @param[:page_id])
-      CPInvalidRequest.new 'Parameters file and page_id are required.'
+      GCInvalidRequest.new 'Parameters file and page_id are required.'
     end
   end
 
@@ -121,7 +121,7 @@ class GApiRequestAttachmentsRemove < GApiRequestBase
              }.merge(rest_client_param)
     ret = JSON.parse RestClient::Request.execute params
     if (ret['ok'] == false)
-      return CPInvalidRequest.new "API return false with msg: #{ret['msg']}"
+      return GCInvalidRequest.new "API return false with msg: #{ret['msg']}"
     end
     return GApiReturn.new(ok: ret['ok'], data: nil)
   end
@@ -129,10 +129,10 @@ class GApiRequestAttachmentsRemove < GApiRequestBase
 protected
 
   # バリデーションエラーを取得する
-  # @return [nil/CPInvalidRequest] バリデーションエラー結果
+  # @return [nil/GCInvalidRequest] バリデーションエラー結果
   def _invalid
     if ! (@param[:attachment_id])
-      CPInvalidRequest.new 'Parameter attachment_id is required.'
+      GCInvalidRequest.new 'Parameter attachment_id is required.'
     end
   end
 

data/lib/growi/client/apireq/api_request_base.rb

@@ -1,11 +1,12 @@
 # APIリクエストのバリデーションエラー
 # @note rescue する必要はないので Exception クラスは継承しない
-class CPInvalidRequest
-  attr_reader :msg
+class GCInvalidRequest
+  attr_reader :ok, :msg
 
   # コンストラクタ
   # @param [String] msg エラーメッセージ（原因と対策が分かるとよい）
   def initialize(msg)
+    @ok = false
     @msg = msg
   end
 
@@ -97,9 +98,9 @@ class GApiRequestBase
 protected
 
   # バリデーションエラーを取得する
-  # @return [nil/CPInvalidRequest] バリデーションエラー結果
+  # @return [nil/GCInvalidRequest] バリデーションエラー結果
   def _invalid
-    return CPInvalidRequest "Invalid API request.";
+    return GCInvalidRequest "Invalid API request.";
   end
 
 end

data/lib/growi/client/apireq/api_request_pages.rb

@@ -1,8 +1,9 @@
 require_relative 'api_request_base'
 require 'growi/client/model/growi_page'
+require 'growi/client/logger'
 
 # ページ一覧リクエスト用クラス
-# @ref https://github.com/growi/growi/blob/master/lib/routes/page.js
+# @ref https://github.com/weseek/growi/blob/master/src/server/routes/page.js
 class GApiRequestPagesList < GApiRequestBase
 
   # コンストラクタ
@@ -14,6 +15,7 @@ class GApiRequestPagesList < GApiRequestBase
   end
 
   # リクエストを実行する
+  # [TODO] pagination に対応する
   # @override
   # @param  [String] entry_point APIのエントリーポイントとなるURL（ex. http://localhost:3000/_api/pages.list）
   # @param  [Hash] rest_client_param RestClientのパラメータ
@@ -25,28 +27,44 @@ class GApiRequestPagesList < GApiRequestBase
     end
 
     params = { method: :get, url: entry_point, headers: { params: @param } }.merge(rest_client_param)
-    ret = JSON.parse RestClient::Request.execute params
-    if (ret['ok'] == false)
-      return CPInvalidRequest.new "API return false with msg: #{ret['msg']}"
+    GCLogger.logger.debug('Request: ' + params.to_s)
+
+    begin
+      raw_ret = RestClient::Request.execute params
+      GCLogger.logger.debug('Return: ' + raw_ret.to_s)
+      ret = JSON.parse raw_ret
+    rescue Exception => e
+      GCLogger.logger.error(e)
+      return GCInvalidRequest.new "Unknown error occured: #{e}"
+    end
+
+    if (!ret['ok'].nil? && ret['ok'] == false)
+      return GCInvalidRequest.new "API return false with msg: #{ret['msg']}"
     end
-    pages = []
-    ret['pages'].each do |page|
-      pages.push(GrowiPage.new(page))
+
+    begin
+      pages = []
+      ret['pages'].each do |page|
+        pages.push(GrowiPage.new(page))
+      end
+      return GApiReturn.new(ok: ret['ok'], data: pages)
+    rescue Exception => e
+      GCLogger.logger.error(e)
+      return GCInvalidRequest.new "Fail to parse: #{e}"
     end
-    return GApiReturn.new(ok: ret['ok'], data: pages)
   end
 
 protected
 
   # バリデーションエラーを取得する
   # @override
-  # @return [nil/CPInvalidRequest] バリデーションエラー結果
+  # @return [nil/GCInvalidRequest] バリデーションエラー結果
   def _invalid
     if ! (@param[:path] || @param[:user])
-      return CPInvalidRequest.new 'Parameter path or user is required.'
+      return GCInvalidRequest.new 'Parameter path or user is required.'
     end
     if (@param[:path] && @param[:user])
-      return CPInvalidRequest.new 'Parameter path and user can not be specified both.'
+      return GCInvalidRequest.new 'Parameter path and user can not be specified both.'
     end
   end
 
@@ -76,11 +94,23 @@ class GApiRequestPagesGet < GApiRequestBase
     if invalid?
       return validation_msg
     end
+
     params = { method: :get, url: entry_point, headers: { params: @param } }.merge(rest_client_param)
-    ret = JSON.parse RestClient::Request.execute params
-    if (ret['ok'] == false)
-      return CPInvalidRequest.new "API return false with msg: #{ret['msg']}"
+    GCLogger.logger.debug('Request: ' + params.to_s)
+
+    begin
+      raw_ret = RestClient::Request.execute params
+      GCLogger.logger.debug('Return: ' + raw_ret.to_s)
+      ret = JSON.parse raw_ret
+    rescue Exception => e
+      GCLogger.logger.error(e)
+      return GCInvalidRequest.new "Unknown error occured: #{e}"
+    end
+
+    if (!ret['ok'].nil? && ret['ok'] == false)
+      return GCInvalidRequest.new "API return false with msg: #{ret['msg']}"
     end
+
     return GApiReturn.new(ok: ret['ok'], data: GrowiPage.new(ret['page']))
   end
 
@@ -88,10 +118,10 @@ protected
 
   # バリデーションエラーを取得する
   # @override
-  # @return [nil/CPInvalidRequest] バリデーションエラー結果
+  # @return [nil/GCInvalidRequest] バリデーションエラー結果
   def _invalid
     if ! (@param[:path] || @param[:page_id]) 
-      return CPInvalidRequest.new 'Parameter path or page_id is required.'
+      return GCInvalidRequest.new 'Parameter path or page_id is required.'
     end
   end
 
@@ -125,10 +155,21 @@ class GApiRequestPagesCreate < GApiRequestBase
                payload: @param.to_json,
                headers: { content_type: :json, accept: :json }
              }.merge(rest_client_param)
-    ret = JSON.parse RestClient::Request.execute params
-    if (ret['ok'] == false)
-      return CPInvalidRequest.new "API return false with msg: #{ret['msg']}"
+    GCLogger.logger.debug('Request: ' + params.to_s)
+
+    begin
+      raw_ret = RestClient::Request.execute params
+      GCLogger.logger.debug('Return: ' + raw_ret.to_s)
+      ret = JSON.parse raw_ret
+    rescue Exception => e
+      GCLogger.logger.error(e)
+      return GCInvalidRequest.new "Unknown error occured: #{e}"
     end
+
+    if (!ret['ok'].nil? && ret['ok'] == false)
+      return GCInvalidRequest.new "API return false with msg: #{ret['msg']}"
+    end
+
     return GApiReturn.new(ok: ret['ok'], data: GrowiPage.new(ret['page']))
   end
 
@@ -136,10 +177,10 @@ protected
 
   # バリデーションエラーを取得する
   # @override
-  # @return [nil/CPInvalidRequest] バリデーションエラー結果
+  # @return [nil/GCInvalidRequest] バリデーションエラー結果
   def _invalid
     if ! (@param[:body] && @param[:path]) 
-      return CPInvalidRequest.new 'Parameters body and path are required.'
+      return GCInvalidRequest.new 'Parameters body and path are required.'
     end
   end
 
@@ -172,10 +213,21 @@ class GApiRequestPagesUpdate < GApiRequestBase
                payload: @param.to_json,
                headers: { content_type: :json, accept: :json }
              }.merge(rest_client_param)
-    ret = JSON.parse RestClient::Request.execute params
-    if (ret['ok'] == false)
-      return CPInvalidRequest.new "API return false with msg: #{ret['msg']}"
+    GCLogger.logger.debug('Request: ' + params.to_s)
+
+    begin
+      raw_ret = RestClient::Request.execute params
+      GCLogger.logger.debug('Return: ' + raw_ret.to_s)
+      ret = JSON.parse raw_ret
+    rescue Exception => e
+      GCLogger.logger.error(e)
+      return GCInvalidRequest.new "Unknown error occured: #{e}"
+    end
+
+    if (!ret['ok'].nil? && ret['ok'] == false)
+      return GCInvalidRequest.new "API return false with msg: #{ret['msg']}"
     end
+
     return GApiReturn.new(ok: ret['ok'], data: GrowiPage.new(ret['page']))
   end
 
@@ -183,10 +235,10 @@ protected
 
   # バリデーションエラーを取得する
   # @override
-  # @return [nil/CPInvalidRequest] バリデーションエラー結果
+  # @return [nil/GCInvalidRequest] バリデーションエラー結果
   def _invalid
-    if ! (@param[:page_id] && @param[:body]) 
-      return CPInvalidRequest.new 'Parameters page_id and body are required.'
+    if ! (@param[:page_id] && @param[:revision_id] && @param[:body])
+      return GCInvalidRequest.new 'Parameters page_id, revision_id and body are required.'
     end
   end
 
@@ -218,21 +270,40 @@ class GApiRequestPagesSeen < GApiRequestBase
                payload: @param.to_json,
                headers: { content_type: :json, accept: :json }
              }.merge(rest_client_param)
-    ret = JSON.parse RestClient::Request.execute params
-    if (ret['ok'] == false)
-      return CPInvalidRequest.new "API return false with msg: #{ret['msg']}"
+    GCLogger.logger.debug('Request: ' + params.to_s)
+
+    begin
+      raw_ret = RestClient::Request.execute params
+      GCLogger.logger.debug('Return: ' + raw_ret.to_s)
+      ret = JSON.parse raw_ret
+    rescue Exception => e
+      GCLogger.logger.error(e)
+      return GCInvalidRequest.new "Unknown error occured: #{e}"
+    end
+
+    if (!ret['ok'].nil? && ret['ok'] == false)
+      return GCInvalidRequest.new "API return false with msg: #{ret['msg']}"
+    end
+
+    begin
+      users = ret['seenUser'].map do |user|
+        user.is_a?(String) ? user : GrowiUser.new(user)
+      end
+      return GApiReturn.new(ok: ret['ok'], data: users)
+    rescue Exception => e
+      GCLogger.logger.error(e)
+      return GCInvalidRequest.new "Fail to parse: #{e}"
     end
-    return GApiReturn.new(ok: ret['ok'], data: GrowiPage.new(ret['seenUser']))
   end
 
 protected
 
   # バリデーションエラーを取得する
   # @override
-  # @return [nil/CPInvalidRequest] バリデーションエラー結果
+  # @return [nil/GCInvalidRequest] バリデーションエラー結果
   def _invalid
     if ! (@param[:page_id]) 
-      return CPInvalidRequest.new 'Parameter page_id required.'
+      return GCInvalidRequest.new 'Parameter page_id required.'
     end
   end
 
@@ -259,14 +330,26 @@ class GApiRequestLikesAdd < GApiRequestBase
     if invalid?
       return validation_msg
     end
+
     params = { method: :post, url: entry_point,
                payload: @param.to_json,
                headers: { content_type: :json, accept: :json }
              }.merge(rest_client_param)
-    ret = JSON.parse RestClient::Request.execute params
-    if (ret['ok'] == false)
-      return CPInvalidRequest.new "API return false with msg: #{ret['msg']}"
+    GCLogger.logger.debug('Request: ' + params.to_s)
+
+    begin
+      raw_ret = RestClient::Request.execute params
+      GCLogger.logger.debug('Return: ' + raw_ret.to_s)
+      ret = JSON.parse raw_ret
+    rescue Exception => e
+      GCLogger.logger.error(e)
+      return GCInvalidRequest.new "Unknown error occured: #{e}"
+    end
+
+    if (!ret['ok'].nil? && ret['ok'] == false)
+      return GCInvalidRequest.new "API return false with msg: #{ret['msg']}"
     end
+
     return GApiReturn.new(ok: ret['ok'], data: GrowiPage.new(ret['page']))
   end
 
@@ -274,10 +357,10 @@ protected
 
   # バリデーションエラーを取得する
   # @override
-  # @return [nil/CPInvalidRequest] バリデーションエラー結果
+  # @return [nil/GCInvalidRequest] バリデーションエラー結果
   def _invalid
     if ! (@param[:page_id]) 
-      return CPInvalidRequest.new 'Parameter page_id required.'
+      return GCInvalidRequest.new 'Parameter page_id required.'
     end
   end
 
@@ -308,10 +391,21 @@ class GApiRequestLikesRemove < GApiRequestBase
                payload: @param.to_json,
                headers: { content_type: :json, accept: :json }
              }.merge(rest_client_param)
-    ret = JSON.parse RestClient::Request.execute params
-    if (ret['ok'] == false)
-      return CPInvalidRequest.new "API return false with msg: #{ret['msg']}"
+    GCLogger.logger.debug('Request: ' + params.to_s)
+
+    begin
+      raw_ret = RestClient::Request.execute params
+      GCLogger.logger.debug('Return: ' + raw_ret.to_s)
+      ret = JSON.parse raw_ret
+    rescue Exception => e
+      GCLogger.logger.error(e)
+      return GCInvalidRequest.new "Unknown error occured: #{e}"
+    end
+
+    if (!ret['ok'].nil? && ret['ok'] == false)
+      return GCInvalidRequest.new "API return false with msg: #{ret['msg']}"
     end
+
     return GApiReturn.new(ok: ret['ok'], data: GrowiPage.new(ret['page']))
   end
 
@@ -319,10 +413,10 @@ protected
 
   # バリデーションエラーを取得する
   # @override
-  # @return [nil/CPInvalidRequest] バリデーションエラー結果
+  # @return [nil/GCInvalidRequest] バリデーションエラー結果
   def _invalid
     if ! (@param[:page_id]) 
-      return CPInvalidRequest.new 'Parameter page_id required.'
+      return GCInvalidRequest.new 'Parameter page_id required.'
     end
   end
 
@@ -351,25 +445,41 @@ class GApiRequestPagesUpdatePost < GApiRequestBase
       return validation_msg
     end
     params = { method: :get, url: entry_point, headers: { params: @param } }.merge(rest_client_param)
-    ret = JSON.parse RestClient::Request.execute params
-    if (ret['ok'] == false)
-      return CPInvalidRequest.new "API return false with msg: #{ret['msg']}"
+    GCLogger.logger.debug('Request: ' + params.to_s)
+
+    begin
+      raw_ret = RestClient::Request.execute params
+      GCLogger.logger.debug('Return: ' + raw_ret.to_s)
+      ret = JSON.parse raw_ret
+    rescue Exception => e
+      GCLogger.logger.error(e)
+      return GCInvalidRequest.new "Unknown error occured: #{e}"
+    end
+
+    if (!ret['ok'].nil? && ret['ok'] == false)
+      return GCInvalidRequest.new "API return false with msg: #{ret['msg']}"
     end
-    posts = []
-    ret['updatePost'].each do |post|
-      pages.push(GrowiPage.new(post))
+
+    begin
+      posts = []
+      ret['updatePost'].each do |post|
+        pages.push(GrowiPage.new(post))
+      end
+      return GApiReturn.new(ok: ret['ok'], data: posts)
+    rescue Exception => e
+      GCLogger.logger.error(e)
+      return GCInvalidRequest.new "Fail to parse: #{e}"
     end
-    return GApiReturn.new(ok: ret['ok'], data: posts)
   end
 
 protected
 
   # バリデーションエラーを取得する
   # @override
-  # @return [nil/CPInvalidRequest] バリデーションエラー結果
+  # @return [nil/GCInvalidRequest] バリデーションエラー結果
   def _invalid
     if ! (@param[:path]) 
-      return CPInvalidRequest.new 'Parameter path required.'
+      return GCInvalidRequest.new 'Parameter path required.'
     end
   end
 
@@ -398,11 +508,23 @@ class GApiRequestPagesRemove < GApiRequestBase
     if invalid?
       return validation_msg
     end
+
     param = { method: :get, url: entry_point, headers: { params: @param } }.merge(rest_client_param)
-    ret = JSON.parse RestClient::Request.execute param
-    if (ret['ok'] == false)
-      return CPInvalidRequest.new "API return false with msg: #{ret['msg']}"
+    GCLogger.logger.debug('Request: ' + params.to_s)
+
+    begin
+      raw_ret = RestClient::Request.execute params
+      GCLogger.logger.debug('Return: ' + raw_ret.to_s)
+      ret = JSON.parse raw_ret
+    rescue Exception => e
+      GCLogger.logger.error(e)
+      return GCInvalidRequest.new "Unknown error occured: #{e}"
+    end
+
+    if (!ret['ok'].nil? && ret['ok'] == false)
+      return GCInvalidRequest.new "API return false with msg: #{ret['msg']}"
     end
+
     return GApiReturn.new(ok: ret['ok'], data: GrowiPage.new(ret['page']))
   end
 
@@ -410,10 +532,10 @@ protected
 
   # バリデーションエラーを取得する
   # @override
-  # @return [nil/CPInvalidRequest] バリデーションエラー結果
+  # @return [nil/GCInvalidRequest] バリデーションエラー結果
   def _invalid
     if ! (@param[:page_id] || @param[:revision_id]) 
-      return CPInvalidRequest.new 'Parameter page_id or revision_id is required.'
+      return GCInvalidRequest.new 'Parameter page_id or revision_id is required.'
     end
   end
 

data/lib/growi/client/client.rb

@@ -11,8 +11,8 @@ class GrowiClient
 
   # コンストラクタ
   def initialize(growi_url: '', access_token: '', rest_client_param: {})
-    raise ArgumentError, 'Config `growi_url` is required.'    if growi_url.empty?
-    raise ArgumentError, 'Config `access_token` is required.' if access_token.empty?
+    raise ArgumentError, 'Config `growi_url` is required.'    if growi_url.nil?
+    raise ArgumentError, 'Config `access_token` is required.' if access_token.nil?
 
     @growi_url = growi_url
     @access_token = access_token
@@ -34,8 +34,8 @@ class GrowiClient
   # @return [String] ページID
   def page_id(path_exp: nil)
     ret = request(GApiRequestPagesList.new path_exp: path_exp)
-    return nil if (ret.kind_of? CPInvalidRequest || ret.data.nil?)
-    return ret.data.find { |page| URI.unescape(page.path) == path_exp }&.id
+    return nil if (ret.kind_of? GCInvalidRequest || ret.data.nil?)
+    return ret.data.find { |page| URI.unescape(page.path) == path_exp }&._id
   end
 
   # ページが存在するか調べる

data/lib/growi/client/logger.rb

@@ -0,0 +1,19 @@
+require 'logger'
+require 'singleton'
+
+# Logger
+class GCLogger
+  include Singleton
+  attr_reader :logger
+
+  # Constractor
+  def initialize(logdev = STDOUT, shift_age = 0, shift_size = 1048576, params = {})
+    init_params = { level: ENV['GC_LOG_LEVEL'] || Logger::Severity::ERROR }
+    @logger = Logger.new(logdev, init_params.merge(params).compact)
+  end
+
+  # instance of Logger
+  def self.logger
+    instance.logger
+  end
+end

data/lib/growi/client/model/growi_attachment.rb

@@ -15,14 +15,13 @@ class GrowiAttachment < GrowiModelBase
     }
 
     params = init_params.merge(params.map { |k,v| [k.to_sym, v] }.to_h)
-    if (params[:_id] == nil)
-      raise ArgumentError.new('Parameters id is required.')
+    if (params[:_id].nil?)
+      raise ArgumentError.new('Parameter _id is required.')
     end
 
     GrowiModelFactory.instance.register({
-      attachment_creator:   Proc.new { |param| param != nil && param.is_a?(String) ? param : GrowiUser.new(param) },
-      attachment_createdAt: Proc.new { |date_str|
-                              date_str != nil && DateTime.parse(date_str) },
+      attachment_creator:   Proc.new { |param| !param.nil? && param.is_a?(String) ? param : GrowiUser.new(param) },
+      attachment_createdAt: Proc.new { |date_str| !date_str.nil? && date_str != "" ? DateTime.parse(date_str) : "" },
     })
     maked_params = {}
     params.each do |k,v|

data/lib/growi/client/model/growi_page.rb

@@ -15,7 +15,8 @@ class GrowiPage < GrowiModelBase
   attr_reader :_id, :redirectTo, :updatedAt, :lastUpdateUser,
               :creator, :path, :__v, :revision, :createdAt,
               :commentCount, :seenUsers, :liker, :grantedUsers,
-              :grant, :status, :id
+              :grant, :status, :extended,
+              :pageIdOnHackmd, :revisionHackmdSynced, :hasDraftOnHackmd
 
   # Constract
   # @param [Hash] params Prameters data show as Hash
@@ -25,21 +26,22 @@ class GrowiPage < GrowiModelBase
       _id: '', redirectTo: nil, updatedAt: '', lastUpdateUser: '',
       creator: nil, path: nil, __v: 0, revision: nil, createdAt: '',
       commentCount: 0, seenUsers: [], liker: [], grantedUsers: [],
-      grant: 0, status: '', id: ''
+      grant: 0, status: ''
     }
-
     params = init_params.merge(params.map { |k,v| [k.to_sym, v] }.to_h)
-    if (params[:_id] == nil || params[:path] == nil || params[:id] == nil)
-      raise ArgumentError.new('Parameters _id, path and id are required.')
+    if (params[:_id].nil?)
+      raise ArgumentError.new('Parameter _id is required.')
     end
 
     # @note Parameters lastUpdateUser and creator have two patterns ID only or Object.
     GrowiModelFactory.instance.register({
-      page_updatedAt:      Proc.new { |str| str != nil && DateTime.parse(str) },
-      page_lastUpdateUser: Proc.new { |param| param != nil && param.is_a?(String) ? param : GrowiUser.new(param) },
-      page_creator:        Proc.new { |param| param != nil && param.is_a?(String) ? param : GrowiUser.new(param) },
-      page_createdAt:      Proc.new { |str| str != nil && DateTime.parse(str) },
-      page_revision:       Proc.new { |param| param != nil && GrowiPageRevision.new(param) },
+      page_updatedAt:      Proc.new { |str| !str.nil? && str != "" ? DateTime.parse(str) : "" },
+      page_lastUpdateUser: Proc.new { |param| !param.nil? && param.is_a?(String) ? param : GrowiUser.new(param) },
+      page_creator:        Proc.new { |param| !param.nil? && param.is_a?(String) ? param : GrowiUser.new(param) },
+      page_createdAt:      Proc.new { |str| !str.nil? && str != "" ? DateTime.parse(str) : "" },
+
+      # revision が文字列のみ(IDだけの場合)であれば _id のみを格納し、ハッシュ化されていればすべて読み込む
+      page_revision:       Proc.new { |param| !param.nil? && GrowiPageRevision.new(param.is_a?(String) ? { _id: param } : param) },
     })
     maked_params = {}
     params.each do |k,v|
@@ -50,4 +52,3 @@ class GrowiPage < GrowiModelBase
   end
 
 end
-

data/lib/growi/client/model/growi_page_revision.rb

@@ -14,13 +14,12 @@ class GrowiPageRevision < GrowiModelBase
     }
 
     params = init_params.merge(params.map { |k,v| [k.to_sym, v] }.to_h)
-    if (params[:_id] == nil ||  params[:path] == nil)
-      raise ArgumentError.new('Parameters _id and path are required.')
+    if (params[:_id].nil?)
+      raise ArgumentError.new('Parameter _id is required.')
     end
 
     GrowiModelFactory.instance.register({
-      page_revision_createdAt: Proc.new { |date_str|
-                                          date_str != nil && DateTime.parse(date_str) },
+      page_revision_createdAt: Proc.new { |date_str| !date_str.nil? && date_str != "" ? DateTime.parse(date_str) : "" },
     })
     maked_params = {}
     params.each do |k,v|

data/lib/growi/client/model/growi_user.rb

@@ -15,13 +15,12 @@ class GrowiUser < GrowiModelBase
     }
 
     params = init_params.merge(params.map { |k,v| [k.to_sym, v] }.to_h)
-    if (params[:_id] == nil || params[:email] == nil || params[:username] == nil)
-      raise ArgumentError.new('Parameters id and email and name are required.')
+    if (params[:_id].nil?)
+      raise ArgumentError.new('Parameter _id is required.')
     end
 
     GrowiModelFactory.instance.register({
-      user_createdAt: Proc.new { |date_str|
-                        date_str != nil && DateTime.parse(date_str) },
+      user_createdAt: Proc.new { |date_str| !date_str.nil? && date_str != "" ? DateTime.parse(date_str) : "" },
     })
     maked_params = {}
     params.each do |k,v|

data/lib/growi/client/version.rb

@@ -1,5 +1,5 @@
 module Growi
   module Client
-    VERSION = "0.9.0"
+    VERSION = "1.0.0"
   end
 end

data/wercker.yml

@@ -1,89 +1,89 @@
-box: ruby:2.5.1
-
-# Run weseek/growi, mongo, elasticsearch
-services:
-  - name: mongo
-    id: mongo:3.4
-
-build:
-    # Steps make up the actions in your pipeline
-    # Read more about steps on our dev center:
-    # http://devcenter.wercker.com/docs/steps/index.html
-    steps:
-        - bundle-install
-
-        - script:
-            name: "Install utility tools"
-            code: |
-              apt-get update
-              apt-get install -y netcat
-
-        - script: 
-            name: "Wait for MongoDB connection" 
-            code: | 
-              echo Wait for connect to $MONGO_PORT_27017_TCP_ADDR:$MONGO_PORT_27017_TCP_PORT
-              while ! nc -q 1 $MONGO_PORT_27017_TCP_ADDR $MONGO_PORT_27017_TCP_PORT </dev/null; do
-                echo "...waiting 3s"; sleep 3;
-              done
-
-        - internal/docker-run:
-            image: weseek/growi:3.1.12
-            name: growi
-            env: >
-              MONGO_URI=mongodb://$MONGO_PORT_27017_TCP_ADDR:$MONGO_PORT_27017_TCP_PORT/growi
-              PASSWORD_SEED=empty
-              FILE_UPLOAD=local
-
-        - script: 
-            name: "Wait for GROWI connection" 
-            code: | 
-              echo Wait for connect to growi:3000
-              while ! nc -q 1 growi 3000 < /dev/null; do
-                echo "...waiting 3s"; sleep 3;
-              done
-              export GROWI_URL=http://growi:3000
-
-        - script:
-            name: "Create admin user"
-            code: |
-              export ADMIN_USER_NAME=admin1
-              export ADMIN_USER_PASS=admin1pass
-              LOGIN_COOKIE=login.cookie
-              OUTPUT_PAGE_NAME=installer.html
-              curl $GROWI_URL/installer -c ${LOGIN_COOKIE} -o ${OUTPUT_PAGE_NAME}
-              CSRF=`grep data-csrftoken ${OUTPUT_PAGE_NAME} | awk -F'=' '{ print $2 }' | sed -e s/\"//g`
-              curl $GROWI_URL/installer/createAdmin -b ${LOGIN_COOKIE} -X POST \
-                -d "registerForm[name]=${ADMIN_USER_NAME}&registerForm[username]=${ADMIN_USER_NAME}&registerForm[email]=${ADMIN_USER_NAME}@localhost&registerForm[password]=${ADMIN_USER_PASS}&_csrf=${CSRF}"
-
-        - script:
-            name: "Login as admin1"
-            code: |
-              OUTPUT_PAGE_NAME=login.html
-              curl $GROWI_URL/login -c ${LOGIN_COOKIE} -o ${OUTPUT_PAGE_NAME}
-              CSRF=`grep data-csrftoken ${OUTPUT_PAGE_NAME} | awk -F'=' '{ print $2 }' | sed -e s/\"//g`
-              curl $GROWI_URL/login -b ${LOGIN_COOKIE} -X POST -d "loginForm[username]=${ADMIN_USER_NAME}&loginForm[password]=${ADMIN_USER_PASS}&_csrf=${CSRF}"
-
-        - script:
-            name: "Generate API token"
-            code: |
-              OUTPUT_PAGE_NAME=apiToken.html
-              curl $GROWI_URL/me/apiToken -b ${LOGIN_COOKIE} -o ${OUTPUT_PAGE_NAME}
-              CSRF=`grep data-csrftoken ${OUTPUT_PAGE_NAME} | awk -F'=' '{ print $2 }' | sed -e s/\"//g`
-              curl $GROWI_URL/me/apiToken -b ${LOGIN_COOKIE} -X POST -d "apiTokenForm[confirm]=1&_csrf=${CSRF}"
-              curl $GROWI_URL/me/apiToken -b ${LOGIN_COOKIE} -o ${OUTPUT_PAGE_NAME}
-              export APITOKEN=`grep -A 10 'Current API Token' ${OUTPUT_PAGE_NAME} | grep '<input' | awk -F'value=' '{ print $2 }' | awk -F'"' '{ print $2 }'`
-
-        - script:
-            name: "Export environment variables"
-            code: |
-              export GROWI_URL=$GROWI_URL
-              export GROWI_ACCESS_TOKEN=$APITOKEN
-
-        - script:
-            name: "View environment variables"
-            code: |
-              env
-
-        - script:
-            name: rspec
-            code: bundle exec rspec
+box: ruby:2.5.1
+
+# Run weseek/growi, mongo, elasticsearch
+services:
+  - name: mongo
+    id: mongo:3.4
+
+build:
+    # Steps make up the actions in your pipeline
+    # Read more about steps on our dev center:
+    # http://devcenter.wercker.com/docs/steps/index.html
+    steps:
+        - bundle-install
+
+        - script:
+            name: "Install utility tools"
+            code: |
+              apt-get update
+              apt-get install -y netcat
+
+        - script: 
+            name: "Wait for MongoDB connection" 
+            code: | 
+              echo Wait for connect to $MONGO_PORT_27017_TCP_ADDR:$MONGO_PORT_27017_TCP_PORT
+              while ! nc -q 1 $MONGO_PORT_27017_TCP_ADDR $MONGO_PORT_27017_TCP_PORT </dev/null; do
+                echo "...waiting 3s"; sleep 3;
+              done
+
+        - internal/docker-run:
+            image: weseek/growi:3.3.3
+            name: growi
+            env: >
+              MONGO_URI=mongodb://$MONGO_PORT_27017_TCP_ADDR:$MONGO_PORT_27017_TCP_PORT/growi
+              PASSWORD_SEED=empty
+              FILE_UPLOAD=local
+
+        - script: 
+            name: "Wait for GROWI connection" 
+            code: | 
+              echo Wait for connect to growi:3000
+              while ! nc -q 1 growi 3000 < /dev/null; do
+                echo "...waiting 3s"; sleep 3;
+              done
+              export GROWI_URL=http://growi:3000
+
+        - script:
+            name: "Create admin user"
+            code: |
+              export ADMIN_USER_NAME=admin1
+              export ADMIN_USER_PASS=admin1pass
+              LOGIN_COOKIE=login.cookie
+              OUTPUT_PAGE_NAME=installer.html
+              curl $GROWI_URL/installer -c ${LOGIN_COOKIE} -o ${OUTPUT_PAGE_NAME}
+              CSRF=`grep data-csrftoken ${OUTPUT_PAGE_NAME} | awk -F'=' '{ print $2 }' | sed -e s/\"//g`
+              curl $GROWI_URL/installer/createAdmin -b ${LOGIN_COOKIE} -X POST \
+                -d "registerForm[name]=${ADMIN_USER_NAME}&registerForm[username]=${ADMIN_USER_NAME}&registerForm[email]=${ADMIN_USER_NAME}@localhost&registerForm[password]=${ADMIN_USER_PASS}&_csrf=${CSRF}"
+
+        - script:
+            name: "Login as admin1"
+            code: |
+              OUTPUT_PAGE_NAME=login.html
+              curl $GROWI_URL/login -c ${LOGIN_COOKIE} -o ${OUTPUT_PAGE_NAME}
+              CSRF=`grep data-csrftoken ${OUTPUT_PAGE_NAME} | awk -F'=' '{ print $2 }' | sed -e s/\"//g`
+              curl $GROWI_URL/login -b ${LOGIN_COOKIE} -X POST -d "loginForm[username]=${ADMIN_USER_NAME}&loginForm[password]=${ADMIN_USER_PASS}&_csrf=${CSRF}"
+
+        - script:
+            name: "Generate API token"
+            code: |
+              OUTPUT_PAGE_NAME=apiToken.html
+              curl $GROWI_URL/me/apiToken -b ${LOGIN_COOKIE} -o ${OUTPUT_PAGE_NAME}
+              CSRF=`grep data-csrftoken ${OUTPUT_PAGE_NAME} | awk -F'=' '{ print $2 }' | sed -e s/\"//g`
+              curl $GROWI_URL/me/apiToken -b ${LOGIN_COOKIE} -X POST -d "apiTokenForm[confirm]=1&_csrf=${CSRF}"
+              curl $GROWI_URL/me/apiToken -b ${LOGIN_COOKIE} -o ${OUTPUT_PAGE_NAME}
+              export APITOKEN=`grep -A 10 'Current API Token' ${OUTPUT_PAGE_NAME} | grep '<input' | awk -F'value=' '{ print $2 }' | awk -F'"' '{ print $2 }'`
+
+        - script:
+            name: "Export environment variables"
+            code: |
+              export GROWI_URL=$GROWI_URL
+              export GROWI_ACCESS_TOKEN=$APITOKEN
+
+        - script:
+            name: "View environment variables"
+            code: |
+              env
+
+        - script:
+            name: rspec
+            code: bundle exec rspec

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: growi-client
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Ryu Sato
@@ -118,6 +118,7 @@ files:
 - lib/growi/client/apireq/api_request_base.rb
 - lib/growi/client/apireq/api_request_pages.rb
 - lib/growi/client/client.rb
+- lib/growi/client/logger.rb
 - lib/growi/client/model/growi_attachment.rb
 - lib/growi/client/model/growi_model.rb
 - lib/growi/client/model/growi_model_base.rb