notion_rb 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ab0eb041c68351cf2c9a9749b78f01cfe13f7d1aae3b11aa452ba95f468c764
-  data.tar.gz: 37ff8830acab646cb9d970846ea6fa2c388d75bacbcdcb684938536ead57a43b
+  metadata.gz: 264256397e48f5afb8cc9151375de8ec0db94f346827e4352a99c184c3d30d13
+  data.tar.gz: 185dc114380c1d5e12aa77602e33ff34d01d36b21965158dfa20ab2f49a18b13
 SHA512:
-  metadata.gz: b2738bba8027e7f7e6b741ae67a5771c67d8c27678e5b3e8460da8d6679128d03109f748fb7e2065b091de213f076ee0fdeb0312e6de2421e491172f457f5002
-  data.tar.gz: 36444104173a52ff3877d92288613bc0380f3fd5e281e87c436ab6a17bb97ee7fbd7d2d038a8cf60e94800d26e481f82d2ba5394a97e50de7e10b4377dbe15cc
+  metadata.gz: 8da865381828b1e3e39fd08c2a9457e09d70103ea1209dab194d880846f61ba1d36213b6a9fc228123b9a40b80bd3ec4d8a98a4c2abe850180defd495ca02244
+  data.tar.gz: 79a6398c608ef952b42001317aa45db1f3abf8d8a8932a0a7867980802fa242e8ddd80eacc75f6eaaceda6c82331e52af1a4a00d4169aa6284492f3719e2ac51

data/.ruby-version

@@ -1 +1 @@
-2.5.7
+2.5.8

data/.travis.yml

@@ -3,7 +3,7 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.5.1
+  - 2.5.8
 branches:
   only:
   - master

data/Gemfile.lock

@@ -3,6 +3,7 @@ PATH
   specs:
     notion_rb (0.1.2)
       mechanize
+      nokogiri (>= 1.10.8)
 
 GEM
   remote: https://rubygems.org/
@@ -43,13 +44,13 @@ GEM
       webrobots (>= 0.0.9, < 0.2)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
+    mime-types-data (3.2020.0425)
     mini_portile2 (2.4.0)
     minitest (5.13.0)
     net-http-digest_auth (1.4.1)
-    net-http-persistent (3.1.0)
+    net-http-persistent (4.0.0)
       connection_pool (~> 2.2)
-    nokogiri (1.10.7)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     ntlm-http (0.1.1)
     parallel (1.19.1)
@@ -57,7 +58,7 @@ GEM
       ast (~> 2.4.0)
     public_suffix (4.0.1)
     rainbow (3.0.0)
-    rake (10.5.0)
+    rake (13.0.1)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -86,7 +87,7 @@ GEM
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.6)
+    unf_ext (0.0.7.7)
     unicode-display_width (1.6.0)
     vcr (5.0.0)
     webmock (3.7.6)
@@ -104,7 +105,7 @@ DEPENDENCIES
   byebug
   factory_bot
   notion_rb!
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   rubocop
   single_cov

data/lib/notion_rb.rb

@@ -20,6 +20,12 @@ require 'notion_rb/utils/uuid_validator'
 
 require 'notion_rb/block'
 
+require 'notion_rb/transaction'
+require 'notion_rb/operations/commands/factory'
+require 'notion_rb/operations/factory'
+
+require 'notion_rb/request_params'
+
 module NotionRb
   def self.config
     @config ||= {}

data/lib/notion_rb/api/create.rb

@@ -22,52 +22,15 @@ module NotionRb
       end
 
       def params
