zendesk2 1.5.8 → 1.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14e4bd18323a6ea77bb0845c4eae76f0862420c6
-  data.tar.gz: 3fe8e0f33eeee1bcb958a4ff01cb52277c062271
+  metadata.gz: 932c737ddfb693f7b5d9b36402067de02a6c1ee9
+  data.tar.gz: f458a0b38c54c48fa1562286f00e561dc24f6a06
 SHA512:
-  metadata.gz: 379a06d552705727b5754663d45e20cd9c1b869ff64818131c746de554840a80257928ccad653ddb72f717d20b6c64ef91920fce84a009b3c987152446922da9
-  data.tar.gz: 1951ff8492d005f325008cf320e1fdb3361c0d8623f91ff3884e6eceac252446927a197427ccde9a551e2760b28d52a54ea7c446ed9c52e642c50cf957260334
+  metadata.gz: c887dc3ba7857f7d02ab28f8c3221d111dd87707cc8049cd93e4440205340c12aeaa0a96f8d3ad880ea0644442d45dcad109523130d341c326d5424adaa4702f
+  data.tar.gz: c8a576b2f37895b66287d50496865a4023dd5dc2c2138bfc05d09ecd46bf85b11e553df8c8fa5750aca15ce083664e08364fdad6ef094481c538dcd3358ec54b

data/lib/zendesk2/client.rb

@@ -34,7 +34,13 @@ require 'zendesk2/client/models/audit_event'
 require_resource("category", plural: "categories")
 require_resource("forum")
 require_resource("group", and: ["get_assignable_groups"])
-require_resource("user", and: ["search_user", "get_current_user", "mark_user_identity_primary"])
+require_resource("user", and: [
+  "search_user",
+  "get_current_user",
+  "mark_user_identity_primary",
+  "get_user_memberships",
+  "get_user_organizations",
+])
 
 require_resource("ticket", and: ["get_requested_tickets", "get_ccd_tickets"])
 require_resource("ticket_audit", except: [:create, :destroy, :update])
@@ -48,15 +54,7 @@ require_resource("organization", and: [
   "get_organization_by_external_id",
   "get_organization_memberships",
   "search_organization",
-  "get_user_memberships",
 ])
 require_resource("user_field")
 require_resource("user_identity", plural: "user_identities")
-
-require "zendesk2/client/models/membership"
-require "zendesk2/client/collections/memberships"
-
-require "zendesk2/client/requests/create_membership"
-require "zendesk2/client/requests/destroy_membership"
-require "zendesk2/client/requests/get_membership"
-require "zendesk2/client/requests/mark_membership_default"
+require_resource("membership", except: [:update], and: "mark_membership_default")

data/lib/zendesk2/client/collections/organizations.rb

@@ -1,9 +1,14 @@
 class Zendesk2::Client::Organizations < Zendesk2::Client::Collection
   include Zendesk2::PagedCollection
   include Zendesk2::Searchable
+  extend Zendesk2::Attributes
 
   model Zendesk2::Client::Organization
 
+  attribute :user_id, type: :integer
+
+  assoc_accessor :user
+
   def find_by_external_id(external_id)
     body = service.get_organization_by_external_id("external_id" => external_id).body
     if data = body.delete("organizations")
@@ -19,4 +24,18 @@ class Zendesk2::Client::Organizations < Zendesk2::Client::Collection
   self.model_root        = "organization"
   self.search_type       = "organization"
   self.search_request    = :search_organization
+
+  def collection_page(params={})
+    collection_method = if self.user_id
+                          :get_user_organizations
+                        else
+                          :get_organizations
+                        end
+
+    body = service.send(collection_method, Cistern::Hash.stringify_keys(self.attributes.merge(params))).body
+
+    self.load(body[collection_root])
+    self.merge_attributes(Cistern::Hash.slice(body, "count", "next_page", "previous_page"))
+    self
+  end
 end

data/lib/zendesk2/client/collections/tickets.rb

@@ -1,11 +1,15 @@
 class Zendesk2::Client::Tickets < Zendesk2::Client::Collection
   include Zendesk2::PagedCollection
   include Zendesk2::Searchable
+  extend Zendesk2::Attributes
 
   model Zendesk2::Client::Ticket
 
-  attribute :requester_id
-  attribute :collaborator_id
+  attribute :requester_id, type: :integer
+  attribute :collaborator_id, type: :integer
+
+  assoc_accessor :requester
+  assoc_accessor :collaborator
 
   self.collection_root   = "tickets"
   self.model_method      = :get_ticket
@@ -23,7 +27,7 @@ class Zendesk2::Client::Tickets < Zendesk2::Client::Collection
 
     body = service.send(collection_method, Cistern::Hash.stringify_keys(self.attributes.merge(params))).body
 
-    self.load(body[collection_root]) # 'results' is the key for paged seraches
+    self.load(body[collection_root]) # 'results' is the key for paged searches
     self.merge_attributes(Cistern::Hash.slice(body, "count", "next_page", "previous_page"))
     self
   end

data/lib/zendesk2/client/models/user.rb

@@ -183,4 +183,9 @@ class Zendesk2::Client::User < Zendesk2::Client::Model
   def memberships
     self.service.memberships(user: self)
   end
