zendesk2 0.0.18 → 0.0.19

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

@@ -1,4 +1,4 @@
-class Zendesk2::Client::Categories < Cistern::Collection
+class Zendesk2::Client::Categories < Zendesk2::Collection
   include Zendesk2::PagedCollection
   include Zendesk2::Searchable
 

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

@@ -1,4 +1,4 @@
-class Zendesk2::Client::Category < Cistern::Model
+class Zendesk2::Client::Category < Zendesk2::Model
   PARAMS = %w[id name description position]
 
   identity  :id, type: :integer         # ro[yes] mandatory[no]  Automatically assigned during creation
@@ -19,7 +19,7 @@ class Zendesk2::Client::Category < Cistern::Model
     !self.reload
   end
 
-  def save
+  def save!
     data = if new_record?
              requires :name
              connection.create_category(params).body["category"]

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

@@ -1,4 +1,4 @@
-class Zendesk2::Client::Forum < Cistern::Model
+class Zendesk2::Client::Forum < Zendesk2::Model
   extend Zendesk2::Attributes
 
   PARAMS = %w[id name description category_id organization_id locale_id locked position forum_type access]
@@ -31,7 +31,7 @@ class Zendesk2::Client::Forum < Cistern::Model
     !self.reload
   end
 
-  def save
+  def save!
     data = if new_record?
              requires :name
              connection.create_forum(params).body["forum"]

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

@@ -1,4 +1,4 @@
-class Zendesk2::Client::Forums < Cistern::Collection
+class Zendesk2::Client::Forums < Zendesk2::Collection
   include Zendesk2::PagedCollection
   include Zendesk2::Searchable
 

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

@@ -1,4 +1,4 @@
-class Zendesk2::Client::Organization < Cistern::Model
+class Zendesk2::Client::Organization < Zendesk2::Model
   PARAMS = %w[id details domain_names external_id group_id shared_comments shared_tickets tags name notes]
 
   identity :id,               type: :integer
@@ -31,7 +31,7 @@ class Zendesk2::Client::Organization < Cistern::Model
     !self.reload
   end
 
-  def save
+  def save!
     data = if new_record?
              requires :name
              connection.create_organization(params).body["organization"]

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

@@ -1,4 +1,4 @@
-class Zendesk2::Client::Organizations < Cistern::Collection
+class Zendesk2::Client::Organizations < Zendesk2::Collection
   include Zendesk2::PagedCollection
   include Zendesk2::Searchable
 

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

@@ -1,4 +1,4 @@
-class Zendesk2::Client::Ticket < Cistern::Model
+class Zendesk2::Client::Ticket < Zendesk2::Model
   extend Zendesk2::Attributes
 
   PARAMS = %w[external_id via requester_id submitter_id assignee_id organization_id subject description fields recipient status collaborator_ids]
@@ -31,7 +31,7 @@ class Zendesk2::Client::Ticket < Cistern::Model
   assoc_accessor :requester, collection: :users
   assoc_reader :submitter, collection: :users
 
-  def save
+  def save!
     if new_record?
       requires :subject, :description
       data = connection.create_ticket(params).body["ticket"]

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

@@ -1,4 +1,4 @@
-class Zendesk2::Client::Tickets < Cistern::Collection
+class Zendesk2::Client::Tickets < Zendesk2::Collection
   include Zendesk2::PagedCollection
   include Zendesk2::Searchable
 

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

@@ -1,4 +1,4 @@
-class Zendesk2::Client::Topic < Cistern::Model
+class Zendesk2::Client::Topic < Zendesk2::Model
   extend Zendesk2::Attributes
 
   PARAMS = %w[id title body submitter_id updater_id forum_id locked pinned highlighted position tags]
@@ -34,7 +34,7 @@ class Zendesk2::Client::Topic < Cistern::Model
     !self.reload
   end
 
-  def save
+  def save!
     data = if new_record?
              requires :title, :body
              connection.create_topic(params).body["topic"]

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

@@ -1,4 +1,4 @@
-class Zendesk2::Client::TopicComment < Cistern::Model
+class Zendesk2::Client::TopicComment < Zendesk2::Model
   extend Zendesk2::Attributes
 
   PARAMS = %w[id topic_id user_id body informative]
@@ -26,7 +26,7 @@ class Zendesk2::Client::TopicComment < Cistern::Model
     !self.reload
   end
 
-  def save
+  def save!
     data = if new_record?
              requires :topic_id, :user_id, :body
              connection.create_topic_comment(params).body["topic_comment"]

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

@@ -1,4 +1,4 @@
-class Zendesk2::Client::TopicComments < Cistern::Collection
+class Zendesk2::Client::TopicComments < Zendesk2::Collection
   include Zendesk2::PagedCollection
   include Zendesk2::Searchable
 

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

@@ -1,4 +1,4 @@
-class Zendesk2::Client::Topics < Cistern::Collection
+class Zendesk2::Client::Topics < Zendesk2::Collection
   include Zendesk2::PagedCollection
   include Zendesk2::Searchable
 

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

@@ -1,4 +1,4 @@
-class Zendesk2::Client::User < Cistern::Model
+class Zendesk2::Client::User < Zendesk2::Model
   extend Zendesk2::Attributes
 
   PARAMS = %w[name email organization_id external_id alias verified locate_id time_zone phone signature details notes role custom_role_id moderator ticket_restriction only_private_comments]
@@ -33,9 +33,10 @@ class Zendesk2::Client::User < Cistern::Model
   attribute :photo
   attribute :authenticity_token
 
+  attr_accessor :errors
   assoc_accessor :organization
 