-        {
-          requestId: SecureRandom.uuid,
-          transactions: [{
-            id: SecureRandom.uuid,
-            operations: [{
-              id: @notion_id,
-              table: 'block',
-              path: [],
-              command: 'set',
-              args: { type: 'text', id: @notion_id, version: 1 }
-            }, {
-              id: @notion_id,
-              table: 'block',
-              path: [],
-              command: 'update',
-              args: { parent_id: @parent_id, parent_table: 'block', alive: true }
-            }, {
-              id: @parent_id,
-              table: 'block',
-              path: ['content'],
-              command: 'listAfter',
-              args: { id: @notion_id }
-            }, {
-              id: @notion_id,
-              table: 'block',
-              path: %w[
-                properties
-                title
-              ],
-              command: 'set',
-              args: []
-            }, {
-              id: @notion_id,
-              table: 'block',
-              path: ['created_time'],
-              command: 'set',
-              args: @created_at
-            }, {
-              id: @notion_id,
-              table: 'block',
-              path: ['last_edited_time'],
-              command: 'set',
-              args: @created_at
-            }]
-          }]
-        }
+        NotionRb::RequestParams.new.add_transaction.tap do |transaction|
+          transaction
+            .add_operation(:set_block_type, @notion_id, 'block')
+            .add_operation(:update_parent, @notion_id, @parent_id)
+            .add_operation(:list_after, @parent_id, @notion_id)
+            .add_operation(:set_block_title, @notion_id, [])
+            .add_operation(:set_block_created_time, @notion_id, @created_at)
+            .add_operation(:set_block_last_edited_time, @notion_id, @created_at)
+        end.to_h
       end
     end
   end

data/lib/notion_rb/operations/commands/base.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module NotionRb
+  module Operations
+    module Commands
+      class Base
+        attr_reader :id, :command, :table, :args, :path
+
+        def initialize(id, opts = {})
+          @id = id
+          @command = opts.fetch(:command) do
+            raise ArgumentError, 'Commands must specify command action key'
+          end
+          @table = opts[:table]
+          @args = opts[:args]
+          @path = opts.fetch(:path, [])
+        end
+
+        def to_h
+          {
+            id: id,
+            table: table,
+            path: path,
+            command: command,
+            args: args
+          }
+        end
+      end
+    end
+  end
+end

data/lib/notion_rb/operations/commands/factory.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require_relative './base'
+require_relative './list_after'
+require_relative './set'
+require_relative './update'
+
+module NotionRb
+  module Operations
+    module Commands
+      COMMANDS = Hash[
+        [
+          ListAfter,
+          Set,
+          Update
+        ].map { |klass| [klass::NAME, klass] }
+      ]
+
+      class Factory
+        def self.build(command_name, id, opts = {})
+          COMMANDS.fetch(command_name).new(
+            id,
+            opts
+          )
+        end
+      end
+    end
+  end
+end

data/lib/notion_rb/operations/commands/list_after.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module NotionRb
+  module Operations
+    module Commands
+      class ListAfter < Base
+        COMMAND = 'listAfter'
+        NAME = :list_after
+
+        def initialize(id, opts = {})
+          opts.merge!(command: COMMAND)
+          super
+        end
+      end
+    end
+  end
+end

data/lib/notion_rb/operations/commands/set.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module NotionRb
+  module Operations
+    module Commands
+      class Set < Base
+        COMMAND = 'set'
+        NAME = :set
+
+        def initialize(id, opts = {})
+          opts.merge!(command: COMMAND)
+          super
+        end
+      end
+    end
+  end
+end

data/lib/notion_rb/operations/commands/update.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module NotionRb
+  module Operations
+    module Commands
+      class Update < Base
+        COMMAND = 'update'
+        NAME = :update
+
+        def initialize(id, opts = {})
+          opts.merge!(command: COMMAND)
+          super
+        end
+      end
+    end
+  end
+end

