zendesk2 0.1.3 → 0.2.0

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

@@ -17,16 +17,12 @@ class Zendesk2::Client::Category < Zendesk2::Model
   # @return [String] The API url of this category
   attribute :url, type: :string
 
-  def destroy
+  def destroy!
     requires :id
 
     connection.destroy_category("id" => self.id)
   end
 
-  def destroyed?
-    !self.reload
-  end
-
   def save!
     data = if new_record?
              requires :name

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

@@ -21,16 +21,12 @@ class Zendesk2::Client::Forum < Zendesk2::Model
   assoc_accessor :organization
   assoc_accessor :category
 
-  def destroy
+  def destroy!
     requires :identity
 
     connection.destroy_forum("id" => self.identity)
   end
 
-  def destroyed?
-    !self.reload
-  end
-
   def save!
     data = if new_record?
              requires :name

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

@@ -29,7 +29,7 @@ class Zendesk2::Client::Group < Zendesk2::Model
     merge_attributes(data)
   end
 
-  def destroy
+  def destroy!
     requires :identity
 
     connection.destroy_group("id" => self.identity)

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

@@ -21,16 +21,6 @@ class Zendesk2::Client::Organization < Zendesk2::Model
     connection.destroy_organization("id" => self.identity)
   end
 
-  def destroy
-    destroy!
-  rescue Zendesk2::Error
-    false
-  end
-
-  def destroyed?
-    !self.reload
-  end
-
   def save!
     data = if new_record?
              requires :name
@@ -42,6 +32,7 @@ class Zendesk2::Client::Organization < Zendesk2::Model
     merge_attributes(data)
   end
 
+  # @return [Zendesk2::Client::Users] users associated with this organization
   def users
     requires :identity
     data = connection.get_organization_users("id" => self.identity).body["users"]
@@ -49,6 +40,7 @@ class Zendesk2::Client::Organization < Zendesk2::Model
     connection.users.load(data)
   end
 
+  # @return [Zendesk2::Client::Tickets] tickets associated with this organization
   def tickets
     requires :identity
     data = connection.get_organization_tickets("id" => self.identity).body["tickets"]

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

@@ -75,7 +75,7 @@ class Zendesk2::Client::Ticket < Zendesk2::Model
     merge_attributes(data)
   end
 
-  def destroy
+  def destroy!
     requires :identity
 
     connection.destroy_ticket("id" => self.identity)

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

@@ -24,16 +24,12 @@ class Zendesk2::Client::Topic < Zendesk2::Model
   assoc_accessor :forum
 
 
-  def destroy
+  def destroy!
     requires :identity
 
     connection.destroy_topic("id" => self.identity)
   end
 
-  def destroyed?
-    !self.reload
-  end
-
   def save!
     data = if new_record?
              requires :title, :body

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

@@ -26,7 +26,7 @@ class Zendesk2::Client::TopicComment < Zendesk2::Model
   assoc_accessor :user
   assoc_accessor :topic
 
-  def destroy
+  def destroy!
     requires :identity
 
     connection.destroy_topic_comment("id" => self.identity, "topic_id" => self.topic_id)

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

@@ -84,12 +84,6 @@ class Zendesk2::Client::User < Zendesk2::Model
     merge_attributes(data)
   end
 
-  def destroy
-    destroy!
-  rescue Zendesk2::Error => e
-    false
-  end
-
   def destroyed?
     !reload || !self.active
   end

data/lib/zendesk2/client.rb

@@ -91,7 +91,7 @@ class Zendesk2::Client < Cistern::Service
     attr_accessor :username, :url, :token, :logger
 
     def initialize(options={})
-      url = options[:url] || begin
+      url = options[:url] || Zendesk2.defaults[:url] || begin
         host      = options[:host]
         subdomain = options[:subdomain] || Zendesk2.defaults[:subdomain]
 
@@ -110,8 +110,8 @@ class Zendesk2::Client < Cistern::Service
       @username          = options[:username] || Zendesk2.defaults[:username]
       token              = options[:token] || Zendesk2.defaults[:token]
       password           = options[:password] || Zendesk2.defaults[:password]
-      @username         += "/token" if token
-      @auth_token        = token || password
+      @auth_token        = password || token
+      @username         += "/token" if @auth_token == token
 
       raise "Missing required options: :username" unless @username 
       raise "Missing required options: :password or :token" unless password || token
@@ -133,7 +133,7 @@ class Zendesk2::Client < Cistern::Service
 
     def request(options={})
       method  = options[:method] || :get
-      url     = File.join(@url, "/api/v2", options[:path])
+      url     = options[:url] || File.join(@url, "/api/v2", options[:path])
       params  = options[:params] || {}
       body    = options[:body]
       headers = {"User-Agent" => USER_AGENT}.merge(options[:headers] || {})

data/lib/zendesk2/model.rb

@@ -20,4 +20,10 @@ class Zendesk2::Model < Cistern::Model
   def destroyed?
     !self.reload
   end
+
+  def destroy
+    destroy!
+  rescue Zendesk2::Error
+    false
+  end
 end

data/lib/zendesk2/searchable.rb

@@ -6,9 +6,10 @@ module Zendesk2::Searchable
   def search(parameters)
     body = connection.send(self.class.search_request, parameters.merge("type" => self.class.search_type)).body
     if data = body.delete("results")
-      load(data)
+      collection = self.clone.load(data)
+      collection.merge_attributes(Cistern::Hash.slice(body, "count", "next_page", "previous_page"))
+      collection
     end
-    merge_attributes(body)
   end
 
   module Attributes

data/lib/zendesk2/version.rb

@@ -1,3 +1,3 @@
 module Zendesk2
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk2
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-17 00:00:00.000000000 Z
+date: 2013-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cistern