zendesk2 1.4.2 → 1.5.3

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

@@ -1,29 +1,19 @@
-class Zendesk2::Client
-  class Real
-    def update_category(params={})
-      id = params.delete("id")
+class Zendesk2::Client::UpdateCategory < Zendesk2::Client::Request
+  request_method :put
+  request_body { |r| { "category" => Cistern::Hash.except(r.category, "id") } }
+  request_path { |r| "/categories/#{r.category_id}.json" }
 
-      request(
-        :method => :put,
-        :path   => "/categories/#{id}.json",
-        :body   => {
-          "category" => params
-        },
-      )
-    end
+  def category
+    self.params.fetch("category")
   end
-  class Mock
-    def update_category(params={})
-      id   = params.delete("id")
-      body = self.find!(:categories, id).merge!(params)
 
-      response(
-        :method => :put,
-        :path   => "/categories/#{id}.json",
-        :body   => {
-          "category" => body
-        },
-      )
-    end
+  def category_id
+    category.fetch("id")
+  end
+
+  def mock
+    mock_response(
+      "category" => find!(:categories, category_id).merge!(Cistern::Hash.slice(category, *Zendesk2::Client::CreateCategory.accepted_attributes))
+    )
   end
 end

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

@@ -1,31 +1,19 @@
-class Zendesk2::Client
-  class Real
-    def update_forum(params={})
-      id = params.delete("id")
+class Zendesk2::Client::UpdateForum < Zendesk2::Client::Request
+  request_method :put
+  request_path { |r| "/forums/#{r.forum_id}.json" }
+  request_body { |r| { "forum" => r.forum_params } }
 
-      request(
-        :method => :put,
-        :path   => "/forums/#{id}.json",
-        :body   => {
-          "forum" => params
-        },
-      )
-    end
+  def forum_params
+    Cistern::Hash.slice(params.fetch("forum"), *Zendesk2::Client::CreateForum.accepted_attributes)
   end
-  class Mock
-    def update_forum(params={})
-      id   = params.delete("id")
-      path = "/forums/#{id}.json"
 
-      body = self.find!(:forums, id).merge!(params)
+  def forum_id
+    params.fetch("forum").fetch("id")
+  end
 
-      response(
-        :method => :put,
-        :path   => path,
-        :body   => {
-          "forum" => body
-        },
-      )
-    end
+  def mock
+    mock_response(
+      "forum" => find!(:forums, forum_id).merge!(forum_params),
+    )
   end
 end

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

@@ -1,29 +1,17 @@
-class Zendesk2::Client
-  class Real
-    def update_group(params={})
-      id   = params.delete("id")
-      path = "/groups/#{id}.json"
+class Zendesk2::Client::UpdateGroup < Zendesk2::Client::Request
+  request_method :put
+  request_path { |r| "/groups/#{r.group_id}.json" }
+  request_body { |r| { "group" => r.group_params } }
 
-      request(
-        :method => :put,
-        :path   => path,
-        :body   => {
-          "group" => params
-        },
-      )
-    end
+  def group_params
+    @_group_params ||= Cistern::Hash.slice(params.fetch("group"), *Zendesk2::Client::CreateGroup.accepted_attributes)
   end
-  class Mock
-    def update_group(params={})
-      id = params.delete("id")
 
-      response(
-        :method => :put,
-        :path   => "/groups/#{id}.json",
-        :body   => {
-          "group" => find!(:groups, id).merge!(params)
-        },
-      )
-    end
+  def group_id
+    @_group_id ||= params.fetch("group").fetch("id")
+  end
+
+  def mock
+    mock_response("group" => find!(:groups, group_id).merge!(group_params))
   end
 end

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

