calendly 0.5.2 → 0.6.0

data/lib/calendly/models/organization.rb

@@ -12,6 +12,7 @@ module Calendly
     # @return [String]
     # unique id of the Organization object.
     attr_accessor :uuid
+
     # @return [String]
     # Canonical resource reference.
     attr_accessor :uri
@@ -28,7 +29,7 @@ module Calendly
     # @raise [Calendly::ApiError] if the api returns error code.
     # @since 0.1.0
     def memberships(opts = {})
-      return @cached_memberships if @cached_memberships
+      return @cached_memberships if defined?(@cached_memberships) && @cached_memberships
 
       request_proc = proc { |options| client.memberships uri, options }
       @cached_memberships = auto_pagination request_proc, opts
@@ -55,7 +56,7 @@ module Calendly
     # @raise [Calendly::ApiError] if the api returns error code.
     # @since 0.1.0
     def invitations(opts = {})
-      return @cached_invitations if @cached_invitations
+      return @cached_invitations if defined?(@cached_invitations) && @cached_invitations
 
       request_proc = proc { |options| client.invitations uuid, options }
       @cached_invitations = auto_pagination request_proc, opts
@@ -80,6 +81,31 @@ module Calendly
       client.create_invitation uuid, email
     end
 
+    #
+    # Returns all Event Types associated with self.
+    #
+    # @param [Hash] opts the optional request parameters.
+    # @option opts [Integer] :count Number of rows to return.
+    # @option opts [String] :page_token Pass this to get the next portion of collection.
+    # @option opts [String] :sort Order results by the specified field and direction.
+    # Accepts comma-separated list of {field}:{direction} values.
+    # @return [Array<Calendly::EventType>]
+    # @raise [Calendly::Error] if the uri is empty.
+    # @raise [Calendly::ApiError] if the api returns error code.
+    # @since 0.6.0
+    def event_types(opts = {})
+      return @cached_event_types if defined?(@cached_event_types) && @cached_event_types
+
+      request_proc = proc { |options| client.event_types uri, options }
+      @cached_event_types = auto_pagination request_proc, opts
+    end
+
+    # @since 0.6.0
+    def event_types!(opts = {})
+      @cached_event_types = nil
+      event_types opts
+    end
+
     #
     # Returns all Scheduled Events associated with self.
     #
@@ -97,7 +123,7 @@ module Calendly
     # @raise [Calendly::ApiError] if the api returns error code.
     # @since 0.5.0
     def scheduled_events(opts = {})
-      return @cached_scheduled_events if @cached_scheduled_events
+      return @cached_scheduled_events if defined?(@cached_scheduled_events) && @cached_scheduled_events
 
       request_proc = proc { |options| client.scheduled_events uri, options }
       @cached_scheduled_events = auto_pagination request_proc, opts
@@ -122,7 +148,7 @@ module Calendly
     # @raise [Calendly::ApiError] if the api returns error code.
     # @since 0.1.3
     def webhooks(opts = {})
-      return @cached_webhooks if @cached_webhooks
+      return @cached_webhooks if defined?(@cached_webhooks) && @cached_webhooks
 
       request_proc = proc { |options| client.webhooks uri, options }
       @cached_webhooks = auto_pagination request_proc, opts

data/lib/calendly/models/organization_invitation.rb

@@ -16,21 +16,27 @@ module Calendly
     # @return [String]
     # unique id of the OrganizationInvitation object.
     attr_accessor :uuid
+
     # @return [String]
     # Canonical resource reference.
     attr_accessor :uri
+
     # @return [String]
     # Invited person's email.
     attr_accessor :email
+
     # @return [String]
     # Invitation status.
     attr_accessor :status
+
     # @return [Time]
     # Moment when user record was first created.
     attr_accessor :created_at
+
     # @return [Time]
     # Moment when user record was last updated.
     attr_accessor :updated_at
+
     # @return [Time]
     # Moment when the last invitation was sent.
     attr_accessor :last_sent_at

data/lib/calendly/models/organization_membership.rb

@@ -16,15 +16,19 @@ module Calendly
     # @return [String]
     # unique id of the OrganizationMembership object.
     attr_accessor :uuid
+
     # @return [String]
     # Canonical resource reference.
     attr_accessor :uri
+
     # @return [String]
     # User's role within the organization
     attr_accessor :role
+
     # @return [Time]
     # Moment when user record was first created.
     attr_accessor :created_at
+
     # @return [Time]
     # Moment when user record was last updated.
     attr_accessor :updated_at
@@ -72,18 +76,12 @@ module Calendly
     # @raise [Calendly::ApiError] if the api returns error code.
     # @since 0.1.3
     def user_scope_webhooks(opts = {})
