kintone 0.1.1 → 0.1.2

data/lib/kintone/command/bulk_request.rb

@@ -0,0 +1,12 @@
+require 'kintone/command'
+
+class Kintone::Command::BulkRequest < Kintone::Command
+  def self.path
+    'bulkRequest'
+  end
+
+  def request(requests)
+    response = @api.post(@url, requests: requests)
+    response['results']
+  end
+end

data/lib/kintone/command/record.rb

@@ -17,7 +17,9 @@ class Kintone::Command::Record < Kintone::Command
     register(app, record)
   end
 
-  def update(app, id, record)
-    @api.put(@url, app: app, id: id, record: record.to_kintone)
+  def update(app, id, record, revision: nil)
+    body = { app: app, id: id, record: record.to_kintone }
+    body[:revision] = revision if revision
+    @api.put(@url, body)
   end
 end

data/lib/kintone/command/records.rb

@@ -23,8 +23,9 @@ class Kintone::Command::Records < Kintone::Command
     @api.put(@url, app: app, records: records.to_kintone)
   end
 
-  def delete(app, ids)
+  def delete(app, ids, revisions: nil)
     params = { app: app, ids: ids }
+    params[:revisions] = revisions if revisions
     @api.delete(@url, params)
   end
 end

data/lib/kintone/query.rb

@@ -68,6 +68,8 @@ class Kintone::Query
     to_s
   end
 
+  alias_method :f, :field
+
   private
 
   def function_string(function)

data/lib/kintone/version.rb

@@ -1,3 +1,3 @@
 module Kintone
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/spec/kintone/api/guest_spec.rb

@@ -176,4 +176,16 @@ describe Kintone::Api::Guest do
 
     it { is_expected.to be_a_kind_of(Kintone::Command::Apps) }
   end
+
+  describe '#bulk_request' do
+    subject { target.bulk_request }
+
+    it { is_expected.to be_a_kind_of(Kintone::Command::BulkRequest) }
+  end
+
+  describe '#bulk' do
+    subject { target.bulk }
+
+    it { is_expected.to be_a_kind_of(Kintone::Command::BulkRequest) }
+  end
 end

data/spec/kintone/api_spec.rb

@@ -242,4 +242,16 @@ describe Kintone::Api do
 
     it { is_expected.to be_a_kind_of(Kintone::Command::Apis) }
   end
+
+  describe '#bulk_request' do
+    subject { target.bulk_request }
+
+    it { is_expected.to be_a_kind_of(Kintone::Command::BulkRequest) }
+  end
+
+  describe '#bulk' do
+    subject { target.bulk }
+
+    it { is_expected.to be_a_kind_of(Kintone::Command::BulkRequest) }
+  end
 end

data/spec/kintone/command/bulk_request_spec.rb

@@ -0,0 +1,71 @@
+require 'spec_helper'
+require 'kintone/command/bulk_request'
+require 'kintone/api'
+
+describe Kintone::Command::BulkRequest do
+  let(:target) { Kintone::Command::BulkRequest.new(api) }
+  let(:api) { Kintone::Api.new('example.cybozu.com', 'Administrator', 'cybozu') }
+
+  describe '#request' do
+    before(:each) do
+      stub_request(
+        :post,
+        'https://example.cybozu.com/k/v1/bulkRequest.json'
+      )
+        .with(body: { requests: requests }.to_json)
+        .to_return(body: { 'results' => results }.to_json, status: 200)
+    end
+
+    subject { target.request(requests) }
+
+    let(:requests) do
+      [
+        {
+          method: 'POST',
+          api: '/k/v1/record.json',
+          payload: {
+            app: 1972,
+            record: {
+              '文字列__1行' => {
+                value: '文字列__1行を追加します。'
+              }
+            }
+          }
+        },
+        {
+          method: 'PUT',
+          api: '/k/v1/record.json',
+          payload: {
+            app: 1973,
+            id: 33,
+            revision: 2,
+            record: {
+              '文字列__1行' => {
+                value: '文字列__1行を更新します。'
+              }
+            }
+          }
+        },
+        {
+          method: 'DELETE',
+          api: '/k/v1/records.json',
+          payload: {
+            app: 1974,
+            ids: [10, 11],
+            revisions: [1, 1]
+          }
+        }
+      ]
+    end
+
+    let(:results) do
+      [
+        { 'id' => '39', 'revision' => '1' },
+        { 'revision' => '34' },
+        {}
+      ]
+    end
+
+    it { is_expected.to eq results }
+  end
+end

