calendlyr 0.3.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 716fb90f54ab5c73f5441ccb7d8d6f8e636bceb3b3f55a6a9053fc06adabb2b0
-  data.tar.gz: 6bebccb4df4028bfdbad116fdef8b49768e640f4858dbb1fc7a930d98cf558f0
+  metadata.gz: 4dba013e04be70a3fdefdae9d2457b5f14b22d8cfd253b6b9247237b1a33aec6
+  data.tar.gz: 9900aa135496d99c7e6e1a13071e2b7366153f9d47db00d5265ac96b61a029dc
 SHA512:
-  metadata.gz: 79f76039110d8ff409c573229851e4cc130772f210a769d41bb2dac8ac05679b5a9db07a1d543604dc0e2858cc8c604dac16459fcdbbbeac9e059ce91f0b7267
-  data.tar.gz: 5de26c0f7b9da6389918ba123935902814ce125dbd193ed50596d06c329044bb161cacb7d9ce5d0b11a032157a01f3e06d6551b2b27d0e542b964f0a5dae11c2
+  metadata.gz: 165450520bdd93a7e6f30566035db95ff2bd99b764bd86c1ea44e52e90cdf398636791e49f7829dbbd238ef966cf6e09562f4b2fed0149985152cc11cc81b13b
+  data.tar.gz: 3885225e6feaea75a074f868ae3ad321c33a4c6413455ee9c10a16ba186e7144972391a20a125804f623ba9de92d69164560701fed6815e9fea9d9b1ce8f7f7c

data/.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ["2.4", "2.5", "2.6", "2.7", "3.0"]
+        ruby: ["2.5", "2.6", "2.7", "3.0"]
 
     steps:
       - uses: actions/checkout@master

data/CHANGELOG.md

@@ -2,35 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 
-## [0.3.4]
-* Renaming variables and directories Calendly to Calendlyr
+## [0.6.0]
+* First real usable release :tada:
 
-## [0.3.3]
-* Fix - Error when trying to send an invitation through the organization
-* More testing = More coverage
-
-## [0.3.2]
-* Minor fixes
-
-## [0.3.0]
-* No runtime dependencies
-* Minor fixes
-
-## [0.2.0]
-* Support for ruby 3.0
-* Minor fixes
-
-## [0.1.1]
-* Changed required ruby version from `>= 2.3.0` to `>= 2.4.0`
-* Minitest
-* Minor fixes
-
-## 0.1.0
-* Birthday!
-
-[0.3.4]: https://github.com/araluce/calendlyr/compare/v0.3.3...v0.3.4
-[0.3.3]: https://github.com/araluce/calendlyr/compare/v0.3.2...v0.3.3
-[0.3.2]: https://github.com/araluce/calendlyr/compare/v0.3.0...v0.3.2
-[0.3.0]: https://github.com/araluce/calendlyr/compare/v0.2.0...v0.3.0
-[0.2.0]: https://github.com/araluce/calendlyr/compare/v0.1.1...v0.2.0
-[0.1.1]: https://github.com/araluce/calendlyr/compare/v0.1.0...v0.1.1
+[0.6.0]: https://github.com/araluce/calendlyr/compare/v0.1.0...v0.6.0

data/README.md

