zendesk2 1.8.1 → 1.9.0

data/lib/zendesk2/ticket_comment.rb

@@ -19,6 +19,6 @@ class Zendesk2::TicketComment < Zendesk2::AuditEvent
   def author
     requires :author_id
 
-    self.service.users.get(self.author_id)
+    self.cistern.users.get(self.author_id)
   end
 end

data/lib/zendesk2/ticket_comment_privacy_change.rb

@@ -13,7 +13,7 @@ class Zendesk2
     def comment
       requires :comment_id
 
-      self.service.ticket_comments.get(self.comment_id)
+      self.cistern.ticket_comments.get(self.comment_id)
     end
   end
 end

data/lib/zendesk2/ticket_comments.rb

@@ -11,13 +11,13 @@ class Zendesk2::TicketComments
   self.collection_root   = "comments"
 
   def ticket
-    self.service.tickets.get(self.ticket_id)
+    self.cistern.tickets.get(self.ticket_id)
   end
 
   def all(params={})
     requires :ticket_id
 
-    body = service.send(collection_method, {"ticket_id" => self.ticket_id}.merge(params)).body
+    body = cistern.send(collection_method, {"ticket_id" => self.ticket_id}.merge(params)).body
 
     collection = self.clone.load(body[collection_root])
     collection.merge_attributes(Cistern::Hash.slice(body, "count", "next_page", "previous_page"))

data/lib/zendesk2/ticket_field.rb

@@ -49,11 +49,11 @@ class Zendesk2::TicketField
     data = if new_record?
              requires :type, :title
 
-             service.create_ticket_field("ticket_field" => self.attributes)
+             cistern.create_ticket_field("ticket_field" => self.attributes)
            else
              requires :identity
 
-             service.update_ticket_field("ticket_field" => self.attributes)
+             cistern.update_ticket_field("ticket_field" => self.attributes)
            end.body["ticket_field"]
 
     merge_attributes(data)
@@ -62,6 +62,6 @@ class Zendesk2::TicketField
   def destroy!
     requires :identity
 
-    service.destroy_ticket_field("ticket_field" => { "id" => self.identity })
+    cistern.destroy_ticket_field("ticket_field" => { "id" => self.identity })
   end
 end

data/lib/zendesk2/ticket_metric.rb

@@ -48,7 +48,7 @@ class Zendesk2::TicketMetric < Cistern::Model
   def ticket
     requires :ticket_id
 
-    self.service.tickets.get(self.ticket_id)
+    self.cistern.tickets.get(self.ticket_id)
   end
 
 end

data/lib/zendesk2/ticket_voice_comment.rb

@@ -28,7 +28,7 @@ class Zendesk2
     def author
       requires :author_id
 
-      self.service.users.get(self.author_id)
+      self.cistern.users.get(self.author_id)
     end
   end
 end

data/lib/zendesk2/tickets.rb

@@ -30,7 +30,7 @@ class Zendesk2::Tickets
                           :get_tickets
                         end
 
-    body = service.send(collection_method, Cistern::Hash.stringify_keys(self.attributes.merge(params))).body
+    body = cistern.send(collection_method, Cistern::Hash.stringify_keys(self.attributes.merge(params))).body
 
     self.load(body[collection_root]) # 'results' is the key for paged searches
     self.merge_attributes(Cistern::Hash.slice(body, "count", "next_page", "previous_page"))

data/lib/zendesk2/topic.rb

@@ -27,18 +27,18 @@ class Zendesk2::Topic
   def destroy!
     requires :identity
 
-    service.destroy_topic("topic" => {"id" => self.identity})
+    cistern.destroy_topic("topic" => {"id" => self.identity})
   end
 
   def save!
     data = if new_record?
              requires :title, :body
 
-             service.create_topic("topic" => self.attributes)
+             cistern.create_topic("topic" => self.attributes)
            else
              requires :identity
 
-             service.update_topic("topic" => self.attributes)
+             cistern.update_topic("topic" => self.attributes)
            end.body["topic"]
 
     merge_attributes(data)

data/lib/zendesk2/topic_comment.rb