+
+  # @return [Zendesk2::Client::Organizations] the organizations of this user through memberships
+  def organizations
+    self.service.organizations(user: self)
+  end
 end

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

@@ -0,0 +1,10 @@
+class Zendesk2::Client::GetMemberships < Zendesk2::Client::Request
+  request_method :get
+  request_path { |r| "/organization_memberships.json" }
+
+  page_params!
+
+  def mock
+    page(self.data[:memberships].values, root: "organization_memberships")
+  end
+end

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

@@ -5,11 +5,14 @@ class Zendesk2::Client::GetOrganizationUsers < Zendesk2::Client::Request
   page_params!
 
   def organization_id
-    params.fetch("organization").fetch("id")
+    params.fetch("organization").fetch("id").to_i
   end
 
   def mock
-    users = self.data[:users].values.select { |u| u["organization_id"].to_i == organization_id.to_i }
+    users = self.data[:users].values.select { |u| u["organization_id"]  == organization_id }
+    users += self.data[:memberships].values.select { |m|
+      m["organization_id"] == organization_id
+    }.map { |m| self.data[:users].fetch(m["user_id"]) }
 
     page(users, root: "users")
   end

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

@@ -0,0 +1,17 @@
+class Zendesk2::Client::GetUserOrganizations < Zendesk2::Client::Request
+  request_method :get
+  request_path { |r| "/users/#{r.user_id}/organizations.json" }
+
+  page_params!
+
+  def user_id
+    params.fetch("user_id").to_i
+  end
+
+  def mock
+    memberships = self.data[:memberships].values.select { |m| m["user_id"] == user_id }
+    organizations = memberships.map { |m| self.data[:organizations].fetch(m["organization_id"]) }
+
+    page(organizations, root: "organizations")
+  end
+end

data/lib/zendesk2/version.rb

@@ -1,3 +1,3 @@
 module Zendesk2
-  VERSION = "1.5.8"
+  VERSION = "1.5.9"
 end

data/spec/memberships_spec.rb

@@ -55,6 +55,19 @@ describe "memberships" do
     expect(another_user.memberships.size).to eq(2)
   end
 
+  it "should get a user's organizations" do
+    another_user = client.users.create!(email: mock_email, name: mock_uuid, verified: true)
+    another_organization = client.organizations.create!(name: mock_uuid)
+
+    another_organization.memberships.create!(user: another_user)
+    another_organization.memberships.create!(user: user)
+    organization.memberships.create!(user: another_user)
+
+    expect(user.organizations.to_a).to contain_exactly(another_organization)
+    expect(another_organization.users.to_a).to contain_exactly(user, another_user)
+    expect(organization.users.to_a).to contain_exactly(another_user)
+  end
+
   describe "create_membership" do
     it "should error when organization does not exist" do
       expect {

data/spec/users_spec.rb

@@ -61,15 +61,17 @@ describe "users" do
     end
   end
 
-  describe "#save" do
+  context "with a user" do
     let!(:user) { client.users.create!(email: mock_email, name: mock_uuid) }
 
-    it "should update organization" do
-      user.organization = organization = client.organizations.create!(name: mock_uuid)
+    describe "#save" do
+      it "should update organization" do
+        user.organization = organization = client.organizations.create!(name: mock_uuid)
 
-      user.save!
+        user.save!
 
-      expect(user.organization).to eq(organization)
+        expect(user.organization).to eq(organization)
+      end
     end
 
     it "should get requested tickets" do
@@ -126,8 +128,8 @@ describe "users" do
       expect {
         initial_identity.destroy
       }.to change { user.identities.all }.
-        from(a_collection_containing_exactly(initial_identity, new_identity)).
-        to(a_collection_containing_exactly(new_identity))
+      from(a_collection_containing_exactly(initial_identity, new_identity)).
+      to(a_collection_containing_exactly(new_identity))
 
       expect(new_identity.reload.primary).to be_falsey
 
@@ -205,6 +207,5 @@ describe "users" do
       expect(query["email"]).to be_nil
       expect(query["jwt"]).not_to be_nil
     end
-
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zendesk2
 version: !ruby/object:Gem::Version
-  version: 1.5.8
+  version: 1.5.9
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cistern
@@ -179,6 +179,7 @@ files:
 - lib/zendesk2/client/requests/get_help_center_section.rb
 - lib/zendesk2/client/requests/get_help_center_sections.rb
 - lib/zendesk2/client/requests/get_membership.rb
+- lib/zendesk2/client/requests/get_memberships.rb
 - lib/zendesk2/client/requests/get_organization.rb
 - lib/zendesk2/client/requests/get_organization_by_external_id.rb
 - lib/zendesk2/client/requests/get_organization_memberships.rb
@@ -205,6 +206,7 @@ files:
 - lib/zendesk2/client/requests/get_user_identities.rb
 - lib/zendesk2/client/requests/get_user_identity.rb
 - lib/zendesk2/client/requests/get_user_memberships.rb
+- lib/zendesk2/client/requests/get_user_organizations.rb
 - lib/zendesk2/client/requests/get_users.rb
 - lib/zendesk2/client/requests/mark_membership_default.rb
 - lib/zendesk2/client/requests/mark_user_identity_primary.rb