zendesk2 1.4.2 → 1.5.3

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

@@ -1,22 +1,16 @@
-class Zendesk2::Client
-  class Real
-    def get_ticket_audits(params={})
-      ticket_id   = params["ticket_id"]
-      page_params = Zendesk2.paging_parameters(params)
+class Zendesk2::Client::GetTicketAudits < Zendesk2::Client::Request
+  request_method :get
+  request_path { |r| "/tickets/#{r.ticket_id}/audits.json" }
 
-      request(
-        :params  => page_params,
-        :method  => :get,
-        :path    => "/tickets/#{ticket_id}/audits.json",
-      )
-    end
-  end # Real
+  page_params!
 
-  class Mock
-    def get_ticket_audits(params={})
-      ticket_id = params["ticket_id"]
+  def ticket_id
+    params.fetch("ticket_id").to_i
+  end
 
-      page(params, :ticket_audits, "/tickets/#{ticket_id}/audits.json", "audits", filter: lambda{|c| c.select{|a| a["ticket_id"] == ticket_id}})
-    end
-  end # Mock
+  def mock
+    audits = self.data[:ticket_audits].values.select { |a| a["ticket_id"] == ticket_id }
+
+    page(audits, root: "audits")
+  end
 end

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

@@ -1,23 +1,14 @@
-class Zendesk2::Client
-  class Real
-    def get_ticket_comments(params={})
-      ticket_id = require_parameters(params, "ticket_id")
+class Zendesk2::Client::GetTicketComments < Zendesk2::Client::Request
+  request_method :get
+  request_path { |r|  "/tickets/#{r.ticket_id}/comments.json" }
 
-      request(
-        :method => :get,
-        :path => "/tickets/#{ticket_id}/comments.json"
-      )
-    end
-  end # Real
+  def ticket_id
+    params.fetch("ticket_id").to_i
+  end
 
-  class Mock
-    def get_ticket_comments(params={})
-      ticket_id = require_parameters(params, "ticket_id")
+  def mock(params={})
+    comments = self.data[:ticket_comments].values.select { |comment| comment["ticket_id"] == ticket_id }
 
-      page(params,
-           :ticket_comments,
-           "/tickets/#{ticket_id}/comments.json",
-           "comments", filter: lambda { |comments| comments.select { |comment| comment["ticket_id"].to_s == ticket_id.to_s } })
-    end
-  end # Mock
+    page(comments, root: "comments")
+  end
 end

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

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

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

@@ -1,18 +1,10 @@
-class Zendesk2::Client
-  class Real
-    def get_ticket_fields(params={})
-      page_params = Zendesk2.paging_parameters(params)
+class Zendesk2::Client::GetTicketFields < Zendesk2::Client::Request
+  request_method :get
+  request_path { |_| "/ticket_fields.json" }
 
-      request(
-        :params  => page_params,
-        :method  => :get,
-        :path    => "/ticket_fields.json",
-      )
-    end
-  end
-  class Mock
-    def get_ticket_fields(params={})
-      collection(:ticket_fields, "/ticket_fields.json", "ticket_fields")
-    end
+  page_params!
+
+  def mock
+    resources(:ticket_fields)
   end
 end

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

@@ -1,18 +1,10 @@
-class Zendesk2::Client
-  class Real
-    def get_tickets(params={})
-      page_params = Zendesk2.paging_parameters(params)
+class Zendesk2::Client::GetTickets < Zendesk2::Client::Request
+  request_method :get
+  request_path { |r| "/tickets.json" }
 
-      request(
-        :params  => page_params,
-        :method  => :get,
-        :path    => "/tickets.json",
-      )
-    end
-  end
-  class Mock
-    def get_tickets(params={})
-      page(params, :tickets, "/tickets.json", "tickets")
-    end
+  page_params!
+
+  def mock
+    page(:tickets)
   end
 end

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