data/spec/kintone/command/record_spec.rb

@@ -36,39 +36,47 @@ describe Kintone::Command::Record do
         :post,
         'https://www.example.com/k/v1/record.json'
       )
-        .with(body: { 'app' => 7, 'record' => hash_record }.to_json)
-        .to_return(body: "{\"id\":\"100\"}", status: 200)
+        .with(body: request_body.to_json)
+        .to_return(body: response_body.to_json, status: 200)
     end
 
     subject { target.register(app, record) }
 
     let(:app) { 7 }
-
-    def hash_record
+    let(:request_body) do
       {
-        'number' => { 'value' => '123456' },
-        'rich_editor' => { 'value' => 'testtest' },
-        'user_select' => { 'value' => [{ 'code' => 'sato' }] }
+        'app' => 7,
+        'record' => {
+          'number' => { 'value' => '123456' },
+          'rich_editor' => { 'value' => 'testtest' },
+          'user_select' => { 'value' => [{ 'code' => 'sato' }] }
+        }
       }
     end
-
-    def record_record
-      Kintone::Type::Record.new(
-        number: '123456',
-        rich_editor: 'testtest',
-        user_select: [{ 'code' => 'sato' }]
-      )
+    let(:response_body) { { 'id' => '100', 'revision' => '1' } }
+
+    context 'use hash' do
+      let(:record) do
+        {
+          'number' => { 'value' => '123456' },
+          'rich_editor' => { 'value' => 'testtest' },
+          'user_select' => { 'value' => [{ 'code' => 'sato' }] }
+        }
+      end
+
+      it { expect(subject).to eq response_body }
     end
 
-    where(:record, :result) do
-      [
-        [hash_record, { 'id' => '100' }],
-        [record_record, { 'id' => '100' }]
-      ]
-    end
+    context 'use record' do
+      let(:record) do
+        Kintone::Type::Record.new(
+          number: '123456',
+          rich_editor: 'testtest',
+          user_select: [{ 'code' => 'sato' }]
+        )
+      end
 
-    with_them do
-      it { expect(subject).to eq result }
+      it { expect(subject).to eq response_body }
     end
   end
 
@@ -78,34 +86,51 @@ describe Kintone::Command::Record do
         :put,
         'https://www.example.com/k/v1/record.json'
       )
-        .with(body: { 'app' => 4, 'id' => 1, 'record' => hash_record }.to_json)
-        .to_return(body: '{}', status: 200)
+        .with(body: request_body.to_json)
+        .to_return(body: response_body.to_json, status: 200)
     end
 
     subject { target.update(app, id, record) }
 
     let(:app) { 4 }
     let(:id) { 1 }
+    let(:hash_record) { { 'string_multi' => { 'value' => 'character string is changed' } } }
+    let(:record_record) { Kintone::Type::Record.new(string_multi: 'character string is changed') }
+    let(:response_body) { { revision: '2' } }
 
-    def hash_record
-      {
-        'string_multi' => { 'value' => 'character string is changed' }
-      }
-    end
+    context 'without revision' do
+      let(:request_body) { { 'app' => 4, 'id' => 1, 'record' => hash_record } }
 
-    def record_record
-      Kintone::Type::Record.new(string_multi: 'character string is changed')
-    end
+      context 'use hash' do
+        let(:record) { hash_record }
 
-    where(:record, :result) do
-      [
-        [hash_record, {}],
-        [record_record, {}]
-      ]
+        it { expect(subject).to match 'revision' => '2' }
+      end
+
+      context 'use record' do
+        let(:record) { record_record }
+
+        it { expect(subject).to match 'revision' => '2' }
+      end
     end
 
