zendesk2 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c144b75c399e6341efe72d69133be4abe3dff438
-  data.tar.gz: 71f62dd8b8c08825f44486be2f1bdcd035571fd0
+  metadata.gz: 346bd463b0617d8c263c4609fdc942cc677b62c4
+  data.tar.gz: 897d819fdee195fe47b86bffccfd135be8594e39
 SHA512:
-  metadata.gz: 27f2a692f0471b39fe9b33c7edee0f4d84639d325412f64cb3587f2687943ff93833c9c87e1e9559817a88b2181bf4934aa027af6472cdb79499f911ae44b793
-  data.tar.gz: 29214d0384eedab7f1399ec05b872ac82d528b684fe2313551dc77e2b696a0fd54d80fcd8cb99393ab0270424d1ec9b43d8b0d9546124685ccb1dde6d1381481
+  metadata.gz: 62de9be59ed9778bab76fb048c7528f415c38ddde42fe9be0b03782e39e4a409795ecda594b789ee51a2d4d21ae072f7865ff625d6f459dbf86dc1504698af44
+  data.tar.gz: 935aa5f661b6b6d2d2809414999dc435219734faf611244160a8d2c97bc98c047aef240db3f91ef0e9cb35cedd31904066d27fa2ae5de4aaf347b45ea74d37dc

data/lib/zendesk2/client/request.rb

@@ -53,11 +53,12 @@ class Zendesk2::Client::Request
   end
 
   def page_params!(options)
-    if url = options.delete("url")
-      Faraday::NestedParamsEncoder.decode(URI.parse(url).query)
-    else
-      Cistern::Hash.stringify_keys(options)
-    end
+    page_params = if url = options.delete("url")
+                    Faraday::NestedParamsEncoder.decode(URI.parse(url).query)
+                  else
+                    Cistern::Hash.stringify_keys(options)
+                  end
+    Cistern::Hash.slice(page_params, "per_page", "page")
   end
 
   def page_params?
@@ -65,9 +66,9 @@ class Zendesk2::Client::Request
   end
 
   def request_params
-    if page_params?
-      page_params = page_params!(self.params)
-    end
+    page_params = if page_params?
+                    page_params!(self.params)
+                  end
 
     if self.class.request_params
       self.class.request_params.call(self)

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

@@ -33,7 +33,7 @@ class Zendesk2::Client::CreateMembership < Zendesk2::Client::Request
 
     resource_id = service.serial_id
 
-    default_membership = false # !self.data[:memberships].values.find { |m| m["user_id"] == user_id && m["default"] }
+    default_membership = !self.data[:memberships].values.find { |m| m["user_id"] == user_id && m["default"] }
 
     resource = {
       "id"              => resource_id,

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

@@ -1,6 +1,8 @@
 class Zendesk2::Client::GetOrganizationMemberships < Zendesk2::Client::Request
   request_method :get
-  request_path { |r| "/organizations/#{r.organization_id}/memberships.json" }
+  request_path { |r| "/organizations/#{r.organization_id}/organization_memberships.json" }
+
+  page_params!
 
   def organization_id
     params.fetch("membership").fetch("organization_id").to_i

data/lib/zendesk2/version.rb

@@ -1,3 +1,3 @@
 module Zendesk2
-  VERSION = "1.5.3"
+  VERSION = "1.5.4"
 end

data/spec/memberships_spec.rb

@@ -14,21 +14,25 @@ describe "memberships" do
   }
 
   it "should be marked as default" do
-    membership           = client.memberships.create!(organization: organization, user: user)
+    membership           = client.memberships.create!(organization: organization, user: user).reload
     another_organization = client.organizations.create!(name: mock_uuid)
 
-    another_membership = client.memberships.create!(organization: another_organization, user: user)
+    another_membership = client.memberships.create!(organization: another_organization, user: user).reload
 
-    expect(membership.default).to be_falsey # for some reason
-    expect(another_membership.default).to be_falsey
+    expect(membership.default).to eq(true)
+    expect(another_membership.default).to eq(false)
 
-    expect { another_membership.default! }.to change { another_membership.reload.default }.from(false).to(true)
+    expect {
+      another_membership.default!
+    }.to change {
+      another_membership.reload.default
+    }.from(false).to(true)
 
     expect(membership.reload.default).to be_falsey
   end
 
   it "should get an organization's memberships" do
-    another_user = client.users.create!(email: mock_email, name: mock_uuid, verified: true)
+    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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zendesk2
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cistern