zendesk2 1.8.1 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47765b2ecc5d355c801ffb42c539133e3e52c5f0
-  data.tar.gz: 8539465b4426c2ac045fb947564465b2932c9011
+  metadata.gz: 57938a7a4d8d6885607eb9ce942295373b41559b
+  data.tar.gz: b56d6e5fc5b3505f8ebe107bca1198cdfa568dc8
 SHA512:
-  metadata.gz: cdea7b59ded18ae6a9f01a7b7bf88a23db8674d8f878bf1eb2832476305c1b590bbe2586a53e75eaa7f1c0eedbca32547985394ede25f3050c73d9a27c5f7317
-  data.tar.gz: e114b86cac3a84db21f6d190a13f79ef09bb435c105105d107c2f483bc11d3824daccc296bfa2cabb73e88deb03b33f8453feb8734a236cf478598f516575d1d
+  metadata.gz: 9147be1837cf536af9c09ffd595dbf2542cfc759d160162d70f7e141d680502dfcc057f67a13997b18d501aae4f73d5dc867b17265bcb566e39ea7e08b8759e7
+  data.tar.gz: 345b472a1182294e3a5a23a1bfac5b775bcb024f020d3117bc78737d781b5797c206df09273eab2084493aa127d6415aa748a9d2855399238ddf4b1042893bd4

data/CHANGELOG.md

@@ -2,7 +2,16 @@
 
 ## [Unreleased](https://github.com/lanej/zendesk2/tree/HEAD)
 