-  def save
+  def save!
     if new_record?
       requires :name, :email
       data = connection.create_user(params).body["user"]

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

@@ -1,4 +1,4 @@
-class Zendesk2::Client::Users < Cistern::Collection
+class Zendesk2::Client::Users < Zendesk2::Collection
   include Zendesk2::PagedCollection
   include Zendesk2::Searchable
 

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

@@ -22,17 +22,18 @@ class Zendesk2::Client
       }.merge(params)
 
       path = "/users.json"
-      if record["email"] && self.data[:users].find{|k,u| u["email"] == record["email"] && k != identity}
+      if (email = record["email"]) && self.data[:users].find{|k,u| u["email"] == email && k != identity}
         response(
           :method => :put,
           :path   => path,
           :status => 422,
           :body   => {
             "error"       => "RecordInvalid",
-            "description" => "Record validation errors", "details" => {
-              "email"       => [ {
-                "type"        => "#{record["email"]} is already being used by another user",
-                "description" => "Email: #{record["email"]} is already being used by another user"
+            "description" => "Record validation errors",
+            "details" => {
+              "email" => [ {
+                "type"        => "#{email} is already being used by another user",
+                "description" => "Email: #{email} is already being used by another user"
               } ]
             }
           }

data/lib/zendesk2/collection.rb

@@ -0,0 +1,6 @@
+class Zendesk2::Collection < Cistern::Collection
+  def create!(attributes={})
+    model = self.new(attributes)
+    model.save!
+  end
+end

data/lib/zendesk2/error.rb

@@ -1,8 +1,9 @@
 class Zendesk2::Error < StandardError
 
-  attr_reader :wrapped_exception
+  attr_reader :wrapped_exception, :response
   def initialize(wrapped_exception)
     @wrapped_exception = wrapped_exception
+    @response = wrapped_exception.response
     message = if wrapped_exception.is_a?(Faraday::Error::ParsingError)
                 wrapped_exception.message
               elsif wrapped_exception.is_a?(Faraday::Error::ClientError)

data/lib/zendesk2/model.rb

@@ -0,0 +1,11 @@
+class Zendesk2::Model < Cistern::Model
+
+  attr_accessor :errors
+
+  def save
+    save!
+  rescue Zendesk2::Error => e
+    self.errors= e.response[:body]["details"].inject({}){|r,(k,v)| r.merge(k => v.map{|e| e["type"] || e["description"]})} rescue nil
+    self
+  end
+end

data/lib/zendesk2/version.rb

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

data/lib/zendesk2.rb

@@ -17,6 +17,8 @@ module Zendesk2
   autoload :PagedCollection, 'zendesk2/paged_collection'
   autoload :Searchable, 'zendesk2/searchable'
   autoload :Logger, 'zendesk2/logger'
+  autoload :Model, 'zendesk2/model'
+  autoload :Collection, 'zendesk2/collection'
 
   def self.defaults
     @defaults ||= if File.exists?(File.expand_path("~/.zendesk2"))
@@ -44,6 +46,6 @@ module Zendesk2
   end
 
   def self.blank?(string)
-    !!string || string == ""
+    !string || string == ""
   end
 end

data/spec/organizations_spec.rb

@@ -20,8 +20,10 @@ describe "organizations" do
       organization.tickets.should include ticket
     end
 
-    it "should raise on name conflict" do
-      lambda { client.organizations.create(name: organization.name) }.should raise_exception(Zendesk2::Error)
+    it "should hate non-unique names" do
+      lambda { client.organizations.create!(name: organization.name) }.should raise_exception(Zendesk2::Error)
+      model = client.organizations.create(name: organization.name)
+      model.errors.should == {"name" => ["Name: has already been taken"]}
     end
   end
 end

data/spec/users_spec.rb

@@ -14,8 +14,11 @@ describe "users" do
   end
 
   describe do
-    let(:user) { client.users.create(email: "zendesk2+#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid) }
-    after(:all) { user.destroy }
+    before(:each) do
+      @user =  client.users.create(email: "zendesk2+#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid)
+    end
+
+    let(:user) { @user }
 
     it "should update organization" do
       organization = client.organizations.create(name: Zendesk2.uuid)
@@ -47,9 +50,16 @@ describe "users" do
     it "should hate non-unique emails" do
       email = "zendesk2+#{Zendesk2.uuid}@example.org"
       client.users.create(email: email, name: Zendesk2.uuid)
-      lambda { client.users.create(email: email, name: Zendesk2.uuid) }.should raise_exception(Zendesk2::Error)
+      lambda { client.users.create!(email: email, name: Zendesk2.uuid) }.should raise_exception(Zendesk2::Error)
+      user = client.users.create(email: email, name: Zendesk2.uuid)
+      user.identity.should be_false
+      user.errors.should == {"email" => ["#{email} is already being used by another user"]}
     end
 
-    it "should form login url"
+    it "should form login url" do
+      return_to = "http://engineyard.com"
+      uri = Addressable::URI.parse(user.login_url(Time.now.to_s, return_to: return_to))
+      uri.query_values["return_to"].should == return_to
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk2
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-09 00:00:00.000000000 Z
+date: 2012-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cistern
@@ -147,8 +147,10 @@ files:
 - lib/zendesk2/client/requests/update_topic.rb
 - lib/zendesk2/client/requests/update_topic_comment.rb
 - lib/zendesk2/client/requests/update_user.rb
+- lib/zendesk2/collection.rb
 - lib/zendesk2/error.rb
 - lib/zendesk2/logger.rb
+- lib/zendesk2/model.rb
 - lib/zendesk2/paged_collection.rb
 - lib/zendesk2/searchable.rb
 - lib/zendesk2/version.rb