zendesk2 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ab381ae9ac2abcdb319cb7485c1046957320739
-  data.tar.gz: 33c6c9c16c1b2dcef4de822d621f1b9d326b6c8c
+  metadata.gz: a18fd1746e59027bea3912be64321d5bfbedf1d8
+  data.tar.gz: 321bc39eff6fd71787f5faf97eaa53bac27230dd
 SHA512:
-  metadata.gz: b6aab81be23583b46b17345738dab3d3fcbec5723be5014fb2ec9058ca8a3de7dd58de77f86e09c7a6e1274b2f4e0f536b703b1cf8ee76758ab31f31d91c5aa4
-  data.tar.gz: 70d741ec4a91b0803e1f1dba2541d23a1f6e78bfb984314b53153e281a0091f7dd8e3905b731e64b0075e003e610e0d2941d0c6184b3d5f386a0be61bea6ddfb
+  metadata.gz: c739e8b40eee14997eaea9bb255bd7cd798175c565bbf8d534dd04ed09a1c8860ca97ec67653ba59b4922cae8f3776e08834235794a239ca3484cdab6b6a3e80
+  data.tar.gz: 176636a93ff3de53c8186c51858ef5e17491cfe281e54923019114faa6df272a542ab4edb75c82fcf5ebddd5331a10c511ad425b882ef5059fa8511f698032d0

data/README.md

@@ -72,6 +72,7 @@ Currently support resources:
 * User Identities
 * User Fields
 * Users
+* Views
 
 Help Center resources:
 

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

@@ -5,8 +5,9 @@ class Zendesk2::Client::Tickets < Zendesk2::Client::Collection
 
   model Zendesk2::Client::Ticket
 
-  attribute :requester_id, type: :integer
+  attribute :requester_id,    type: :integer
   attribute :collaborator_id, type: :integer
+  attribute :view_id,         type: :integer
 
   assoc_accessor :requester
   assoc_accessor :collaborator
@@ -21,6 +22,8 @@ class Zendesk2::Client::Tickets < Zendesk2::Client::Collection
                           :get_requested_tickets
                         elsif collaborator_id
                           :get_ccd_tickets
+                        elsif view_id
+                          :get_view_tickets
                         else
                           :get_tickets
                         end
@@ -34,4 +37,5 @@ class Zendesk2::Client::Tickets < Zendesk2::Client::Collection
 
   scopes << :requester_id
   scopes << :collaborator_id
+  scopes << :view_id
 end

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

@@ -0,0 +1,11 @@
+class Zendesk2::Client::Views < Zendesk2::Client::Collection
+  include Zendesk2::PagedCollection
+  extend Zendesk2::Attributes
+
+  model Zendesk2::Client::View
+
+  self.collection_method = :get_views
+  self.collection_root   = "views"
+  self.model_method      = :get_view
+  self.model_root        = "view"
+end

data/lib/zendesk2/client/mock.rb

@@ -24,6 +24,7 @@ class Zendesk2::Client < Cistern::Service
         :topics                 => {},
         :user_fields            => {},
         :users                  => {},
+        :views                  => {},
       }
     end
 

data/lib/zendesk2/client/models/view.rb