-      return @cached_user_scope_webhooks if @cached_user_scope_webhooks
-
-      org_uri = organization.uri if organization
-      user_uri = user.uri if user
-      request_proc = proc { |options| client.user_scope_webhooks org_uri, user_uri, options }
-      @cached_user_scope_webhooks = auto_pagination request_proc, opts
+      user.webhooks(opts)
     end
 
     # @since 0.2.0
     def user_scope_webhooks!(opts = {})
-      @cached_user_scope_webhooks = nil
-      user_scope_webhooks opts
+      user.webhooks!(opts)
     end
 
     #
@@ -98,9 +96,20 @@ module Calendly
     # @raise [Calendly::ApiError] if the api returns error code.
     # @since 0.1.3
     def create_user_scope_webhook(url, events)
-      org_uri = organization.uri if organization
-      user_uri = user.uri if user
-      client.create_webhook url, events, org_uri, user_uri
+      user.create_webhook url, events
+    end
+
+  private
+
+    def after_set_attributes(attrs)
+      super attrs
+      if user.is_a?(User) && user.current_organization.nil? && organization.is_a?(Organization) # rubocop:disable Style/GuardClause
+        user.current_organization = organization
+      end
+    end
+
+    def inspect_attributes
+      super + %i[role]
     end
   end
 end