-    with_them do
-      it { expect(subject).to match result }
+    context 'with revision' do
+      subject { target.update(app, id, record, revision: revision) }
+
+      let(:revision) { 1 }
+      let(:request_body) { { 'app' => 4, 'id' => 1, 'record' => hash_record, 'revision' => 1 } }
+
+      context 'use hash' do
+        let(:record) { hash_record }
+
+        it { expect(subject).to match 'revision' => '2' }
+      end
+
+      context 'use record' do
+        let(:record) { record_record }
+
+        it { expect(subject).to match 'revision' => '2' }
+      end
     end
   end
 end

data/spec/kintone/command/records_spec.rb

@@ -92,108 +92,181 @@ describe Kintone::Command::Records do
   end
 
   describe '#register' do
-    subject { target.register(app, records) }
+    before(:each) do
+      stub_request(
+        :post,
+        'https://example.cybozu.com/k/v1/records.json'
+      )
+        .with(body: request_body.to_json)
+        .to_return(body: response_body.to_json, status: 200)
+    end
 
-    context '' do
-      before(:each) do
-        stub_request(
-          :post,
-          'https://example.cybozu.com/k/v1/records.json'
-        )
-          .with(body: { 'app' => 7, 'records' => hash_data }.to_json)
-          .to_return(body: "{\"ids\":[\"100\", \"101\"]}", status: 200)
-      end
+    subject { target.register(app, records) }
 
-      let(:app) { 7 }
+    let(:app) { 7 }
+    let(:request_body) do
+      {
+        'app' => 7,
+        'records' => [
+          { 'rich_editor' => { 'value' => 'testtest' } },
+          { 'user_select' => { 'value' => [{ 'code' => 'suzuki' }] } }
+        ]
+      }
+    end
+    let(:response_body) { { 'ids' => ['100', '101'], 'revisions' => ['1', '1'] } }
 
-      def hash_data
+    context 'use hash' do
+      let(:records) do
         [
-          {
-            'rich_editor' => { 'value' => 'testtest' }
-          },
-          {
-            'user_select' => { 'value' => [{ 'code' => 'suzuki' }] }
-          }
+          { 'rich_editor' => { 'value' => 'testtest' } },
+          { 'user_select' => { 'value' => [{ 'code' => 'suzuki' }] } }
         ]
       end
 
-      def record_data
+      it { expect(subject).to eq response_body }
+    end
+
+    context 'use record' do
+      let(:records) do
         [
           Kintone::Type::Record.new(rich_editor: 'testtest'),
           Kintone::Type::Record.new(user_select: [{ code: 'suzuki' }])
         ]
       end
 
-      where(:records, :result) do
-        [
-          [hash_data, { 'ids' => %w(100 101) }],
-          [record_data, { 'ids' => %w(100 101) }]
-        ]
-      end
-
-      with_them do
-        it { expect(subject).to eq result }
-      end
+      it { expect(subject).to eq response_body }
     end
   end
 
   describe '#update' do
+    before(:each) do
+      stub_request(
+        :put,
+        'https://example.cybozu.com/k/v1/records.json'
+      )
+        .with(body: request_body.to_json)
+        .to_return(body: response_body.to_json, status: 200)
+    end
+
     subject { target.update(app, records) }
 
-    context '' do
-      before(:each) do
-        stub_request(
-          :put,
-          'https://example.cybozu.com/k/v1/records.json'
-        )
-          .with(body: { 'app' => 4, 'records' => hash_data }.to_json)
-          .to_return(body: '{}', status: 200)
+    let(:app) { 4 }
+    let(:response_body) do
+      { 'records' => [{ 'id' => '1', 'revision' => '2' }, { 'id' => '2', 'revision' => '2' }] }
+    end
+
+    context 'without revision' do
+      let(:request_body) do
+        {
+          'app' => 4,
+          'records' => [
+            { 'id' => 1, 'record' => { 'string_1' => { 'value' => 'abcdef' } } },
+            { 'id' => 2, 'record' => { 'string_multi' => { 'value' => 'opqrstu' } } }
+          ]
+        }
       end
 
