Skip to content

Commit ba1840f

Browse files
authored
Merge pull request #4 from ekohe/feature/office356_add_contact_api
FEATURE - Add contact API and add params to message API
2 parents 84cc9e9 + 5675529 commit ba1840f

11 files changed

Lines changed: 232 additions & 7 deletions

File tree

.rubocop.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,6 @@ Metrics/AbcSize:
1717

1818
Style/Documentation:
1919
Enabled: false
20+
21+
Metrics/BlockLength:
22+
Max: 150

Gemfile.lock

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ GEM
9090
hashdiff (>= 0.4.0, < 2.0.0)
9191

9292
PLATFORMS
93+
ruby
9394
x86_64-darwin-21
9495
x86_64-linux
9596

README.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,21 @@ client.calendars
4949

5050
```ruby
5151
client.messages
52+
client.messages({ filter: "createdDateTime lt 2022-01-01" })
53+
client.messages_with_nextlink
54+
client.messages_with_nextlink(next_link: true, params: { filter: "createdDateTime lt 2022-01-01" })
55+
```
56+
57+
**Get all contact**
58+
59+
```ruby
60+
client.contacts
5261
```
5362

5463
## Copyright
5564

5665
Copyright (c) 2022 Encore Shao. See LICENSE for details.
5766

58-
5967
## Contributing
6068

6169
Bug reports and pull requests are welcome on GitHub at https://github.com/ekohe/ruby-office365.

lib/office365/rest/api.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
require_relative "./user"
44
require_relative "./mailbox"
55
require_relative "./calendar"
6+
require_relative "./contact"
67
require_relative "./token"
78

89
module Office365
@@ -11,6 +12,7 @@ module API
1112
include Office365::REST::User
1213
include Office365::REST::Mailbox
1314
include Office365::REST::Calendar
15+
include Office365::REST::Contact
1416
include Office365::REST::Token
1517
end
1618
end

lib/office365/rest/contact.rb

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# frozen_string_literal: true
2+
3+
module Office365
4+
module REST
5+
module Contact
6+
def contacts
7+
contacts_uri = ["/", Office365::API_VERSION, "/me/contacts"].join
8+
response = Request.new(access_token, debug: debug).get(contacts_uri)
9+
10+
response["value"].map { |v| Models::User.new(v) }
11+
end
12+
end
13+
end
14+
end

lib/office365/rest/mailbox.rb

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
module Office365
44
module REST
55
module Mailbox
6-
def messages
7-
message_response["value"].map { |v| Models::Mailbox.new(v) }
6+
def messages(params = {})
7+
message_response(params: params)["value"].map { |v| Models::Mailbox.new(v) }
88
end
99

1010
# response = client.messages_with_nextlink
1111
# response[:results].each -> data save
1212
# if response[:next_link].present? client.messages_with_nextlink(response[:next_link])
13-
def messages_with_nextlink(next_link = nil)
14-
response = message_response(next_link)
13+
def messages_with_nextlink(next_link: nil, params: {})
14+
response = message_response(next_link: next_link, params: params)
1515

1616
{
1717
results: response["value"].map { |v| Models::Mailbox.new(v) },
@@ -21,8 +21,14 @@ def messages_with_nextlink(next_link = nil)
2121

2222
private
2323

24-
def message_response(next_link = nil)
25-
messages_uri = next_link || ["/", Office365::API_VERSION, "/me/messages"].join
24+
def message_response(params: {}, next_link: nil)
25+
messages_uri = ["/", Office365::API_VERSION, "/me/messages"].join
26+
if params.any?
27+
messages_uri = [messages_uri, "?", params.to_query].join
28+
elsif next_link
29+
messages_uri = next_link
30+
end
31+
2632
Request.new(access_token, debug: debug).get(messages_uri)
2733
end
2834
end

lib/office365/utils.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
# frozen_string_literal: true
22

33
require "office365/utils/string"
4+
require "office365/utils/to_query"

lib/office365/utils/to_query.rb

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
# frozen_string_literal: true
2+
3+
require "cgi"
4+
5+
class Object
6+
# Alias of <tt>to_s</tt>.
7+
def to_param
8+
to_s
9+
end
10+
11+
# Converts an object into a string suitable for use as a URL query string,
12+
# using the given <tt>key</tt> as the param name.
13+
def to_query(key)
14+
"#{CGI.escape(key.to_param)}=#{CGI.escape(to_param.to_s)}"
15+
end
16+
end
17+
18+
class NilClass
19+
# Returns +self+.
20+
def to_param
21+
self
22+
end
23+
end
24+
25+
class TrueClass
26+
# Returns +self+.
27+
def to_param
28+
self
29+
end
30+
end
31+
32+
class FalseClass
33+
# Returns +self+.
34+
def to_param
35+
self
36+
end
37+
end
38+
39+
class Array
40+
# Calls <tt>to_param</tt> on all its elements and joins the result with
41+
# slashes. This is used by <tt>url_for</tt> in Action Pack.
42+
def to_param
43+
collect(&:to_param).join "/"
44+
end
45+
46+
# Converts an array into a string suitable for use as a URL query string,
47+
# using the given +key+ as the param name.
48+
#
49+
# ['Rails', 'coding'].to_query('hobbies') # => "hobbies%5B%5D=Rails&hobbies%5B%5D=coding"
50+
def to_query(key)
51+
prefix = "#{key}[]"
52+
53+
if empty?
54+
nil.to_query(prefix)
55+
else
56+
collect { |value| value.to_query(prefix) }.join "&"
57+
end
58+
end
59+
end
60+
61+
class Hash
62+
# Returns a string representation of the receiver suitable for use as a URL
63+
# query string:
64+
#
65+
# {name: 'David', nationality: 'Danish'}.to_query
66+
# # => "name=David&nationality=Danish"
67+
#
68+
# An optional namespace can be passed to enclose key names:
69+
#
70+
# {name: 'David', nationality: 'Danish'}.to_query('user')
71+
# # => "user%5Bname%5D=David&user%5Bnationality%5D=Danish"
72+
#
73+
# The string pairs "key=value" that conform the query string
74+
# are sorted lexicographically in ascending order.
75+
#
76+
# This method is also aliased as +to_param+.
77+
def to_query(namespace = nil)
78+
query = collect do |key, value|
79+
unless (value.is_a?(Hash) || value.is_a?(Array)) && value.empty?
80+
value.to_query(namespace ? "#{namespace}[#{key}]" : key)
81+
end
82+
end.compact
83+
84+
query.sort! unless namespace.to_s.include?("[]")
85+
query.join("&")
86+
end
87+
88+
alias to_param to_query
89+
end

spec/fixtures/vcr_cassettes/office365_my_contact.yml

Lines changed: 45 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

spec/fixtures/vcr_cassettes/office365_my_mailbox_filter_by_created_date_time.yml

Lines changed: 44 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)