@@ -29,18 +29,18 @@ class Zendesk2::TopicComment
   def destroy!
     requires :identity
 
-    service.destroy_topic_comment("topic_comment" => { "id" => self.identity, "topic_id" => self.topic_id })
+    cistern.destroy_topic_comment("topic_comment" => { "id" => self.identity, "topic_id" => self.topic_id })
   end
 
   def save!
     response = if new_record?
                  requires :topic_id, :user_id, :body
 
-                 service.create_topic_comment("topic_comment" => self.attributes)
+                 cistern.create_topic_comment("topic_comment" => self.attributes)
                else
                  requires :identity
 
-                 service.update_topic_comment("topic_comment" => self.attributes)
+                 cistern.update_topic_comment("topic_comment" => self.attributes)
                end
 
     merge_attributes(response.body["topic_comment"])
@@ -49,7 +49,7 @@ class Zendesk2::TopicComment
   def reload
     requires :identity
 
-    if data = self.service.topic_comments("topic_id" => topic_id).get(identity)
+    if data = self.cistern.topic_comments("topic_id" => topic_id).get(identity)
       new_attributes = data.attributes
       merge_attributes(new_attributes)
       self

data/lib/zendesk2/update_organization.rb

@@ -20,7 +20,7 @@ class Zendesk2::UpdateOrganization
   def mock
     record = self.find!(:organizations, organization_id)
 
-    other_organizations = service.data[:organizations].dup
+    other_organizations = cistern.data[:organizations].dup
     other_organizations.delete(organization_id)
 
     if organization["name"] && other_organizations.values.find { |o| o["name"].downcase == organization["name"].downcase }

data/lib/zendesk2/update_ticket.rb

@@ -23,12 +23,12 @@ class Zendesk2::UpdateTicket
     body = self.find!(:tickets, ticket_id).merge!(ticket_params)
 
     if comment
-      comment_id = service.serial_id
+      comment_id = cistern.serial_id
 
