kintone 0.0.5 → 0.1.0

data/lib/kintone/command/records.rb

@@ -6,22 +6,26 @@ class Kintone::Command::Records < Kintone::Command
   end
 
   def get(app, query, fields)
-    params = { app: app, query: query }
+    params = { app: app, query: query.to_s }
     fields.each_with_index { |v, i| params["fields[#{i}]"] = v }
     @api.get(@url, params)
   end
 
+  def register(app, records)
+    @api.post(@url, app: app, records: records.to_kintone)
+  end
+
   def create(app, records)
-    @api.post(@url, app: app, records: records)
+    register(app, records)
   end
 
   def update(app, records)
-    @api.put(@url, app: app, records: records)
+    @api.put(@url, app: app, records: records.to_kintone)
   end
 
   def delete(app, ids)
-    params = { app: app }
-    ids.each_with_index { |v, i| params["ids[#{i}]"] = v }
+    params = { app: app, ids: ids }
+    # ids.each_with_index { |v, i| params["ids[#{i}]"] = v }
     @api.delete(@url, params)
   end
 end

data/lib/kintone/command/space_guests.rb

@@ -0,0 +1,11 @@
+require 'kintone/command'
+
+class Kintone::Command::SpaceGuests < Kintone::Command
+  def self.path
+    'space/guests'
+  end
+
+  def update(id, guests)
+    @api.put(@url, id: id, guests: guests)
+  end
+end

data/lib/kintone/command/space_members.rb

@@ -0,0 +1,16 @@
+require 'kintone/command'
+
+class Kintone::Command::SpaceMembers < Kintone::Command
+  def self.path
+    'space/members'
+  end
+
+  def get(id)
+    response = @api.get(@url, id: id)
+    response['members']
+  end
+
+  def update(id, members)
+    @api.put(@url, id: id, members: members)
+  end
+end

data/lib/kintone/command/space_thread.rb

@@ -0,0 +1,14 @@
+require 'kintone/command'
+
+class Kintone::Command::SpaceThread < Kintone::Command
+  def self.path
+    'space/thread'
+  end
+
+  def update(id, name: nil, body: nil)
+    request_body = { id: id }
+    request_body[:name] = name if name
+    request_body[:body] = body if body
+    @api.put(@url, request_body)
+  end
+end

data/lib/kintone/query.rb

@@ -0,0 +1,146 @@
+require 'kintone/query/extension'
+
+class Kintone::Query
+  def initialize(&block)
+    @query = []
+    instance_eval(&block) if block_given?
+  end
+
+  def field(code)
+    condition = Field.new(code)
+    @query << condition
+    condition
+  end
+
+  def and!
+    @query << 'and'
+  end
+
+  def or!
+    @query << 'or'
+  end
+
+  def precede(&block)
+    @query << "(#{Kintone::Query.new(&block)})" if block_given?
+  end
+
+  def login_user
+    function_string('LOGINUSER()')
+  end
+
+  def now
+    function_string('NOW()')
+  end
+
+  def today
+    function_string('TODAY()')
+  end
+
+  def this_month
+    function_string('THIS_MONTH()')
+  end
+
+  def last_month
+    function_string('LAST_MONTH()')
+  end
+
+  def this_year
+    function_string('THIS_YEAR()')
+  end
+
+  def order_by(field, sort = :asc)
+    @query << "order by #{field} #{sort}"
+  end
+
+  def limit(count)
+    @query << "limit #{count}"
+  end
+
+  def offset(index)
+    @query << "offset #{index}"
+  end
+
+  def to_s
+    @query.map(&:to_s).join(' ')
+  end
+
+  def inspect
+    to_s
+  end
+
+  private
+
+  def function_string(function)
+    function.instance_eval do
+      class << self
+        define_method :query_format, proc { self }
+      end
+    end
+    function
+  end
+
+  class Field
+    using Kintone::Query::Extention
+
+    def initialize(code)
+      @code = code.to_s
+    end
+
+    def ==(other)
+      save('=', other.query_format)
+    end
+
+    def !=(other)
+      save('!=', other.query_format)
+    end
+
+    def >(other)
+      save('>', other.query_format)
+    end
+
+    def <(other)
+      save('<', other.query_format)
+    end
+
+    def >=(other)
+      save('>=', other.query_format)
+    end
+
+    def <=(other)
+      save('<=', other.query_format)
+    end
+
+    def in(other)
+      other = "(#{other.map { |v| v.query_format }.join(', ')})" if other.is_a?(Array)
+      save('in', other)
+    end
+
+    def not_in(other)
+      other = "(#{other.map { |v| v.query_format }.join(', ')})" if other.is_a?(Array)
+      save('not in', other)
+    end
+
+    def like(other)
+      save('like', other.query_format)
+    end
+
+    def not_like(other)
+      save('not like', other.query_format)
+    end
+
+    def to_s
+      "#{@code} #{@condition} #{@other}"
+    end
+
+    def inspect
+      to_s
+    end
+
+    private
+
+    def save(condition, other)
+      @condition ||= condition
+      @other ||= other
+    end
+  end
+end