@@ -1,26 +1,11 @@
-class Zendesk2::Client
-  class Real
-    def get_topic(params={})
-      id = params["id"]
+class Zendesk2::Client::GetTopic < Zendesk2::Client::Request
+  request_path { |r| "/topics/#{r.topic_id}.json" }
 
-      request(
-        :method => :get,
-        :path => "/topics/#{id}.json"
-      )
-    end
-  end # Real
+  def topic_id
+    params.fetch("topic").fetch("id")
+  end
 
-  class Mock
-    def get_topic(params={})
-      id   = params["id"]
-      body = self.find!(:topics, id)
-
-      response(
-        :path  => "/topics/#{id}.json",
-        :body  => {
-          "topic" => body
-        },
-      )
-    end
-  end # Mock
+  def mock
+    mock_response("topic" => self.find!(:topics, topic_id))
+  end
 end

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

@@ -1,32 +1,16 @@
-class Zendesk2::Client
-  class Real
-    def get_topic_comment(params={})
-      id       = params["id"]
-      topic_id = params["topic_id"]
-      path     = "/topics/#{topic_id}/comments/#{id}.json"
+class Zendesk2::Client::GetTopicComment < Zendesk2::Client::Request
+  request_method :get
+  request_path { |r| "/topics/#{r.topic_id}/comments/#{r.topic_comment_id}.json" }
 
-      request(
-        :method => :get,
-        :path => path,
-      )
-    end
-  end # Real
+  def topic_id
+    params.fetch("topic_comment").fetch("topic_id")
+  end
 
-  class Mock
-    def get_topic_comment(params={})
-      id       = params["id"]
-      topic_id = params["topic_id"]
+  def topic_comment_id
+    params.fetch("topic_comment").fetch("id")
+  end
 
-      unless (topic_comment = self.find!(:topic_comments, id)) && topic_comment["topic_id"] == topic_id
-        error!(:not_found)
-      else
-        response(
-          :path  => "/topics/#{topic_id}/comments/#{id}.json",
-          :body  => {
-            "topic_comment" => topic_comment,
-          },
-        )
-      end
-    end
-  end # Mock
+  def mock
+    mock_response("topic_comment" => self.find!(:topic_comments, topic_comment_id))
+  end
 end

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

@@ -1,23 +1,18 @@
-class Zendesk2::Client
-  class Real
-    def get_topic_comments(params={})
-      topic_id    = params.delete("topic_id")
-      page_params = Zendesk2.paging_parameters(params)
+class Zendesk2::Client::GetTopicComments < Zendesk2::Client::Request
+  request_path { |r| "/topics/#{r.topic_id}/comments.json" }
+  request_method :get
 
-      request(
-        :params => page_params,
-        :path   => "/topics/#{topic_id}/comments.json",
-      )
-    end
+  page_params!
+
+  def topic_id
+    params.fetch("topic_id")
   end
-  class Mock
-    def get_topic_comments(params={})
-      topic_id = params["topic_id"]
-      self.find!(:topics, topic_id)
-      filter   = lambda { |comments| comments.select { |c| c["topic_id"] == topic_id } }
 
-      page(params, :topic_comments, "/topics/#{topic_id}/comments.json", "topic_comments", filter: filter).tap do
-      end
-    end
+  def mock
+    self.find!(:topics, topic_id)
+
+    topic_comments = self.data[:topic_comments].values.select { |c| c["topic_id"] == topic_id }
+
+    page(topic_comments, root: "topic_comments")
   end
 end

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

@@ -1,18 +1,9 @@
-class Zendesk2::Client
-  class Real
-    def get_topics(params={})
-      page_params = Zendesk2.paging_parameters(params)
+class Zendesk2::Client::GetTopics < Zendesk2::Client::Request
+  request_path { |r| "/topics.json" }
 
-      request(
-        :params  => page_params,
-        :method  => :get,
-        :path    => "/topics.json",
-      )
-    end
-  end
-  class Mock
-    def get_topics(params={})
-      page(params, :topics, "/topics.json", "topics")
-    end
+  page_params!
+
+  def mock
+    page(:topics)
   end
 end

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