@@ -0,0 +1,53 @@
+class Zendesk2::Client::View < Zendesk2::Client::Model
+  extend Zendesk2::Attributes
+
+  # @return [Integer] Automatically assigned when created
+  identity :id, type: :integer
+
+  # @return [Boolean] Useful for determining if the view should be displayed
+  attribute :active, type: :boolean
+  # @return [Hash] An object describing how the view is constructed
+  attribute :conditions, type: :hash, default: {}
+  # @return [Time] The time the view was created
+  attribute :created_at, type: :time
+  # @return [Hash] An object describing how the view should be executed
+  attribute :execution, type: :hash, default: {}
+  # @return [Hash] Who may access this account. Will be null when everyone in the account can access it.
+  attribute :restriction, type: :hash, default: {}
+  # @return [Integer] If the view is for an SLA this is the id
+  attribute :sla_id, type: :integer
+  # @return [String] The title of the view
+  attribute :title, type: :string
+  # @return [Time] The time of the last update of the view
+  attribute :updated_at, type: :time
+
+  def save!
+    requires :execution, :title
+
+    params = {
+      "title"  => self.title,
+      "active" => self.active,
+      "output" => Cistern::Hash.slice(self.execution, "sort_by", "sort_order", "group_by", "group_order", "columns")
+    }.merge(Cistern::Hash.slice(self.conditions, "any", "all"))
+
+    data = if new_record?
+             service.create_view("view" => params)
+           else
+             service.create_view("view" => params)
+           end.body
+
+    merge_attributes(data["view"])
+  end
+
+  def tickets
+    requires :identity
+
+    service.tickets(view_id: self.identity)
+  end
+
+  def destroy!
+    requires :identity
+
+    service.destroy_view("view" => {"id" => self.identity})
+  end
+end

data/lib/zendesk2/client/real.rb

@@ -11,7 +11,7 @@ class Zendesk2::Client < Cistern::Service
       @logger   = options[:logger]   || Logger.new(nil)
       adapter   = options[:adapter]  || Faraday.default_adapter
       @username = options[:username] || Zendesk2.defaults[:username]
-      @token    = options[:token]    || Zendesk2.defaults[:token]
+      @token    = options.fetch(:token, Zendesk2.defaults[:token])
       password  = options[:password] || Zendesk2.defaults[:password]
 
       service_options = options[:service_options] || {}
@@ -62,6 +62,8 @@ class Zendesk2::Client < Cistern::Service
         req.params.merge!(params)
         req.body = @last_request = body
       end
+    rescue Faraday::ConnectionFailed
+      raise
     rescue Faraday::Error::ClientError => e
       raise Zendesk2::Error.new(e)
     end

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

@@ -20,7 +20,7 @@ class Zendesk2::Client::CreateMembership < Zendesk2::Client::Request
   end
 
   def mock