data/lib/kintone/query/extension.rb

@@ -0,0 +1,23 @@
+class Kintone::Query
+  module Extention
+    refine Object do
+      def query_format
+        self
+      end
+    end
+
+    refine Symbol do
+      def query_format
+        "\"#{self}\""
+      end
+    end
+
+    refine String do
+      def query_format
+        if self =~ /\A".+"\z/ then self
+        else "\"#{self}\""
+        end
+      end
+    end
+  end
+end

data/lib/kintone/type.rb

@@ -0,0 +1,6 @@
+require 'kintone/type/extension/object'
+require 'kintone/type/extension/enumerable'
+require 'kintone/type/extension/hash'
+require 'kintone/type/record'
+
+module Kintone::Type; end

data/lib/kintone/type/extension/enumerable.rb

@@ -0,0 +1,5 @@
+module Enumerable
+  def to_kintone
+    map(&:to_kintone)
+  end
+end

data/lib/kintone/type/extension/hash.rb

@@ -0,0 +1,5 @@
+class Hash
+  def to_kintone
+    map { |k, v| [k, v.to_kintone] }.to_h
+  end
+end

data/lib/kintone/type/extension/object.rb

@@ -0,0 +1,5 @@
+class Object
+  def to_kintone
+    self
+  end
+end

data/lib/kintone/type/record.rb

@@ -0,0 +1,11 @@
+module Kintone::Type
+  class Record < Hash
+    def initialize(default = nil)
+      default.each { |k, v| store(k, v) } if default.is_a?(Hash)
+    end
+
+    def to_kintone
+      map { |k, v| [k, { value: v }] }.to_h
+    end
+  end
+end

data/lib/kintone/version.rb

@@ -1,3 +1,3 @@
 module Kintone
-  VERSION = '0.0.5'
+  VERSION = '0.1.0'
 end

data/spec/kintone/api/guest_spec.rb

@@ -82,9 +82,12 @@ describe Kintone::Api::Guest do
     before(:each) do
       stub_request(
         :delete,
-        'https://example.cybozu.com/k/guest/1/v1/path.json?p1=abc&p2=def'
+        'https://example.cybozu.com/k/guest/1/v1/path.json'
       )
-        .with(headers: { 'X-Cybozu-Authorization' => 'QWRtaW5pc3RyYXRvcjpjeWJvenU=' })
+        .with(
+          body: { 'p1' => 'abc', 'p2' => 'def' }.to_json,
+          headers: { 'X-Cybozu-Authorization' => 'QWRtaW5pc3RyYXRvcjpjeWJvenU=' }
+        )
         .to_return(body: "{\"abc\":\"def\"}", status: 200)
     end
 
@@ -131,4 +134,40 @@ describe Kintone::Api::Guest do
 
     it { expect(subject).to be_a_kind_of(Kintone::Command::FieldAcl) }
   end
