calendlyr 0.3.3 → 0.5.0

data/test/{calendly → calendlyr}/resources/event_types_test.rb

@@ -10,8 +10,8 @@ class EventTypesResourceTest < Minitest::Test
     stub(path: "event_types?user=#{user_uri}&organization=#{organization_uri}", response: response)
     event_types = client.event_types.list(user_uri: user_uri, organization_uri: organization_uri)
 
-    assert_equal Calendly::Collection, event_types.class
-    assert_equal Calendly::EventType, event_types.data.first.class
+    assert_equal Calendlyr::Collection, event_types.class
+    assert_equal Calendlyr::EventType, event_types.data.first.class
     assert_equal 1, event_types.count
     assert_equal "sNjq4TvMDfUHEl7zHRR0k0E1PCEJWvdi", event_types.next_page_token
   end
@@ -22,7 +22,7 @@ class EventTypesResourceTest < Minitest::Test
     stub(path: "event_types/#{event_type_uuid}", response: response)
     event_type = client.event_types.retrieve(event_type_uuid: event_type_uuid)
 
-    assert_equal Calendly::EventType, event_type.class
+    assert_equal Calendlyr::EventType, event_type.class
     assert_equal "https://api.calendly.com/event_types/AAAAAAAAAAAAAAAA", event_type.uri
     assert_equal "15 Minute Meeting", event_type.name
     assert_equal "acmesales", event_type.slug

data/test/{calendly → calendlyr}/resources/events_test.rb

@@ -10,8 +10,8 @@ class EventsResourceTest < Minitest::Test
     stub(path: "scheduled_events?user=#{user_uri}&organization=#{organization_uri}", response: response)
     events = client.events.list(user_uri: user_uri, organization_uri: organization_uri)
 
-    assert_equal Calendly::Collection, events.class
-    assert_equal Calendly::Event, events.data.first.class
+    assert_equal Calendlyr::Collection, events.class
+    assert_equal Calendlyr::Event, events.data.first.class
     assert_equal 1, events.count
     assert_equal "sNjq4TvMDfUHEl7zHRR0k0E1PCEJWvdi", events.next_page_token
   end
@@ -22,7 +22,7 @@ class EventsResourceTest < Minitest::Test
     stub(path: "scheduled_events/#{event_uuid}", response: response)
     event = client.events.retrieve(event_uuid: event_uuid)
 
-    assert_equal Calendly::Event, event.class
+    assert_equal Calendlyr::Event, event.class
     assert_equal "https://api.calendly.com/scheduled_events/GBGBDCAADAEDCRZ2", event.uri
     assert_equal "15 Minute Meeting", event.name
   end

data/test/{calendly → calendlyr}/resources/organizations_test.rb

@@ -11,7 +11,7 @@ class OrganizationsResourceTest < Minitest::Test
 
     invitation = client.organizations.invite(organization_uuid: organization_uuid, email: email)
 
-    assert_equal Calendly::Invitation, invitation.class
+    assert_equal Calendlyr::Invitation, invitation.class
     assert_equal email, invitation.email
   end
 
@@ -21,8 +21,8 @@ class OrganizationsResourceTest < Minitest::Test
     stub(path: "organizations/#{organization_uuid}/invitations", response: response)
     invitations = client.organizations.list_invitations(organization_uuid: organization_uuid)
 
-    assert_equal Calendly::Collection, invitations.class
-    assert_equal Calendly::Invitation, invitations.data.first.class
+    assert_equal Calendlyr::Collection, invitations.class
+    assert_equal Calendlyr::Invitation, invitations.data.first.class
     assert_equal 1, invitations.count
     assert_equal "sNjq4TvMDfUHEl7zHRR0k0E1PCEJWvdi", invitations.next_page_token
   end
@@ -34,31 +34,53 @@ class OrganizationsResourceTest < Minitest::Test
     stub(path: "organization_memberships?user=#{user_uri}&organization=#{organization_uri}", response: response)
     memberships = client.organizations.list_memberships(user_uri: user_uri, organization_uri: organization_uri)
 
-    assert_equal Calendly::Collection, memberships.class
-    assert_equal Calendly::Membership, memberships.data.first.class
+    assert_equal Calendlyr::Collection, memberships.class
+    assert_equal Calendlyr::Membership, memberships.data.first.class
     assert_equal 1, memberships.count
     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)
 
-    assert_equal Calendly::Invitation, invitation.class
+    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 Calendly::Membership, membership.class
+    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,63 +99,56 @@ 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)
 
     invitation = client.organization.invite_user(email: email)
 
-    assert_equal Calendly::Invitation, invitation.class
+    assert_equal Calendlyr::Invitation, invitation.class
     assert_equal email, invitation.email
   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
 
-    assert_equal Calendly::Collection, invitations.class
-    assert_equal Calendly::Invitation, invitations.data.first.class
+    assert_equal Calendlyr::Collection, invitations.class
+    assert_equal Calendlyr::Invitation, invitations.data.first.class
     assert_equal 1, invitations.count
     assert_equal "sNjq4TvMDfUHEl7zHRR0k0E1PCEJWvdi", invitations.next_page_token
   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")
 
