zendesk2 1.4.2 → 1.5.3

data/spec/spec_helper.rb

@@ -18,6 +18,8 @@ RSpec.configure do |config|
   else
     config.filter_run_excluding(mock_only: true)
   end
+  config.filter_run(:focus => true)
+  config.run_all_when_everything_filtered = true
 
   config.order = "random"
 end

data/spec/tickets_spec.rb

@@ -14,7 +14,7 @@ describe "Zendesk2::Client" do
   describe "#create_ticket" do
     it "should require a description" do
       expect {
-        client.create_ticket("subject" => mock_uuid)
+        client.create_ticket("ticket" => {"subject" => mock_uuid})
       }.to raise_exception(Zendesk2::Error, /Description: cannot be blank/)
     end
   end
@@ -149,7 +149,7 @@ describe "Zendesk2::Client" do
       expect(custom_field["value"]).to be_nil
 
       ticket = client.tickets.create!(subject: mock_uuid, description: mock_uuid, custom_fields: [{"id" => ticket_field.identity, "value" => "jessicaspacekat"}])
-      custom_field = ticket.custom_fields.find { |cf| cf["id"].to_i == ticket_field.identity.to_i }
+      custom_field = ticket.custom_fields.find { |cf| cf["id"] == ticket_field.identity }
 
       expect(custom_field).to be
       expect(custom_field["value"]).to eq("jessicaspacekat")

data/spec/topic_comments_spec.rb

@@ -8,8 +8,8 @@ describe "topic_comments" do
 
   include_examples "zendesk resource",
     {
-      :create_params => lambda { {body: mock_uuid, topic_id: topic.identity, user_id: user.identity} },
-      :update_params => lambda { {body: mock_uuid} },
+      :create_params => lambda { { body: mock_uuid, topic_id: topic.identity, user_id: user.identity } },
+      :update        => false,
       :fetch_params  => lambda { |tc| {"topic_id" => tc.topic_id, "id" => tc.identity} },
       :collection    => lambda { client.topic_comments(topic_id: topic.identity) },
     }

data/spec/user_identities_spec.rb

@@ -18,13 +18,13 @@ describe "user_identities" do
 
     it "should prevent duplicate identities across users" do
       expect {
-        client.create_user_identity("type" => "email", "value" => user.email, "user_id" => another_user.id)
+        client.create_user_identity("user_identity" => { "type" => "email", "value" => user.email, "user_id" => another_user.id })
       }.to raise_exception(Zendesk2::Error, /is already being used by another user/)
     end
 
     it "should prevent duplicate identities on the same user" do
       expect {
-        client.create_user_identity("type" => "email", "value" => user.email, "user_id" => user.id)
+        client.create_user_identity("user_identity" => { "type" => "email", "value" => user.email, "user_id" => user.id })
       }.to raise_exception(Zendesk2::Error, /is already being used by another user/)
     end
 
@@ -33,10 +33,13 @@ describe "user_identities" do
       user.destroy
 
       expect {
-        client.create_user_identity("type"    => "email",
-                                    "value"   => email,
-                                    "user_id" => another_user.id,
-                                   )
+        client.create_user_identity(
+          "user_identity" => {
+            "type"    => "email",
+            "value"   => email,
+            "user_id" => another_user.id,
+          }
+        )
       }.to change { another_user.identities.all.count }.by(1)
     end
   end

data/spec/users_spec.rb

@@ -18,12 +18,12 @@ describe "users" do
     it "should prevent duplicate external_ids" do
       external_id = mock_uuid
 
-      client.create_user(email: mock_email, name: "a", external_id: nil)         # fine
-      client.create_user(email: mock_email, name: "b", external_id: nil)         # also fine
-      client.create_user(email: mock_email, name: "c", external_id: external_id) # it's cool
+      client.create_user("user" => {:email => mock_email, :name => "a", :external_id => nil})         # fine
+      client.create_user("user" => {:email => mock_email, :name => "b", :external_id => nil})         # also fine
+      client.create_user("user" => {:email => mock_email, :name => "c", :external_id => external_id}) # it's cool
 
       expect {
-        client.create_user(email:  mock_email, name: "d", external_id: external_id)
+        client.create_user("user" => {:email => mock_email, :name => "d", :external_id => external_id})
       }.to raise_exception(Zendesk2::Error, /External has already been taken/)
     end
   end
@@ -35,11 +35,11 @@ describe "users" do
 
       external_id = mock_uuid
 
-      client.update_user(id: user.id, external_id: nil)                 # fine
-      client.update_user(id: another_user.id, external_id: external_id) # also fine
+      client.update_user("user" => {"id" => user.id,         "external_id" => nil})         # fine
+      client.update_user("user" => {"id" => another_user.id, "external_id" => external_id}) # also fine
 
       expect {
-        client.update_user("id" => user.id, external_id: external_id)
+        client.update_user("user" => {"id" => user.id, "external_id" => external_id})
       }.to raise_exception(Zendesk2::Error, /External has already been taken/)
     end
   end
@@ -157,14 +157,12 @@ describe "users" do
     end
 
     it "should create another identity when updating email" do
-      expect(user.identities.size).to eq(1)
-
       original_email = user.email
       user.email = (new_email = mock_email)
 
       expect {
         user.save!
-      }.to change { user.identities.size }.by(1)
+      }.to change { user.identities.size }.from(1).to(2)
 
       new_identity = user.identities.find { |i| i.value == new_email }
 
@@ -184,22 +182,25 @@ describe "users" do
 
     it "should form 'legacy' login url" do
       return_to = "http://engineyard.com"
-      uri = Addressable::URI.parse(user.login_url(Time.now.to_s, return_to: return_to, token: "in-case-you-dont-have-it-in ~/.zendesk2 (aka ci)"))
-      expect(uri.query_values["return_to"]).to eq(return_to)
-      expect(uri.query_values["name"]).to eq user.name
-      expect(uri.query_values["email"]).to eq user.email
-      expect(uri.query_values["hash"]).not_to be_nil
+      login_uri = user.login_url(Time.now.to_s, return_to: return_to, token: "in-case-you-dont-have-it-in ~/.zendesk2 (aka ci)")
+      query = Faraday::NestedParamsEncoder.decode(URI.parse(login_uri).query)
+
+      expect(query["return_to"]).to eq(return_to)
+      expect(query["name"]).to eq user.name
+      expect(query["email"]).to eq user.email
+      expect(query["hash"]).not_to be_nil
     end
 
     it "should form jwt login url" do
       return_to = "http://engineyard.com"
-      uri = Addressable::URI.parse(user.jwt_login_url(return_to: return_to, jwt_token: "in-case-you-dont-have-it-in ~/.zendesk2 (aka ci)"))
-      expect(uri.query_values["return_to"]).to eq(return_to)
-      expect(uri.query_values["name"]).to be_nil
-      expect(uri.query_values["email"]).to be_nil
-      expect(uri.query_values["jwt"]).not_to be_nil
 
-      #TODO: try JWT.decode
+      jwt_login_uri = user.jwt_login_url(return_to: return_to, jwt_token: "in-case-you-dont-have-it-in ~/.zendesk2 (aka ci)")
+      query = Faraday::NestedParamsEncoder.decode(URI.parse(jwt_login_uri).query)
+
+      expect(query["return_to"]).to eq(return_to)
+      expect(query["name"]).to be_nil
+      expect(query["email"]).to be_nil
+      expect(query["jwt"]).not_to be_nil
     end
 
   end

data/zendesk2.gemspec

@@ -16,8 +16,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Zendesk2::VERSION
 
-  gem.add_dependency "addressable",        "~> 2.2"
-  gem.add_dependency "cistern",            "~> 0.11"
+  gem.add_dependency "cistern",            "~> 2.0"
   gem.add_dependency "faraday",            "~> 0.9"
   gem.add_dependency "faraday_middleware", "~> 0.9"
   gem.add_dependency "jwt",                "~> 1.0"

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: zendesk2
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-05-18 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: addressable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: cistern
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -98,6 +84,7 @@ files:
 - lib/zendesk2.rb
 - lib/zendesk2/attributes.rb
 - lib/zendesk2/client.rb
+- lib/zendesk2/client/collection.rb
 - lib/zendesk2/client/collections/categories.rb
 - lib/zendesk2/client/collections/forums.rb
 - lib/zendesk2/client/collections/groups.rb
@@ -118,6 +105,7 @@ files:
 - lib/zendesk2/client/collections/users.rb
 - lib/zendesk2/client/help_center.rb
 - lib/zendesk2/client/mock.rb
+- lib/zendesk2/client/model.rb
 - lib/zendesk2/client/models/audit_event.rb
 - lib/zendesk2/client/models/category.rb
 - lib/zendesk2/client/models/forum.rb
@@ -143,6 +131,7 @@ files:
 - lib/zendesk2/client/models/user_field.rb
 - lib/zendesk2/client/models/user_identity.rb
 - lib/zendesk2/client/real.rb
+- lib/zendesk2/client/request.rb
 - lib/zendesk2/client/requests/create_category.rb
 - lib/zendesk2/client/requests/create_forum.rb
 - lib/zendesk2/client/requests/create_group.rb
@@ -234,14 +223,11 @@ files:
 - lib/zendesk2/client/requests/update_ticket.rb
 - lib/zendesk2/client/requests/update_ticket_field.rb
 - 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

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

@@ -1,37 +0,0 @@
-class Zendesk2::Client
-  class Real
-    def update_topic_comment(params={})
-      id       = params.delete("id")
-      topic_id = params.delete("topic_id")
-      path     = "/topics/#{topic_id}/comments/#{id}.json"
-
-      request(
-        :method => :put,
-        :path   => path,
-        :body   => {
-          "topic_comment" => params
-        },
-      )
-    end
-  end
-  class Mock
-    def update_topic_comment(params={})
-      id       = params.delete("id")
-      topic_id = params.delete("topic_id")
-      path     = "/topics/#{topic_id}/comments/#{id}.json"
-
-      unless (topic_comment = self.find!(:topic_comments, id)) && topic_comment["topic_id"] == topic_id
-        error!(:not_found)
-      else
-        body = topic_comment.merge!(params)
-        response(
-          :method => :put,
-          :path   => path,
-          :body   => {
-            "topic_comment" => body
-          },
-        )
-      end
-    end
-  end
-end