-      let(:app) { 4 }
+      context 'use hash' do
+        let(:records) do
+          [
+            { 'id' => 1, 'record' => { 'string_1' => { 'value' => 'abcdef' } } },
+            { 'id' => 2, 'record' => { 'string_multi' => { 'value' => 'opqrstu' } } }
+          ]
+        end
 
-      def hash_data
-        [
-          { 'id' => 1, 'record' => { 'string_1' => { 'value' => 'abcdef' } } },
-          { 'id' => 2, 'record' => { 'string_multi' => { 'value' => 'opqrstu' } } }
-        ]
+        it { expect(subject).to eq response_body }
       end
 
-      def record_data
-        [
-          { id: 1, record: Kintone::Type::Record.new(string_1: 'abcdef') },
-          { id: 2, record: Kintone::Type::Record.new(string_multi: 'opqrstu') }
-        ]
+      context 'use record' do
+        let(:records) do
+          [
+            { id: 1, record: Kintone::Type::Record.new(string_1: 'abcdef') },
+            { id: 2, record: Kintone::Type::Record.new(string_multi: 'opqrstu') }
+          ]
+        end
+
+        it { expect(subject).to eq response_body }
+      end
+    end
+
+    context 'with revision' do
+      let(:request_body) do
+        {
+          'app' => 4,
+          'records' => [
+            {
+              'id' => 1,
+              'revision' => 1,
+              'record' => { 'string_1' => { 'value' => 'abcdef' } }
+            },
+            {
+              'id' => 2,
+              'revision' => 1,
+              'record' => { 'string_multi' => { 'value' => 'opqrstu' } }
+            }
+          ]
+        }
       end
 
-      where(:records, :result) do
-        [
-          [hash_data, {}],
-          [record_data, {}]
-        ]
+      context 'use hash' do
+        let(:records) do
+          [
+            {
+              'id' => 1,
+              'revision' => 1,
+              'record' => { 'string_1' => { 'value' => 'abcdef' } }
+            },
+            {
+              'id' => 2,
+              'revision' => 1,
+              'record' => { 'string_multi' => { 'value' => 'opqrstu' } }
+            }
+          ]
+        end
+
+        it { expect(subject).to eq response_body }
       end
 
-      with_them do
-        it { expect(subject).to eq result }
+      context 'use record' do
+        let(:records) do
+          [
+            { id: 1, revision: 1, record: Kintone::Type::Record.new(string_1: 'abcdef') },
+            { id: 2, revision: 1, record: Kintone::Type::Record.new(string_multi: 'opqrstu') }
+          ]
+        end
+
+        it { expect(subject).to eq response_body }
       end
     end
   end
 
   describe '#delete' do
-    subject { target.delete(app, ids) }
+    before(:each) do
+      stub_request(
+        :delete,
+        'https://example.cybozu.com/k/v1/records.json'
+      )
+        .with(body: request_body.to_json)
+        .to_return(body: '{}', status: 200)
+    end
 
-    context '' do
-      before(:each) do
-        stub_request(
-          :delete,
-          'https://example.cybozu.com/k/v1/records.json'
-        )
-          .with(body: { app: app, ids: ids }.to_json)
-          .to_return(body: '{}', status: 200)
-      end
+    context 'without revisions' do
+      subject { target.delete(app, ids) }
+
+      let(:app) { 1 }
+      let(:ids) { [100, 80] }
+      let(:request_body) { { app: app, ids: ids } }
+
+      it { expect(subject).to eq({}) }
+    end
+
+    context 'with revisions' do
+      subject { target.delete(app, ids, revisions: revisions) }
 
       let(:app) { 1 }
       let(:ids) { [100, 80] }
+      let(:revisions) { [1, 4] }
+      let(:request_body) { { app: app, ids: ids, revisions: revisions } }
 
       it { expect(subject).to eq({}) }
     end