data/lib/notion_rb/operations/factory.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require_relative './set_block_type'
+require_relative './set_block_last_edited_time'
+require_relative './set_block_created_time'
+require_relative './set_block_title'
+require_relative './list_after'
+require_relative './update_parent'
+
+module NotionRb
+  module Operations
+    class Factory
+      OPERATIONS = Hash[
+        [
+          ListAfter,
+          SetBlockCreatedTime,
+          SetBlockLastEditedTime,
+          SetBlockTitle,
+          SetBlockType,
+          UpdateParent
+        ].map { |klass| [klass::OPERATION_NAME, klass] }
+      ]
+
+      def self.build(operation_name, *args)
+        OPERATIONS.fetch(operation_name).new(
+          *args
+        )
+      end
+    end
+  end
+end

data/lib/notion_rb/operations/list_after.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module NotionRb
+  module Operations
+    class ListAfter
+      COMMAND_TYPE = :list_after
+      OPERATION_NAME = :list_after
+      DEFAULT_TABLE = 'block'
+      DEFAULT_PATH = ['content']
+
+      attr_reader :id, :list_after_id, :table, :path
+
+      def initialize(id, list_after_id, opts={})
+        @id = id
+        @list_after_id = list_after_id
+        @table = opts.fetch(:table, DEFAULT_TABLE)
+        @path = opts.fetch(:path, DEFAULT_PATH)
+      end
+
+      def commands
+        [
+          Commands::Factory.build(
+            COMMAND_TYPE,
+            id,
+            args: args,
+            table: table,
+            path: path
+          )
+        ]
+      end
+
+      def args
+        {
+          id: list_after_id
+        }
+      end
+    end
+  end
+end

data/lib/notion_rb/operations/set_block_created_time.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module NotionRb
+  module Operations
+    class SetBlockCreatedTime < SetBlockLastEditedTime
+      OPERATION_NAME = :set_block_created_time
+      DEFAULT_PATH = ['created_time'].freeze
+
+      def initialize(id, time, opts = {})
+        opts[:path] ||= DEFAULT_PATH
+        super
+      end
+    end
+  end
+end

data/lib/notion_rb/operations/set_block_last_edited_time.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module NotionRb
+  module Operations
+    class SetBlockLastEditedTime
+      COMMAND_TYPE = :set
+      OPERATION_NAME = :set_block_last_edited_time
+      DEFAULT_PATH = ['last_edited_time'].freeze
+      TABLE = 'block'
+
+      attr_reader :id, :time, :path
+
+      def initialize(id, time, opts = {})
+        @id = id
+        @time = time
+        @path = opts.fetch(:path, DEFAULT_PATH)
+      end
+
+      def commands
+        [
+          Commands::Factory.build(
+            COMMAND_TYPE,
+            id,
+            args: args,
+            table: TABLE,
+            path: path
+          )
+        ]
+      end
+
+      def args
+        time
+      end
+    end
+  end
+end

data/lib/notion_rb/operations/set_block_title.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module NotionRb
+  module Operations
+    class SetBlockTitle
+      COMMAND_TYPE = :set
+      OPERATION_NAME = :set_block_title
+      TABLE = 'block'
+      DEFAULT_PATH = %w[properties title].freeze
+
+      attr_reader :id, :title, :path
+
+      def initialize(id, title = nil, opts = {})
+        @id = id
+        @title = title
+        @path = opts.fetch(:path, DEFAULT_PATH)
+      end
+
+      def commands
+        [
+          Commands::Factory.build(
+            COMMAND_TYPE,
+            id,
+            args: args,
+            table: TABLE,
+            path: path
+          )
+        ]
+      end
+
+      def args
+        return [] if title.nil?
+      end
+    end
+  end
+end

data/lib/notion_rb/operations/set_block_type.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module NotionRb
+  module Operations
+    class SetBlockType
+      DEFAULT_VERSION = 1
+      COMMAND_TYPE = :set
+      OPERATION_NAME = :set_block_type
+      TABLE = 'block'
+
+      attr_reader :id, :type
+
+      def initialize(id, type)
+        @id = id
+        @type = type
+      end
+
+      def commands
+        [
+          Commands::Factory.build(
+            :set,
+            id,
+            args: args,
+            table: TABLE
+          )
+        ]
+      end
+
+      def args
+        {
+          type: type,
+          version: DEFAULT_VERSION,
+          id: id
+        }
+      end
+    end
+  end
+end