data/lib/calendly/models/team.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'calendly/client'
+require 'calendly/models/model_utils'
+
+module Calendly
+  # Calendly's team model.
+  class Team
+    include ModelUtils
+    UUID_RE = %r{\A#{Client::API_HOST}/teams/(\w+)\z}.freeze
+
+    # @return [String]
+    # unique id of the Team object.
+    attr_accessor :uuid
+
+    # @return [String]
+    # Canonical resource reference.
+    attr_accessor :uri
+  end
+end

data/lib/calendly/models/user.rb

@@ -10,38 +10,52 @@ module Calendly
     include ModelUtils
     UUID_RE = %r{\A#{Client::API_HOST}/users/(\w+)\z}.freeze
     TIME_FIELDS = %i[created_at updated_at].freeze
+    ASSOCIATION = {current_organization: Organization}.freeze
 
     # @return [String]
     # unique id of the User object.
     attr_accessor :uuid
+
     # @return [String]
     # Canonical resource reference.
     attr_accessor :uri
+
     # @return [String]
     # User's human-readable name.
     attr_accessor :name
+
     # @return [String]
     # Unique readable value used in page URL.
     attr_accessor :slug
+
     # @return [String]
     # User's email address.
     attr_accessor :email
+
     # @return [String]
     # URL of user's avatar image.
     attr_accessor :avatar_url
+
     # @return [String]
     # URL of user's event page.
     attr_accessor :scheduling_url
+
     # @return [String]
     # Timezone offest to use when presenting time information to user.
     attr_accessor :timezone
+
     # @return [Time]
     # Moment when user record was first created.
     attr_accessor :created_at
+
     # @return [Time]
     # Moment when user record was last updated.
     attr_accessor :updated_at
 
+    # @return [Organization]
+    # user's current organization
+    attr_accessor :current_organization
+
     #
     # Get basic information associated with self.
     #
@@ -60,7 +74,9 @@ module Calendly
     # @raise [Calendly::Error] if the uri is empty.
     # @since 0.1.0
     def organization_membership
-      return @cached_organization_membership if @cached_organization_membership
+      if defined?(@cached_organization_membership) && @cached_organization_membership
+        return @cached_organization_membership
+      end
 
       mems, = client.memberships_by_user uri
       @cached_organization_membership = mems.first
@@ -85,9 +101,9 @@ module Calendly
     # @raise [Calendly::ApiError] if the api returns error code.
     # @since 0.1.0
     def event_types(opts = {})
-      return @cached_event_types if @cached_event_types
+      return @cached_event_types if defined?(@cached_event_types) && @cached_event_types
 
-      request_proc = proc { |options| client.event_types uri, options }
+      request_proc = proc { |options| client.event_types_by_user uri, options }
       @cached_event_types = auto_pagination request_proc, opts
     end
 
@@ -114,7 +130,7 @@ module Calendly
     # @raise [Calendly::ApiError] if the api returns error code.
     # @since 0.1.0
     def scheduled_events(opts = {})
-      return @cached_scheduled_events if @cached_scheduled_events
+      return @cached_scheduled_events if defined?(@cached_scheduled_events) && @cached_scheduled_events
 
       request_proc = proc { |options| client.scheduled_events_by_user uri, options }
       @cached_scheduled_events = auto_pagination request_proc, opts
@@ -125,5 +141,48 @@ module Calendly
       @cached_scheduled_events = nil
       scheduled_events opts
     end
+
+    #
+    # Get List of user scope Webhooks associated with self.
+    #
+    # @param [Hash] opts the optional request parameters.
+    # @option opts [Integer] :count Number of rows to return.
+    # @option opts [String] :page_token Pass this to get the next portion of collection.
+    # @option opts [String] :sort Order results by the specified field and directin. Accepts comma-separated list of {field}:{direction} values.
+    # Accepts comma-separated list of {field}:{direction} values.
+    # @return [Array<Calendly::WebhookSubscription>]
+    # @raise [Calendly::Error] if the organization.uri is empty.
+    # @raise [Calendly::Error] if the uri is empty.
+    # @raise [Calendly::ApiError] if the api returns error code.
+    # @since 0.6.0
+    def webhooks(opts = {})
+      return @cached_webhooks if defined?(@cached_webhooks) && @cached_webhooks
+
+      org_uri = current_organization&.uri
+      request_proc = proc { |options| client.user_scope_webhooks org_uri, uri, options }
+      @cached_webhooks = auto_pagination request_proc, opts
+    end
+
+    # @since 0.6.0
+    def webhooks!(opts = {})
+      @cached_webhooks = nil
+      webhooks opts
+    end
+
+    #
+    # Create a user scope webhook associated with self.
+    #
+    # @param [String] url Canonical reference (unique identifier) for the resource.
+    # @param [Array<String>] events List of user events to subscribe to. options: invitee.created or invitee.canceled
+    # @return [Calendly::WebhookSubscription]
+    # @raise [Calendly::Error] if the url arg is empty.
+    # @raise [Calendly::Error] if the events arg is empty.
+    # @raise [Calendly::Error] if the organization.uri is empty.
+    # @raise [Calendly::ApiError] if the api returns error code.
+    # @since 0.6.0
+    def create_webhook(url, events)
+      org_uri = current_organization&.uri
+      client.create_webhook url, events, org_uri, uri
+    end
   end
 end

data/lib/calendly/models/webhook_subscription.rb

@@ -16,36 +16,47 @@ module Calendly
     # @return [String]
     # unique id of the WebhookSubscription object.
     attr_accessor :uuid
+
     # @return [String]
     # Canonical reference (unique identifier) for the webhook.
     attr_accessor :uri
+
     # @return [String]
     # The callback URL to use when the event is triggered.
     attr_accessor :callback_url
+
     # @return [Time]
     # The moment when the webhook subscription was created.
     attr_accessor :created_at
+
     # @return [Time]
     # The moment when the webhook subscription was last updated.
     attr_accessor :updated_at
+
     # @return [Time]
     # The date and time the webhook subscription is retried.
     attr_accessor :retry_started_at
+
     # @return [String]
     # Indicates if the webhook subscription is "active" or "disabled".
     attr_accessor :state
+
     # @return [Array<String>]
     # A list of events to which the webhook is subscribed.
     attr_accessor :events
+
     # @return [String]
     # The scope of the webhook subscription.
     attr_accessor :scope
+
     # @return [Calendly::Organization]
     # The organization that's associated with the webhook subscription.
     attr_accessor :organization
+
     # @return [Calendly::User]
     # The user that's associated with the webhook subscription.
     attr_accessor :user
+
     # @return [Calendly::User]
     # The user who created the webhook subscription.
     attr_accessor :creator
@@ -71,5 +82,11 @@ module Calendly
     def delete
       client.delete_webhook uuid
     end
+
+  private
+
+    def inspect_attributes
+      super + %i[state scope events callback_url]
+    end
   end
 end

data/lib/calendly/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Calendly
-  VERSION = '0.5.2'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calendly
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Kenji Koshikawa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-13 00:00:00.000000000 Z
+date: 2021-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
@@ -136,14 +136,21 @@ files:
 - lib/calendly/loggable.rb
 - lib/calendly/models/event.rb
 - lib/calendly/models/event_type.rb
+- lib/calendly/models/event_type_custom_question.rb
+- lib/calendly/models/event_type_profile.rb
+- lib/calendly/models/guest.rb
 - lib/calendly/models/invitee.rb
+- lib/calendly/models/invitee_cancellation.rb
+- lib/calendly/models/invitee_payment.rb
 - lib/calendly/models/invitee_question_and_answer.rb
 - lib/calendly/models/invitee_tracking.rb
+- lib/calendly/models/invitees_counter.rb
 - lib/calendly/models/location.rb
 - lib/calendly/models/model_utils.rb
 - lib/calendly/models/organization.rb
 - lib/calendly/models/organization_invitation.rb
 - lib/calendly/models/organization_membership.rb
+- lib/calendly/models/team.rb
 - lib/calendly/models/user.rb
 - lib/calendly/models/webhook_subscription.rb
 - lib/calendly/version.rb
@@ -154,7 +161,7 @@ metadata:
   homepage_uri: https://github.com/koshilife/calendly-api-ruby-client
   source_code_uri: https://github.com/koshilife/calendly-api-ruby-client
   changelog_uri: https://github.com/koshilife/calendly-api-ruby-client/blob/master/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/calendly/0.5.2
+  documentation_uri: https://www.rubydoc.info/gems/calendly/0.6.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -170,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Client for accessing Calendly APIs