@@ -1,48 +1,23 @@
-class Zendesk2::Client
-  class Real
-    def update_help_center_article(params={})
-      id     = require_parameters(params, "id")
-      locale = params["locale"]
-
-      path = if locale
-               "/help_center/#{locale}/articles/#{id}.json"
-             else
-               "/help_center/articles/#{id}.json"
-             end
-
-      request(
-        :method => :put,
-        :path   => path,
-        :body   => {
-          "article" => params
-        },
-      )
+class Zendesk2::Client::UpdateHelpCenterArticle < Zendesk2::Client::Request
+  request_method :put
+  request_body { |r| { "article" => r.article_params } }
+  request_path { |r|
+    if locale = r.article_params["locale"]
+      "/help_center/#{locale}/articles/#{r.article_id}.json"
+    else
+      "/help_center/articles/#{r.article_id}.json"
     end
-  end
-  class Mock
-    def update_help_center_article(params={})
-      params = Cistern::Hash.stringify_keys(params)
-
-      require_parameters(params, "id")
+  }
 
-      id     = params.delete("id")
-      locale = params["locale"]
-
-      path = if locale
-               "/help_center/#{locale}/articles/#{id}.json"
-             else
-               "/help_center/articles/#{id}.json"
-             end
+  def article_params
+    @_article_params ||= Cistern::Hash.slice(params.fetch("article"), *Zendesk2::Client::CreateHelpCenterArticle.accepted_attributes)
+  end
 
-      body = self.find!(:help_center_articles, id).merge!(params)
+  def article_id
+    params.fetch("article").fetch("id")
+  end
 
-      response(
-        :method => :put,
-        :path   => path,
-        :body   => {
-          "article" => body,
-        },
-      )
-    end
+  def mock
+    mock_response("article" => self.find!(:help_center_articles, article_id).merge!(article_params))
   end
 end

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

@@ -1,48 +1,23 @@
-class Zendesk2::Client
-  class Real
-    def update_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 => :put,
-        :path   => path,
-        :body   => {
-          "category" => params
-        },
-      )
+class Zendesk2::Client::UpdateHelpCenterCategory < Zendesk2::Client::Request
+  request_method :put
+  request_body { |r| { "category" => r.category_params } }
+  request_path { |r|
+    if locale = r.category_params["locale"]
+      "/help_center/#{locale}/categories/#{r.category_id}.json"
+    else
+      "/help_center/categories/#{r.category_id}.json"
     end
-  end
-  class Mock
-    def update_help_center_category(params={})
-      params = Cistern::Hash.stringify_keys(params)
-
-      require_parameters(params, "id")
+  }
 
-      id     = params.delete("id").to_s
-      locale = params["locale"]
-
-      path = if locale
-               "/help_center/#{locale}/categories/#{id}.json"
-             else
-               "/help_center/categories/#{id}.json"
-             end
+  def category_params
+    @_category_params ||= Cistern::Hash.slice(params.fetch("category"), *Zendesk2::Client::CreateHelpCenterCategory.accepted_attributes)
+  end
 
-      body = self.find!(:help_center_categories, id).merge!(params)
+  def category_id
+    params.fetch("category").fetch("id")
+  end
 
-      response(
-        :method => :put,
-        :path   => path,
-        :body   => {
-          "category" => body,
-        },
-      )
-    end
+  def mock
+    mock_response("category" => self.find!(:help_center_categories, self.category_id).merge!(category_params))
   end
 end

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

@@ -1,48 +1,23 @@
-class Zendesk2::Client
-  class Real
-    def update_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 => :put,
-        :path   => path,
-        :body   => {
-          "section" => params
-        },
-      )
+class Zendesk2::Client::UpdateHelpCenterSection < Zendesk2::Client::Request
+  request_method :put
+  request_body { |r| { "section" => r.section_params } }
+  request_path { |r|
+    if locale = r.section_params["locale"]
+      "/help_center/#{locale}/sections/#{r.section_id}.json"
+    else
+      "/help_center/sections/#{r.section_id}.json"
     end
-  end
-  class Mock
-    def update_help_center_section(params={})
-      params = Cistern::Hash.stringify_keys(params)
-
-      require_parameters(params, "id")
+  }
 