data/lib/notion_rb/operations/update_parent.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module NotionRb
+  module Operations
+    class UpdateParent
+      COMMAND_TYPE = :update
+      OPERATION_NAME = :update_parent
+      TABLE = 'block'
+      DEFAULT_PARENT_TABLE = TABLE
+      DEFAULT_ALIVE_VALUE = true
+
+      attr_reader :id, :parent_id, :parent_table, :alive
+
+      def initialize(id, parent_id, opts = {})
+        @id = id
+        @parent_id = parent_id
+        @parent_table = opts.fetch(:parent_table, DEFAULT_PARENT_TABLE)
+        @alive = opts.fetch(:alive, DEFAULT_ALIVE_VALUE)
+      end
+
+      def commands
+        [
+          Commands::Factory.build(
+            COMMAND_TYPE,
+            id,
+            args: args,
+            table: TABLE
+          )
+        ]
+      end
+
+      def args
+        {
+          parent_id: parent_id,
+          parent_table: parent_table,
+          alive: alive
+        }
+      end
+    end
+  end
+end

data/lib/notion_rb/request_params.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module NotionRb
+  class RequestParams
+    attr_reader :transactions, :request_id
+
+    def initialize
+      @request_id = SecureRandom.uuid
+      @transactions = []
+    end
+
+    def add_transaction
+      Transaction.new.tap { |t| @transactions.push(t) }
+    end
+
+    def to_h
+      {
+        requestId: request_id,
+        transactions: transactions.map(&:to_h)
+      }
+    end
+  end
+end

data/lib/notion_rb/transaction.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module NotionRb
+  class Transaction
+    attr_reader :id, :operations
+
+    def initialize
+      @id = SecureRandom.uuid
+      @operations = []
+    end
+
+    def add_operation(operation_name, *args)
+      operations.push(
+        Operations::Factory.build(operation_name, *args)
+      )
+      self
+    end
+
+    def to_h
+      { id: id, operations: operations.flat_map { |o| o.commands.map(&:to_h) } }
+    end
+  end
+end

data/lib/notion_rb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NotionRb
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/notion_rb.gemspec

@@ -28,11 +28,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'mechanize'
+  spec.add_runtime_dependency 'nokogiri', '>= 1.10.8'
 
   spec.add_development_dependency 'bundler', '~> 1.17.0'
   spec.add_development_dependency 'byebug'
   spec.add_development_dependency 'factory_bot'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'single_cov'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notion_rb
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Tomas Gunther
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-07 00:00:00.000000000 Z
+date: 2020-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.10.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.10.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -180,6 +194,20 @@ files:
 - lib/notion_rb/api/restore.rb
 - lib/notion_rb/api/update.rb
 - lib/notion_rb/block.rb
+- lib/notion_rb/operations/commands/base.rb
+- lib/notion_rb/operations/commands/factory.rb
+- lib/notion_rb/operations/commands/list_after.rb
+- lib/notion_rb/operations/commands/set.rb
+- lib/notion_rb/operations/commands/update.rb
+- lib/notion_rb/operations/factory.rb
+- lib/notion_rb/operations/list_after.rb
+- lib/notion_rb/operations/set_block_created_time.rb
+- lib/notion_rb/operations/set_block_last_edited_time.rb
+- lib/notion_rb/operations/set_block_title.rb
+- lib/notion_rb/operations/set_block_type.rb
+- lib/notion_rb/operations/update_parent.rb
+- lib/notion_rb/request_params.rb
+- lib/notion_rb/transaction.rb
 - lib/notion_rb/utils/block_cache.rb
 - lib/notion_rb/utils/converter.rb
 - lib/notion_rb/utils/parser.rb