zendesk2 0.0.19 → 0.0.20

data/Gemfile

@@ -4,6 +4,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rake'
+gem 'cistern'#, :path => "~/p/cistern"
 
 group :test do
   gem 'guard-rspec'

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

@@ -45,6 +45,10 @@ class Zendesk2::Client::Topic < Zendesk2::Model
     merge_attributes(data)
   end
 
+  def comments
+    self.topic_comments(topic_id: topic_id)
+  end
+
   private
 
   def params

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

@@ -19,11 +19,7 @@ class Zendesk2::Client::TopicComment < Zendesk2::Model
   def destroy
     requires :identity
 
-    connection.destroy_topic_comment("id" => self.identity)
-  end
-
-  def destroyed?
-    !self.reload
+    connection.destroy_topic_comment("id" => self.identity, "topic_id" => self.topic_id)
   end
 
   def save!
@@ -37,6 +33,16 @@ class Zendesk2::Client::TopicComment < Zendesk2::Model
     merge_attributes(data)
   end
 
+  def reload
+    requires :identity
+
+    if data = collection.get(topic_id, identity)
+      new_attributes = data.attributes
+      merge_attributes(new_attributes)
+      self
+    end
+  end
+
   private
 
   def params

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

@@ -2,11 +2,29 @@ class Zendesk2::Client::TopicComments < Zendesk2::Collection
   include Zendesk2::PagedCollection
   include Zendesk2::Searchable
 
+  attribute :topic_id
+
   model Zendesk2::Client::TopicComment
 
-  self.collection_method= :get_topic_comments
-  self.collection_root= "topic_comments"
-  self.model_method= :get_topic_comment
-  self.model_root= "topic_comment"
-  self.search_type= "topic_comment"
+  self.collection_method = :get_topic_comments
+  self.collection_root   = "topic_comments"
+  self.model_method      = :get_topic_comment
+  self.model_root        = "topic_comment"
+  self.search_type       = "topic_comment"
+
+  def all(params={})
+    body = connection.send(collection_method, params.merge("topic_id" => self.topic_id)).body
+
+    collection = self.clone.load(body[collection_root])
+    collection.merge_attributes(Cistern::Hash.slice(body, "count", "next_page", "previous_page"))
+    collection
+  end
+
+  def get(topic_id, topic_comment_id)
+    if data = self.connection.send(model_method, {"topic_id" => topic_id, "id" => topic_comment_id}).body[self.model_root]
+      new(data)
+    end
+  rescue Zendesk2::Error
+    nil
+  end
 end

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

@@ -1,10 +1,11 @@
 class Zendesk2::Client
   class Real
     def create_topic_comment(params={})
+      topic_id = params.delete("topic_id")
       request(
         :body   => {"topic_comment" => params},
         :method => :post,
-        :path   => "/topic_comments.json",
+        :path   => "/topics/#{topic_id}/comments.json",
       )
     end
   end # Real

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

@@ -1,19 +1,21 @@
 class Zendesk2::Client
   class Real
     def destroy_topic_comment(params={})
-      id = params["id"]
+      id       = params["id"]
+      topic_id = params["topic_id"]
 
       request(
         :method => :delete,
-        :path   => "/topic_comments/#{id}.json"
+        :path => "/topics/#{topic_id}/comments/#{id}.json"
       )
     end
   end
 
   class Mock
     def destroy_topic_comment(params={})
