zendesk2 0.0.3 → 0.0.4

data/lib/zendesk2/client.rb

@@ -18,6 +18,8 @@ class Zendesk2::Client < Cistern::Service
   request :destroy_user
   request :get_current_user
   request :get_organization
+  request :get_organization_tickets
+  request :get_organization_users
   request :get_ticket
   request :get_user
   request :get_organizations
@@ -148,12 +150,15 @@ class Zendesk2::Client < Cistern::Service
       File.join(@url, path)
     end
 
-    def page(params, collection, path, collection_root)
+    def page(params, collection, path, collection_root, options={})
       page_params = Zendesk2.paging_parameters(params)
       page_size   = (page_params["per_page"] || 50).to_i
       page_index  = (page_params["page"] || 1).to_i
-      count       = self.data[collection].size
       offset      = (page_index - 1) * page_size
+      filter      = options[:filter]
+      resources   = self.data[collection].values
+      resources   = filter.call(resources) if filter
+      count       = resources.size
       total_pages = (count / page_size) + 1
 
       next_page = if page_index < total_pages
@@ -167,7 +172,7 @@ class Zendesk2::Client < Cistern::Service
                         nil
                       end
 
-      resource_page = self.data[collection].values.slice(offset, page_size)
+      resource_page = resources.slice(offset, page_size)
 
       body = {
         collection_root => resource_page,

data/lib/zendesk2/models/organization.rb

@@ -13,6 +13,18 @@ class Zendesk2::Client::Organization < Cistern::Model
   attribute :shared_tickets
   attribute :updated_at, type: :time
 
+  def destroy
+    requires :identity
+
+    response = connection.destroy_organization("id" => self.identity)
+  end
+
+  def destroyed?
+    self.reload
+  rescue not_found
+    true
+  end
+
   def save
     if new_record?
       requires :name
@@ -21,7 +33,7 @@ class Zendesk2::Client::Organization < Cistern::Model
     else
       requires :identity
       params = {
-        "id" => self.identity,
+        "id"   => self.identity,
         "name" => self.name,
       }
       data = connection.update_organization(params).body["organization"]
@@ -29,15 +41,16 @@ class Zendesk2::Client::Organization < Cistern::Model
     end
   end
 
-  def destroy
+  def users
     requires :identity
-
-    response = connection.destroy_organization("id" => self.identity)
+    data = connection.get_organization_users("id" => self.identity).body["users"]
+    connection.users.load(data)
   end
 
-  def destroyed?
-    self.reload
-  rescue not_found
-    true
+  def tickets
+    requires :identity
+    data = connection.get_organization_tickets("id" => self.identity).body["tickets"]
+
+    connection.tickets.load(data)
   end
 end

data/lib/zendesk2/models/ticket.rb

@@ -20,23 +20,18 @@ class Zendesk2::Client::Ticket < Cistern::Model
   attribute :forum_topic_id
   attribute :problem_id
   attribute :has_incidents
-  attribute :due_at
-  attribute :tags
+  attribute :due_at, type: :time
+  attribute :tags, type: :array
   attribute :fields
 
   def save
     if new_record?
       requires :subject, :description
-      data = connection.create_ticket(attributes).body["ticket"]
+      data = connection.create_ticket(params).body["ticket"]
       merge_attributes(data)
     else
       requires :identity
-      params = {
-        "id" => self.identity,
-        "subject" => self.subject,
-        "description" => self.description,
-      }
-      data = connection.update_ticket(params).body["ticket"]
+      data = connection.update_ticket(params.merge("id" => self.identity)).body["ticket"]
       merge_attributes(data)
     end
   end
@@ -52,4 +47,20 @@ class Zendesk2::Client::Ticket < Cistern::Model
   rescue not_found
     true
   end
+
+  def params
+    Cistern::Hash.slice(Zendesk2.stringify_keys(attributes), "external_id", "via", "requester_id", "submitter_id", "assignee_id", "organization_id", "subject", "description", "fields", "recipient", "status")
+  end
+
+  def submitter
+    self.connection.users.get(submitter_id)
+  end
+
+  def requester=(requester)
+    self.requester_id= requester.id
+  end
+
+  def requester
+    self.connection.users.get(self.requester_id)
+  end
 end

data/lib/zendesk2/models/user.rb

@@ -32,16 +32,11 @@ class Zendesk2::Client::User < Cistern::Model
   def save
     if new_record?
       requires :name, :email
-      data = connection.create_user(attributes).body["user"]
+      data = connection.create_user(params).body["user"]
       merge_attributes(data)
     else
       requires :identity
-      params = {
-        "id" => self.identity,
-        "name" => self.name,
-        "email" => self.email,
-      }
-      data = connection.update_user(params).body["user"]
+      data = connection.update_user(params.merge("id" => self.identity)).body["user"]
       merge_attributes(data)
     end
   end
@@ -57,4 +52,10 @@ class Zendesk2::Client::User < Cistern::Model
   def destroyed?
     !self.active
   end
+
+  private
+
+  def params
+    Cistern::Hash.slice(Zendesk2.stringify_keys(attributes), "name", "email", "organization_id", "external_id", "alias", "active", "verified", "locate_id", "time_zone", "phone", "signature", "details", "notes", "role", "custom_role_id", "moderator", "ticket_restriction", "only_private_comments")
+  end
 end

data/lib/zendesk2/requests/create_ticket.rb

@@ -20,6 +20,11 @@ class Zendesk2::Client
         "updated_at" => Time.now.iso8601,
       }.merge(params)
 
