zendesk2 0.4.4 → 0.4.5

data/spec/topic_comments_spec.rb

@@ -5,11 +5,12 @@ describe "topic_comments" do
   let!(:user)   { client.users.create!(email: "zendesk2+#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid, verified: true) }
   let!(:forum)  { client.forums.create!(name: Zendesk2.uuid) }
   let!(:topic)  { client.topics.create!(title: Zendesk2.uuid, body: Zendesk2.uuid, forum: forum) }
-  it_should_behave_like "a resource", :topic_comments,
-    lambda { {body: Zendesk2.uuid, topic_id: topic.identity, user_id: user.identity} },
-    lambda { {body: Zendesk2.uuid} },
+
+  include_examples "zendesk resource",
     {
-      :fetch_params => lambda {|tc| {"topic_id" => tc.topic_id, "id" => tc.identity}},
-      :collection   => lambda { client.topic_comments(topic_id: topic.identity) },
+      :create_params => lambda { {body: Zendesk2.uuid, topic_id: topic.identity, user_id: user.identity} },
+      :update_params => lambda { {body: Zendesk2.uuid} },
+      :fetch_params  => lambda { |tc| {"topic_id" => tc.topic_id, "id" => tc.identity} },
+      :collection    => lambda { client.topic_comments(topic_id: topic.identity) },
     }
 end

data/spec/topics_spec.rb

@@ -2,9 +2,11 @@ require 'spec_helper'
 
 describe "topics" do
   let(:client) { create_client }
-  let(:forum) { client.forums.create(name: Zendesk2.uuid) }
-  it_should_behave_like "a resource",
-    :topics,
-    lambda { {title: Zendesk2.uuid, body: Zendesk2.uuid, forum_id: forum.id} },
-    lambda { {title: Zendesk2.uuid, body: Zendesk2.uuid} }
+  let(:forum)  { client.forums.create(name: Zendesk2.uuid) }
+
+  include_examples "zendesk resource", {
+    :collection    => lambda { client.topics },
+    :create_params => lambda { { title: Zendesk2.uuid, body: Zendesk2.uuid, forum_id: forum.id } },
+    :update_params => lambda { { title: Zendesk2.uuid, body: Zendesk2.uuid } },
+  }
 end

data/spec/user_fields_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe "user_fields" do
+  let(:client) { create_client }
+
+  include_examples "zendesk resource", {
+    :collection    => lambda { client.user_fields },
+    :create_params => lambda { { title: Zendesk2.uuid, type: "text", key: "custom_#{SecureRandom.hex(3)}"} },
+    :update_params => lambda { { title: Zendesk2.uuid } },
+    :paged         => false,
+  }
+end

data/spec/user_identities_spec.rb

@@ -3,12 +3,12 @@ require 'spec_helper'
 describe "user_identities" do
   let(:client) { create_client }
   let(:user)   { client.users.create(email: "zendesk2+#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid, verified: true) }
-  it_should_behave_like "a resource",
-    :identities,
-    lambda { {value: "ey+#{Zendesk2.uuid}@example.org", type: "email", user_id: user.id} },
-    lambda { {verified: true} },
-    {
-      :fetch_params => lambda {|uc| {"user_id" => uc.user_id, "id" => uc.id}},
-      :collection   => lambda { client.user_identities(user_id: user.id) },
+
+  include_examples "zendesk resource", {
+      :create_params => lambda { { value: "ey+#{Zendesk2.uuid}@example.org", type: "email", user_id: user.id } },
+      :update_params => lambda { { verified: true } },
+      :fetch_params  => lambda { |uc| { "user_id" => uc.user_id, "id" => uc.id } },
+      :collection    => lambda { client.user_identities(user_id: user.id) },
+      :paged         => false,
     }
 end

data/spec/users_spec.rb

@@ -2,9 +2,12 @@ require 'spec_helper'
 
 describe "users" do
   let(:client) { create_client }
-  it_should_behave_like "a resource", :users,
-    lambda { {email: "zendesk2+#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid, verified: true} },
-  lambda { {name: Zendesk2.uuid} }
+
+  include_examples "zendesk resource", {
+    :collection    => lambda { client.users },
+    :create_params => lambda { { email: "zendesk2+#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid, verified: true } },
+    :update_params => lambda { { name: Zendesk2.uuid } },
+  }
 
   it "should get current user" do
     current_user = client.users.current
@@ -38,7 +41,7 @@ describe "users" do
     end
 
     it "cannot destroy a user with a ticket" do
-      ticket = client.tickets.create(requester: user, subject: Zendesk2.uuid, description: Zendesk2.uuid)
+      client.tickets.create(requester: user, subject: Zendesk2.uuid, description: Zendesk2.uuid)
 
       user.destroy.should be_false
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zendesk2
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -130,6 +130,8 @@ files:
 - lib/zendesk2/client/models/topic_comments.rb
 - lib/zendesk2/client/models/topics.rb
 - lib/zendesk2/client/models/user.rb
+- lib/zendesk2/client/models/user_field.rb
+- lib/zendesk2/client/models/user_fields.rb
 - lib/zendesk2/client/models/user_identities.rb
 - lib/zendesk2/client/models/user_identity.rb
 - lib/zendesk2/client/models/users.rb
@@ -143,6 +145,7 @@ files:
 - lib/zendesk2/client/requests/create_topic.rb
 - lib/zendesk2/client/requests/create_topic_comment.rb
 - lib/zendesk2/client/requests/create_user.rb
+- lib/zendesk2/client/requests/create_user_field.rb
 - lib/zendesk2/client/requests/create_user_identity.rb
 - lib/zendesk2/client/requests/destroy_category.rb
 - lib/zendesk2/client/requests/destroy_forum.rb
@@ -154,6 +157,7 @@ files:
 - lib/zendesk2/client/requests/destroy_topic.rb
 - lib/zendesk2/client/requests/destroy_topic_comment.rb
 - lib/zendesk2/client/requests/destroy_user.rb
+- lib/zendesk2/client/requests/destroy_user_field.rb
 - lib/zendesk2/client/requests/destroy_user_identity.rb
 - lib/zendesk2/client/requests/get_assignable_groups.rb
 - lib/zendesk2/client/requests/get_audits.rb
@@ -187,6 +191,8 @@ files:
 - lib/zendesk2/client/requests/get_topic_comments.rb
 - lib/zendesk2/client/requests/get_topics.rb
 - lib/zendesk2/client/requests/get_user.rb
+- lib/zendesk2/client/requests/get_user_field.rb
+- lib/zendesk2/client/requests/get_user_fields.rb
 - lib/zendesk2/client/requests/get_user_identities.rb
 - lib/zendesk2/client/requests/get_user_identity.rb
 - lib/zendesk2/client/requests/get_user_memberships.rb
@@ -205,20 +211,20 @@ files:
 - lib/zendesk2/client/requests/update_topic.rb
 - lib/zendesk2/client/requests/update_topic_comment.rb
 - lib/zendesk2/client/requests/update_user.rb
+- lib/zendesk2/client/requests/update_user_field.rb
 - lib/zendesk2/client/requests/update_user_identity.rb
 - lib/zendesk2/collection.rb
 - lib/zendesk2/error.rb
 - lib/zendesk2/logger.rb
 - lib/zendesk2/model.rb
+- lib/zendesk2/paged_collection.rb
 - lib/zendesk2/searchable.rb
 - lib/zendesk2/version.rb
 - spec/categories_spec.rb
-- spec/config_spec.rb
 - spec/forums_spec.rb
 - spec/groups_spec.rb
 - spec/memberships_spec.rb
 - spec/organizations_spec.rb
-- spec/shared/resource.rb
 - spec/shared/zendesk_resource.rb
 - spec/spec_helper.rb
 - spec/support/client_helper.rb
@@ -226,6 +232,7 @@ files:
 - spec/tickets_spec.rb
 - spec/topic_comments_spec.rb
 - spec/topics_spec.rb
+- spec/user_fields_spec.rb
 - spec/user_identities_spec.rb
 - spec/users_spec.rb
 - zendesk2.gemspec
@@ -255,12 +262,10 @@ specification_version: 4
 summary: Zendesk V2 API client
 test_files:
 - spec/categories_spec.rb
-- spec/config_spec.rb
 - spec/forums_spec.rb
 - spec/groups_spec.rb
 - spec/memberships_spec.rb
 - spec/organizations_spec.rb
-- spec/shared/resource.rb
 - spec/shared/zendesk_resource.rb
 - spec/spec_helper.rb
 - spec/support/client_helper.rb
@@ -268,5 +273,6 @@ test_files:
 - spec/tickets_spec.rb
 - spec/topic_comments_spec.rb
 - spec/topics_spec.rb
+- spec/user_fields_spec.rb
 - spec/user_identities_spec.rb
 - spec/users_spec.rb

data/spec/config_spec.rb

@@ -1,17 +0,0 @@
-require 'spec_helper'
-
-describe "client" do
-
-  it "can be configured" do
-    client = Zendesk2::Client.new(:url => "https://myzen.zendesk.com",
-                                  :username => "person@place.com",
-                                  :password => "wickedsecure",
-                                  :token => "12345678901234567890",
-                                  :jwt_token => "234823472398472938423234")
-    client.url.should eq "https://myzen.zendesk.com"
-    client.username.should eq "person@place.com"
-    client.token.should eq "12345678901234567890"
-    client.jwt_token.should eq "234823472398472938423234"
-  end
-
-end

data/spec/shared/resource.rb

@@ -1,66 +0,0 @@
-shared_examples "a resource" do |_collection, _params, _update_params, _options={}|
-  let(:options)       { _options || {} }
-  let(:collection)    { options[:collection] ? instance_exec(&options[:collection]) : client.send(_collection) }
-  let(:params)        { instance_exec(&_params) || {} }
-  let(:update_params) { instance_exec(&_update_params) }
-  let(:fetch_params)  { options[:fetch_params] || lambda {|r| r.identity} }
-
-  it "by creating a record" do
-    record = collection.create!(params)
-    record.identity.should_not be_nil
-  end
-
-  it "by fetching a specific record" do
-    record = collection.create!(params)
-    collection.get!(fetch_params.call(record)).should == record
-  end
-
-  if _options.fetch(:paged, true)
-    context "that is paged" do
-      before(:each) do
-        3.times.each { collection.create!(instance_exec(&_params)) }
-      end
-
-      it "by retrieving the first page" do
-        collection.all("per_page" => "1").size.should == 1
-      end
-
-      it "by retrieving the next page" do
-        first_page = collection.all("per_page" => 1)
-        second_page = collection.all("per_page" => 1).next_page
-        second_page.should_not == first_page
-      end
-
-      it "by retrieving the previous page" do
-        first_page = collection.all("per_page" => "1")
-        previous_to_second_page = collection.all("per_page" => 1).next_page.previous_page
-        previous_to_second_page.should == first_page
-      end
-    end
-  end
-
-  if _options.fetch(:update, true)
-    it "by updating a record" do
-      record = collection.create!(params)
-      record.merge_attributes(update_params)
-      record.save
-      update_params.each {|k,v| record.send(k).should == v}
-    end
-  end
-
-  it "by destroying a record" do
-    pending if _collection == :forums
-    record = collection.create!(params)
-    record.identity.should_not be_nil
-    record.destroy
-    record.should be_destroyed
-  end
-
-  # Search index takes 2-3 minutes according to the docs
-  it "should search" do
-    pending unless Zendesk2::Client.mocking?
-    pending unless collection.is_a?(Zendesk2::Searchable)
-    record = collection.create!(params)
-    collection.search(params).should include(record)
-  end
-end