-[Full Changelog](https://github.com/lanej/zendesk2/compare/v1.8.0...HEAD)
+[Full Changelog](https://github.com/lanej/zendesk2/compare/v1.8.1...HEAD)
+
+**Merged pull requests:**
+
+- separate auth\_id and username [\#50](https://github.com/lanej/zendesk2/pull/50) ([lanej](https://github.com/lanej))
+- s/service/cistern/g [\#49](https://github.com/lanej/zendesk2/pull/49) ([lanej](https://github.com/lanej))
+- Help center translations API [\#48](https://github.com/lanej/zendesk2/pull/48) ([omgitsads](https://github.com/omgitsads))
+
+## [v1.8.1](https://github.com/lanej/zendesk2/tree/v1.8.1) (2016-05-19)
+[Full Changelog](https://github.com/lanej/zendesk2/compare/v1.8.0...v1.8.1)
 
 **Merged pull requests:**
 

data/lib/zendesk2/attributes.rb

@@ -4,7 +4,7 @@ module Zendesk2::Attributes
     collection = options[:collection] || "#{name}s"
     define_method(name) do
       if assoc_id = self.send(assoc_key)
-        self.service.send(collection).get(assoc_id)
+        self.cistern.send(collection).get(assoc_id)
       else self.instance_variable_get("@#{name}")
       end
     end

data/lib/zendesk2/audit_event.rb

@@ -18,7 +18,7 @@ class Zendesk2::AuditEvent
     if klass = all.find{|k| k.name == event_class}
       klass.new(attributes)
     else # handle unrecognized audit events
-      attributes.reject{|k,v| k == :service}
+      attributes.reject{|k,v| k == :cistern}
     end
   end
 

data/lib/zendesk2/category.rb

@@ -21,18 +21,18 @@ class Zendesk2::Category
   def destroy!
     requires :identity
 
-    service.destroy_category("category" => {"id" => self.identity})
+    cistern.destroy_category("category" => {"id" => self.identity})
   end
 
   def save!
     data = if new_record?
              requires :name
 
-             service.create_category(params).body["category"]
+             cistern.create_category(params).body["category"]
            else
              requires :identity
 
-             service.update_category(params).body["category"]
+             cistern.update_category(params).body["category"]
            end
 
     merge_attributes(data)

data/lib/zendesk2/collection.rb

@@ -48,7 +48,7 @@ module Zendesk2::Collection
   # Fetch a collection of resources
   def all(params={})
     scoped_attributes = self.class.scopes.inject({}){|r,k| r.merge(k.to_s => send(k))}.merge(params)
-    body = service.send(collection_method, scoped_attributes).body
+    body = cistern.send(collection_method, scoped_attributes).body
 
     self.load(body[collection_root])
     self.merge_attributes(Cistern::Hash.slice(body, "count"))
@@ -80,7 +80,7 @@ module Zendesk2::Collection
 
     scoped_attributes = { namespace => scoped_attributes }
 
-    if data = self.service.send(model_method, scoped_attributes).body[self.model_root]
+    if data = self.cistern.send(model_method, scoped_attributes).body[self.model_root]
       new(data)
     end
   end

data/lib/zendesk2/create_category.rb

@@ -10,7 +10,7 @@ class Zendesk2::CreateCategory
   end
 
   def mock
-    identity = service.serial_id
+    identity = cistern.serial_id
 
     record = {
       "id"         => identity,
@@ -19,7 +19,7 @@ class Zendesk2::CreateCategory
       "updated_at" => Time.now.iso8601,
     }.merge(Cistern::Hash.slice(params.fetch("category"), *self.class.accepted_attributes))
 
-    service.data[:categories][identity] = record
+    cistern.data[:categories][identity] = record
 
     mock_response({"category" => record}, {status: 201})
   end

data/lib/zendesk2/create_forum.rb

@@ -14,7 +14,7 @@ class Zendesk2::CreateForum
   end
 
   def mock
-    identity = service.serial_id
+    identity = cistern.serial_id
 
     record = {
       "id"         => identity,
@@ -23,7 +23,7 @@ class Zendesk2::CreateForum
       "updated_at" => Time.now.iso8601,
     }.merge(Cistern::Hash.slice(params.fetch("forum"), *self.class.accepted_attributes))
 
-    service.data[:forums][identity] = record
+    cistern.data[:forums][identity] = record
 
     mock_response({"forum" => record}, {status: 201})
   end

data/lib/zendesk2/create_group.rb

@@ -14,7 +14,7 @@ class Zendesk2::CreateGroup
   end
 
   def mock(params={})
-    identity = service.serial_id
+    identity = cistern.serial_id
 
     record = {
       "id"         => identity,

data/lib/zendesk2/create_membership.rb

@@ -33,7 +33,7 @@ class Zendesk2::CreateMembership
       error!(:invalid, description: { "user_id" => [ { "description" => "User has already been taken" } ] })
     end
 
-    resource_id = service.serial_id
+    resource_id = cistern.serial_id
 
     default_membership = !self.data[:memberships].values.find { |m| m["user_id"] == user_id && m["default"] }
 

data/lib/zendesk2/create_organization.rb

@@ -14,7 +14,7 @@ class Zendesk2::CreateOrganization
   end
 
   def mock
-    identity = service.serial_id
+    identity = cistern.serial_id
 
     record = {
       "id"         => identity,

data/lib/zendesk2/create_ticket.rb

@@ -33,11 +33,11 @@ class Zendesk2::CreateTicket
             ]})
       end
 
-      user_id = if known_user = service.users.search(email: requester['email']).first
+      user_id = if known_user = cistern.users.search(email: requester['email']).first
                   known_user.identity
                 else
                   # name is not required in this case
-                  service.create_user("user" => requester).body["user"]["id"]
+                  cistern.create_user("user" => requester).body["user"]["id"]
                 end
 
       create_params['requester_id'] = user_id.to_i
@@ -48,19 +48,19 @@ class Zendesk2::CreateTicket
     custom_fields = requested_custom_fields.map do |cf|
       field_id = cf["id"].to_i
 
-      if service.data[:ticket_fields][field_id]
+      if cistern.data[:ticket_fields][field_id]
         {"id" => field_id, "value" => cf["value"] }
       else
         # @fixme error ?!
       end
     end.compact
 
-    service.data[:ticket_fields].each do |field_id, field|
+    cistern.data[:ticket_fields].each do |field_id, field|
       requested_custom_fields.find { |cf| cf["id"] == field_id } ||
         custom_fields << {"id" => field_id, "value" => nil }
     end
 
-    identity = service.serial_id
+    identity = cistern.serial_id
 
     record = {
       "id"               => identity,
@@ -72,14 +72,14 @@ class Zendesk2::CreateTicket
       "custom_fields"    => custom_fields,
     }.merge(create_params)
 
-    record["requester_id"] ||= (requester_id && requester_id.to_i) || service.current_user["id"]
-    record["submitter_id"] = service.current_user["id"].to_i
+    record["requester_id"] ||= (requester_id && requester_id.to_i) || cistern.current_user["id"]
+    record["submitter_id"] = cistern.current_user["id"].to_i
 
-    record["organization_id"] ||= if requester = service.data[:users][record["requester_id"].to_i]
+    record["organization_id"] ||= if requester = cistern.data[:users][record["requester_id"].to_i]
                                     requester["organization_id"]
                                   end
 
-    service.data[:tickets][identity] = record
+    cistern.data[:tickets][identity] = record
 
     mock_response("ticket" => record)
   end

data/lib/zendesk2/create_ticket_field.rb

@@ -14,7 +14,7 @@ class Zendesk2::CreateTicketField
   end
 
   def mock
-    identity = service.serial_id
+    identity = cistern.serial_id
 
     record = {
       "active"                => true,

data/lib/zendesk2/create_topic.rb

@@ -14,7 +14,7 @@ class Zendesk2::CreateTopic
   end
 
   def mock
-    identity = service.serial_id
+    identity = cistern.serial_id
 
     record = {
       "id"         => identity,

data/lib/zendesk2/create_topic_comment.rb

@@ -18,7 +18,7 @@ class Zendesk2::CreateTopicComment
   end
 
   def mock
-    identity = service.serial_id
+    identity = cistern.serial_id
 
     record = {
       "id"         => identity,

data/lib/zendesk2/create_user.rb

@@ -14,7 +14,7 @@ class Zendesk2::CreateUser
   end
 
   def mock
-    user_id = service.serial_id
+    user_id = cistern.serial_id
 
     user = params.fetch("user")
 
@@ -41,7 +41,7 @@ class Zendesk2::CreateUser
           "description" => "Email: #{email} is already being used by another user"
         }]})
     else
-      user_identity_id = service.serial_id
+      user_identity_id = cistern.serial_id
 
       user_identity = {
         "id"         => user_identity_id,
@@ -59,7 +59,7 @@ class Zendesk2::CreateUser
       self.data[:users][user_id] = record.reject { |k,v| k == "email" }
 
       if organization_id
-        service.create_membership("membership" => { "user_id" => user_id, "organization_id" => organization_id, "default" => true } )
+        cistern.create_membership("membership" => { "user_id" => user_id, "organization_id" => organization_id, "default" => true } )
       end
 
       mock_response({"user" => record}, {status: 201})

data/lib/zendesk2/create_user_field.rb

@@ -14,7 +14,7 @@ class Zendesk2::CreateUserField
   end
 
   def mock
-    identity = service.serial_id
+    identity = cistern.serial_id
 
     record = {
       "active"                => true,
@@ -35,7 +35,7 @@ class Zendesk2::CreateUserField
       "visible_in_portal"     => false,
     }.merge(user_field_params)
 
-    service.data[:user_fields][identity] = record
+    cistern.data[:user_fields][identity] = record
 
     mock_response("user_field" => record)
   end

data/lib/zendesk2/create_user_identity.rb

@@ -18,7 +18,7 @@ class Zendesk2::CreateUserIdentity
   end
 
   def mock
-    identity = service.serial_id
+    identity = cistern.serial_id
 
     record = {
       "id"         => identity,
@@ -30,13 +30,13 @@ class Zendesk2::CreateUserIdentity
       "user_id"    => user_id,
     }.merge(user_identity_params)
 
-    record.merge("primary" => true) if service.data[:identities].values.find { |ui| ui["user_id"] == user_id }.nil?
+    record.merge("primary" => true) if cistern.data[:identities].values.find { |ui| ui["user_id"] == user_id }.nil?
 
-    if service.data[:identities].values.find { |i| i["value"] == record["value"] }
+    if cistern.data[:identities].values.find { |i| i["value"] == record["value"] }
       error!(:invalid, details: { "value" => [ { "description" => "Value: #{record["value"]} is already being used by another user" } ] })
     end
 
-    service.data[:identities][identity] = record
+    cistern.data[:identities][identity] = record
 
     mock_response("identity" => record)
   end

data/lib/zendesk2/create_view.rb

@@ -55,7 +55,7 @@ class Zendesk2::CreateView
       error!(:invalid, :details => {"base" => ["Invalid conditions: You must select at least one condition"]})
     end
 
-    identity = service.serial_id
+    identity = cistern.serial_id
 
     output = view_params.delete("output") || {}
     columns = (output["columns"] || []).inject([]) { |r,c| r << {"id" => c, "name" => self.class.view_columns.fetch(c)} }
@@ -91,7 +91,7 @@ class Zendesk2::CreateView
       },
     }.merge(create_params)
 
-    service.data[:views][identity] = record
+    cistern.data[:views][identity] = record
 
     mock_response("view" => record)
   end

data/lib/zendesk2/destroy_user.rb

@@ -9,10 +9,10 @@ class Zendesk2::DestroyUser
   end
 
   def mock
-    ticket_count = service.data[:tickets].values.select { |t| t["requester_id"].to_i == user_id }.size
+    ticket_count = cistern.data[:tickets].values.select { |t| t["requester_id"].to_i == user_id }.size
 
     if ticket_count < 1
-      service.data[:identities].each { |k,v| service.data[:identities].delete(k) if v["user_id"] == user_id }
+      cistern.data[:identities].each { |k,v| cistern.data[:identities].delete(k) if v["user_id"] == user_id }
 
       mock_response("user" => self.delete!(:users, user_id))
     else

data/lib/zendesk2/forum.rb

@@ -24,18 +24,18 @@ class Zendesk2::Forum
   def destroy!
     requires :identity
 
-    service.destroy_forum("forum" => {"id" => self.identity})
+    cistern.destroy_forum("forum" => {"id" => self.identity})
   end
 
   def save!
     response = if new_record?
                  requires :name
 
-                 service.create_forum("forum" => self.attributes)
+                 cistern.create_forum("forum" => self.attributes)
                else
                  requires :identity
 
-                 service.update_forum("forum" => self.attributes)
+                 cistern.update_forum("forum" => self.attributes)
                end
 
     merge_attributes(response.body["forum"])

data/lib/zendesk2/get_assignable_groups.rb

@@ -7,7 +7,7 @@ class Zendesk2::GetAssignableGroups
   page_params!
 
   def mock
-    groups = service.data[:groups].values.select { |group| group.select { |g| !g['deleted'] } }
+    groups = cistern.data[:groups].values.select { |group| group.select { |g| !g['deleted'] } }
 
     page(groups, root: "groups")
   end

data/lib/zendesk2/get_ccd_tickets.rb

@@ -10,7 +10,7 @@ class Zendesk2::GetCcdTickets
   end
 
   def mock
-    tickets = service.data[:tickets].values.select { |u| u["collaborator_ids"].include?(collaborator_id) }
+    tickets = cistern.data[:tickets].values.select { |u| u["collaborator_ids"].include?(collaborator_id) }
 
     page(tickets, root: "tickets")
   end

data/lib/zendesk2/get_current_user.rb

@@ -5,6 +5,6 @@ class Zendesk2::GetCurrentUser
   request_path { |_| "/users/me.json" }
 
   def mock
-    service.get_user("user" => {"id" => service.current_user.fetch("id")})
+    cistern.get_user("user" => {"id" => cistern.current_user.fetch("id")})
   end
 end

data/lib/zendesk2/get_user_identities.rb

@@ -10,7 +10,7 @@ class Zendesk2::GetUserIdentities
   end
 
   def mock
-    identities = service.data[:identities].values.select { |a| a["user_id"] == user_id }
+    identities = cistern.data[:identities].values.select { |a| a["user_id"] == user_id }
 
     page(identities, root: "identities")
   end

data/lib/zendesk2/group.rb

@@ -21,11 +21,11 @@ class Zendesk2::Group
     data = if new_record?
              requires :name
 
-             service.create_group("group" => self.attributes)
+             cistern.create_group("group" => self.attributes)
            else
              requires :identity
 
-             service.update_group("group" => self.attributes)
+             cistern.update_group("group" => self.attributes)
            end.body["group"]
 
     merge_attributes(data)
@@ -34,7 +34,7 @@ class Zendesk2::Group
   def destroy!
     requires :identity
 
-    service.destroy_group("group" => {"id" => self.identity})
+    cistern.destroy_group("group" => {"id" => self.identity})
 
     self.deleted = true
   end

data/lib/zendesk2/groups.rb

@@ -13,8 +13,8 @@ class Zendesk2::Groups
   self.search_type       = "group"
 
   def assignable
-    data = self.service.get_assignable_groups.body
-    collection = self.service.groups.load(data["groups"])
+    data = self.cistern.get_assignable_groups.body
+    collection = self.cistern.groups.load(data["groups"])
     collection.merge_attributes(Cistern::Hash.slice(data, "next_page", "previous_page", "count"))
   end
 end