+      record["requester_id"] ||= @current_user_id
+      record["submitter_id"]= @current_user_id
+      requester = self.data[:users][record["requester_id"]]
+      # TODO: throw error if user doesn't exist?
+      record["organization_id"]= requester["organization_id"]
       self.data[:tickets][identity]= record
 
       response(

data/lib/zendesk2/requests/create_user.rb

@@ -14,10 +14,10 @@ class Zendesk2::Client
       identity = self.class.new_id
 
       record = {
-        "id"         => identity,
-        "url"        => url_for("/users/#{identity}.json"),
-        "created_at" => Time.now.iso8601,
-        "updated_at" => Time.now.iso8601,
+        "id"              => identity,
+        "url"             => url_for("/users/#{identity}.json"),
+        "created_at"      => Time.now.iso8601,
+        "updated_at"      => Time.now.iso8601
       }.merge(params)
 
       self.data[:users][identity]= record

data/lib/zendesk2/requests/get_organization_tickets.rb

@@ -0,0 +1,23 @@
+class Zendesk2::Client
+  class Real
+    def get_organization_tickets(params={})
+      id          = params["id"]
+      page_params = Zendesk2.paging_parameters(params)
+
+      request(
+        :params  => page_params,
+        :method  => :get,
+        :path    => "/organizations/#{id}/tickets.json",
+      )
+    end
+  end # Real
+
+  class Mock
+    def get_organization_tickets(params={})
+      id = params["id"]
+
+      requesters = self.data[:users].values.select{|u| u["organization_id"].to_s == id.to_s}.map{|s| s["organization_id"].to_s}
+      page(params, :tickets, "/organizations/#{id}/tickets.json", "tickets", filter: lambda{|c| c.select{|u| requesters.include?(u["organization_id"].to_s)}})
+    end
+  end # Mock
+end

data/lib/zendesk2/requests/get_organization_users.rb

@@ -0,0 +1,21 @@
+class Zendesk2::Client
+  class Real
+    def get_organization_users(params={})
+      id          = params["id"]
+      page_params = Zendesk2.paging_parameters(params)
+
+      request(
+        :params  => page_params,
+        :method  => :get,
+        :path    => "/organizations/#{id}/users.json",
+      )
+    end
+  end # Real
+
+  class Mock
+    def get_organization_users(params={})
+      id = params["id"]
+      page(params, :users, "/organizations/#{id}/users.json", "users", filter: lambda{|c| c.select{|u| u["organization_id"].to_s == id.to_s}})
+    end
+  end # Mock
+end

data/lib/zendesk2/version.rb

@@ -1,3 +1,3 @@
 module Zendesk2
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/zendesk2.rb

@@ -33,6 +33,10 @@ module Zendesk2
   def self.uuid
     UUIDTools::UUID.random_create.to_s
   end
+
+  def self.stringify_keys(hash)
+    hash.inject({}){|r,(k,v)| r.merge(k.to_s => v)}
+  end
 end
 
 Zendesk = Zendesk2

data/spec/organizations_spec.rb

@@ -6,4 +6,18 @@ describe "organizations" do
     :organizations,
     lambda { {name: Zendesk2.uuid} },
     lambda { {name: Zendesk2.uuid} }
+
+  describe do
+    let(:organization) { client.organizations.create(name: Zendesk2.uuid) }
+    it "should get #users" do
+      user = client.users.create(email: "#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid, organization_id: organization.id)
+      organization.users.should include user
+    end
+
+    it "should get #tickets" do
+      user = client.users.create(email: "#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid, organization_id: organization.id)
+      ticket = client.tickets.create(subject: "#{Zendesk2.uuid}@example.org", description: Zendesk2.uuid, requester: user)
+      organization.tickets.should include ticket
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk2
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-18 00:00:00.000000000 Z
+date: 2012-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cistern
@@ -123,6 +123,8 @@ files:
 - lib/zendesk2/requests/destroy_user.rb
 - lib/zendesk2/requests/get_current_user.rb
 - lib/zendesk2/requests/get_organization.rb
+- lib/zendesk2/requests/get_organization_tickets.rb
+- lib/zendesk2/requests/get_organization_users.rb
 - lib/zendesk2/requests/get_organizations.rb
 - lib/zendesk2/requests/get_ticket.rb
 - lib/zendesk2/requests/get_tickets.rb