@@ -1,34 +1,21 @@
-class Zendesk2::Client
-  class Real
-    def get_user(params={})
-      id = params["id"]
+class Zendesk2::Client::GetUser < Zendesk2::Client::Request
+  request_method :get
+  request_path { |r| "/users/#{r.user_id}.json" }
 
-      request(
-        :method => :get,
-        :path => "/users/#{id}.json"
-      )
-    end
-  end # Real
-
-  class Mock
-    def get_user(params={})
-      id = require_parameters(params, "id")
+  def user_id
+    params.fetch("user").fetch("id").to_i
+  end
 
-      identities = self.data[:identities].values.select { |i| i["user_id"] == id.to_s }
-      body = find!(:users, id).dup
+  def mock
+    identities = self.data[:identities].values.select { |i| i["user_id"] == user_id }
+    body = find!(:users, user_id).dup
 
-      if identity = identities.find { |i| i["type"] == "email" && i["primary"] } || identities.find { |i| i["type"] == "email" }
-        body.merge!("email" => identity["value"])
-      end
+    if identity = identities.find { |i| i["type"] == "email" && i["primary"] } || identities.find { |i| i["type"] == "email" }
+      body.merge!("email" => identity["value"])
+    end
 
-      # @todo what happens if no identity?
+    # @todo what happens if no identity?
 
-      response(
-        :path  => "/users/#{id}.json",
-        :body  => {
-          "user" => body,
-        },
-      )
-    end
-  end # Mock
+    mock_response("user" => body)
+  end
 end

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

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

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

@@ -1,22 +1,15 @@
-class Zendesk2::Client
-  class Real
-    def get_user_identities(params={})
-      user_id     = require_parameters(params, "user_id")
-      page_params = Zendesk2.paging_parameters(params)
+class Zendesk2::Client::GetUserIdentities < Zendesk2::Client::Request
+  request_path { |r| "/users/#{r.user_id}/identities.json" }
 
-      request(
-        :params => page_params,
-        :method => :get,
-        :path   => "/users/#{user_id}/identities.json",
-      )
-    end
-  end # Real
+  page_params!
 
-  class Mock
-    def get_user_identities(params={})
-      user_id = require_parameters(params, "user_id")
+  def user_id
+    params.fetch("user_id").to_i
+  end
 
-      page(params, :identities, "/users/#{user_id}/identities.json", "identities", filter: lambda { |c| c.select { |a| a["user_id"].to_s == user_id.to_s } })
-    end
-  end # Mock
+  def mock
+    identities = service.data[:identities].values.select { |a| a["user_id"] == user_id }
+
+    page(identities, root: "identities")
+  end
 end

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

@@ -1,25 +1,15 @@
-class Zendesk2::Client
-  class Real
-    def get_user_identity(params={})
-      id      = params["id"]
-      user_id = params["user_id"]
-      path    = "/users/#{user_id}/identities/#{id}.json"
+class Zendesk2::Client::GetUserIdentity < Zendesk2::Client::Request
+  request_path { |r| "/users/#{r.user_id}/identities/#{r.user_identity_id}.json" }
 
-      request(:path => path)
-    end
-  end # Real
+  def user_identity_id
+    params.fetch("user_identity").fetch("id").to_i
+  end
 
-  class Mock
-    def get_user_identity(params={})
-      id      = params["id"]
-      user_id = params["user_id"]
+  def user_id
+    params.fetch("user_identity").fetch("user_id").to_i
+  end
 
-      response(
-        :path =>  "/users/#{user_id}/identities/#{id}.json",
-        :body => {
-          "identity" => find!(:identities, id)
-        },
-      )
-    end
-  end # Mock
+  def mock
+    mock_response("identity" => find!(:identities, user_identity_id))
+  end
 end