-      comment_data = service.data[:ticket_comments][comment_id] = {
+      comment_data = cistern.data[:ticket_comments][comment_id] = {
         "id"          => comment_id,
         "type"        => "Comment",
-        "author_id"   => service.current_user["id"],
+        "author_id"   => cistern.current_user["id"],
         "body"        => comment["body"],
         "html_body"   => "<p>#{comment["body"]}</p>",
         "public"      => comment["public"].nil? ? true : comment["public"],
@@ -37,13 +37,13 @@ class Zendesk2::UpdateTicket
         "ticket_id"   => ticket_id,
       }
 
-      audit_id = service.serial_id
+      audit_id = cistern.serial_id
 
       audit = {
         "id"         => audit_id,
         "ticket_id"  => ticket_id,
         "created_at" => Time.now,
-        "author_id"  => service.current_user["id"],
+        "author_id"  => cistern.current_user["id"],
         "via"        => {
           "channel" => "api",
           "source"  => {

data/lib/zendesk2/update_user.rb

@@ -16,7 +16,7 @@ class Zendesk2::UpdateUser
   def mock
     email = user_params["email"]
 
-    other_users = service.data[:users].dup
+    other_users = cistern.data[:users].dup
     other_users.delete(user_id)
 
     external_id = user_params["external_id"]
@@ -25,7 +25,7 @@ class Zendesk2::UpdateUser
       error!(:invalid, details: {"name" => [ { "description" => "External has already been taken" } ]})
     end
 
-    existing_identity = service.data[:identities].values.find { |i| i["type"] == "email" && i["value"] == email }
+    existing_identity = cistern.data[:identities].values.find { |i| i["type"] == "email" && i["value"] == email }
 
     if !email
       # nvm
@@ -38,7 +38,7 @@ class Zendesk2::UpdateUser
       # no-op email already used
     else
       # add a new identity
-      user_identity_id = service.serial_id
+      user_identity_id = cistern.serial_id
 
       user_identity = {
         "id"         => user_identity_id,
@@ -52,7 +52,7 @@ class Zendesk2::UpdateUser
         "user_id"    => user_id,
       }
 
-      service.data[:identities][user_identity_id] = user_identity
+      cistern.data[:identities][user_identity_id] = user_identity
     end
 
     mock_response("user" => self.find!(:users, user_id).merge!(user_params))

data/lib/zendesk2/user.rb

@@ -70,11 +70,11 @@ class Zendesk2::User
     data = if new_record?
              requires :name, :email
 
-             service.create_user("user" => self.attributes)
+             cistern.create_user("user" => self.attributes)
            else
              requires :identity
 
-             service.update_user("user" => self.attributes)
+             cistern.update_user("user" => self.attributes)
            end.body["user"]
 
     merge_attributes(data)
@@ -83,12 +83,12 @@ class Zendesk2::User
   def destroy!
     requires :identity
 
-    if self.email == service.username
+    if self.email == cistern.username
       raise "don't nuke yourself"
     end
 
     merge_attributes(
-      service.destroy_user("user" => {"id" => self.identity}).body["user"]
+      cistern.destroy_user("user" => {"id" => self.identity}).body["user"]
     )
   end
 
@@ -105,9 +105,9 @@ class Zendesk2::User
     requires :name, :email
 
     return_to = options[:return_to]
-    token     = self.service.token || options[:token]
+    token     = self.cistern.token || options[:token]
 
-    uri      = URI.parse(self.service.url)
+    uri      = URI.parse(self.cistern.url)
     uri.path = "/access/remote"
 
     raise "timestamp cannot be nil" unless timestamp
@@ -137,9 +137,9 @@ class Zendesk2::User
     requires :name, :email
 
     return_to = options[:return_to]
-    jwt_token = self.service.jwt_token || options[:jwt_token]
+    jwt_token = self.cistern.jwt_token || options[:jwt_token]
 
-    uri       = URI.parse(self.service.url)
+    uri       = URI.parse(self.cistern.url)
     uri.path  = "/access/jwt"
 
     iat = Time.now.to_i
@@ -167,7 +167,7 @@ class Zendesk2::User
   def tickets
     requires :identity
 
-    service.tickets(requester_id: self.identity)
+    cistern.tickets(requester_id: self.identity)
   end
   alias requested_tickets tickets
 
@@ -175,21 +175,21 @@ class Zendesk2::User
   def ccd_tickets
     requires :identity
 
-    service.tickets(collaborator_id: self.identity)
+    cistern.tickets(collaborator_id: self.identity)
   end
 
   # @return [Zendesk2::UserIdentities] the identities of this user
   def identities
-    self.service.user_identities("user_id" => self.identity)
+    self.cistern.user_identities("user_id" => self.identity)
   end
 
   # @return [Zendesk2::Memberships] the organization memberships of this user
   def memberships
-    self.service.memberships(user: self)
+    self.cistern.memberships(user: self)
   end
 
   # @return [Zendesk2::Organizations] the organizations of this user through memberships
   def organizations
-    self.service.organizations(user: self)
+    self.cistern.organizations(user: self)
   end
 end

data/lib/zendesk2/user_field.rb

@@ -35,11 +35,11 @@ class Zendesk2::UserField
     response = if new_record?
                  requires :type, :title, :key
 
-                 service.create_user_field("user_field" => self.attributes)
+                 cistern.create_user_field("user_field" => self.attributes)
                else
                  requires :identity
 
-                 service.update_user_field("user_field" => self.attributes)
+                 cistern.update_user_field("user_field" => self.attributes)
                end
 
     merge_attributes(response.body["user_field"])
@@ -48,6 +48,6 @@ class Zendesk2::UserField
   def destroy!
     requires :identity
 
-    service.destroy_user_field("user_field" => { "id" => self.identity })
+    cistern.destroy_user_field("user_field" => { "id" => self.identity })
   end
 end

data/lib/zendesk2/user_identity.rb

@@ -27,11 +27,11 @@ class Zendesk2::UserIdentity
     data = if new_record?
              requires :type, :value, :user_id
 
-             service.create_user_identity("user_identity" => self.attributes)
+             cistern.create_user_identity("user_identity" => self.attributes)
            else
              requires :identity
 
-             service.update_user_identity("user_identity" => self.attributes)
+             cistern.update_user_identity("user_identity" => self.attributes)
            end.body["identity"]
 
     merge_attributes(data)
@@ -40,20 +40,20 @@ class Zendesk2::UserIdentity
   def destroy!
     requires :identity
 
-    service.destroy_user_identity("user_identity" => { "user_id" => self.user_id, "id" => self.identity })
+    cistern.destroy_user_identity("user_identity" => { "user_id" => self.user_id, "id" => self.identity })
   end
 
   def reload
     requires :identity
 
-    if model = self.service.user_identities("user_id" => user_id).get(identity)
+    if model = self.cistern.user_identities("user_id" => user_id).get(identity)
       merge_attributes(model.attributes)
       self
     end
   end
 
   def primary!
-    self.service.mark_user_identity_primary("user_identity" => { "user_id" => self.user_id, "id" => self.identity })
+    self.cistern.mark_user_identity_primary("user_identity" => { "user_id" => self.user_id, "id" => self.identity })
     self.primary = true
   end
 end

data/lib/zendesk2/users.rb

@@ -14,6 +14,6 @@ class Zendesk2::Users
   self.search_request    = :search_user
 
   def current
-    new(service.get_current_user.body["user"])
+    new(cistern.get_current_user.body["user"])
   end
 end

data/lib/zendesk2/version.rb

@@ -1,3 +1,3 @@
 module Zendesk2
-  VERSION = "1.8.1"
+  VERSION = "1.9.0"
 end

data/lib/zendesk2/view.rb

@@ -33,9 +33,9 @@ class Zendesk2::View
     }.merge(Cistern::Hash.slice(self.conditions, "any", "all"))
 
     data = if new_record?
-             service.create_view("view" => params)
+             cistern.create_view("view" => params)
            else
-             service.create_view("view" => params)
+             cistern.create_view("view" => params)
            end.body
 
     merge_attributes(data["view"])
@@ -44,12 +44,12 @@ class Zendesk2::View
   def tickets
     requires :identity
 
-    service.tickets(view_id: self.identity)
+    cistern.tickets(view_id: self.identity)
   end
 
   def destroy!
     requires :identity
 
-    service.destroy_view("view" => {"id" => self.identity})
+    cistern.destroy_view("view" => {"id" => self.identity})
   end
 end

data/spec/help_center/articles_spec.rb

@@ -19,4 +19,22 @@ describe "help_center/articles" do
     :search_params => lambda { Cistern::Hash.slice(create_params, :title) },
     :search        => true,
   }
+
+  describe "translations" do
+    let!(:article) do
+      client.help_center_articles.create!(:title    => mock_uuid,
+                                          :locale   => "en-us",
+                                          :section  => section
+                                          )
+    end
+    let!(:locale) { mock_uuid }
+
+    include_examples "zendesk#resource", {
+      :collection     => lambda { article.translations },
+      :fetch_params   => lambda { |r| Cistern::Hash.slice(r.attributes, :source_id, :source_type, :locale) },
+      :create_params  => lambda { { source: article, locale: locale, title: mock_uuid } },
+      :update_params  => lambda { { title: mock_uuid } },
+      :search         => false
+    }
+  end
 end

data/spec/help_center/categories_spec.rb

@@ -28,4 +28,17 @@ describe "help_center/categories" do
       expect(category.articles.all).to match_array(articles)
     end
   end
+
+  describe "translations" do
+    let!(:category) { client.help_center_categories.create!(name: mock_uuid, locale: "en-us") }
+    let!(:locale) { mock_uuid }
+
+    include_examples "zendesk#resource", {
+      :collection     => lambda { category.translations },
+      :fetch_params   => lambda { |r| Cistern::Hash.slice(r.attributes, :source_id, :source_type, :locale) },
+      :create_params  => lambda { { source: category, locale: locale, title: mock_uuid } },
+      :update_params  => lambda { { title: mock_uuid } },
+      :search         => false
+    }
+  end
 end