-      id     = params.delete("id").to_s
-      locale = params["locale"]
-
-      path = if locale
-               "/help_center/#{locale}/sections/#{id}.json"
-             else
-               "/help_center/sections/#{id}.json"
-             end
+  def section_params
+    @_section_params ||= Cistern::Hash.slice(params.fetch("section"), *Zendesk2::Client::CreateHelpCenterSection.accepted_attributes)
+  end
 
-      body = self.find!(:help_center_sections, id).merge!(params)
+  def section_id
+    params.fetch("section").fetch("id")
+  end
 
-      response(
-        :method => :put,
-        :path   => path,
-        :body   => {
-          "section" => body,
-        },
-      )
-    end
+  def mock
+    mock_response("section" => self.find!(:help_center_sections, section_id).merge!(section_params))
   end
 end

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

@@ -1,44 +1,32 @@
-class Zendesk2::Client
-  class Real
-    def update_organization(params={})
-      id = params.delete("id")
-
-      request(
-        :method => :put,
-        :path   => "/organizations/#{id}.json",
-        :body   => {
-          "organization" => params
-        },
-      )
-    end
-  end
-  class Mock
-    def update_organization(_params={})
-      params = Cistern::Hash.stringify_keys(_params)
-      id     = params.delete("id")
+class Zendesk2::Client::UpdateOrganization < Zendesk2::Client::Request
+  request_method :put
+  request_path { |r| "/organizations/#{r.organization_id}.json" }
+  request_body { |r| { "organization" => Cistern::Hash.except(r.organization, "id") } }
 
-      organization = self.find!(:organizations, id)
+  def organization
+    params.fetch("organization")
+  end
 
-      other_organizations = self.data[:organizations].dup
-      other_organizations.delete(id.to_s)
+  def organization_id
+    organization.fetch("id").to_i
+  end
 
-      if other_organizations.values.find { |o| o["name"] == params["name"] }
-        error!(:invalid, details: {"name" => [ { "description" => "Name: has already been taken" } ]})
-      end
+  def mock
+    record = self.find!(:organizations, organization_id)
 
-      if params["external_id"] && other_organizations.values.find { |o| o["external_id"] == params["external_id"] }
-        error!(:invalid, details: {"name" => [ { "description" => "External has already been taken" } ]})
-      end
+    other_organizations = service.data[:organizations].dup
+    other_organizations.delete(organization_id)
 
-      body = organization.merge!(params)
+    if organization["name"] && other_organizations.values.find { |o| o["name"].downcase == organization["name"].downcase }
+      error!(:invalid, details: {"name" => [ { "description" => "Name: has already been taken" } ]})
+    end
 
-      response(
-        :method => :put,
-        :path   => "/organizations/#{id}.json",
-        :body   => {
-          "organization" => body
-        },
-      )
+    if organization["external_id"] && other_organizations.values.find { |o| o["external_id"].to_s == organization["external_id"].to_s }
+      error!(:invalid, details: {"name" => [ { "description" => "External has already been taken" } ]})
     end
+
+    record.merge!(Cistern::Hash.slice(organization, *Zendesk2::Client::CreateOrganization.accepted_attributes))
+
+    mock_response("organization" => record)
   end
 end

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

@@ -1,74 +1,74 @@
-class Zendesk2::Client
-  class Real
-    def update_ticket(params={})
-      id = params.delete("id")
+class Zendesk2::Client::UpdateTicket < Zendesk2::Client::Request
+  request_method :put
+  request_path { |r| "/tickets/#{r.ticket_id}.json"  }
+  request_body { |r| { "ticket" => r.ticket_params } }
 
