zendesk2 1.7.5 → 1.8.1

data/lib/zendesk2/{client/requests/create_user_identity.rb → create_user_identity.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::CreateUserIdentity < Zendesk2::Client::Request
+class Zendesk2::CreateUserIdentity
+  include Zendesk2::Request
+
   request_method :post
   request_path { |r| "/users/#{r.user_id}/identities.json" }
   request_body { |r| { "identity" => r.user_identity_params } }

data/lib/zendesk2/{client/requests/create_view.rb → create_view.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::CreateView < Zendesk2::Client::Request
+class Zendesk2::CreateView
+  include Zendesk2::Request
+
   request_method :post
   request_path { |_| "/views.json" }
   request_body { |r| { "view" => r.view_params } }

data/lib/zendesk2/{client/requests/destroy_category.rb → destroy_category.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::DestroyCategory < Zendesk2::Client::Request
+class Zendesk2::DestroyCategory
+  include Zendesk2::Request
+
   request_method :delete
   request_path { |r| "/categories/#{r.category_id}.json" }
 

data/lib/zendesk2/{client/requests/destroy_forum.rb → destroy_forum.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::DestroyForum < Zendesk2::Client::Request
+class Zendesk2::DestroyForum
+  include Zendesk2::Request
+
   request_method :delete
   request_path { |r| "/forums/#{r.forum_id}.json" }
 

data/lib/zendesk2/{client/requests/destroy_group.rb → destroy_group.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::DestroyGroup < Zendesk2::Client::Request
+class Zendesk2::DestroyGroup
+  include Zendesk2::Request
+
   request_method :delete
   request_path { |r| "/groups/#{r.group_id}.json" }
 

data/lib/zendesk2/{client/requests/destroy_membership.rb → destroy_membership.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::DestroyMembership < Zendesk2::Client::Request
+class Zendesk2::DestroyMembership
+  include Zendesk2::Request
+
   request_method :delete
   request_path { |r| "/organization_memberships/#{r.membership_id}.json" }
 

data/lib/zendesk2/{client/requests/destroy_organization.rb → destroy_organization.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::DestroyOrganization < Zendesk2::Client::Request
+class Zendesk2::DestroyOrganization
+  include Zendesk2::Request
+
   request_method :delete
   request_path { |r| "/organizations/#{r.organization_id}.json" }
 

data/lib/zendesk2/{client/requests/destroy_ticket.rb → destroy_ticket.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::DestroyTicket < Zendesk2::Client::Request
+class Zendesk2::DestroyTicket
+  include Zendesk2::Request
+
   request_method :delete
   request_path { |r| "/tickets/#{r.ticket_id}.json" }
 

data/lib/zendesk2/{client/requests/destroy_ticket_field.rb → destroy_ticket_field.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::DestroyTicketField < Zendesk2::Client::Request
+class Zendesk2::DestroyTicketField
+  include Zendesk2::Request
+
   request_method :delete
   request_path { |r| "/ticket_fields/#{r.ticket_field_id}.json" }
 

data/lib/zendesk2/{client/requests/destroy_topic.rb → destroy_topic.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::DestroyTopic < Zendesk2::Client::Request
+class Zendesk2::DestroyTopic
+  include Zendesk2::Request
+
   request_method :delete
   request_path { |r| "/topics/#{r.topic_id}.json" }
 

data/lib/zendesk2/{client/requests/destroy_topic_comment.rb → destroy_topic_comment.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::DestroyTopicComment < Zendesk2::Client::Request
+class Zendesk2::DestroyTopicComment
+  include Zendesk2::Request
+
   request_method :delete
   request_path { |r| "/topics/#{r.topic_id}/comments/#{r.topic_comment_id}.json" }
 

data/lib/zendesk2/{client/requests/destroy_user.rb → destroy_user.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::DestroyUser < Zendesk2::Client::Request
+class Zendesk2::DestroyUser
+  include Zendesk2::Request
+
   request_method :delete
   request_path { |r| "/users/#{r.user_id}.json" }
 

data/lib/zendesk2/{client/requests/destroy_user_field.rb → destroy_user_field.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::DestroyUserField < Zendesk2::Client::Request
+class Zendesk2::DestroyUserField
+  include Zendesk2::Request
+
   request_method :delete
   request_path { |r| "/user_fields/#{r.user_field_id}.json" }
 

data/lib/zendesk2/{client/requests/destroy_user_identity.rb → destroy_user_identity.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::DestroyUserIdentity < Zendesk2::Client::Request
+class Zendesk2::DestroyUserIdentity
+  include Zendesk2::Request
+
   request_path { |r| "/users/#{r.user_id}/identities/#{r.user_identity_id}.json" }
   request_method :delete
 

data/lib/zendesk2/{client/requests/destroy_view.rb → destroy_view.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::DestroyView < Zendesk2::Client::Request
+class Zendesk2::DestroyView
+  include Zendesk2::Request
+
   request_method :delete
   request_path { |r| "/views/#{r.view_id}.json" }
 

data/lib/zendesk2/{client/models/forum.rb → forum.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::Forum < Zendesk2::Client::Model
+class Zendesk2::Forum
+  include Zendesk2::Model
+
   extend Zendesk2::Attributes
 
   identity :id,                 type: :integer # ro yes mandatory no  Automatically assigned upon creation

data/lib/zendesk2/{client/collections/forums.rb → forums.rb}

@@ -1,8 +1,10 @@
-class Zendesk2::Client::Forums < Zendesk2::Client::Collection
+class Zendesk2::Forums
+  include Zendesk2::Collection
+
   include Zendesk2::PagedCollection
   include Zendesk2::Searchable
 
-  model Zendesk2::Client::Forum
+  model Zendesk2::Forum
 
   self.collection_method = :get_forums
   self.collection_root   = "forums"

data/lib/zendesk2/{client/requests/get_assignable_groups.rb → get_assignable_groups.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::GetAssignableGroups < Zendesk2::Client::Request
+class Zendesk2::GetAssignableGroups
+  include Zendesk2::Request
+
   request_method :get
   request_path { |r| "/groups/assignable.json" }
 

data/lib/zendesk2/{client/requests/get_categories.rb → get_categories.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::GetCategories < Zendesk2::Client::Request
+class Zendesk2::GetCategories
+  include Zendesk2::Request
+
   request_method :get
   request_path { |_| "/categories.json" }
 

data/lib/zendesk2/{client/requests/get_category.rb → get_category.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::GetCategory < Zendesk2::Client::Request
+class Zendesk2::GetCategory
+  include Zendesk2::Request
+
   request_method :get
   request_path { |r| "/categories/#{r.category_id}.json" }
 

data/lib/zendesk2/{client/requests/get_ccd_tickets.rb → get_ccd_tickets.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::GetCcdTickets < Zendesk2::Client::Request
+class Zendesk2::GetCcdTickets
+  include Zendesk2::Request
+
   request_path { |r| "/users/#{r.collaborator_id}/tickets/ccd.json" }
 
   page_params!

data/lib/zendesk2/{client/requests/get_current_user.rb → get_current_user.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::GetCurrentUser < Zendesk2::Client::Request
+class Zendesk2::GetCurrentUser
+  include Zendesk2::Request
+
   request_method :get
   request_path { |_| "/users/me.json" }
 

data/lib/zendesk2/{client/requests/get_forum.rb → get_forum.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::GetForum < Zendesk2::Client::Request
+class Zendesk2::GetForum
+  include Zendesk2::Request
+
   request_method :get
   request_path { |r| "/forums/#{r.forum_id}.json" }
 

data/lib/zendesk2/{client/requests/get_forums.rb → get_forums.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::GetForums < Zendesk2::Client::Request
+class Zendesk2::GetForums
+  include Zendesk2::Request
+
   request_method :get
   request_path { |_| "/forums.json" }
 

data/lib/zendesk2/{client/requests/get_group.rb → get_group.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::GetGroup < Zendesk2::Client::Request
+class Zendesk2::GetGroup
+  include Zendesk2::Request
+
   request_method :get
   request_path { |r| "/groups/#{r.group_id}.json" }
 

data/lib/zendesk2/{client/requests/get_groups.rb → get_groups.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::GetGroups < Zendesk2::Client::Request
+class Zendesk2::GetGroups
+  include Zendesk2::Request
+
   request_method :get
   request_path { |_| "/groups.json" }
 

data/lib/zendesk2/{client/requests/get_membership.rb → get_membership.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::GetMembership < Zendesk2::Client::Request
+class Zendesk2::GetMembership
+  include Zendesk2::Request
+
   request_method :get
   request_path { |r| "/organization_memberships/#{r.membership_id}.json" }
 

data/lib/zendesk2/{client/requests/get_memberships.rb → get_memberships.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::GetMemberships < Zendesk2::Client::Request
+class Zendesk2::GetMemberships
+  include Zendesk2::Request
+
   request_method :get
   request_path { |r| "/organization_memberships.json" }
 

data/lib/zendesk2/{client/requests/get_organization.rb → get_organization.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::GetOrganization < Zendesk2::Client::Request
+class Zendesk2::GetOrganization
+  include Zendesk2::Request
+
   request_method :get
   request_path { |r| "/organizations/#{r.organization_id}.json" }
 

data/lib/zendesk2/{client/requests/get_organization_by_external_id.rb → get_organization_by_external_id.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::GetOrganizationByExternalId < Zendesk2::Client::Request
+class Zendesk2::GetOrganizationByExternalId
+  include Zendesk2::Request
+
   request_method :get
   request_params { |r| { "external_id" => r.external_id } }
   request_path   { |_| "/organizations/search.json" }

data/lib/zendesk2/{client/requests/get_organization_memberships.rb → get_organization_memberships.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::GetOrganizationMemberships < Zendesk2::Client::Request
+class Zendesk2::GetOrganizationMemberships
+  include Zendesk2::Request
+
   request_method :get
   request_path { |r| "/organizations/#{r.organization_id}/organization_memberships.json" }
 

data/lib/zendesk2/{client/requests/get_organization_tickets.rb → get_organization_tickets.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::GetOrganizationTickets < Zendesk2::Client::Request
+class Zendesk2::GetOrganizationTickets
+  include Zendesk2::Request
+
   request_method :get
   request_path { |r| "/organizations/#{r.organization_id}/tickets.json" }
 

data/lib/zendesk2/{client/requests/get_organization_users.rb → get_organization_users.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::GetOrganizationUsers < Zendesk2::Client::Request
+class Zendesk2::GetOrganizationUsers
+  include Zendesk2::Request
+
   request_method :get
   request_path { |r| "/organizations/#{r.organization_id}/users.json" }
 

data/lib/zendesk2/{client/requests/get_organizations.rb → get_organizations.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::GetOrganizations < Zendesk2::Client::Request
+class Zendesk2::GetOrganizations
+  include Zendesk2::Request
+
   request_method :get
   request_path { |_| "/organizations.json" }
 

data/lib/zendesk2/{client/requests/get_requested_tickets.rb → get_requested_tickets.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::GetRequestedTickets < Zendesk2::Client::Request
+class Zendesk2::GetRequestedTickets
+  include Zendesk2::Request
+
   request_method :get
   request_path { |r| "/users/#{r.requester_id}/tickets/requested.json" }
 

data/lib/zendesk2/{client/requests/get_ticket.rb → get_ticket.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::GetTicket < Zendesk2::Client::Request
+class Zendesk2::GetTicket
+  include Zendesk2::Request
+
   request_method :get
   request_path { |r| "/tickets/#{r.ticket_id}.json" }
 

data/lib/zendesk2/get_ticket_audit.rb

@@ -0,0 +1,18 @@
+class Zendesk2::GetTicketAudit
+  include Zendesk2::Request
+
+  request_method :get
+  request_path { |r| "/tickets/#{r.ticket_id}/audits/#{r.audit_id}.json" }
+
+  def audit_id
+    params.fetch("id")
+  end
+
+  def ticket_id
+    params.fetch("ticket_id")
+  end
+
+  def mock(params={})
+    mock_response("ticket_audit" => find!(:ticket_audits, audit_id))
+  end
+end

data/lib/zendesk2/{client/requests/get_ticket_audits.rb → get_ticket_audits.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::GetTicketAudits < Zendesk2::Client::Request
+class Zendesk2::GetTicketAudits
+  include Zendesk2::Request
+
   request_method :get
   request_path { |r| "/tickets/#{r.ticket_id}/audits.json" }
 

data/lib/zendesk2/{client/requests/get_ticket_comments.rb → get_ticket_comments.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::GetTicketComments < Zendesk2::Client::Request
+class Zendesk2::GetTicketComments
+  include Zendesk2::Request
+
   request_method :get
   request_path { |r|  "/tickets/#{r.ticket_id}/comments.json" }
 

data/lib/zendesk2/{client/requests/get_ticket_field.rb → get_ticket_field.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::GetTicketField < Zendesk2::Client::Request
+class Zendesk2::GetTicketField
+  include Zendesk2::Request
+
   request_method :get
   request_path { |r| "/ticket_fields/#{r.ticket_field_id}.json" }
 

data/lib/zendesk2/{client/requests/get_ticket_fields.rb → get_ticket_fields.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::GetTicketFields < Zendesk2::Client::Request
+class Zendesk2::GetTicketFields
+  include Zendesk2::Request
+
   request_method :get
   request_path { |_| "/ticket_fields.json" }
 

data/lib/zendesk2/get_ticket_metric.rb

@@ -0,0 +1,22 @@
+class Zendesk2::GetTicketMetric
+  include Zendesk2::Request
+
+  request_method :get
+  request_path do |r|
+    metric_id ? "/ticket_metrics/#{r.metric_id}.json" : "/tickets/#{r.ticket_id}/metrics.json"
+  end
+
+  def metric_id
+    params["id"]
+  end
+
+  def ticket_id
+    params.fetch("ticket_id")
+  end
+
+  def mock
+    mock_response(
+      "ticket_metric" => find!(:ticket_metrics, metric_id)
+    )
+  end
+end

data/lib/zendesk2/get_ticket_metrics.rb

@@ -0,0 +1,12 @@
+class Zendesk2::GetTicketMetrics
+  include Zendesk2::Request
+
+  request_method :get
+  request_path { "/ticket_metrics.json" }
+
+  page_params!
+
+  def mock
+    page(:ticket_metrics, root: "metrics")
+  end
+end

data/lib/zendesk2/{client/requests/get_tickets.rb → get_tickets.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::GetTickets < Zendesk2::Client::Request
+class Zendesk2::GetTickets
+  include Zendesk2::Request
+
   request_method :get
   request_path { |r| "/tickets.json" }
 

data/lib/zendesk2/{client/requests/get_topic.rb → get_topic.rb}

@@ -1,4 +1,6 @@
-class Zendesk2::Client::GetTopic < Zendesk2::Client::Request
+class Zendesk2::GetTopic
+  include Zendesk2::Request
+
   request_path { |r| "/topics/#{r.topic_id}.json" }
 
   def topic_id