@@ -1,5 +1,5 @@
 [![](https://img.shields.io/github/license/araluce/calendlyr)](https://github.com/araluce/calendlyr/blob/master/LICENSE.txt)
-![](https://github.com/araluce/calendlyr/actions/workflows/ci.yml/badge.svg)
+[![](https://github.com/araluce/calendlyr/actions/workflows/ci.yml/badge.svg)](https://github.com/araluce/calendlyr/actions)
 [![codecov](https://codecov.io/gh/araluce/calendlyr/branch/master/graph/badge.svg?token=YSUU4PHM6Y)](https://codecov.io/gh/araluce/calendlyr)
 [![Gem Version](https://badge.fury.io/rb/calendlyr.svg)](https://badge.fury.io/rb/calendlyr)
 
@@ -7,10 +7,16 @@
 
 Easy and complete rubygem for [Calendly](https://calendly.com/). Currently supports [API v2](https://calendly.stoplight.io/docs/api-docs).
 
-No dependencies, just needed a Personal Access Token.
+Just needed a Personal Access Token.
 
 > If you need a Oauth authentication maybe you need [calendly-api-ruby-client](https://github.com/koshilife/calendly-api-ruby-client)
 
+## Dependencies
+
+No dependencies :tada:
+
+We know about the importance of not add dependencies that you don't want.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -84,6 +90,17 @@ client.me.memberships
 #=> Calendlyr::Collection @data=[#<Calendlyr::MemberShip>, #<Calendlyr::MemberShip>]
 ```
 
+#### Me (Cached)
+
+Probably you need to make many calls through `client.me`, so we decided to not make calls for every `client.me` reference by caching it the first time. However, if you need to reload the content of `me` you can `force_relaod` to force a new call.
+
+```ruby
+client.me # makes a call and caches the response
+client.me # no call, value cached
+client.me(force_reload: true) # makes a new call and update cache value
+```
+
+
 ### Event Types
 ````ruby
 client.event_types.list user_uri: "user_uri", organization_uri: "organization_uri"
@@ -118,7 +135,7 @@ client.organization.list_invitations
 # Get invitation
 client.organizations.retrieve_invitation(organization_uuid: "organization_uuid", invitation_uuid: "invitation_uuid")
 client.organization.invitation(invitation_uuid: "invitation_uuid")
-#Revoke invitation
+# Revoke invitation
 client.organizations.revoke_invitation(organization_uuid: "organization_uuid", invitation_uuid: "organization_uuid")
 client.organization.revoke_invitation(invitation_uuid: "organization_uuid")
 invitation = client.organization.invitation(invitation_uuid: "invitation_uuid")
@@ -133,12 +150,16 @@ client.organizations.retrieve_membership(membership_uuid: "membership_uuid")
 client.organizations.remove_user(membership_uuid: "membership_uuid")
 
 client.organization.events
+
+# List/Creaete webhooks
+client.organization.list_webhooks(scope: "scope")
+client.organization.create_webhook(url: "post_callback_url", events: ["invitee.canceled", "invitee.created"], scope: "scope")
 ````
 
 ### Webhooks
 ```ruby
 client.webhooks.list(organization_uri: "organization_uri", scope: "scope")
-client.webhooks.create(resource_uri: "resource_uri", events: ["invitee.canceled", "invitee.created"], organization_uri: "organization_uri", scope: "scope")
+client.webhooks.create(url: "post_callback_url", events: ["invitee.canceled", "invitee.created"], organization_uri: "organization_uri", scope: "scope")
 client.webhooks.retrieve(webhook_uuid: "webhook_uuid")
 client.webhooks.delete(webhook_uuid: "webhook_uuid")
 ```
@@ -160,4 +181,6 @@ When adding resources, add to the list of resources in lib/calendlyr. Additional
 
 ## Thanks
 
+Many thanks [@markets](https://github.com/markets) (our contributor in the shadows) for all comments, details and tips for this rubygem project and for made me grow professionally in my day by day :raised_hands:
+
 Thanks [@excid3](https://github.com/excid3) and his [Vultr.rb](https://github.com/excid3/vultr.rb) rubygem project.

data/lib/calendlyr/client.rb

@@ -8,8 +8,9 @@ module Calendlyr
       @token = token
     end
 
-    def me
-      users.me
+    def me(force_reload: false)
+      @me = nil if force_reload
+      @me ||= users.me
     end
 
     def organization

data/lib/calendlyr/collection.rb

@@ -1,3 +1,6 @@
+require "uri"
+require "cgi"
+
 module Calendlyr
   class Collection
     attr_reader :data, :count, :next_page, :next_page_token, :client

data/lib/calendlyr/objects/organizations.rb

@@ -8,6 +8,14 @@ module Calendlyr
       client.organizations.list_invitations organization_uuid: uuid, **params
     end
 
+    def list_webhooks(**params)
+      client.webhooks.list(organization_uri: uri, **params)
+    end
+
+    def create_webhook(**params)
+      client.webhooks.create(organization_uri: uri, **params)
+    end
+
     def revoke_invitation(invitation_uuid:)
       client.organizations.revoke_invitation(organization_uuid: uuid, invitation_uuid: invitation_uuid)
     end

data/lib/calendlyr/resource.rb

@@ -1,7 +1,14 @@
+require "net/http"
+require "json"
+require "openssl"
+require "uri"
+
 module Calendlyr
   class Resource
     attr_reader :client
 
+    ERROR_CODES = %w[400 401 403 404 409 500]
+
     def initialize(client)
       @client = client
     end
@@ -16,14 +23,6 @@ module Calendlyr
       handle_response request(url, Net::HTTP::Post, body: body)
     end
 
-    def patch_request(url, body:)
-      handle_response request(url, Net::HTTP::Patch, body: body)
-    end
-
-    def put_request(url, body)
-      handle_response request(url, Net::HTTP::Put, body: body)
-    end
-
     def delete_request(url, params: {})
       handle_response request(url, Net::HTTP::Delete, params: params)
     end
@@ -49,22 +48,11 @@ module Calendlyr
     end
 
     def handle_response(response)
+      return true unless response.read_body
+
       body = JSON.parse(response.read_body)
-      case response.code
-      when 400
-        raise Error, "#{body["title"]}. #{body["message"]}"
-      when 401
-        raise Error, "#{body["title"]}. #{body["message"]}"
-      when 403
-        raise Error, "#{body["title"]}. #{body["message"]}"
-      when 404
-        raise Error, "#{body["title"]}. #{body["message"]}"
-      when 429
-        raise Error, "#{body["title"]}. #{body["message"]}"
-      when 500
-        raise Error, "#{body["title"]}. #{body["message"]}"
-      when 503
-        raise Error, "#{body["title"]}. #{body["message"]}"
+      if ERROR_CODES.include? response.code
+        raise Error, "[Error #{response.code}] #{body["title"]}. #{body["message"]}"
       else
         body
       end

data/lib/calendlyr/resources/event_invitees.rb

@@ -6,7 +6,7 @@ module Calendlyr
     end
 
     def retrieve(event_uuid:, invitee_uuid:)
-      EventInvitee.new get_request("scheduled_events/#{event_uuid}/invitees/#{invitee_uuid}").merge(client: client)
+      EventInvitee.new get_request("scheduled_events/#{event_uuid}/invitees/#{invitee_uuid}").dig("resource").merge(client: client)
     end
   end
 end

data/lib/calendlyr/resources/organizations.rb

@@ -1,7 +1,7 @@
 module Calendlyr
   class OrganizationResource < Resource
     def invite(organization_uuid:, email:)
-      Invitation.new post_request("organizations/#{organization_uuid}/invitations", body: {email: email}).merge(client: client)
+      Invitation.new post_request("organizations/#{organization_uuid}/invitations", body: {email: email}).dig("resource").merge(client: client)
     end
 
     def list_invitations(organization_uuid:, **params)

data/lib/calendlyr/version.rb

@@ -1,3 +1,3 @@
 module Calendlyr
-  VERSION = "0.3.5"
+  VERSION = "0.6.0"
 end

data/lib/calendlyr.rb

@@ -1,8 +1,3 @@
-require "net/http"
-require "uri"
-require "json"
-require "openssl"
-require "cgi"
 require "calendlyr/version"
 
 module Calendlyr

data/test/calendlyr/client_test.rb

@@ -2,7 +2,10 @@ require "test_helper"
 
 class ClientTest < Minitest::Test
   def test_token
-    client = Calendlyr::Client.new token: "test"
-    assert_equal "test", client.token
+    assert_equal "fake", client.token
+  end
+
+  def test_inspect
+    assert_equal "#<Calendlyr::Client>", client.inspect
   end
 end

data/test/calendlyr/resource_test.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class ResourceTest < Minitest::Test
+  def test_handle_response_error
+    error_code = Calendlyr::Resource::ERROR_CODES.sample
+    stub(path: "users/me", response: {body: fixture_file("resources/#{error_code}"), status: error_code.to_i})
+
+    assert_raises Calendlyr::Error do
+      client.me
+    end
+  end
+end

data/test/calendlyr/resources/organizations_test.rb

@@ -40,25 +40,47 @@ class OrganizationsResourceTest < Minitest::Test
     assert_equal "sNjq4TvMDfUHEl7zHRR0k0E1PCEJWvdi", memberships.next_page_token
   end
 
+  def test_list_webhooks
+    stub(path: "webhook_subscriptions?organization=#{client.organization.uri}&scope=user", response: {body: fixture_file("webhooks/list"), status: 200})
+    webhooks = client.organization.list_webhooks(scope: "user")
+
+    assert_equal Calendlyr::Collection, webhooks.class
+    assert_equal Calendlyr::Webhook, webhooks.data.first.class
+    assert_equal 1, webhooks.count
+    assert_equal "sNjq4TvMDfUHEl7zHRR0k0E1PCEJWvdi", webhooks.next_page_token
+  end
+
+  def test_create_webhook
+    body = {url: "https://blah.foo/bar", events: ["invitee.created"], organization: client.organization.uri, scope: "user", user: client.me.uri}
+    stub(method: :post, path: "webhook_subscriptions", body: body, response: {body: fixture_file("webhooks/create"), status: 201})
+
+    assert client.webhooks.create(url: body[:url], events: body[:events], organization_uri: body[:organization], scope: body[:scope], user_uri: body[:user])
+  end
+
   def test_retrieve_invitation
-    organization_uuid = "AAAAAAAAAAAAAAAA"
     invitation_uuid = "AAAAAAAAAAAAAAAA"
-    response = {body: fixture_file("organizations/retrieve_invitation"), status: 200}
-    stub(path: "organizations/#{organization_uuid}/invitations/#{invitation_uuid}", response: response)
-    invitation = client.organizations.retrieve_invitation(organization_uuid: organization_uuid, invitation_uuid: invitation_uuid)
+
+    stub(path: "organizations/#{client.organization.uuid}/invitations/#{invitation_uuid}", response: {body: fixture_file("organizations/retrieve_invitation"), status: 200})
+    stub(method: :delete, path: "organizations/#{client.organization.uuid}/invitations/#{invitation_uuid}", response: {body: fixture_file("organizations/revoke_invitation")})
+    invitation = client.organizations.retrieve_invitation(organization_uuid: client.organization.uuid, invitation_uuid: invitation_uuid)
 
     assert_equal Calendlyr::Invitation, invitation.class
     assert_equal "test@example.com", invitation.email
+
+    assert invitation.associated_organization
+    assert invitation.revoke
   end
 
   def test_retrieve_membership
     membership_uuid = "AAAAAAAAAAAAAAAA"
     response = {body: fixture_file("organizations/retrieve_membership"), status: 200}
     stub(path: "organization_memberships/#{membership_uuid}", response: response)
+    stub(path: "users/#{membership_uuid}", response: {body: fixture_file("users/retrieve"), status: 200})
     membership = client.organizations.retrieve_membership(membership_uuid: membership_uuid)
 
     assert_equal Calendlyr::Membership, membership.class
     assert_equal "test@example.com", membership.user.email
+    assert_equal membership.associated_user, client.users.retrieve(user_uuid: membership_uuid)
   end
 
   def test_revoke_invitation
@@ -77,8 +99,6 @@ class OrganizationsResourceTest < Minitest::Test
   end
 
   def test_organization_invite_user
-    stub(path: "users/me", response: {body: fixture_file("users/retrieve"), status: 200})
-
     email = "email@example.com"
     response = {body: fixture_file("organizations/invite"), status: 201}
     stub(method: :post, path: "organizations/#{client.organization.uuid}/invitations", body: {email: email}, response: response)
@@ -90,7 +110,6 @@ class OrganizationsResourceTest < Minitest::Test
   end
 
   def test_organization_list_invitations
-    stub(path: "users/me", response: {body: fixture_file("users/retrieve"), status: 200})
     stub(path: "organizations/#{client.organization.uuid}/invitations", response: {body: fixture_file("organizations/list_invitations"), status: 200})
     invitations = client.organization.list_invitations
 
@@ -101,13 +120,11 @@ class OrganizationsResourceTest < Minitest::Test
   end
 
   def test_organization_revoke_invitation
-    stub(path: "users/me", response: {body: fixture_file("users/retrieve"), status: 200})
     stub(method: :delete, path: "organizations/#{client.organization.uuid}/invitations/AAAAAAAAAAAAAAAA", response: {body: fixture_file("organizations/revoke_invitation")})
     assert client.organization.revoke_invitation(invitation_uuid: "AAAAAAAAAAAAAAAA")
   end
 
   def test_organization_invitation
-    stub(path: "users/me", response: {body: fixture_file("users/retrieve"), status: 200})
     response = {body: fixture_file("organizations/retrieve_invitation"), status: 200}
     stub(path: "organizations/#{client.organization.uuid}/invitations/AAAAAAAAAAAAAAAA", response: response)
     invitation = client.organization.invitation(invitation_uuid: "AAAAAAAAAAAAAAAA")
@@ -117,7 +134,6 @@ class OrganizationsResourceTest < Minitest::Test
   end
 
   def test_organization_events
-    stub(path: "users/me", response: {body: fixture_file("users/retrieve"), status: 200})
     stub(path: "scheduled_events?organization=#{client.organization.uri}", response: {body: fixture_file("events/list"), status: 200})
     events = client.organization.events
 
@@ -128,7 +144,6 @@ class OrganizationsResourceTest < Minitest::Test
   end
 
   def test_organization_memberships
-    stub(path: "users/me", response: {body: fixture_file("users/retrieve"), status: 200})
     stub(path: "organization_memberships?organization=#{client.organization.uri}", response: {body: fixture_file("organizations/list_memberships"), status: 200})
     memberships = client.organization.memberships
 

data/test/calendlyr/resources/scheduling_links_test.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class SchedulingLinksResourceTest < Minitest::Test
+  def test_create
+    owner_uri = "https://api.calendly.com/event_types/GBGBDCAADAEDCRZ2"
+    max_event_count = 20
+    owner_type = "EventType"
+    response = {body: fixture_file("scheduling_links/create"), status: 201}
+    stub(method: :post, path: "scheduling_links", body: {owner: owner_uri, max_event_count: max_event_count, owner_type: owner_type}, response: response)
+
+    assert client.scheduling_links.create(owner_uri: owner_uri, max_event_count: max_event_count, owner_type: owner_type)
+  end
+end

data/test/calendlyr/resources/users_test.rb

@@ -28,6 +28,21 @@ class UsersResourceTest < Minitest::Test
     assert_equal "test@example.com", me.email
   end
 
+  def test_me_caching
+    response = {body: fixture_file("users/retrieve"), status: 200}
+    stub = stub(path: "users/me", response: response)
+    me = client.me
+    remove_request_stub(stub)
+    assert_equal client.me, me
+  end
+
+  def test_me_caching_reload
+    me = client.me
+    stub(path: "users/me", response: {body: fixture_file("users/reload"), status: 200})
+    reloaded_me = client.me(force_reload: true)
+    assert me.name != reloaded_me.name
+  end
+
   def test_organization
     response = {body: fixture_file("users/retrieve"), status: 200}
     stub(path: "users/me", response: response)
@@ -39,7 +54,6 @@ class UsersResourceTest < Minitest::Test
   end
 
   def test_event_types
-    stub(path: "users/me", response: {body: fixture_file("users/retrieve"), status: 200})
     me = client.me
 
     stub(path: "event_types?user=#{me.uri}&organization=#{me.organization.uri}", response: {body: fixture_file("event_types/list"), status: 200})
@@ -52,7 +66,6 @@ class UsersResourceTest < Minitest::Test
   end
 
   def test_events
-    stub(path: "users/me", response: {body: fixture_file("users/retrieve"), status: 200})
     me = client.me
 
     stub(path: "scheduled_events?user=#{me.uri}&organization=#{me.organization.uri}", response: {body: fixture_file("events/list"), status: 200})
@@ -65,7 +78,6 @@ class UsersResourceTest < Minitest::Test
   end
 
   def test_memberships
-    stub(path: "users/me", response: {body: fixture_file("users/retrieve"), status: 200})
     me = client.me
 
     stub(path: "organization_memberships?user=#{me.uri}&organization=#{me.organization.uri}", response: {body: fixture_file("organizations/list_memberships"), status: 200})

data/test/calendlyr/resources/webhooks_test.rb

@@ -21,16 +21,19 @@ class WebhooksResourceTest < Minitest::Test
     stub(method: :post, path: "webhook_subscriptions", body: body, response: {body: fixture_file("webhooks/create"), status: 201})
 
     assert client.webhooks.create(url: body[:url], events: body[:events], organization_uri: body[:organization], scope: body[:scope], user_uri: body[:user])
+    assert client.organization.create_webhook(url: body[:url], events: body[:events], scope: body[:scope], user_uri: body[:user])
   end
 
   def test_retrieve
     webhook_uuid = "AAAAAAAAAAAAAAAA"
-    response = {body: fixture_file("webhooks/retrieve"), status: 200}
-    stub(path: "webhook_subscriptions/#{webhook_uuid}", response: response)
+    stub(path: "webhook_subscriptions/#{webhook_uuid}", response: {body: fixture_file("webhooks/retrieve"), status: 200})
+    stub(path: "users/AAAAAAAAAAAAAAAA", response: {body: fixture_file("users/retrieve"), status: 200})
     webhook = client.webhooks.retrieve(webhook_uuid: webhook_uuid)
 
     assert_equal Calendlyr::Webhook, webhook.class
     assert_equal "user", webhook.scope
+    assert_equal webhook.associated_user, client.users.retrieve(user_uuid: "AAAAAAAAAAAAAAAA")
+    assert_equal webhook.associated_organization, client.users.retrieve(user_uuid: "AAAAAAAAAAAAAAAA").organization
   end
 
   def test_delete

data/test/fixtures/event_invitees/retrieve.json

@@ -1,38 +1,40 @@
 {
-  "cancel_url": "https://calendly.com/cancellations/AAAAAAAAAAAAAAAA",
-  "created_at": "2020-01-01T20:30:00Z",
-  "email": "email@example.com",
-  "reschedule_url": "https://calendly.com/reschedulings/AAAAAAAAAAAAAAAA",
-  "event": "https://api.calendly.com/scheduled_events/ABCDABCDABCDABCD",
-  "name": "John Doe",
-  "status": "active",
-  "timezone": "America/New_York",
-  "updated_at": "2020-01-01T20:30:00Z",
-  "uri": "https://api.calendly.com/api/v2/scheduled_events/ABCDABCDABCDABCD/invitees/ABCDABCDABCDABCD",
-  "questions_and_answers": [
-    {
-      "answer": "radio button answer",
-      "position": 0,
-      "question": "Question with Radio Buttons answer type"
-    },
-    {
-      "answer": "Multiple line\nAnswer",
-      "position": 1,
-      "question": "Question with Multiple Lines answer type"
-    },
-    {
-      "answer": "Answer 1\nAnswer 2\nAnswer 3",
-      "position": 2,
-      "question": "Question with Checkboxes answer type"
+  "resource": {
+    "cancel_url": "https://calendly.com/cancellations/AAAAAAAAAAAAAAAA",
+    "created_at": "2020-01-01T20:30:00Z",
+    "email": "email@example.com",
+    "reschedule_url": "https://calendly.com/reschedulings/AAAAAAAAAAAAAAAA",
+    "event": "https://api.calendly.com/scheduled_events/ABCDABCDABCDABCD",
+    "name": "John Doe",
+    "status": "active",
+    "timezone": "America/New_York",
+    "updated_at": "2020-01-01T20:30:00Z",
+    "uri": "https://api.calendly.com/api/v2/scheduled_events/ABCDABCDABCDABCD/invitees/ABCDABCDABCDABCD",
+    "questions_and_answers": [
+      {
+        "answer": "radio button answer",
+        "position": 0,
+        "question": "Question with Radio Buttons answer type"
+      },
+      {
+        "answer": "Multiple line\nAnswer",
+        "position": 1,
+        "question": "Question with Multiple Lines answer type"
+      },
+      {
+        "answer": "Answer 1\nAnswer 2\nAnswer 3",
+        "position": 2,
+        "question": "Question with Checkboxes answer type"
+      }
+    ],
+    "canceled": false,
+    "payment": {
+      "external_id": "ch_AAAAAAAAAAAAAAAAAAAAAAAA",
+      "provider": "stripe",
+      "amount": 1234.56,
+      "currency": "USD",
+      "terms": "sample terms of payment (up to 1,024 characters)",
+      "successful": true
     }
-  ],
-  "canceled": false,
-  "payment": {
-    "external_id": "ch_AAAAAAAAAAAAAAAAAAAAAAAA",
-    "provider": "stripe",
-    "amount": 1234.56,
-    "currency": "USD",
-    "terms": "sample terms of payment (up to 1,024 characters)",
-    "successful": true
   }
 }

data/test/fixtures/organizations/invite.json

@@ -1,9 +1,11 @@
 {
-  "created_at": "2020-01-01T20:30:00Z",
-  "email": "email@example.com",
-  "last_sent_at": "2020-01-01T20:30:00Z",
-  "organization": "https://api.calendly.com/organizations/ABCDABCDABCDABCD",
-  "status": "pending",
-  "updated_at": "2020-01-01T20:30:00Z",
-  "uri": "https://api.calendly.com/organizations/ABCDABCDABCDABCD/invitations/DCBADCBADCBADCBA"
+  "resource": {
+    "created_at": "2020-01-01T20:30:00Z",
+    "email": "email@example.com",
+    "last_sent_at": "2020-01-01T20:30:00Z",
+    "organization": "https://api.calendly.com/organizations/ABCDABCDABCDABCD",
+    "status": "pending",
+    "updated_at": "2020-01-01T20:30:00Z",
+    "uri": "https://api.calendly.com/organizations/ABCDABCDABCDABCD/invitations/DCBADCBADCBADCBA"
+  }
 }

data/test/fixtures/organizations/list_invitations.json

@@ -1,7 +1,7 @@
 {
   "collection": [
     {
-      "uri": "https://api.calendly.com/organizations/AAAAAAAAAAAAAAAA/invitations",
+      "uri": "https://api.calendly.com/organizations/AAAAAAAAAAAAAAAA/invitations/AAAAAAAAAAAAAAAA",
       "organization": "https://api.calendly.com/organizations/AAAAAAAAAAAAAAAA",
       "email": "test@example.com",
       "status": "accepted",

data/test/fixtures/organizations/retrieve_invitation.json

@@ -1,6 +1,6 @@
 {
   "resource": {
-    "uri": "https://api.calendly.com/organizations/AAAAAAAAAAAAAAAA/invitations",
+    "uri": "https://api.calendly.com/organizations/AAAAAAAAAAAAAAAA/invitations/AAAAAAAAAAAAAAAA",
     "organization": "https://api.calendly.com/organizations/AAAAAAAAAAAAAAAA",
     "email": "test@example.com",
     "status": "accepted",

data/test/fixtures/resources/400.json

@@ -0,0 +1,10 @@
+{
+  "title": "Unauthenticated",
+  "message": "The access token is invalid",
+  "details": [
+    {
+      "parameter": "string",
+      "message": "string"
+    }
+  ]
+}

data/test/fixtures/resources/401.json

@@ -0,0 +1,10 @@
+{
+  "title": "Invalid Argument",
+  "message": "The supplied parameters are invalid.",
+  "details": [
+    {
+      "parameter": "string",
+      "message": "string"
+    }
+  ]
+}

data/test/fixtures/resources/403.json

@@ -0,0 +1,10 @@
+{
+  "title": "Permission Denied",
+  "message": "This user is not in your organization",
+  "details": [
+    {
+      "parameter": "string",
+      "message": "string"
+    }
+  ]
+}

data/test/fixtures/resources/404.json

@@ -0,0 +1,10 @@
+{
+  "title": "Resource Not Found",
+  "message": "The server could not find the requested resource.",
+  "details": [
+    {
+      "parameter": "string",
+      "message": "string"
+    }
+  ]
+}

data/test/fixtures/resources/409.json

@@ -0,0 +1,4 @@
+{
+  "title": "Already Exists",
+  "message": "Hook with this url already exists"
+}

data/test/fixtures/resources/500.json

@@ -0,0 +1,10 @@
+{
+  "title": "Internal Server Error",
+  "message": "The server encountered an unexpected condition that prevented it from fulfilling the request.",
+  "details": [
+    {
+      "parameter": "string",
+      "message": "string"
+    }
+  ]
+}

data/test/fixtures/users/reload.json

@@ -0,0 +1,14 @@
+{
+  "resource": {
+    "uri": "https://api.calendly.com/users/AAAAAAAAAAAAAAAA",
+    "name": "John Doe Reloaded",
+    "slug": "acmesales",
+    "email": "test@example.com",
+    "scheduling_url": "https://calendly.com/acmesales",
+    "timezone": "America/New York",
+    "avatar_url": "https://01234567890.cloudfront.net/uploads/user/avatar/0123456/a1b2c3d4.png",
+    "created_at": "2019-01-02T03:04:05.678Z",
+    "updated_at": "2019-08-07T06:05:04.321Z",
+    "current_organization": "https://api.calendly.com/organizations/AAAAAAAAAAAAAAAA"
+  }
+}

data/test/test_helper.rb

@@ -11,8 +11,13 @@ require "minitest/autorun"
 require "webmock/minitest"
 
 class Minitest::Test
+  def initialize(name)
+    stub(path: "users/me", response: {body: fixture_file("users/retrieve"), status: 200})
+    super
+  end
+
   def client
-    Calendlyr::Client.new(token: "fake")
+    @client ||= Calendlyr::Client.new(token: "fake")
   end
 
   def fixture_file(fixture)
@@ -23,5 +28,6 @@ class Minitest::Test
     stub_req = stub_request(method, "#{Calendlyr::Client::BASE_URL}/#{path}")
     stub_req.with(body: body) if [:post, :put, :patch].include?(method)
     stub_req.to_return(**response)
+    stub_req
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calendlyr
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.6.0
 platform: ruby
 authors:
 - araluce
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-23 00:00:00.000000000 Z
+date: 2021-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -141,12 +141,13 @@ files:
 - lib/calendlyr/version.rb
 - test/calendlyr/client_test.rb
 - test/calendlyr/object_test.rb
-- test/calendlyr/resources/data_compliance.rb
+- test/calendlyr/resource_test.rb
+- test/calendlyr/resources/data_compliance_test.rb
 - test/calendlyr/resources/event_invitees_test.rb
 - test/calendlyr/resources/event_types_test.rb
 - test/calendlyr/resources/events_test.rb
 - test/calendlyr/resources/organizations_test.rb
-- test/calendlyr/resources/scheduling_links.rb
+- test/calendlyr/resources/scheduling_links_test.rb
 - test/calendlyr/resources/users_test.rb
 - test/calendlyr/resources/webhooks_test.rb
 - test/calendlyr_test.rb
@@ -164,7 +165,14 @@ files:
 - test/fixtures/organizations/retrieve_invitation.json
 - test/fixtures/organizations/retrieve_membership.json
 - test/fixtures/organizations/revoke_invitation.json
+- test/fixtures/resources/400.json
+- test/fixtures/resources/401.json
+- test/fixtures/resources/403.json
+- test/fixtures/resources/404.json
+- test/fixtures/resources/409.json
+- test/fixtures/resources/500.json
 - test/fixtures/scheduling_links/create.json
+- test/fixtures/users/reload.json
 - test/fixtures/users/retrieve.json
 - test/fixtures/webhooks/create.json
 - test/fixtures/webhooks/delete.json
@@ -198,12 +206,13 @@ summary: Ruby bindings for Calendly API.
 test_files:
 - test/calendlyr/client_test.rb
 - test/calendlyr/object_test.rb
-- test/calendlyr/resources/data_compliance.rb
+- test/calendlyr/resource_test.rb
+- test/calendlyr/resources/data_compliance_test.rb
 - test/calendlyr/resources/event_invitees_test.rb
 - test/calendlyr/resources/event_types_test.rb
 - test/calendlyr/resources/events_test.rb
 - test/calendlyr/resources/organizations_test.rb
-- test/calendlyr/resources/scheduling_links.rb
+- test/calendlyr/resources/scheduling_links_test.rb
 - test/calendlyr/resources/users_test.rb
 - test/calendlyr/resources/webhooks_test.rb
 - test/calendlyr_test.rb
@@ -221,7 +230,14 @@ test_files:
 - test/fixtures/organizations/retrieve_invitation.json
 - test/fixtures/organizations/retrieve_membership.json
 - test/fixtures/organizations/revoke_invitation.json
+- test/fixtures/resources/400.json
+- test/fixtures/resources/401.json
+- test/fixtures/resources/403.json
+- test/fixtures/resources/404.json
+- test/fixtures/resources/409.json
+- test/fixtures/resources/500.json
 - test/fixtures/scheduling_links/create.json
+- test/fixtures/users/reload.json
 - test/fixtures/users/retrieve.json
 - test/fixtures/webhooks/create.json
 - test/fixtures/webhooks/delete.json

data/test/calendlyr/resources/scheduling_links.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-require "test_helper"
-
-class SchedulingLinksResourceTest < Minitest::Test
-  def test_create
-    body = {owner_uri: "https://api.calendly.com/event_types/GBGBDCAADAEDCRZ2", max_event_count: 20, owner_type: "EventType"}
-    stub(method: :post, path: "scheduling_links", body: body, response: {body: fixture_file("scheduling_links/create"), status: 201})
-
-    assert client.data_compliance.delete_invitee_data(**body)
-  end
-end