+
+  describe '#space' do
+    subject { target.space }
+
+    it { expect(subject).to be_a_kind_of(Kintone::Command::Space) }
+  end
+
+  describe '#space_body' do
+    subject { target.space_body }
+
+    it { expect(subject).to be_a_kind_of(Kintone::Command::SpaceBody) }
+  end
+
+  describe '#space_thread' do
+    subject { target.space_thread }
+
+    it { expect(subject).to be_a_kind_of(Kintone::Command::SpaceThread) }
+  end
+
+  describe '#space_members' do
+    subject { target.space_members }
+
+    it { expect(subject).to be_a_kind_of(Kintone::Command::SpaceMembers) }
+  end
+
+  describe '#space_guests' do
+    subject { target.space_guests }
+
+    it { expect(subject).to be_a_kind_of(Kintone::Command::SpaceGuests) }
+  end
+
+  describe '#app' do
+    subject { target.app }
+
+    it { is_expected.to be_a_kind_of(Kintone::Command::App) }
+  end
 end

data/spec/kintone/api_spec.rb

@@ -15,7 +15,7 @@ describe Kintone::Api do
 
     context '' do
       let(:command) { 'path' }
-      it { expect(subject).to eq('/k/v1/path.json') }
+      it { is_expected.to eq('/k/v1/path.json') }
     end
   end
 
@@ -25,7 +25,7 @@ describe Kintone::Api do
     context '引数が数値の1の時' do
       let(:space) { 1 }
 
-      it { expect(subject).to be_a_kind_of(Kintone::Api::Guest) }
+      it { is_expected.to be_a_kind_of(Kintone::Api::Guest) }
       it { expect(subject.instance_variable_get(:@guest_path)).to eq('/k/guest/1/v1/') }
     end
 
@@ -44,17 +44,47 @@ describe Kintone::Api do
     before(:each) do
       stub_request(
         :get,
-        'https://www.example.com/k/v1/path?p1=abc&p2=def'
+        'https://www.example.com/k/v1/path'
       )
-        .with(headers: { 'X-Cybozu-Authorization' => 'QWRtaW5pc3RyYXRvcjpjeWJvenU=' })
+        .with(
+          query: query,
+          headers: { 'X-Cybozu-Authorization' => 'QWRtaW5pc3RyYXRvcjpjeWJvenU=' }
+        )
         .to_return(body: "{\"abc\":\"def\"}", status: 200)
     end
 
     subject { target.get(path, params) }
+
     let(:path) { '/k/v1/path' }
-    let(:params) { { 'p1' => 'abc', 'p2' => 'def' } }
 
-    it { expect(subject).to eq 'abc' => 'def' }
+    context 'with some params' do
+      let(:params) { { 'p1' => 'abc', 'p2' => 'def' } }
+      let(:query) { 'p1=abc&p2=def' }
+
+      it { is_expected.to eq 'abc' => 'def' }
+    end
+
+    context 'with empty params' do
+      let(:params) { {} }
+      let(:query) { nil }
+
+      it { is_expected.to eq 'abc' => 'def' }
+    end
+
+    context 'with nil' do
+      let(:params) { nil }
+      let(:query) { nil }
+
+      it { expect { subject }.to raise_error NoMethodError }
+    end
+
+    context 'with no params' do
+      subject { target.get(path) }
+
+      let(:query) { nil }
+
+      it { is_expected.to eq 'abc' => 'def' }
+    end
   end
 
   describe '#post' do
@@ -77,7 +107,7 @@ describe Kintone::Api do
     let(:path) { '/k/v1/path' }
     let(:body) { { 'p1' => 'abc', 'p2' => 'def' } }
 
-    it { expect(subject).to eq 'abc' => 'def' }
+    it { is_expected.to eq 'abc' => 'def' }
   end
 
   describe '#put' do
@@ -100,16 +130,19 @@ describe Kintone::Api do
     let(:path) { '/k/v1/path' }
     let(:body) { { 'p1' => 'abc', 'p2' => 'def' } }
 
