dynalist 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b14867d776bec71831858f2f35e74e09c2e47b626aefef877de2116f3b72f41
-  data.tar.gz: 25bb283e5c407ac1fa7e4fc60534fc4fedf9971a6fe52cab9ae5b6b0ae3eb28a
+  metadata.gz: 5288d5e7d1b03c29e1734a75752ce28adef262bbecff28c13005b60b488bdca6
+  data.tar.gz: b670d8d8c3010fa1d4f198ea5fadbae4b37d8c7227457fe4bfac3d2a62fb7286
 SHA512:
-  metadata.gz: 168ff6b9e3f821f49a64daa0c4750ac2ede8ee1c39e6407545f3505eea8e2b0fead70ecccb6d681f3b0aa36199ecec5965fd302ecc4ed7b23a6e5452b7f328dc
-  data.tar.gz: 672fa7e84b6634390f1fb9217c1c13c44d0e5ef24eb89b13dcfcb34b0fd722fc96a51be194ef447a285c2ce1c0a0b971c0e72e6c244224a77868f18bdfe39131
+  metadata.gz: 8ae32352a15314846171fcd409ebb129bb1cf663b57b2280af7327064976084bb918704c01723158876b2dd3993f92abf97faa0a6c0060e627cb6d9bbe942c7b
+  data.tar.gz: 0e721921aaeee8dcaf8bac1b6ee8774e377b7aede8f79571f2badabc91d8fc3bbb9d6e55e3666af85f5db941e96d427b139cda1d4e819acd5506d24df08efa9c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dynalist (1.0.0)
+    dynalist (1.0.1)
       faraday
 
 GEM
@@ -15,7 +15,7 @@ GEM
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
     dotenv (2.7.5)
-    faraday (0.16.1)
+    faraday (0.17.0)
       multipart-post (>= 1.2, < 3)
     hashdiff (1.0.0)
     method_source (0.9.2)

data/lib/dynalist.rb

@@ -16,5 +16,4 @@ Dotenv.load
 
 module Dynalist
   class Error < StandardError; end
-  # Your code goes here...
 end

data/lib/dynalist/base_api_client.rb

@@ -7,4 +7,39 @@ class BaseApiClient
     @base = 'api/v1/'
     @token = token || ENV['DYNALIST_TOKEN']
   end
+
+  class Error < StandardError; end
+
+  class ApiError < Error
+    attr_reader :response
+
+    # @param [Response] response
+    def initialize(response = nil)
+      @response = response
+    end
+
+    def message
+      @response[:_msg]
+    end
+  end
+
+  class InvalidError < ApiError; end
+  class InvalidTokenError < ApiError; end
+  class TooManyRequestsError < ApiError; end
+  class LockFailError < ApiError; end
+
+  ApiErrors = {
+    Invalid: InvalidError,
+    InvalidToken: InvalidTokenError,
+    TooManyRequests: TooManyRequestsError,
+    LockFail: LockFailError
+  }.freeze
+
+  def check_response!(response)
+    res = JSON.parse(response.body, symbolize_names: true)
+    return true if res[:_code] == 'Ok'
+
+    error = ApiErrors.fetch(res[:_code].to_sym, ApiError)
+    raise error, res
+  end
 end

data/lib/dynalist/file_api_client.rb

@@ -4,7 +4,9 @@ require 'json'
 class FileApiClient < BaseApiClient
   def get_file
     response = @conn.post "#{@base}file/list", {token: @token}.to_json
+    check_response!(response)
     json = JSON.parse(response.body, symbolize_names: true)
+
     FileTree.instance.root_id = json[:root_file_id]
     json[:files].map do |file|
       instance = if file[:type] == 'folder'
@@ -21,7 +23,8 @@ class FileApiClient < BaseApiClient
   def move_file(queries)
     changes = queries.map(&:to_query)
     response = @conn.post "#{@base}file/edit", {token: @token, changes: changes}.to_json
-    JSON.parse(response.body)["results"]
+    check_response!(response)
+    JSON.parse(response.body, symbolize_names: true)[:results]
   end
 
   class Edit

data/lib/dynalist/node_api_client.rb

@@ -3,22 +3,25 @@ require 'json'
 
 class NodeApiClient < BaseApiClient
   def read(document)
-    res = @conn.post "#{@base}doc/read", {token: @token, file_id: document.id}.to_json
-    JSON.parse(res.body, symbolize_names: true)[:nodes].map{ |node| node }
-    nodes = JSON.parse(res.body, symbolize_names: true)[:nodes].map{ |node| Node.new(node.merge(file_id: document.id)) }
+    response = @conn.post "#{@base}doc/read", {token: @token, file_id: document.id}.to_json
+    check_response!(response)
+    JSON.parse(response.body, symbolize_names: true)[:nodes].map{ |node| node }
+    nodes = JSON.parse(response.body, symbolize_names: true)[:nodes].map{ |node| Node.new(node.merge(file_id: document.id)) }
     NodeTree.add(nodes)
   end
 
   def check_updates(documents)
     document_ids = documents.map(&:id)
-    res = @conn.post "#{@base}doc/check_for_updates", {token: @token, file_ids: document_ids}.to_json
-    JSON.parse(res.body, symbolize_names: true)[:versions]
+    response = @conn.post "#{@base}doc/check_for_updates", {token: @token, file_ids: document_ids}.to_json
+    check_response!(response)
+    JSON.parse(response.body, symbolize_names: true)[:versions]
   end
 
   def edit(document, queries)
     changes = queries.map(&:to_query)
-    res = @conn.post "#{@base}doc/edit", {token: @token, file_id: document.id, changes: changes}.to_json
-    JSON.parse(res.body, symbolize_names: true)[:new_node_ids]
+    response = @conn.post "#{@base}doc/edit", {token: @token, file_id: document.id, changes: changes}.to_json
+    check_response!(response)
+    JSON.parse(response.body, symbolize_names: true)[:new_node_ids]
   end
 
   class Insert

data/lib/dynalist/version.rb

@@ -1,3 +1,3 @@
 module Dynalist
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynalist
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - 4geru
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-08 00:00:00.000000000 Z
+date: 2019-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler