zendesk_api 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa3544c5e08b828371b17825f4241cbace2312bb
-  data.tar.gz: 7e1909d97426a6d092c73a65b4505e83b09e95c0
+  metadata.gz: 738a6a408575a7686612e21e3c0778fdf51de2ba
+  data.tar.gz: 7e11351db8cf9f54bb0057b8ac66c8f30203df19
 SHA512:
-  metadata.gz: 8dd96ac26287dc751acd2ebc0f53dc7d3fc2950ed50d3a13e05982998275ef9c64b85e99abdbf371cb7553172b5488e756daec4f503cd42d12a6b7ef8044284b
-  data.tar.gz: fa06182c9968a63eb3b1e4caff6af8f05d878c5b53620c1cb8da20c345cae3c86bfdc0d45fb043808bd971c9aced2b23e328907da4f9b24b8d6b8908da39afa1
+  metadata.gz: d047462c93fa23570309dea0fc10ea4259bf8051b6c4aad4f942c53bbebb38488e572c5b5cade0077a0fd955a9c8c1c2599fdb88be068c49bf3e3f9c677f2f3e
+  data.tar.gz: aff758204c53103e268e9e0a4a600d727b9db7b02d1278d41aa594fbed6a289c0aaaece502d57d1d0839981dbffadbf114918d34034f9bbc4d451a67afefd3e7

data/.travis.yml

@@ -1,6 +1,9 @@
+language: ruby
+
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.5
+  - 2.1
   - jruby
-cache: bundler
+
+sudo: false

data/README.md

@@ -18,6 +18,7 @@ Please check out the [wiki](https://github.com/zendesk/zendesk_api_client_rb/wik
 * Version 1.3.8 had a bug where attachments were created, but the response was not handled properly
 * Version >= 1.0 and < 1.4.2 had a bug where non application/json response bodies were discarded
 * Version 1.5.0 removed support for Ruby 1.8
+* Version 1.6.0 ZendeskAPI::Voice::CertificationAddress is now ZendeskAPI::Voice::Address
 
 ## Installation
 

data/lib/zendesk_api/configuration.rb

@@ -55,6 +55,9 @@ module ZendeskAPI
           :accept_encoding => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
           :user_agent => "ZendeskAPI API #{ZendeskAPI::VERSION}"
         },
+        :request => {
+          :open_timeout => 10
+        },
         :url => @url
       }.merge(client_options)
     end

data/lib/zendesk_api/resources.rb

@@ -465,7 +465,40 @@ module ZendeskAPI
     end
   end
 
+  module Conditions
+    def all_conditions=(all_conditions)
+      self.conditions ||= {}
+      self.conditions[:all] = all_conditions
+    end
+
+    def any_conditions=(any_conditions)
+      self.conditions ||= {}
+      self.conditions[:any] = any_conditions
+    end
+
+    def add_all_condition(field, operator, value)
+      self.conditions ||= {}
+      self.conditions[:all] ||= []
+      self.conditions[:all] << { :field => field, :operator => operator, :value => value }
+    end
+
+    def add_any_condition(field, operator, value)
+      self.conditions ||= {}
+      self.conditions[:any] ||= []
+      self.conditions[:any] << { :field => field, :operator => operator, :value => value }
+    end
+  end
+
+  module Actions
+    def add_action(field, value)
+      self.actions ||= []
+      self.actions << { :field => field, :value => value }
+    end
+  end
+
   class View < Rule
+    include Conditions
+
     has_many :tickets, :class => Ticket
     has_many :feed, :class => Ticket, :path => "feed"
 
@@ -473,20 +506,39 @@ module ZendeskAPI
     has :execution, :class => RuleExecution
     has ViewCount, :path => "count"
 
+    def add_column(column)
+      columns = execution.columns.map(&:id)
+      columns << column
+      self.columns = columns
+    end
+
+    def columns=(columns)
+      self.output ||= {}
+      self.output[:columns] = columns
+    end
+
     def self.preview(client, options = {})
       Collection.new(client, ViewRow, options.merge(:path => "views/preview", :verb => :post))
     end
   end
 
   class Trigger < Rule
+    include Conditions
+    include Actions
+
     has :execution, :class => RuleExecution
   end
 
   class Automation < Rule
+    include Conditions
+    include Actions
+
     has :execution, :class => RuleExecution
   end
 
   class Macro < Rule
+    include Actions
+
     has :execution, :class => RuleExecution
 
     # Returns the update to a ticket that happens when a macro will be applied.
@@ -632,7 +684,7 @@ module ZendeskAPI
       namespace "channels/voice"
     end
 
-    class CertificationAddress < Resource
+    class Address < Resource
       namespace "channels/voice"
     end
 

data/lib/zendesk_api/version.rb

@@ -1,3 +1,3 @@
 module ZendeskAPI
-  VERSION = "1.5.1"
+  VERSION = "1.6.0"
 end

data/spec/core/client_spec.rb

@@ -271,7 +271,7 @@ describe ZendeskAPI::Client do
     end
 
     it "manages namespace correctly" do
-      expect(client.certification_addresses.path).to match(/channels\/voice\/certification_addresses/)
+      expect(client.addresses.path).to match(/channels\/voice\/addresses/)
       expect(client.phone_numbers.path).to match(/channels\/voice\/phone_numbers/)
       expect(client.greetings.path).to match(/channels\/voice\/greetings/)
       expect(client.greeting_categories.path).to match(/channels\/voice\/greeting_categories/)

data/spec/core/configuration_spec.rb

@@ -17,6 +17,10 @@ describe ZendeskAPI::Configuration do
     expect(subject.options[:headers][:user_agent]).to match(/ZendeskAPI API/)
   end
 
+  it "should set a default open_timeout" do
+    expect(subject.options[:request][:open_timeout]).to eq(10)
+  end
+
   it "should merge options with client_options" do
     subject.client_options = {:ssl => false}
     expect(subject.options[:ssl]).to eq(false)

data/spec/core/resources/automation_spec.rb

@@ -0,0 +1,81 @@
+require 'core/spec_helper'
+
+describe ZendeskAPI::Automation do
+  def valid_attributes
+    {
+      :title => "my test automation",
+      :conditions => {
+        :any => [{ :field => "assignee_id", :operator => "is", :value => 1}],
+        :all => [{ :field => "status", :operator => "is", :value => "open" }]
+      },
+      :actions => [{ :field => "priority", :value => "urgent" }],
+    }
+  end
+
+  subject do
+    described_class.new(double, valid_attributes)
+  end
+
+  describe "#all_conditions=" do
+    it "should assign new values to all conditions" do
+      new_conditions = [
+        { "field" => "type", "operator" => "is", "value" => "question" },
+        { "field" => "status", "operator" => "less_than", "value" => "solved" }
+      ]
+      subject.all_conditions = new_conditions
+
+      expect(subject.conditions[:all]).to eq(new_conditions)
+    end
+  end
+
+  describe "#any_conditions=" do
+    it "should assign new values to any conditions" do
+      new_conditions = [
+        { "field" => "type", "operator" => "is", "value" => "question" },
+        { "field" => "status", "operator" => "less_than", "value" => "solved" }
+      ]
+      subject.any_conditions = new_conditions
+
+      expect(subject.conditions[:any]).to eq(new_conditions)
+    end
+  end
+
+  describe "#add_all_condition" do
+    it "should add a condition to all condition" do
+      new_condition = { :field => "type", :operator => "is", :value => "problem" }
+      existing_conditions = subject.conditions[:all]
+
+      expect(existing_conditions).not_to include(new_condition)
+
+      subject.add_all_condition("type", "is", "problem")
+
+      expect(subject.conditions[:all]).to eq(existing_conditions << new_condition)
+    end
+  end
+
+  describe "#add_any_condition" do
+    it "should add a condition to any condition" do
+      new_condition = { :field => "type", :operator => "is", :value => "task" }
+      existing_conditions = subject.conditions[:any]
+
+      expect(existing_conditions).not_to include(new_condition)
+
+      subject.add_any_condition("type", "is", "task")
+
+      expect(subject.conditions[:any]).to eq(existing_conditions << new_condition)
+    end
+  end
+
+  describe "#add_action" do
+    it "should add an action to the current actions" do
+      new_action = { :field => "status", :value => "solved" }
+      existing_actions = subject.actions
+
+      expect(existing_actions).not_to include(new_action)
+
+      subject.add_action("status", "solved")
+
+      expect(subject.actions).to eq(existing_actions << new_action)
+    end
+  end
+end

data/spec/core/resources/macro_spec.rb

@@ -0,0 +1,27 @@
+require 'core/spec_helper'
+
+describe ZendeskAPI::Macro do
+  def valid_attributes
+    {
+      :title => "my test macro",
+      :actions => [{ :field => "priority", :value => "urgent" }],
+    }
+  end
+
+  subject do
+    described_class.new(double, valid_attributes)
+  end
+
+  describe "#add_action" do
+    it "should add an action to the current actions" do
+      new_action = { :field => "status", :value => "solved" }
+      existing_actions = subject.actions
+
+      expect(existing_actions).not_to include(new_action)
+
+      subject.add_action("status", "solved")
+
+      expect(subject.actions).to eq(existing_actions << new_action)
+    end
+  end
+end

data/spec/core/resources/trigger_spec.rb

@@ -0,0 +1,67 @@
+require 'core/spec_helper'
+
+describe ZendeskAPI::Trigger do
+  def valid_attributes
+    {
+      :title => "my test trigger",
+      :conditions => {
+        :any => [{ :field => "assignee_id", :operator => "is", :value => 1}],
+        :all => [{ :field => "status", :operator => "is", :value => "open" }]
+      },
+    }
+  end
+
+  subject do
+    described_class.new(double, valid_attributes)
+  end
+
+  describe "#all_conditions=" do
+    it "should assign new values to all conditions" do
+      new_conditions = [
+        { "field" => "type", "operator" => "is", "value" => "question" },
+        { "field" => "status", "operator" => "less_than", "value" => "solved" }
+      ]
+      subject.all_conditions = new_conditions
+
+      expect(subject.conditions[:all]).to eq(new_conditions)
+    end
+  end
+
+  describe "#any_conditions=" do
+    it "should assign new values to any conditions" do
+      new_conditions = [
+        { "field" => "type", "operator" => "is", "value" => "question" },
+        { "field" => "status", "operator" => "less_than", "value" => "solved" }
+      ]
+      subject.any_conditions = new_conditions
+
+      expect(subject.conditions[:any]).to eq(new_conditions)
+    end
+  end
+
+  describe "#add_all_condition" do
+    it "should add a condition to all condition" do
+      new_condition = { :field => "type", :operator => "is", :value => "problem" }
+      existing_conditions = subject.conditions[:all]
+
+      expect(existing_conditions).not_to include(new_condition)
+
+      subject.add_all_condition("type", "is", "problem")
+
+      expect(subject.conditions[:all]).to eq(existing_conditions << new_condition)
+    end
+  end
+
+  describe "#add_any_condition" do
+    it "should add a condition to any condition" do
+      new_condition = { :field => "type", :operator => "is", :value => "task" }
+      existing_conditions = subject.conditions[:any]
+
+      expect(existing_conditions).not_to include(new_condition)
+
+      subject.add_any_condition("type", "is", "task")
+
+      expect(subject.conditions[:any]).to eq(existing_conditions << new_condition)
+    end
+  end
+end

data/spec/core/resources/view_spec.rb

@@ -0,0 +1,97 @@
+require 'core/spec_helper'
+
+describe ZendeskAPI::View do
+  def valid_attributes
+    {
+      :title => "my test view",
+      :conditions => {
+        :any => [{ :field => "assignee_id", :operator => "is", :value => 1}],
+        :all => [{ :field => "status", :operator => "is", :value => "open" }]
+      },
+      :execution => {
+        :columns => [:id => "status", :title=> "Status"]
+      }
+    }
+  end
+
+  subject do
+    described_class.new(double, valid_attributes)
+  end
+
+  describe "#columns=" do
+    it "should add a single column" do
+      new_column = ["priority"]
+      subject.columns = new_column
+
+      expect(subject.output["columns"]).to eq(new_column)
+    end
+
+    it "should set columns on output" do
+      new_columns = ["type", "priority"]
+      subject.columns = new_columns
+
+      expect(subject.output["columns"]).to eq(new_columns)
+    end
+  end
+
+  describe "#add_column" do
+    it "should add a column to the existing columns" do
+      existing_columns = subject.execution.columns.map {|c| c["id"]}
+      expect(existing_columns.include?("type")).to eq(false)
+
+      subject.add_column("type")
+
+      expect(subject.output["columns"]).to eq(existing_columns << "type")
+    end
+  end
+
+  describe "#all_conditions=" do
+    it "should assign new values to all conditions" do
+      new_conditions = [
+        { "field" => "type", "operator" => "is", "value" => "question" },
+        { "field" => "status", "operator" => "less_than", "value" => "solved" }
+      ]
+      subject.all_conditions = new_conditions
+
+      expect(subject.conditions[:all]).to eq(new_conditions)
+    end
+  end
+
+  describe "#any_conditions=" do
+    it "should assign new values to any conditions" do
+      new_conditions = [
+        { "field" => "type", "operator" => "is", "value" => "question" },
+        { "field" => "status", "operator" => "less_than", "value" => "solved" }
+      ]
+      subject.any_conditions = new_conditions
+
+      expect(subject.conditions[:any]).to eq(new_conditions)
+    end
+  end
+
+  describe "#add_all_condition" do
+    it "should add a condition to all condition" do
+      new_condition = { :field => "type", :operator => "is", :value => "problem" }
+      existing_conditions = subject.conditions[:all]
+
+      expect(existing_conditions).not_to include(new_condition)
+
+      subject.add_all_condition("type", "is", "problem")
+
+      expect(subject.conditions[:all]).to eq(existing_conditions << new_condition)
+    end
+  end
+
+  describe "#add_any_condition" do
+    it "should add a condition to any condition" do
+      new_condition = { :field => "type", :operator => "is", :value => "task" }
+      existing_conditions = subject.conditions[:any]
+
+      expect(existing_conditions).not_to include(new_condition)
+
+      subject.add_any_condition("type", "is", "task")
+
+      expect(subject.conditions[:any]).to eq(existing_conditions << new_condition)
+    end
+  end
+end

data/spec/live/dynamic_content/variant_spec.rb

@@ -3,7 +3,7 @@ require 'core/spec_helper'
 describe ZendeskAPI::DynamicContent::Item::Variant, :delete_after do
   def valid_attributes
     {
-      :locale_id => 127,
+      :locale_id => 43,
       :active => true,
       :default => false,
       :content => 'Mon dieu!'

data/spec/live/request_spec.rb

@@ -9,7 +9,7 @@ describe ZendeskAPI::Request do
   end
 
   it_should_be_creatable
-  it_should_be_updatable :subject
+  it_should_be_updatable :solved, true
   it_should_be_readable :requests
   it_should_be_readable user, :requests
 

data/spec/live/ticket_spec.rb

@@ -68,7 +68,7 @@ describe ZendeskAPI::Ticket do
       VCR.use_cassette("ticket_import_can_import") do
         old = Time.now - 5*365*24*60*60
         ticket = ZendeskAPI::Ticket.import(client, valid_attributes.merge(:created_at => old.iso8601))
-        expect(ZendeskAPI::Ticket.find(client, ticket).created_at.year).to eq(old.year)
+        expect(ZendeskAPI::Ticket.find(client, :id => ticket.id).created_at.year).to eq(old.year)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_api
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Steven Davidovitz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-14 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump
@@ -198,7 +198,6 @@ files:
 - ".travis.yml"
 - ".yardopts"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -255,6 +254,10 @@ files:
 - spec/core/middleware/response/raise_error_spec.rb
 - spec/core/read_resource_spec.rb
 - spec/core/resource_spec.rb
+- spec/core/resources/automation_spec.rb
+- spec/core/resources/macro_spec.rb
+- spec/core/resources/trigger_spec.rb
+- spec/core/resources/view_spec.rb
 - spec/core/search_spec.rb
 - spec/core/spec_helper.rb
 - spec/core/trackie_spec.rb
@@ -368,6 +371,10 @@ test_files:
 - spec/core/middleware/response/raise_error_spec.rb
 - spec/core/read_resource_spec.rb
 - spec/core/resource_spec.rb
+- spec/core/resources/automation_spec.rb
+- spec/core/resources/macro_spec.rb
+- spec/core/resources/trigger_spec.rb
+- spec/core/resources/view_spec.rb
 - spec/core/search_spec.rb
 - spec/core/spec_helper.rb
 - spec/core/trackie_spec.rb

data/Gemfile.lock

@@ -1,108 +0,0 @@
-PATH
-  remote: .
-  specs:
-    zendesk_api (1.5.1)
-      faraday (~> 0.9)
-      hashie (>= 1.2, < 4.0)
-      inflection
-      mime-types
-      multi_json
-      multipart-post (~> 2.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionpack (3.2.20)
-      activemodel (= 3.2.20)
-      activesupport (= 3.2.20)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.20)
-      activesupport (= 3.2.20)
-      builder (~> 3.0.0)
-    activesupport (3.2.20)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    addressable (2.3.6)
-    builder (3.0.4)
-    bump (0.5.1)
-    byebug (3.5.1)
-      columnize (~> 0.8)
-      debugger-linecache (~> 1.2)
-      slop (~> 3.6)
-    columnize (0.8.9)
-    crack (0.4.2)
-      safe_yaml (~> 1.0.0)
-    debugger-linecache (1.2.0)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    erubis (2.7.0)
-    faraday (0.9.0)
-      multipart-post (>= 1.2, < 3)
-    hashie (3.3.1)
-    hike (1.2.3)
-    i18n (0.6.11)
-    inflection (1.0.0)
-    journey (1.0.4)
-    json (1.8.1)
-    mime-types (2.4.3)
-    multi_json (1.10.1)
-    multipart-post (2.0.0)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rake (10.3.2)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    safe_yaml (1.0.4)
-    simplecov (0.9.1)
-      docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    slop (3.6.0)
-    sprockets (2.2.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    tilt (1.4.1)
-    vcr (2.9.3)
-    webmock (1.20.4)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-    yard (0.8.7.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  actionpack (~> 3.2)
-  bump
-  byebug
-  jruby-openssl
-  json
-  rake
-  rspec
-  simplecov
-  vcr
-  webmock
-  yard
-  zendesk_api!