-    find!(:users, user_id)
+    user = find!(:users, user_id)
     find!(:organizations, organization_id,
           :error   => :invalid,
           :details => {
@@ -44,6 +44,12 @@ class Zendesk2::Client::CreateMembership < Zendesk2::Client::Request
 
     self.data[:memberships][resource_id] = resource
 
+    primary_organization = self.data[:memberships].values.find { |m| m["user_id"] == user_id && m["default"] }
+
+    if primary_organization
+      user.merge!("organization_id" => primary_organization["organization_id"])
+    end
+
     mock_response("organization_membership" => resource)
   end
 end

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

@@ -55,6 +55,10 @@ class Zendesk2::Client::CreateUser < Zendesk2::Client::Request
       self.data[:identities][user_identity_id] = user_identity
       self.data[:users][user_id] = record.reject { |k,v| k == "email" }
 
+      if organization_id
+        service.create_membership("membership" => { "user_id" => user_id, "organization_id" => organization_id, "default" => true } )
+      end
+
       mock_response({"user" => record}, {status: 201})
     end
   end

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

@@ -0,0 +1,96 @@
+class Zendesk2::Client::CreateView < Zendesk2::Client::Request
+  request_method :post
+  request_path { |_| "/views.json" }
+  request_body { |r| { "view" => r.view_params } }
+
+  def self.accepted_attributes
+    %w[title all any active output restriction]
+  end
+
+  def self.view_columns
+    @_view_columns ||= {
+      "assigned"           => "Assigned date",
+      "assignee"           => "Assignee",
+      "brand"              => "Brand",
+      "created"            => "Request date",
+      "description"        => "Subject",
+      "due_date"           => "Due Date",
+      "group"              => "Group",
+      "locale_id"          => "Requester language",
+      "nice_id"            => "ID",
+      "organization"       => "Organization",
+      "priority"           => "Priority",
+      "requester"          => "Requester",
+      "satisfaction_score" => "Satisfaction",
+      "score"              => "Score",
+      "solved"             => "Solved date",
+      "status"             => "Status",
+      "submitter"          => "Submitter",
+      "ticket_form"        => "Ticket form",
+      "type"               => "Ticket type",
+      "updated"            => "Latest update",
+      "updated_assignee"   => "Latest update by assignee",
+      "updated_by_type"    => "Latest updater type (agent/end-user)",
+      "updated_requester"  => "Latest update by requester",
+    }.freeze
+  end
+
+  def view_params
+    @_view_params ||= Cistern::Hash.slice(params.fetch("view"), *self.class.accepted_attributes)
+  end
+
+  # {:status=>422, :headers=>{"server"=>"nginx", "date"=>"Fri, 10 Jul 2015 18:58:50 GMT", "content-type"=>"application/json; charset=UTF-8", "content-length"=>"262", "connection"=>"close", "status"=>"422 Unprocessable Entity", "x-zendesk-api-version"=>"v2", "x-frame-options"=>"SAMEORIGIN", "strict-transport-security"=>"max-age=31536000;", "x-ua-compatible"=>"IE=Edge,chrome=1", "cache-control"=>"no-cache", "x-zendesk-origin-server"=>"app5.pod5.iad1.zdsys.com", "x-request-id"=>"8dec47a7-f80d-4823-c8e2-b8ca3a6b1aa9", "x-runtime"=>"0.106400", "x-rack-cache"=>"invalidate, pass", "x-zendesk-request-id"=>"6efea4cc3c46093df8b1"}, :body=>{"error"=>"RecordInvalid", "description"=>"Record validation errors", "details"=>{"base"=>[{"description"=>"View must test for at least <strong>one</strong> of the following ticket properties in the ALL conditions section: Status, Type, Group, Assignee, Requester."}]}}}
+  # {:status=>400, :headers=>{"server"=>"nginx", "date"=>"Fri, 10 Jul 2015 18:58:39 GMT", "content-type"=>"application/json; charset=UTF-8", "content-length"=>"142", "connection"=>"close", "status"=>"400 Bad Request", "x-zendesk-api-version"=>"v2", "strict-transport-security"=>"max-age=31536000;", "x-ua-compatible"=>"IE=Edge,chrome=1", "cache-control"=>"no-cache", "x-zendesk-origin-server"=>"app5.pod5.iad1.zdsys.com", "x-request-id"=>"55216728-1c4b-49ce-c988-b8ca3a6b1a09", "x-runtime"=>"0.077761", "x-rack-cache"=>"invalidate, pass", "x-zendesk-request-id"=>"a49e204bdb7ceb6d22b2"}, :body=>{"error"=>{"title"=>"Invalid attribute", "message"=>"You passed an invalid value for the value attribute. must be a string"}}}
+  # {:status=>422, :headers=>{"server"=>"nginx", "date"=>"Fri, 10 Jul 2015 18:57:38 GMT", "content-type"=>"application/json; charset=UTF-8", "content-length"=>"326", "connection"=>"close", "status"=>"422 Unprocessable Entity", "x-zendesk-api-version"=>"v2", "x-frame-options"=>"SAMEORIGIN", "strict-transport-security"=>"max-age=31536000;", "x-ua-compatible"=>"IE=Edge,chrome=1", "cache-control"=>"no-cache", "x-zendesk-origin-server"=>"app19.pod5.iad1.zdsys.com", "x-request-id"=>"577927e1-1a98-4642-c636-b8ca3a6bdb18", "x-runtime"=>"0.114688", "x-rack-cache"=>"invalidate, pass", "x-zendesk-request-id"=>"6f646a8ab4e30717d593"}, :body=>{"error"=>"RecordInvalid", "description"=>"Record validation errors", "details"=>{"base"=>[{"description"=>"Organization 1 was deleted and cannot be used"}, {"description"=>"View must test for at least <strong>one</strong> of the following ticket properties in the ALL conditions section: Status, Type, Group, Assignee, Requester."}]}}}
+  def mock
+    create_params = view_params.dup
+
+    if create_params["title"].nil? || create_params["title"] == ""
+      error!(:invalid, :details => {"base" => [{"title" => "Title: cannot be blank"}]})
+    end
+
+    if Array(create_params["any"]).empty? && Array(create_params["all"]).empty?
+      error!(:invalid, :details => {"base" => ["Invalid conditions: You must select at least one condition"]})
+    end
+
+    identity = service.serial_id
+
+    output = view_params.delete("output") || {}
+    columns = (output["columns"] || []).inject([]) { |r,c| r << {"id" => c, "name" => self.class.view_columns.fetch(c)} }
+
+    record = {
+      "id"               => identity,
+      "url"              => url_for("/views/#{identity}.json"),
+      "created_at"       => Time.now.iso8601,
+      "updated_at"       => Time.now.iso8601,
+      "active"           => true,
+      "execution"        => {
+        "columns"       => columns,
+        "fields"        => columns,
+        "custom_fields" => [],
+        "group_by"      => create_params["group_by"],
+        "group_order"   => create_params["group_order"],
+        "sort_by"       => create_params["sort_by"],
+        "sort_order"    => create_params["sort_order"],
+        "sort" => {
+          "id"    => create_params["sort_by"],
+          "order" => create_params["sort_order"],
+          "title" => (create_params["sort_by"] && create_params["sort_by"].to_s.upcase),
+        },
+        "group" => {
+          "id"    => create_params["group_by"],
+          "order" => create_params["group_order"],
+          "title" => (create_params["group_by"] && create_params["group_by"].to_s.upcase),
+        },
+      },
+      "conditions"    => {
+        "any" => Array(create_params["any"]),
+        "all" => Array(create_params["all"]),
+      },
+    }.merge(create_params)
+
+    service.data[:views][identity] = record
+
+    mock_response("view" => record)
+  end
+end

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

@@ -3,11 +3,19 @@ class Zendesk2::Client::DestroyMembership < Zendesk2::Client::Request
   request_path { |r| "/organization_memberships/#{r.membership_id}.json" }
 
   def membership_id
-    params.fetch("membership").fetch("id")
+    params.fetch("membership").fetch("id").to_i
   end
 
   def mock
-    delete!(:memberships, membership_id)
+    membership = delete!(:memberships, membership_id)
+
+    primary_organization = self.data[:memberships].values.find { |m| m["user_id"] == membership["user_id"] && m["default"] } ||
+      self.data[:memberships].values.find { |m| m["user_id"] == membership["user_id"] }
+
+    if primary_organization
+      primary_organization.merge!("default" => true)
+      self.find!(:users, membership["user_id"].to_i).merge!("organization_id" => primary_organization["organization_id"])
+    end
 
     mock_response(nil)
   end

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

@@ -0,0 +1,14 @@
+class Zendesk2::Client::DestroyView < Zendesk2::Client::Request
+  request_method :delete
+  request_path { |r| "/views/#{r.view_id}.json" }
+
+  def view_id
+    @_view_id ||= params.fetch("view").fetch("id")
+  end
+
+  def mock
+    self.delete!(:views, view_id)
+
+    mock_response(nil)
+  end
+end

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

@@ -9,10 +9,9 @@ class Zendesk2::Client::GetOrganizationUsers < Zendesk2::Client::Request
   end
 
   def mock
-    users = self.data[:users].values.select { |u| u["organization_id"]  == organization_id }
-    users += self.data[:memberships].values.select { |m|
-      m["organization_id"] == organization_id
-    }.map { |m| self.data[:users].fetch(m["user_id"]) }
+    users = self.data[:memberships].values.
+      select { |m| m["organization_id"] == organization_id }.
+      map    { |m| self.data[:users].fetch(m["user_id"]) }
 
     page(users, root: "users")
   end

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

@@ -0,0 +1,12 @@
+class Zendesk2::Client::GetView < Zendesk2::Client::Request
+  request_method :get
+  request_path { |r| "/views/#{r.view_id}.json" }
+
+  def view_id
+    params.fetch("view").fetch("id")
+  end
+
+  def mock
+    mock_response("view" => self.find!(:views, view_id))
+  end
+end

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

@@ -0,0 +1,37 @@
+class Zendesk2::Client::GetViewTickets < Zendesk2::Client::Request
+  request_method :get
+  request_path { |r| "/views/#{r.view_id}/tickets.json" }
+
+  page_params!
+
+  def view_id
+    params.fetch("view_id").to_i
+  end
+
+  def mock(params={})
+    view = self.find!(:views, view_id)
+
+    tickets = Array(view["conditions"]["all"]).map { |c|
+      operator = ("is" == c.fetch("operator")) ? :eql? : :!=
+      key      = c.fetch("field")
+      value    = c.fetch("value").to_s
+
+      [operator, key, value]
+    }.inject(self.data[:tickets].values) { |r, (o,k,v)|
+      r.select { |t| t[k].to_s.public_send(o, v) }
+    }
+
+    any_operators = Array(view["conditions"]["any"]).map { |c|
+      operator = ("is" == c.fetch("operator")) ? :eql? : :!=
+      key      = c.fetch("field")
+      value    = c.fetch("value").to_s
+
+      [operator, key, value]
+    }
+
+    any_operators.any? &&
+      tickets.select! { |t| any_operators.find { |(o,k,v)| t[k].to_s.public_send(o, v) } }
+
+    page(tickets, root: "tickets")
+  end
+end

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

@@ -0,0 +1,10 @@
+class Zendesk2::Client::GetViews < Zendesk2::Client::Request
+  request_method :get
+  request_path { |r| "/views.json" }
+
+  page_params!
+
+  def mock
+    page(:views)
+  end
+end

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

@@ -0,0 +1,62 @@
+class Zendesk2::Client::UpdateView < Zendesk2::Client::Request
+  request_method :put
+  request_path { |r| "/views/#{r.view_id}.json"  }
+  request_body { |r| { "view" => r.view_params } }
+
+  def self.accepted_attributes
+    Zendesk2::Client::Createview.accepted_attributes
+  end
+
+  def view_params
+    @_view_params ||= Cistern::Hash.slice(params.fetch("view"), *self.class.accepted_attributes)
+  end
+
+  def view_id
+    params.fetch("view").fetch("id")
+  end
+
+  def mock
+    body = self.find!(:views, view_id)
+
+    update_params = view_params.dup
+
+    output = params.delete("output") || {}
+    columns = (output["columns"] || []).inject([]) { |r,c| r << {"id" => c, "name" => Zendesk2::Client::CreateView.view_columns.fetch(c)} }
+
+    body.merge!("updated_at" => Time.now.iso8601)
+
+    if columns.any?
+      body.merge!(
+        "execution"        => {
+          "columns"       => columns,
+          "fields"        => columns,
+          "custom_fields" => [],
+        }
+      )
+    end
+
+    body["execution"]["conditions"].merge!(Cistern::Hash.slice(body, "any", "all"))
+
+    group_params = Cistern::Hash.slice(body, "group_by", "group_order").merge(Cistern::Hash.slice(update_params, "group_by", "group_order"))
+
+    body.merge!(group_params).merge!(
+      "group" => {
+        "id"    => group_params["group_by"],
+        "order" => group_params["group_order"],
+        "title" => (group_params["group_by"] && group_params["group_by"].to_s.upcase),
+      },
+    )
+
+    sort_params = Cistern::Hash.slice(body, "sort_by", "sort_order").merge(Cistern::Hash.slice(update_params, "sort_by", "sort_order"))
+
+    body.merge!(sort_params).merge!(
+      "sort" => {
+        "id"    => sort_params["sort_by"],
+        "order" => sort_params["sort_order"],
+        "title" => (sort_params["sort_by"] && sort_params["sort_by"].to_s.upcase),
+      },
+    )
+
+    mock_response("view" => body)
+  end
+end

data/lib/zendesk2/client.rb

@@ -58,3 +58,4 @@ require_resource("organization", and: [
 require_resource("user_field")
 require_resource("user_identity", plural: "user_identities")
 require_resource("membership", except: [:update], and: "mark_membership_default")
+require_resource("view", and: ["get_view_tickets"])

data/lib/zendesk2/version.rb

@@ -1,3 +1,3 @@
 module Zendesk2
-  VERSION = "1.6.1"
+  VERSION = "1.7.0"
 end

data/spec/categories_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "categories" do
   let(:client) { create_client }
 
-  include_examples "zendesk resource", {
+  include_examples "zendesk#resource", {
     :collection    => lambda { client.categories },
     :create_params => lambda { { name: mock_uuid } },
     :update_params => lambda { { name: mock_uuid } },

data/spec/forums_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "forums" do
   let(:client) { create_client }
 
-  include_examples "zendesk resource", {
+  include_examples "zendesk#resource", {
     :collection      => lambda { client.forums },
     :create_params   => lambda { { name: mock_uuid } },
     :update_params   => lambda { { name: mock_uuid } },

data/spec/groups_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "groups" do
   let(:client) { create_client }
 
-  include_examples "zendesk resource", {
+  include_examples "zendesk#resource", {
     :collection    => lambda { client.groups },
     :create_params => lambda { { name: mock_uuid } },
     :update_params => lambda { { name: mock_uuid } },

data/spec/help_center/articles_spec.rb

@@ -12,7 +12,7 @@ describe "help_center/articles" do
                                        )
   end
 
-  include_examples "zendesk resource", {
+  include_examples "zendesk#resource", {
     :collection    => lambda { client.help_center_articles },
     :create_params => lambda { { title: mock_uuid, locale: "en-us", section: section } },
     :update_params => lambda { { title: mock_uuid } },

data/spec/help_center/categories_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "help_center/categories" do
   let(:client)   { create_client }
 
-  include_examples "zendesk resource", {
+  include_examples "zendesk#resource", {
     :collection    => lambda { client.help_center_categories },
     :create_params => lambda { { name: mock_uuid, locale: "en-us" } },
     :update_params => lambda { { name: mock_uuid } },

data/spec/help_center/sections_spec.rb

@@ -9,7 +9,7 @@ describe "help_center/sections" do
     )
   end
 
-  include_examples "zendesk resource", {
+  include_examples "zendesk#resource", {
     :collection    => lambda { client.help_center_sections },
     :create_params => lambda { { name: mock_uuid, locale: "en-us", category: category } },
     :update_params => lambda { { name: mock_uuid } },

data/spec/memberships_spec.rb

@@ -5,7 +5,7 @@ describe "memberships" do
   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", {
+  include_examples "zendesk#resource", {
     :create_params => lambda { { organization_id: client.organizations.create!(name: mock_uuid).identity, user_id: user.id } },
     :collection    => lambda { client.memberships(user: user) },
     :paged         => true,
@@ -63,9 +63,9 @@ describe "memberships" do
     another_organization.memberships.create!(user: user)
     organization.memberships.create!(user: another_user)
 
-    expect(user.organizations.to_a).to contain_exactly(another_organization)
+    expect(user.organizations.to_a).to         contain_exactly(another_organization)
     expect(another_organization.users.to_a).to contain_exactly(user, another_user)
-    expect(organization.users.to_a).to contain_exactly(another_user)
+    expect(organization.users.to_a).to         contain_exactly(another_user)
   end
 
   describe "create_membership" do

data/spec/organizations_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "organizations" do
   let(:client) { create_client }
 
-  include_examples "zendesk resource", {
+  include_examples "zendesk#resource", {
     :collection    => lambda { client.organizations },
     :create_params => lambda { { name: mock_uuid } },
     :update_params => lambda { { name: mock_uuid } },

data/spec/shared/zendesk_resource.rb

@@ -1,4 +1,4 @@
-shared_examples "zendesk resource" do |options={}|
+shared_examples "zendesk#resource" do |options={}|
   context "as a resource" do
     let!(:collection)   { instance_exec(&options[:collection]) }
     let(:create_params) { instance_exec(&options[:create_params]) || {} }

data/spec/ticket_fields_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "ticket_fields" do
   let(:client) { create_client }
 
-  include_examples "zendesk resource", {
+  include_examples "zendesk#resource", {
     :collection    => lambda { client.ticket_fields },
     :create_params => lambda { { title: mock_uuid, type: "text" } },
     :update_params => lambda { { title: mock_uuid } },

data/spec/tickets_spec.rb

@@ -4,7 +4,7 @@ describe "Zendesk2::Client" do
   let(:client) { create_client }
 
   describe "tickets" do
-    include_examples "zendesk resource", {
+    include_examples "zendesk#resource", {
       :collection    => lambda { client.tickets },
       :create_params => lambda { {subject: mock_uuid, description: mock_uuid} },
       :update_params => lambda { {subject: mock_uuid} },

data/spec/topic_comments_spec.rb

@@ -6,7 +6,7 @@ describe "topic_comments" do
   let!(:forum)  { client.forums.create!(name: mock_uuid) }
   let!(:topic)  { client.topics.create!(title: mock_uuid, body: mock_uuid, forum: forum) }
 
-  include_examples "zendesk resource",
+  include_examples "zendesk#resource",
     {
       :create_params => lambda { { body: mock_uuid, topic_id: topic.identity, user_id: user.identity } },
       :update        => false,

data/spec/topics_spec.rb

@@ -4,7 +4,7 @@ describe "topics" do
   let(:client) { create_client }
   let(:forum)  { client.forums.create(name: mock_uuid) }
 
-  include_examples "zendesk resource", {
+  include_examples "zendesk#resource", {
     :collection    => lambda { client.topics },
     :create_params => lambda { { title: mock_uuid, body: mock_uuid, forum_id: forum.id } },
     :update_params => lambda { { title: mock_uuid, body: mock_uuid } },

data/spec/user_fields_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "user_fields" do
   let(:client) { create_client }
 
-  include_examples "zendesk resource", {
+  include_examples "zendesk#resource", {
     :collection    => lambda { client.user_fields },
     :create_params => lambda { { title: mock_uuid, type: "text", key: "custom_#{SecureRandom.hex(3)}"} },
     :update_params => lambda { { title: mock_uuid } },

data/spec/user_identities_spec.rb

@@ -4,7 +4,7 @@ describe "user_identities" do
   let(:client) { create_client }
   let(:user)   { client.users.create(email: mock_email, name: mock_uuid, verified: true) }
 
-  include_examples "zendesk resource", {
+  include_examples "zendesk#resource", {
     :create_params => lambda { { value: "ey+#{mock_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 } },

data/spec/users_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "users" do
   let(:client) { create_client }
 
-  include_examples "zendesk resource", {
+  include_examples "zendesk#resource", {
     :collection    => lambda { client.users },
     :create_params => lambda { { email: mock_email, name: mock_uuid, verified: true } },
     :update_params => lambda { { name: mock_uuid } },

data/spec/views_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+describe Zendesk2::Client do
+  let(:client) { create_client }
+
+  context "with an organization" do
+    let!(:organization) { client.organizations.create!(name: mock_uuid) }
+
+    include_examples "zendesk#resource", {
+      :collection    => lambda { client.views },
+      :create_params => lambda {
+        {
+          :title      => mock_uuid,
+          :conditions => {
+            "any" => [ {"field" => "organization_id", "operator" => "is", "value" => organization.identity.to_s } ],
+            "all" => [ {"field" => "status",          "operator" => "is", "value" => "pending"                  } ],
+          }
+        }
+      },
+      :update_params => lambda { { title: mock_uuid } },
+      :search        => false,
+    }
+
+    context "and a view that filters by that organization" do
+      let!(:user) { client.users.create!(email: mock_email, name: mock_uuid, verified: true) }
+      let!(:view) {
+        client.views.create!(
+          :title      => mock_uuid,
+          :conditions => {
+            "all" => [ {"field" => "organization_id", "operator" => "is", "value" => organization.identity.to_s } ],
+          }
+        )
+      }
+
+      before {
+        client.memberships.create(user: user, organization: organization)
+      }
+
+      let!(:tickets) {
+        2.times.map {
+          client.tickets.create!(subject: mock_uuid, description: mock_uuid, requester: user, organization: organization)
+        }
+      }
+
+      before {
+        another_organization =  client.organizations.create!(name: mock_uuid)
+        another_user         = client.users.create!(email: mock_email, name: mock_uuid, verified: true)
+
+        client.memberships.create(user: another_user, organization: another_organization)
+
+        2.times.each {
+          client.tickets.create!(subject: mock_uuid, description: mock_uuid, requester: another_user)
+        }
+      }
+
+      it "should find only that organizations tickets" do
+        expect(view.tickets).to match_array(tickets)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zendesk2
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-07 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cistern
@@ -103,6 +103,7 @@ files:
 - lib/zendesk2/client/collections/user_fields.rb
 - lib/zendesk2/client/collections/user_identities.rb
 - lib/zendesk2/client/collections/users.rb
+- lib/zendesk2/client/collections/views.rb
 - lib/zendesk2/client/help_center.rb
 - lib/zendesk2/client/mock.rb
 - lib/zendesk2/client/model.rb
@@ -130,6 +131,7 @@ files:
 - lib/zendesk2/client/models/user.rb
 - lib/zendesk2/client/models/user_field.rb
 - lib/zendesk2/client/models/user_identity.rb
+- lib/zendesk2/client/models/view.rb
 - lib/zendesk2/client/real.rb
 - lib/zendesk2/client/request.rb
 - lib/zendesk2/client/requests/create_category.rb
@@ -147,6 +149,7 @@ files:
 - 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/create_view.rb
 - lib/zendesk2/client/requests/destroy_category.rb
 - lib/zendesk2/client/requests/destroy_forum.rb
 - lib/zendesk2/client/requests/destroy_group.rb
@@ -162,6 +165,7 @@ files:
 - 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/destroy_view.rb
 - lib/zendesk2/client/requests/get_assignable_groups.rb
 - lib/zendesk2/client/requests/get_audits.rb
 - lib/zendesk2/client/requests/get_categories.rb
@@ -211,6 +215,9 @@ files:
 - lib/zendesk2/client/requests/get_user_memberships.rb
 - lib/zendesk2/client/requests/get_user_organizations.rb
 - lib/zendesk2/client/requests/get_users.rb
+- lib/zendesk2/client/requests/get_view.rb
+- lib/zendesk2/client/requests/get_view_tickets.rb
+- lib/zendesk2/client/requests/get_views.rb
 - lib/zendesk2/client/requests/mark_membership_default.rb
 - lib/zendesk2/client/requests/mark_user_identity_primary.rb
 - lib/zendesk2/client/requests/search.rb
@@ -231,6 +238,7 @@ files:
 - 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/client/requests/update_view.rb
 - lib/zendesk2/error.rb
 - lib/zendesk2/logger.rb
 - lib/zendesk2/paged_collection.rb
@@ -258,6 +266,7 @@ files:
 - spec/user_fields_spec.rb
 - spec/user_identities_spec.rb
 - spec/users_spec.rb
+- spec/views_spec.rb
 - zendesk2.gemspec
 homepage: http://joshualane.com/zendesk2
 licenses:
@@ -305,3 +314,4 @@ test_files:
 - spec/user_fields_spec.rb
 - spec/user_identities_spec.rb
 - spec/users_spec.rb
+- spec/views_spec.rb