-    assert_equal Calendly::Invitation, invitation.class
+    assert_equal Calendlyr::Invitation, invitation.class
     assert_equal "test@example.com", invitation.email
   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
 
-    assert_equal Calendly::Collection, events.class
-    assert_equal Calendly::Event, events.data.first.class
+    assert_equal Calendlyr::Collection, events.class
+    assert_equal Calendlyr::Event, events.data.first.class
     assert_equal 1, events.count
     assert_equal "sNjq4TvMDfUHEl7zHRR0k0E1PCEJWvdi", events.next_page_token
   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
 
-    assert_equal Calendly::Collection, memberships.class
-    assert_equal Calendly::Membership, memberships.data.first.class
+    assert_equal Calendlyr::Collection, memberships.class
+    assert_equal Calendlyr::Membership, memberships.data.first.class
     assert_equal 1, memberships.count
     assert_equal "sNjq4TvMDfUHEl7zHRR0k0E1PCEJWvdi", memberships.next_page_token
   end

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/{calendly → calendlyr}/resources/users_test.rb

@@ -9,7 +9,7 @@ class UsersResourceTest < Minitest::Test
     stub(path: "users/#{user_uuid}", response: response)
     user = client.users.retrieve(user_uuid: user_uuid)
 
-    assert_equal Calendly::User, user.class
+    assert_equal Calendlyr::User, user.class
     assert_equal "https://api.calendly.com/users/AAAAAAAAAAAAAAAA", user.uri
     assert_equal "John Doe", user.name
     assert_equal "acmesales", user.slug
@@ -21,58 +21,70 @@ class UsersResourceTest < Minitest::Test
     stub(path: "users/me", response: response)
     me = client.me
 
-    assert_equal Calendly::User, me.class
+    assert_equal Calendlyr::User, me.class
     assert_equal "https://api.calendly.com/users/AAAAAAAAAAAAAAAA", me.uri
     assert_equal "John Doe", me.name
     assert_equal "acmesales", me.slug
     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)
     organization = client.organization
 
-    assert_equal Calendly::Organization, organization.class
+    assert_equal Calendlyr::Organization, organization.class
     assert_equal "https://api.calendly.com/organizations/AAAAAAAAAAAAAAAA", organization.uri
     assert_equal "AAAAAAAAAAAAAAAA", organization.uuid
   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})
     event_types = client.me.event_types
 
-    assert_equal Calendly::Collection, event_types.class
-    assert_equal Calendly::EventType, event_types.data.first.class
+    assert_equal Calendlyr::Collection, event_types.class
+    assert_equal Calendlyr::EventType, event_types.data.first.class
     assert_equal 1, event_types.count
     assert_equal "sNjq4TvMDfUHEl7zHRR0k0E1PCEJWvdi", event_types.next_page_token
   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})
     events = client.me.events
 
-    assert_equal Calendly::Collection, events.class
-    assert_equal Calendly::Event, events.data.first.class
+    assert_equal Calendlyr::Collection, events.class
+    assert_equal Calendlyr::Event, events.data.first.class
     assert_equal 1, events.count
     assert_equal "sNjq4TvMDfUHEl7zHRR0k0E1PCEJWvdi", events.next_page_token
   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})
     memberships = client.me.memberships(organization_uri: me.organization.uri)
 
-    assert_equal Calendly::Collection, memberships.class
-    assert_equal Calendly::Membership, memberships.data.first.class
+    assert_equal Calendlyr::Collection, memberships.class
+    assert_equal Calendlyr::Membership, memberships.data.first.class
     assert_equal 1, memberships.count
     assert_equal "sNjq4TvMDfUHEl7zHRR0k0E1PCEJWvdi", memberships.next_page_token
   end

data/test/{calendly → calendlyr}/resources/webhooks_test.rb

@@ -10,8 +10,8 @@ class WebhooksResourceTest < Minitest::Test
     stub(path: "webhook_subscriptions?organization=#{organization_uri}&scope=#{scope}", response: response)
     webhooks = client.webhooks.list(organization_uri: organization_uri, scope: scope)
 
-    assert_equal Calendly::Collection, webhooks.class
-    assert_equal Calendly::Webhook, webhooks.data.first.class
+    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
@@ -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 Calendly::Webhook, webhook.class
+    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/{calendly_test.rb → calendlyr_test.rb}

@@ -1,7 +1,7 @@
 require "test_helper"
 
-class CalendlyTest < Minitest::Test
+class CalendlyrTest < Minitest::Test
   def test_that_it_has_a_version_number
-    refute_nil ::Calendly::VERSION
+    refute_nil ::Calendlyr::VERSION
   end
 end

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

@@ -6,13 +6,18 @@ if ENV["CI"] == "true"
   require "codecov"
   SimpleCov.formatter = SimpleCov::Formatter::Codecov
 end
-require "calendly"
+require "calendlyr"
 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
-    Calendly::Client.new(api_key: "fake")
+    @client ||= Calendlyr::Client.new(token: "fake")
   end
 
   def fixture_file(fixture)
@@ -20,8 +25,9 @@ class Minitest::Test
   end
 
   def stub(path:, method: :get, body: {}, response: {})
-    stub_req = stub_request(method, "#{Calendly::Client::BASE_URL}/#{path}")
+    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