-      id   = params["id"]
-      path = "/topic_comments/#{id}.json"
+      id       = params["id"]
+      topic_id = params["topic_id"]
+      path     = "/topics/#{topic_id}/comments/#{id}.json"
 
       body = self.data[:topic_comments].delete(id)
       response(

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

@@ -1,11 +1,12 @@
 class Zendesk2::Client
   class Real
     def get_topic_comment(params={})
-      id = params["id"]
+      id       = params["id"]
+      topic_id = params["topic_id"]
 
       request(
         :method => :get,
-        :path => "/topic_comments/#{id}.json"
+        :path => "/topics/#{topic_id}/comments/#{id}.json"
       )
     end
   end # Real

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

@@ -1,18 +1,22 @@
 class Zendesk2::Client
   class Real
     def get_topic_comments(params={})
+      topic_id    = params.delete("topic_id")
       page_params = Zendesk2.paging_parameters(params)
 
       request(
-        :params  => page_params,
-        :method  => :get,
-        :path    => "/topic_comments.json",
+        :params => page_params,
+        :path   => "/topics/#{topic_id}/comments.json",
       )
     end
   end
   class Mock
     def get_topic_comments(params={})
-      page(params, :topic_comments, "/topic_comments.json", "topic_comments")
+      topic_id = params["topic_id"]
+      topic    = self.data[:topics][topic_id] # TODO: 404 if !topic
+      filter   = lambda{|comments| comments.select{|c| c["topic_id"] == topic_id}}
+
+      page(params, :topic_comments, "/topics/#{topic_id}/comments.json", "topic_comments", filter: filter)
     end
   end
 end

data/lib/zendesk2/model.rb

@@ -8,4 +8,8 @@ class Zendesk2::Model < Cistern::Model
     self.errors= e.response[:body]["details"].inject({}){|r,(k,v)| r.merge(k => v.map{|e| e["type"] || e["description"]})} rescue nil
     self
   end
+
+  def destroyed?
+    !self.reload
+  end
 end

data/lib/zendesk2/version.rb

@@ -1,3 +1,3 @@
 module Zendesk2
-  VERSION = "0.0.19"
+  VERSION = "0.0.20"
 end

data/spec/shared/resource.rb

@@ -1,13 +1,20 @@
-shared_examples "a resource" do |_collection, _params, _update_params|
-  let(:collection) { client.send(_collection) }
-  let(:params) { instance_exec(&_params) || {} }
+shared_examples "a resource" do |_collection, _params, _update_params, _options|
+  let(:options)       { _options || {} }
+  let(:collection)    { options[:collection] ? instance_exec(&options[:collection]) : client.send(_collection) }
+  let(:params)        { instance_exec(&_params) || {} }
   let(:update_params) { instance_exec(&_update_params) }
+  let(:fetch_params)  { options[:fetch_params] || lambda {|r| r.identity} }
 
   it "by creating a record" do
-    record = collection.create(params)
+    record = collection.create!(params)
     record.identity.should_not be_nil
   end
 
+  it "by fetching a specific record" do
+    record = collection.create(params)
+    collection.get(*fetch_params.call(record)).should == record
+  end
+
   context "that is paged" do
     before(:each) do
       2.times.each { collection.create(instance_exec(&_params)) }
@@ -30,11 +37,6 @@ shared_examples "a resource" do |_collection, _params, _update_params|
     end
   end
 
-  it "by fetching a specific record" do
-    record = collection.create(params)
-    collection.get(record.identity).should == record
-  end
-
   it "by updating a record" do
     record = collection.create(params)
     record.merge_attributes(update_params)

data/spec/topic_comments_spec.rb

@@ -2,11 +2,15 @@ require 'spec_helper'
 
 describe "topic_comments" do
   let(:client) { create_client }
-  let(:user) { client.users.create(email: "zendesk2+#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid, verified: true) }
-  let(:forum) { client.forums.create(name: Zendesk2.uuid) }
-  let(:topic) { client.topics.create(title: Zendesk2.uuid, body: Zendesk2.uuid, forum: forum) }
+  let(:user)   { client.users.create(email: "zendesk2+#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid, verified: true) }
+  let(:forum)  { client.forums.create(name: Zendesk2.uuid) }
+  let(:topic)  { client.topics.create(title: Zendesk2.uuid, body: Zendesk2.uuid, forum: forum) }
   it_should_behave_like "a resource",
     :topic_comments,
     lambda { {body: Zendesk2.uuid, topic_id: topic.id, user_id: user.id} },
-    lambda { {body: Zendesk2.uuid} }
+    lambda { {body: Zendesk2.uuid} },
+    {
+      :fetch_params => lambda {|tc| [tc.topic_id, tc.id]},
+      :collection   => lambda { client.topic_comments(topic_id: topic.id) },
+    }
 end

data/zendesk2.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Zendesk2::VERSION
 
-  gem.add_dependency "cistern", "~> 0.0.2"
+  gem.add_dependency "cistern"#, "~> 0.0.2"
   gem.add_dependency "faraday"
   gem.add_dependency "faraday_middleware"
   gem.add_dependency "addressable"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk2
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-20 00:00:00.000000000 Z
+date: 2012-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cistern
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -200,4 +200,3 @@ test_files:
 - spec/topic_comments_spec.rb
 - spec/topics_spec.rb
 - spec/users_spec.rb
-has_rdoc: