zendesk2 1.4.2 → 1.5.3

data/lib/zendesk2/client/requests/get_help_center_category.rb

@@ -1,41 +1,17 @@
-class Zendesk2::Client
-  class Real
-    def get_help_center_category(params={})
-      id     = require_parameters(params, "id")
-      locale = params["locale"]
-
-      path = if locale
-               "/help_center/#{locale}/categories/#{id}.json"
-             else
-               "/help_center/categories/#{id}.json"
-             end
-
-
-      request(
-        :method => :get,
-        :path   => path,
-      )
+class Zendesk2::Client::GetHelpCenterCategory < Zendesk2::Client::Request
+  request_path { |r|
+    if locale = r.params.fetch("category")["locale"]
+      "/help_center/#{locale}/categories/#{r.category_id}.json"
+    else
+      "/help_center/categories/#{r.category_id}.json"
     end
-  end # Real
+  }
 
-  class Mock
-    def get_help_center_category(params={})
-      id = require_parameters(params, "id")
+  def category_id
+    params.fetch("category").fetch("id")
+  end
 
-      locale = params["locale"]
-
-      path = if locale
-               "/help_center/#{locale}/categories/#{id}.json"
-             else
-               "/help_center/categories/#{id}.json"
-             end
-
-      response(
-        :path => path,
-        :body => {
-          "category" => self.find!(:help_center_categories, id)
-        },
-      )
-    end
-  end # Mock
+  def mock
+    mock_response("category" => self.find!(:help_center_categories, category_id))
+  end
 end

data/lib/zendesk2/client/requests/get_help_center_section.rb

@@ -1,41 +1,18 @@
-class Zendesk2::Client
-  class Real
-    def get_help_center_section(params={})
-      id     = require_parameters(params, "id")
-      locale = params["locale"]
-
-      path = if locale
-               "/help_center/#{locale}/sections/#{id}.json"
-             else
-               "/help_center/sections/#{id}.json"
-             end
-
-
-      request(
-        :method => :get,
-        :path   => path,
-      )
+class Zendesk2::Client::GetHelpCenterSection < Zendesk2::Client::Request
+  request_method :get
+  request_path { |r|
+    if locale = r.params.fetch("section")["locale"]
+      "/help_center/#{locale}/sections/#{r.section_id}.json"
+    else
+      "/help_center/sections/#{r.section_id}.json"
     end
-  end # Real
+  }
 
-  class Mock
-    def get_help_center_section(params={})
-      id = require_parameters(params, "id")
+  def section_id
+    params.fetch("section").fetch("id")
+  end
 
-      locale = params["locale"]
-
-      path = if locale
-               "/help_center/#{locale}/sections/#{id}.json"
-             else
-               "/help_center/sections/#{id}.json"
-             end
-
-      response(
-        :path => path,
-        :body => {
-          "section" => self.find!(:help_center_sections, id)
-        },
-      )
-    end
-  end # Mock
+  def mock(params={})
+    mock_response("section" => self.find!(:help_center_sections, section_id))
+  end
 end

data/lib/zendesk2/client/requests/get_help_center_sections.rb

@@ -1,18 +1,9 @@
-class Zendesk2::Client
-  class Real
-    def get_help_center_sections(params={})
-      page_params = Zendesk2.paging_parameters(params)
+class Zendesk2::Client::GetHelpCenterSections < Zendesk2::Client::Request
+  request_path { |_| "/help_center/sections.json" }
 
-      request(
-        :params  => page_params,
-        :method  => :get,
-        :path    => "/help_center/sections.json",
-      )
-    end
-  end
-  class Mock
-    def get_help_center_sections(params={})
-      page(params, :help_center_sections, "/help_center_sections.json", "sections")
-    end
+  page_params!
+
+  def mock
+    page(:help_center_sections, root: "sections")
   end
 end

data/lib/zendesk2/client/requests/get_membership.rb

@@ -1,27 +1,12 @@
-class Zendesk2::Client
-  class Real
-    def get_membership(params={})
-      id = params["id"]
+class Zendesk2::Client::GetMembership < Zendesk2::Client::Request
+  request_method :get
+  request_path { |r| "/organization_memberships/#{r.membership_id}.json" }
 
-      request(
-        :method => :get,
-        :path   => "/organization_memberships/#{id}.json",
-      )
-    end
-  end # Real
+  def membership_id
+    params.fetch("organization_membership").fetch("id")
+  end
 
-  class Mock
-    def get_membership(params={})
-      membership_id = params["id"]
-
-      path = "/organization_memberships/#{membership_id}.json"
-
-      response(
-        :path => path,
-        :body => {
-          "organization_membership" => find!(:memberships, membership_id)
-        },
-      )
-    end
-  end # Mock
+  def mock
+    mock_response("organization_membership" => find!(:memberships, membership_id))
+  end
 end

data/lib/zendesk2/client/requests/get_organization.rb

@@ -1,25 +1,12 @@
-class Zendesk2::Client
-  class Real
-    def get_organization(params={})
-      id = params["id"]
+class Zendesk2::Client::GetOrganization < Zendesk2::Client::Request
+  request_method :get
+  request_path { |r| "/organizations/#{r.organization_id}.json" }
 
-      request(
-        :method => :get,
-        :path   => "/organizations/#{id}.json"
-      )
-    end
-  end # Real
+  def organization_id
+    params.fetch("organization").fetch("id").to_i
+  end
 
-  class Mock
-    def get_organization(params={})
-      id = params["id"]
-
-      response(
-        :path  => "/organizations/#{id}.json",
-        :body  => {
-          "organization" => find!(:organizations, id)
-        },
-      )
-    end
-  end # Mock
+  def mock
+    mock_response("organization" => find!(:organizations, organization_id))
+  end
 end

data/lib/zendesk2/client/requests/get_organization_by_external_id.rb

@@ -1,24 +1,15 @@
-class Zendesk2::Client
-  class Real
-    def get_organization_by_external_id(external_id)
-      request(
-        :method => :get,
-        :params => { external_id: external_id },
-        :path   => "/organizations/search.json",
-      )
-    end
-  end # Real
+class Zendesk2::Client::GetOrganizationByExternalId < Zendesk2::Client::Request
+  request_method :get
+  request_params { |r| { "external_id" => r.external_id } }
+  request_path   { |_| "/organizations/search.json" }
 
-  class Mock
-    def get_organization_by_external_id(external_id)
-      collection = self.data[:organizations]
+  def external_id
+    params.fetch("external_id")
+  end
 
-      results = collection.select { |k,v| v["external_id"].to_s == external_id.to_s }.values
+  def mock
+    results = self.data[:organizations].select { |k,v| v["external_id"].to_s == external_id.to_s }.values
 
-      response(
-        :path => "/organizations/search.json",
-        :body => {"organizations" => results},
-      )
-    end
-  end # Mock
+    mock_response("organizations" => results)
+  end
 end

data/lib/zendesk2/client/requests/get_organization_memberships.rb

@@ -1,20 +1,14 @@
-class Zendesk2::Client
-  class Real
-    def get_organization_memberships(params={})
-      organization_id = params["organization_id"]
+class Zendesk2::Client::GetOrganizationMemberships < Zendesk2::Client::Request
+  request_method :get
+  request_path { |r| "/organizations/#{r.organization_id}/memberships.json" }
 
-      request(
-        :method  => :get,
-        :path    => "/organizations/#{organization_id}/memberships.json",
-      )
-    end
-  end # Real
+  def organization_id
+    params.fetch("membership").fetch("organization_id").to_i
+  end
 
-  class Mock
-    def get_organization_memberships(params={})
-      organization_id = params["organization_id"]
+  def mock
+    memberships = self.data[:memberships].values.select { |m| m["organization_id"] == organization_id }
 
-      resources(:memberships, "/organizations/#{organization_id}/memberships.json", "organization_memberships", filter: lambda { |c| c.select { |m| m["organization_id"] == organization_id } })
-    end
-  end # Mock
+    resources(memberships, root: "organization_memberships")
+  end
 end

data/lib/zendesk2/client/requests/get_organization_tickets.rb

@@ -1,25 +1,18 @@
-class Zendesk2::Client
-  class Real
-    def get_organization_tickets(params={})
-      id          = require_parameters(params, "id").to_s
-      page_params = Zendesk2.paging_parameters(params)
+class Zendesk2::Client::GetOrganizationTickets < Zendesk2::Client::Request
+  request_method :get
+  request_path { |r| "/organizations/#{r.organization_id}/tickets.json" }
 
-      request(
-        :params => page_params,
-        :method => :get,
-        :path   => "/organizations/#{id}/tickets.json",
-      )
-    end
-  end # Real
+  page_params!
 
-  class Mock
-    def get_organization_tickets(params={})
-      id = require_parameters(params, "id").to_s
+  def organization_id
+    params.fetch("organization_id").to_i
+  end
 
-      requesters = self.data[:users].values.select { |u| u["organization_id"] == id }.map { |s| s["organization_id"].to_s }
-      page(params, :tickets, "/organizations/#{id}/tickets.json", "tickets",
-           :filter => lambda { |c| c.select { |u| requesters.include?(u["organization_id"].to_s) } }
-          )
-    end
-  end # Mock
+  def mock(params={})
+    requesters = self.data[:users].values.select { |u| u["organization_id"] == organization_id }.map { |s| s["organization_id"] }
+
+    tickets = self.data[:tickets].values.select { |t| requesters.include?(t["organization_id"]) }
+
+    page(tickets, root: "tickets")
+  end
 end

data/lib/zendesk2/client/requests/get_organization_users.rb

@@ -1,24 +1,16 @@
-class Zendesk2::Client
-  class Real
-    def get_organization_users(params={})
-      id          = require_parameters(params, "id").to_s
-      page_params = Zendesk2.paging_parameters(params)
+class Zendesk2::Client::GetOrganizationUsers < Zendesk2::Client::Request
+  request_method :get
+  request_path { |r| "/organizations/#{r.organization_id}/users.json" }
 
-      request(
-        :params  => page_params,
-        :method  => :get,
-        :path    => "/organizations/#{id}/users.json",
-      )
-    end
-  end # Real
+  page_params!
 
-  class Mock
-    def get_organization_users(params={})
-      id = require_parameters(params, "id").to_s
+  def organization_id
+    params.fetch("organization").fetch("id")
+  end
 
-      page(params, :users, "/organizations/#{id}/users.json", "users",
-           :filter => lambda { |c| c.select { |u| u["organization_id"].to_s == id } }
-          )
-    end
-  end # Mock
+  def mock
+    users = self.data[:users].values.select { |u| u["organization_id"].to_i == organization_id.to_i }
+
+    page(users, root: "users")
+  end
 end

data/lib/zendesk2/client/requests/get_organizations.rb

@@ -1,19 +1,10 @@
-class Zendesk2::Client
-  class Real
-    def get_organizations(params={})
-      page_params = Zendesk2.paging_parameters(params)
+class Zendesk2::Client::GetOrganizations < Zendesk2::Client::Request
+  request_method :get
+  request_path { |_| "/organizations.json" }
 
-      request(
-        :params  => page_params,
-        :method  => :get,
-        :url     => params.delete("url"),
-        :path    => "/organizations.json",
-      )
-    end
-  end
-  class Mock
-    def get_organizations(params={})
-      page(params, :organizations, "/organizations.json", "organizations")
-    end
+  page_params!
+
+  def mock
+    page(:organizations)
   end
 end

data/lib/zendesk2/client/requests/get_requested_tickets.rb

@@ -1,22 +1,16 @@
-class Zendesk2::Client
-  class Real
-    def get_requested_tickets(params={})
-      id          = params["id"]
-      page_params = Zendesk2.paging_parameters(params)
+class Zendesk2::Client::GetRequestedTickets < Zendesk2::Client::Request
+  request_method :get
+  request_path { |r| "/users/#{r.user_id}/tickets/requested.json" }
 
-      request(
-        :params  => page_params,
-        :method  => :get,
-        :path    => "/users/#{id}/tickets/requested.json",
-      )
-    end
-  end # Real
+  page_params!
 
-  class Mock
-    def get_requested_tickets(params={})
-      id = params["id"].to_s
+  def user_id
+    params.fetch("user_id").to_i
+  end
 
-      page(params, :tickets, "/requesteds/#{id}/tickets.json", "tickets", filter: lambda { |c| c.select { |u| u["requester_id"] == id } })
-    end
-  end # Mock
+  def mock(params={})
+    tickets = self.data[:tickets].values.select { |u| u["requester_id"] == user_id }
+
+    page(tickets, root: "tickets")
+  end
 end

data/lib/zendesk2/client/requests/get_ticket.rb

@@ -1,26 +1,12 @@
-class Zendesk2::Client
-  class Real
-    def get_ticket(params={})
-      id = params["id"]
+class Zendesk2::Client::GetTicket < Zendesk2::Client::Request
+  request_method :get
+  request_path { |r| "/tickets/#{r.ticket_id}.json" }
 
-      request(
-        :method => :get,
-        :path => "/tickets/#{id}.json"
-      )
-    end
-  end # Real
+  def ticket_id
+    params.fetch("ticket").fetch("id")
+  end
 
-  class Mock
-    def get_ticket(params={})
-      id   = params["id"]
-      path = "/tickets/#{id}.json"
-
-      response(
-        :path => path,
-        :body => {
-          "ticket" => self.find!(:tickets, id)
-        },
-      )
-    end
-  end # Mock
+  def mock
+    mock_response("ticket" => self.find!(:tickets, ticket_id))
+  end
 end