zendesk2 1.5.3 → 1.5.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c144b75c399e6341efe72d69133be4abe3dff438
4
- data.tar.gz: 71f62dd8b8c08825f44486be2f1bdcd035571fd0
3
+ metadata.gz: 346bd463b0617d8c263c4609fdc942cc677b62c4
4
+ data.tar.gz: 897d819fdee195fe47b86bffccfd135be8594e39
5
5
  SHA512:
6
- metadata.gz: 27f2a692f0471b39fe9b33c7edee0f4d84639d325412f64cb3587f2687943ff93833c9c87e1e9559817a88b2181bf4934aa027af6472cdb79499f911ae44b793
7
- data.tar.gz: 29214d0384eedab7f1399ec05b872ac82d528b684fe2313551dc77e2b696a0fd54d80fcd8cb99393ab0270424d1ec9b43d8b0d9546124685ccb1dde6d1381481
6
+ metadata.gz: 62de9be59ed9778bab76fb048c7528f415c38ddde42fe9be0b03782e39e4a409795ecda594b789ee51a2d4d21ae072f7865ff625d6f459dbf86dc1504698af44
7
+ data.tar.gz: 935aa5f661b6b6d2d2809414999dc435219734faf611244160a8d2c97bc98c047aef240db3f91ef0e9cb35cedd31904066d27fa2ae5de4aaf347b45ea74d37dc
@@ -53,11 +53,12 @@ class Zendesk2::Client::Request
53
53
  end
54
54
 
55
55
  def page_params!(options)
56
- if url = options.delete("url")
57
- Faraday::NestedParamsEncoder.decode(URI.parse(url).query)
58
- else
59
- Cistern::Hash.stringify_keys(options)
60
- end
56
+ page_params = if url = options.delete("url")
57
+ Faraday::NestedParamsEncoder.decode(URI.parse(url).query)
58
+ else
59
+ Cistern::Hash.stringify_keys(options)
60
+ end
61
+ Cistern::Hash.slice(page_params, "per_page", "page")
61
62
  end
62
63
 
63
64
  def page_params?
@@ -65,9 +66,9 @@ class Zendesk2::Client::Request
65
66
  end
66
67
 
67
68
  def request_params
68
- if page_params?
69
- page_params = page_params!(self.params)
70
- end
69
+ page_params = if page_params?
70
+ page_params!(self.params)
71
+ end
71
72
 
72
73
  if self.class.request_params
73
74
  self.class.request_params.call(self)
@@ -33,7 +33,7 @@ class Zendesk2::Client::CreateMembership < Zendesk2::Client::Request
33
33
 
34
34
  resource_id = service.serial_id
35
35
 
36
- default_membership = false # !self.data[:memberships].values.find { |m| m["user_id"] == user_id && m["default"] }
36
+ default_membership = !self.data[:memberships].values.find { |m| m["user_id"] == user_id && m["default"] }
37
37
 
38
38
  resource = {
39
39
  "id" => resource_id,
@@ -1,6 +1,8 @@
1
1
  class Zendesk2::Client::GetOrganizationMemberships < Zendesk2::Client::Request
2
2
  request_method :get
3
- request_path { |r| "/organizations/#{r.organization_id}/memberships.json" }
3
+ request_path { |r| "/organizations/#{r.organization_id}/organization_memberships.json" }
4
+
5
+ page_params!
4
6
 
5
7
  def organization_id
6
8
  params.fetch("membership").fetch("organization_id").to_i
@@ -1,3 +1,3 @@
1
1
  module Zendesk2
2
- VERSION = "1.5.3"
2
+ VERSION = "1.5.4"
3
3
  end
@@ -14,21 +14,25 @@ describe "memberships" do
14
14
  }
15
15
 
16
16
  it "should be marked as default" do
17
- membership = client.memberships.create!(organization: organization, user: user)
17
+ membership = client.memberships.create!(organization: organization, user: user).reload
18
18
  another_organization = client.organizations.create!(name: mock_uuid)
19
19
 
20
- another_membership = client.memberships.create!(organization: another_organization, user: user)
20
+ another_membership = client.memberships.create!(organization: another_organization, user: user).reload
21
21
 
22
- expect(membership.default).to be_falsey # for some reason
23
- expect(another_membership.default).to be_falsey
22
+ expect(membership.default).to eq(true)
23
+ expect(another_membership.default).to eq(false)
24
24
 
25
- expect { another_membership.default! }.to change { another_membership.reload.default }.from(false).to(true)
25
+ expect {
26
+ another_membership.default!
27
+ }.to change {
28
+ another_membership.reload.default
29
+ }.from(false).to(true)
26
30
 
27
31
  expect(membership.reload.default).to be_falsey
28
32
  end
29
33
 
30
34
  it "should get an organization's memberships" do
31
- another_user = client.users.create!(email: mock_email, name: mock_uuid, verified: true)
35
+ another_user = client.users.create!(email: mock_email, name: mock_uuid, verified: true)
32
36
  another_organization = client.organizations.create!(name: mock_uuid)
33
37
 
34
38
  another_organization.memberships.create!(user: another_user)
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: zendesk2
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.3
4
+ version: 1.5.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Josh Lane
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-05-18 00:00:00.000000000 Z
11
+ date: 2015-05-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: cistern