-      request(
-        :method => :put,
-        :path   => "/tickets/#{id}.json",
-        :body   => {
-          "ticket" => params
-        },
-      )
-    end
+  def self.accepted_attributes
+    Zendesk2::Client::CreateTicket.accepted_attributes + ["comment"]
   end
 
-  class Mock
-    def update_ticket(params={})
-      ticket_id = params.delete("id")
-      body      = self.find!(:tickets, ticket_id).merge!(params)
+  def ticket_params
+    @_ticket_params ||= Cistern::Hash.slice(params.fetch("ticket"), *self.class.accepted_attributes)
+  end
 
-      if comment = params["comment"]
-        comment_id = self.class.new_id
-        comment_data = self.data[:ticket_comments][comment_id] = {
-            "id"          => comment_id,
-            "type"        => "Comment",
-            "author_id"   => current_user["id"],
-            "body"        => comment["body"],
-            "html_body"   => "<p>#{comment["body"]}</p>",
-            "public"      => comment["public"].nil? ? true : comment["public"],
-            "trusted"     => comment["trusted"].nil? ? true : comment["trusted"],
-            "attachments" => comment["attachments"] || [],
-            "ticket_id"   => ticket_id,
-        }
+  def ticket_id
+    params.fetch("ticket").fetch("id")
+  end
 
-        audit_id = self.class.new_id
+  def mock
+    comment = params.fetch("ticket").delete("comment")
 
-        self.data[:ticket_audits][audit_id] = audit = {
-          "id"         => audit_id,
-          "ticket_id"  => ticket_id,
-          "created_at" => Time.now,
-          "author_id"  => current_user["id"],
-          "via"        => {
-            "channel" => "api",
-            "source"  => {
-              "form" => {},
-              "to"   => {},
-              "rel"  => nil,
-            }
-          },
-          "metadata" => {
-            "system" => {
-              "client"     => Zendesk2::Client::USER_AGENT,
-              "ip_address" => "127.0.0.1",
-              "location"   => "Oakland, CA, United States",
-              "latitude"   => 37.83449999999999,
-              "longitude"  => -122.2647,
-            },
-            "custom" => {},
-          },
-          "events" => [comment_data]
-        }
-      end
+    body = self.find!(:tickets, ticket_id).merge!(ticket_params)
+
+    if comment
+      comment_id = service.serial_id
 
-      response(
-        :method => :put,
-        :path   => "/tickets/#{ticket_id}.json",
-        :body   => {
-          "ticket" => body,
-          "audit"  => audit,
+      comment_data = service.data[:ticket_comments][comment_id] = {
+        "id"          => comment_id,
+        "type"        => "Comment",
+        "author_id"   => service.current_user["id"],
+        "body"        => comment["body"],
+        "html_body"   => "<p>#{comment["body"]}</p>",
+        "public"      => comment["public"].nil? ? true : comment["public"],
+        "trusted"     => comment["trusted"].nil? ? true : comment["trusted"],
+        "attachments" => comment["attachments"] || [],
+        "ticket_id"   => ticket_id,
+      }
+
+      audit_id = service.serial_id
+
+      audit = {
+        "id"         => audit_id,
+        "ticket_id"  => ticket_id,
+        "created_at" => Time.now,
+        "author_id"  => service.current_user["id"],
+        "via"        => {
+          "channel" => "api",
+          "source"  => {
+            "form" => {},
+            "to"   => {},
+            "rel"  => nil,
+          }
+        },
+        "metadata" => {
+          "system" => {
+            "client"     => Zendesk2::Client::USER_AGENT,
+            "ip_address" => "127.0.0.1",
+            "location"   => "Oakland, CA, United States",
+            "latitude"   => 37.83449999999999,
+            "longitude"  => -122.2647,
+          },
+          "custom" => {},
         },
-      )
+        "events" => [comment_data]
+      }
+
+      self.data[:ticket_audits][audit_id] = audit
     end
+
+    mock_response(
+      "ticket" => body,
+      "audit"  => audit,
+    )
   end
 end