zendesk2 1.5.10 → 1.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de5470cb6dcb955c1ef2d479cc686a57fd13429c
-  data.tar.gz: 37533b2cf4e9549230883682315009c429fe7512
+  metadata.gz: d3fcbdbdb4b58bb78f1860e9674718eca73bb298
+  data.tar.gz: 6b69e843cb4cafd7dd347ee2e1158c40c5f27548
 SHA512:
-  metadata.gz: b21ea4b0b5d8bfc20e6a2949b5cf8aa75635b5266967c6bc8360ecaa55e2dc139e8e27ba81a7665291bac96c3f64e7fec1a84605d3baf8aa22e16d007c0e33c6
-  data.tar.gz: c0cb2db884e230cdd63b406711018ce2354d726ccc08d6754fd126e3d700ae59a5c3b3f0353ebdebe730bd8fe5c3f45bb84bd432221bdbc0dfaa62d89d048e7d
+  metadata.gz: f4c24ea86731f7cdd3e02d50d784fdb33da1977c89d4d823a7e3c3044d649b376e8829e385489e5cb84e4324c09759b7d8539f647fed14b7e5aa92737e3e0614
+  data.tar.gz: 27b45d88a7854e86f1999ace2a1b01b9d54d4a9ae1df5374611284fbdbd3d6e8cf8c8cd00ae784b4709becdb99b531378674b519dd97aac1737e89b3ece5b09d

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

@@ -1,11 +1,11 @@
 class Zendesk2::Client::Memberships < Zendesk2::Client::Collection
+  include Zendesk2::PagedCollection
   extend Zendesk2::Attributes
 
   model Zendesk2::Client::Membership
 
   attribute :user_id, type: :integer
   attribute :organization_id, type: :integer
-  attribute :count, type: :integer
 
   assoc_accessor :organization
   assoc_accessor :user
@@ -19,12 +19,14 @@ class Zendesk2::Client::Memberships < Zendesk2::Client::Collection
 
     body = if self.user_id && self.organization_id
              {
-               "organization_memberships" => [ service.get_membership("user_id" => self.user_id, "organization_id" => self.organization_id).body["organization_membership"] ]
+               "organization_memberships" => [
+                 service.get_membership("user_id" => self.user_id, "organization_id" => self.organization_id).body["organization_membership"]
+               ]
              }
            elsif self.user_id
-             service.get_user_memberships("membership" => { "user_id" => self.user_id }).body
+             service.get_user_memberships({"membership" => { "user_id" => self.user_id }}.merge(params)).body
            else
-             service.get_organization_memberships("membership" => { "organization_id" => self.organization_id }).body
+             service.get_organization_memberships({"membership" => { "organization_id" => self.organization_id }}.merge(params)).body
            end
 
     self.load(body[collection_root])

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

@@ -9,8 +9,6 @@ class Zendesk2::Client::GetOrganizationMemberships < Zendesk2::Client::Request
   end
 
   def mock
-    memberships = self.data[:memberships].values.select { |m| m["organization_id"] == organization_id }
-
-    resources(memberships, root: "organization_memberships")
+    page(self.data[:memberships].values.select { |m| m["organization_id"] == organization_id }, root: "organization_memberships")
   end
 end

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

@@ -9,8 +9,6 @@ class Zendesk2::Client::GetUserMemberships < Zendesk2::Client::Request
   end
 
   def mock
-    collection = self.data[:memberships].values.select { |m| m["user_id"] == user_id }
-
-    resources(collection, root: "organization_memberships")
+    page(self.data[:memberships].values.select { |m| m["user_id"] == user_id }, root: "organization_memberships")
   end
 end

data/lib/zendesk2/paged_collection.rb

@@ -41,11 +41,23 @@ module Zendesk2::PagedCollection
   end
 
   def next_page
-    new_page.all("url" => next_page_link, "filtered" => self.filtered) if next_page_link
+    if next_page_link
+      options = {"url" => next_page_link}
+      if self.respond_to?(:filtered) # searchable
+        options.merge!("filtered" => self.filtered)
+      end
+      new_page.all(options)
+    end
   end
 
   def previous_page
-    new_page.all("url" => previous_page_link, "filtered" => self.filtered) if previous_page_link
+    if previous_page_link
+      options = {"url" => previous_page_link}
+      if self.respond_to?(:filtered) # searchable
+        options.merge!("filtered" => self.filtered)
+      end
+      new_page.all(options)
+    end
   end
 
   # Attempt creation of resource and explode if unsuccessful
@@ -53,7 +65,7 @@ module Zendesk2::PagedCollection
   # @raise [Zendesk2::Error] if creation was unsuccessful
   # @return [Zendesk::Client::Model]
   def create!(attributes={})
-    model = self.new(attributes.merge(Zendesk2.stringify_keys(self.attributes)))
+    model = self.new(Zendesk2.stringify_keys(attributes).merge(Zendesk2.stringify_keys(self.attributes)))
     model.save!
   end
 

data/lib/zendesk2/version.rb

@@ -1,3 +1,3 @@
 module Zendesk2
-  VERSION = "1.5.10"
+  VERSION = "1.5.11"
 end

data/spec/memberships_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
 describe "memberships" do
-  let(:client) { create_client }
-  let(:user)   { client.users.create!(email: mock_email, name: mock_uuid, verified: true) }
-  let(:organization)   { client.organizations.create!(name: mock_uuid) }
+  let!(:client)      { create_client }
+  let!(:user)        { client.users.create!(email: mock_email, name: mock_uuid, verified: true) }
+  let(:organization) { client.organizations.create!(name: mock_uuid) }
 
   include_examples "zendesk resource", {
-    :create_params => lambda { { organization_id: organization.id, user_id: user.id } },
+    :create_params => lambda { { organization_id: client.organizations.create!(name: mock_uuid).identity, user_id: user.id } },
     :collection    => lambda { client.memberships(user: user) },
-    :paged         => false,
+    :paged         => true,
     :update        => false,
     :search        => false,
   }

data/spec/shared/zendesk_resource.rb

@@ -25,7 +25,7 @@ shared_examples "zendesk resource" do |options={}|
           @resources = 3.times.map { collection.create!(instance_exec(&options[:create_params])) }
         end
 
-        after(:each) { @resources.each { |r| r.destroy } }
+        after(:each) { (@resources || []).each { |r| r.destroy } }
 
         it "should retrieve first page" do
           expect(collection.all("per_page" => "1").size).to eq(1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk2
 version: !ruby/object:Gem::Version
-  version: 1.5.10
+  version: 1.5.11
 platform: ruby
 authors:
 - Josh Lane