-    it { expect(subject).to eq 'abc' => 'def' }
+    it { is_expected.to eq 'abc' => 'def' }
   end
 
   describe '#delete' do
     before(:each) do
       stub_request(
         :delete,
-        'https://www.example.com/k/v1/path?p1=abc&p2=def'
+        'https://www.example.com/k/v1/path'
       )
-        .with(headers: { 'X-Cybozu-Authorization' => 'QWRtaW5pc3RyYXRvcjpjeWJvenU=' })
+        .with(
+          body: { 'p1' => 'abc', 'p2' => 'def' }.to_json,
+          headers: { 'X-Cybozu-Authorization' => 'QWRtaW5pc3RyYXRvcjpjeWJvenU=' }
+        )
         .to_return(body: "{\"abc\":\"def\"}", status: 200)
     end
 
@@ -117,60 +150,90 @@ describe Kintone::Api do
     let(:path) { '/k/v1/path' }
     let(:params) { { 'p1' => 'abc', 'p2' => 'def' } }
 
-    it { expect(subject).to eq 'abc' => 'def' }
+    it { is_expected.to eq 'abc' => 'def' }
   end
 
   describe '#record' do
     subject { target.record }
 
-    it { expect(subject).to be_a_kind_of(Kintone::Command::Record) }
+    it { is_expected.to be_a_kind_of(Kintone::Command::Record) }
   end
 
   describe '#records' do
     subject { target.records }
 
-    it { expect(subject).to be_a_kind_of(Kintone::Command::Records) }
+    it { is_expected.to be_a_kind_of(Kintone::Command::Records) }
   end
 
   describe '#form' do
     subject { target.form }
 
-    it { expect(subject).to be_a_kind_of(Kintone::Command::Form) }
+    it { is_expected.to be_a_kind_of(Kintone::Command::Form) }
   end
 
   describe '#app_acl' do
     subject { target.app_acl }
 
-    it { expect(subject).to be_a_kind_of(Kintone::Command::AppAcl) }
+    it { is_expected.to be_a_kind_of(Kintone::Command::AppAcl) }
   end
 
   describe '#record_acl' do
     subject { target.record_acl }
 
-    it { expect(subject).to be_a_kind_of(Kintone::Command::RecordAcl) }
+    it { is_expected.to be_a_kind_of(Kintone::Command::RecordAcl) }
   end
 
   describe '#field_acl' do
     subject { target.field_acl }
 
-    it { expect(subject).to be_a_kind_of(Kintone::Command::FieldAcl) }
+    it { is_expected.to be_a_kind_of(Kintone::Command::FieldAcl) }
   end
 
   describe '#template_space' do
     subject { target.template_space }
 
-    it { expect(subject).to be_a_kind_of(Kintone::Command::TemplateSpace) }
+    it { is_expected.to be_a_kind_of(Kintone::Command::TemplateSpace) }
   end
 
   describe '#space' do
     subject { target.space }
 
-    it { expect(subject).to be_a_kind_of(Kintone::Command::Space) }
+    it { is_expected.to be_a_kind_of(Kintone::Command::Space) }
   end
 
   describe '#space_body' do
     subject { target.space_body }
 
-    it { expect(subject).to be_a_kind_of(Kintone::Command::SpaceBody) }
+    it { is_expected.to be_a_kind_of(Kintone::Command::SpaceBody) }
+  end
+
+  describe '#space_thread' do
+    subject { target.space_thread }
+
+    it { is_expected.to be_a_kind_of(Kintone::Command::SpaceThread) }
+  end
+
+  describe '#space_members' do
+    subject { target.space_members }
+
+    it { is_expected.to be_a_kind_of(Kintone::Command::SpaceMembers) }
+  end
+
+  describe '#guests' do
+    subject { target.guests }
+
+    it { is_expected.to be_a_kind_of(Kintone::Command::Guests) }
+  end
+
+  describe '#app' do
+    subject { target.app }
+
+    it { is_expected.to be_a_kind_of(Kintone::Command::App) }
+  end
+
+  describe '#apis' do
+    subject { target.apis }
+
+    it { is_expected.to be_a_kind_of(Kintone::Command::Apis) }
   end
 end