zendesk_rails 0.0.1 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7789387d91473a18513bc9a722fc13e3cf3531d6
-  data.tar.gz: 3955edcc59139c0dabd07f33051bca4025b01bc3
+  metadata.gz: f5fb96a52344222e9e1a3adb8b563ae2241a14eb
+  data.tar.gz: 155198622fa584c50f53ed0d8bf68401cc05614d
 SHA512:
-  metadata.gz: 1d4e34daf8e477af6e6afb20694130e871c20fd52d1087ec9584fdb4b359741dcc3db853a2a73058bf28329f78c4c95980d20489267c2f11d8ab761fc5533889
-  data.tar.gz: c95159cf2599910322ca2dbe44c44e27822eb7664ee78b54f67f2082e7fdfc1c4d0655376e81f64098cb27af70934e142daf9be488e307464b8d5066dc5c2e0d
+  metadata.gz: 893f78bd0719115cc8a2a66e02f4058b1e2284e45be1654a1f96aba6d9d9fe4bac75860dba708bc3293427394350993737d9fa0ff22b49a0628b42c755e5f0f1
+  data.tar.gz: f9d185c480227309bc0c854b16d4fa0b20874fb29f8bfcc5de5ac66fc2e7575cc1c590b920028645bb213414dab9a844b3394d476def2ee983fbdf5ab96d2403

data/README.md

@@ -111,23 +111,25 @@ When `config.test_mode` is true, a fake API will be used. All created tickets wi
 
 ### Overriding Controller Behavior
 
-Zendesk Rails offers hooks that allow you to control what happens after a ticket is created/invalid. You can override the following methods in your `ApplicationController`.
+Zendesk Rails offers hooks that allow you to control what happens after a ticket is created/updated/invalid. To do that, create `app/controllers/zendesk_rails/tickets_controller.rb`.
 
 ```ruby
-# The user will be redirected to this URL when a
-# ticket is successfully created
-def after_zendesk_ticket_created_path_for(ticket)
-  if user_signed_in?
-    ticket_path(ticket.id)
-  else
-    main_app.root_path
-  end
-end
+module ZendeskRails
+  class TicketsController < ApplicationController
+    private
+
+    def after_created_ticket ticket # When a ticket is created
+      redirect_to ticket_path(ticket.id), flash: { notice: 'Congrats!' }
+    end
 
-# Render will be called with these arguments when a ticket is invalid
-def after_zendesk_ticket_invalid_template
-  return 'new' if user_signed_in?
-  ['welcome/index', { layout: false }]
+    def after_invalid_ticket ticket # When a ticket is invalid
+      render 'new'
+    end
+
+    def after_updated_ticket ticket # When a comment is added
+      redirect_to ticket_path(ticket.id), flash: { notice: 'Cool comment, bro.' }
+    end
+  end
 end
 ```
 

data/app/assets/stylesheets/zendesk_rails/application.css

@@ -3,27 +3,27 @@
  *= require_self
 */
 
-body {
-  padding-top: 70px;
+.zendesk-no-tickets {
+  margin-top: 30px;
 }
 
-.comment {
+.zendesk-comment {
   font-size: 17.5px;
 }
 
-.comment-body p:last-child,
-.comment-body ul:last-child,
-.comment-body ol:last-child {
+.zendesk-comment-body p:last-child,
+.zendesk-comment-body ul:last-child,
+.zendesk-comment-body ol:last-child {
   margin-bottom: 0;
 }
 
-.comment-details {
+.zendesk-comment-details {
   display: block;
   font-size: 80%;
   line-height: 1.42857143;
   color: #777;
 }
 
-.comment-details:before {
+.zendesk-comment-details:before {
   content: '\2014 \00A0';
-}
+}

data/app/controllers/zendesk_rails/tickets_controller.rb

@@ -1,43 +1,50 @@
 module ZendeskRails
   class TicketsController < ApplicationController
+    delegate :config, to: :ZendeskRails, prefix: :zendesk
+    delegate :layout, to: :zendesk_config, prefix: :zendesk
+
     layout :zendesk_layout
 
+    helper_method :zendesk_config,
+                  :zendesk_current_user,
+                  :zendesk_user_signed_in?,
+                  :zendesk_user_attribute
+
+    rescue_from Resource::NotFoundException do |ex|
+      redirect_to tickets_path, flash: { alert: t('zendesk.tickets.not_found') }
+    end
+
     def index
-      @tickets = TicketHandler.search(query: {
-        requester: zendesk_user_attribute(:email)
-      })
+      email = zendesk_user_attribute(:email)
+      @tickets = Ticket.belonging_to(email)
     end
 
     def show
-      @ticket  = TicketHandler.find_request(params[:id])
-      @handler = CommentHandler.new(@ticket)
+      @ticket  = Ticket.find_request(params[:id])
+      @comment = Comment.new(@ticket)
+      @comments = @ticket.comments(zendesk_config.comment_list_options)
     end
 
     def new
-      @handler = TicketHandler.new
+      @handler = Ticket.new
     end
 
     def create
-      @handler = TicketHandler.new(ticket_params)
+      @handler = Ticket.new(ticket_params)
 
       if @ticket = @handler.create
-        flash_key = zendesk_user_signed_in? ? :authenticated : :unauthenticated
-        redirect_to after_zendesk_ticket_created_path_for(@ticket), flash: {
-          success: t("zendesk.tickets.create.#{flash_key}.message")
-        }
+        after_created_ticket(@ticket)
       else
-        render *Array(after_zendesk_ticket_invalid_template)
+        after_invalid_ticket(@ticket)
       end
     end
 
     def update
-      @ticket  = TicketHandler.find_ticket(params[:id])
-      @handler = CommentHandler.new(@ticket, comment_params)
+      @ticket  = Ticket.find_ticket(params[:id])
+      @comment = Comment.new(@ticket, comment_params)
 
-      if @handler.save
-        redirect_to ticket_path(@ticket.id), flash: {
-          success: t('zendesk.comments.added')
-        }
+      if @comment.save
+        after_updated_ticket(@ticket)
       else
         render 'show'
       end
@@ -55,5 +62,35 @@ module ZendeskRails
         email: (params[:ticket][:email].presence || zendesk_user_attribute(:email))
       })
     end
+
+    def zendesk_current_user
+      send "current_#{zendesk_config.devise_scope}"
+    end
+
+    def zendesk_user_signed_in?
+      send "#{zendesk_config.devise_scope}_signed_in?"
+    end
+
+    # Gets the value of a user's name/emails based on
+    # configurable attribute names
+    def zendesk_user_attribute(attribute)
+      attr_name = zendesk_config.user_attributes[attribute]
+      zendesk_current_user.try(attr_name)
+    end
+
+    def after_created_ticket ticket
+      key = zendesk_user_signed_in? ? :authenticated : :unauthenticated
+      message = t "zendesk.tickets.create.#{key}.message"
+      redirect_to ticket_path(ticket.id), flash: { notice: message }
+    end
+
+    def after_updated_ticket ticket
+      message = t 'zendesk.comments.added'
+      redirect_to ticket_path(ticket.id), flash: { notice: message }
+    end
+
+    def after_invalid_ticket ticket
+      render 'new'
+    end
   end
 end

data/app/models/zendesk_rails/comment.rb

@@ -0,0 +1,19 @@
+module ZendeskRails
+  class Comment < Resource
+    attr_reader :ticket
+    has_fields :comment
+    delegate :requester_id, to: :ticket
+    validates_presence_of :comment, :requester_id
+
+    def initialize(ticket, attributes = {})
+      @ticket = ticket
+      super(attributes)
+    end
+
+    def save
+      return false unless valid?
+      ticket.comment = { body: comment, author_id: requester_id }
+      ticket.save
+    end
+  end
+end

data/app/models/zendesk_rails/resource.rb

@@ -0,0 +1,60 @@
+require 'active_model'
+
+module ZendeskRails
+  class Resource
+    include ActiveModel::Validations
+    include ActiveModel::Conversion
+    extend ActiveModel::Naming
+
+    class NotFoundException < StandardError
+      attr_reader :id, :resource
+
+      def initialize(id, resource)
+        @id, @resource = id, resource
+      end
+
+      def to_s
+        "#{resource} ##{id} not found."
+      end
+    end
+
+    class << self
+      delegate :client, :config, to: :ZendeskRails
+      attr_reader :known_fields
+
+      def has_fields(*names)
+        @known_fields ||= []
+        @known_fields |= names.map(&:to_s)
+      end
+
+      def resource_not_found!(id)
+        fail NotFoundException.new(id, self)
+      end
+    end
+    delegate :known_fields, :client, :config, to: :class
+
+    attr_accessor :attributes
+
+    def initialize(attributes = {})
+      @attributes = attributes.with_indifferent_access
+    end
+
+    def persisted?
+      false
+    end
+
+    def respond_to_missing?(meth, *)
+      known_fields.include?(meth.to_s) || super
+    end
+
+    def method_missing(meth, *args, &block)
+      if attributes.key?(meth)
+        attributes[meth]
+      elsif known_fields.include?(meth.to_s)
+        nil
+      else
+        super
+      end
+    end
+  end
+end

data/app/models/zendesk_rails/ticket.rb

@@ -0,0 +1,56 @@
+module ZendeskRails
+  # ActiveModel wrapper for submitting tickets to Zendesk
+  class Ticket < Resource
+    attr_reader :ticket
+    has_fields :name, :email, :subject, :body, :requester
+    validates :subject, :body, :requester, presence: true
+    validate :requester_email_presence, :requester_name_presence
+
+    # Returns ticket from Zendesk's API, not a ZendeskRails::Ticket
+    def create
+      return unless valid?
+      @ticket = client.tickets.create({
+        subject: subject,
+        comment: { value: body },
+        requester: requester
+      }.merge(config.ticket_create_params))
+    end
+
+    private
+
+    [:name, :email].each do |key|
+      define_method "requester_#{key}_presence" do
+        if requester && requester[key].blank?
+          errors.add key, "can't be blank"
+        end
+      end
+    end
+
+    class << self
+      def search(conditions = {})
+        conditions[:query] = to_query(conditions[:query])
+        conditions.merge!(config.ticket_list_options)
+        client.search conditions
+      end
+
+      def belonging_to(email)
+        search query: { requester: email }
+      end
+
+      def find_request(id)
+        client.requests.find(id: id) || resource_not_found!(id)
+      end
+
+      def find_ticket(id)
+        client.tickets.find(id: id) || resource_not_found!(id)
+      end
+
+      private
+
+      def to_query(query)
+        return query unless query.respond_to?(:keys)
+        query.to_a.map { |a| a.join(':') }.join('+')
+      end
+    end
+  end
+end

data/app/views/layouts/zendesk_rails/tickets.html.erb

@@ -8,7 +8,7 @@
   <%= csrf_meta_tags %>
 </head>
 <body>
-  <div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+  <div class="navbar navbar-inverse" role="navigation">
     <div class="container">
       <div class="navbar-header">
         <%= link_to zendesk_config.app_name, main_app.root_path, class: 'navbar-brand' %>
@@ -18,7 +18,7 @@
 
   <div class="container" role="main">
     <% flash.each do |type, message| %>
-      <div class="alert alert-<%= type %> fade in">
+      <div class="alert alert-<%= { notice: 'success', alert: 'danger'}[type] %> fade in">
         <button class="close" data-dismiss="alert">×</button>
         <%= message %>
       </div>

data/app/views/zendesk_rails/tickets/_comment_form.html.erb

@@ -0,0 +1,8 @@
+<%= form_for(comment, as: :ticket, method: :put, url: ticket_path(@ticket.id)) do |f| %>
+
+  <%= form_group_with_errors f.object, :comment do %>
+    <%= f.text_area :comment, rows: 5, class: "form-control", placeholder: t('zendesk.comments.new.placeholder') %>
+  <% end %>
+
+  <p><%= submit_tag t('zendesk.comments.new.submit'), class: "btn btn-large btn-primary" %></p>
+<% end %>

data/app/views/zendesk_rails/tickets/_form.html.erb

@@ -0,0 +1,25 @@
+<%= form_for(handler, as: :ticket, url: tickets_path) do |f| %>
+  <% unless zendesk_user_signed_in? %>
+    <%= form_group_with_errors f.object, :name do %>
+      <%= f.label :name, t('zendesk.tickets.new.name.label') %>
+      <%= f.text_field :name, class: "form-control", placeholder: t('zendesk.tickets.new.name.placeholder') %>
+    <% end %>
+
+    <%= form_group_with_errors f.object, :email do %>
+      <%= f.label :email, t('zendesk.tickets.new.email.label') %>
+      <%= f.text_field :email, class: "form-control", placeholder: t('zendesk.tickets.new.email.placeholder') %>
+    <% end %>
+  <% end %>
+
+  <%= form_group_with_errors f.object, :subject do %>
+    <%= f.label :subject, t('zendesk.tickets.new.subject.label') %>
+    <%= f.text_field :subject, class: "form-control", placeholder: t('zendesk.tickets.new.subject.placeholder') %>
+  <% end %>
+
+  <%= form_group_with_errors f.object, :body do %>
+    <%= f.label :body, t('zendesk.tickets.new.body.label') %>
+    <%= f.text_area :body, rows: 10, class: "form-control", placeholder: t('zendesk.tickets.new.body.placeholder') %>
+  <% end %>
+
+  <p><%= f.submit t('zendesk.tickets.new.submit'), class: "btn btn-large btn-primary" %></p>
+<% end %>

data/app/views/zendesk_rails/tickets/index.html.erb

@@ -1,6 +1,6 @@
 <div class="jumbotron">
   <h1><%= t 'zendesk.tickets.jumbotron.callout' %></h1>
-  <p><%= t 'zendesk.tickets.jumbotron.body' %></p>
+  <p><%= raw t('zendesk.tickets.jumbotron.body') %></p>
   <p>
     <%= link_to t('zendesk.tickets.jumbotron.new'), new_ticket_path, class: "btn btn-primary btn-lg" %>
   </p>
@@ -9,29 +9,37 @@
 <div class="row">
   <div class="col-md-12">
     <h1><%= t 'zendesk.tickets.list.heading' %></h1>
-    <div class="table-responsive">
-      <table class="table table-hover table-striped">
-        <thead>
-          <th><%= t 'zendesk.tickets.list.columns.id' %></th>
-          <th><%= t 'zendesk.tickets.list.columns.subject' %></th>
-          <th><%= t 'zendesk.tickets.list.columns.status' %></th>
-          <th><%= t 'zendesk.tickets.list.columns.last_updated' %></th>
-        </thead>
-        <tbody>
-          <% @tickets.each do |ticket| %>
-            <tr>
-              <td><%= link_to ticket.id, zendesk_rails.ticket_path(ticket.id) %></td>
-              <td><%= truncate ticket.subject, length: 300 %></td>
-              <td>
-                <span class="label label-<%= status_label_class(ticket.status) %>">
-                  <%= ticket.status.try(:titleize) || 'New' %>
-                </span>
-              </td>
-              <td><%= format_time(ticket.updated_at || ticket.created_at) %></td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-    </div>
+    <% if @tickets.empty? %>
+      <div class="zendesk-no-tickets well">
+        <h4 class="text-muted text-center">
+          <%= t 'zendesk.tickets.none' %>
+        </h4>
+      </div>
+    <% else %>
+      <div class="table-responsive">
+        <table class="table table-hover table-striped">
+          <thead>
+            <th><%= t 'zendesk.tickets.list.columns.id' %></th>
+            <th><%= t 'zendesk.tickets.list.columns.subject' %></th>
+            <th><%= t 'zendesk.tickets.list.columns.status' %></th>
+            <th><%= t 'zendesk.tickets.list.columns.last_updated' %></th>
+          </thead>
+          <tbody>
+            <% @tickets.each do |ticket| %>
+              <tr>
+                <td><%= link_to ticket.id, zendesk_rails.ticket_path(ticket.id) %></td>
+                <td><%= truncate ticket.subject, length: 300 %></td>
+                <td>
+                  <span class="label label-<%= status_label_class(ticket.status) %>">
+                    <%= ticket.status.try(:titleize) || 'New' %>
+                  </span>
+                </td>
+                <td><%= format_time(ticket.updated_at || ticket.created_at) %></td>
+              </tr>
+            <% end %>
+          </tbody>
+        </table>
+      </div>
+    <% end %>
   </div>
 </div>

data/app/views/zendesk_rails/tickets/new.html.erb

@@ -4,32 +4,7 @@
 
 <div class="row">
   <div class="col-md-8">
-    <%= form_for(@handler, as: :ticket, url: tickets_path) do |f| %>
-      <% unless zendesk_user_signed_in? %>
-        <%= form_group_with_errors f.object, :name do %>
-          <%= f.label :name, t('zendesk.tickets.new.name.label') %>
-          <%= f.text_field :name, class: "form-control", placeholder: t('zendesk.tickets.new.name.placeholder') %>
-        <% end %>
-
-        <%= form_group_with_errors f.object, :email do %>
-          <%= f.label :email, t('zendesk.tickets.new.email.label') %>
-          <%= f.text_field :email, class: "form-control", placeholder: t('zendesk.tickets.new.email.placeholder') %>
-        <% end %>
-      <% end %>
-
-      <%= form_group_with_errors f.object, :subject do %>
-        <%= f.label :subject, t('zendesk.tickets.new.subject.label') %>
-        <%= f.text_field :subject, class: "form-control", placeholder: t('zendesk.tickets.new.subject.placeholder') %>
-      <% end %>
-
-      <%= form_group_with_errors f.object, :body do %>
-        <%= f.label :body, t('zendesk.tickets.new.body.label') %>
-        <%= f.text_area :body, rows: 10, class: "form-control", placeholder: t('zendesk.tickets.new.body.placeholder') %>
-      <% end %>
-
-      <p><%= f.submit t('zendesk.tickets.new.submit'), class: "btn btn-large btn-primary" %></p>
-
-    <% end %>
+    <%= render 'form', handler: @handler %>
   </div>
 
   <div class="col-md-4">

data/app/views/zendesk_rails/tickets/show.html.erb

@@ -8,22 +8,15 @@
 <div class="row">
   <div class="col-md-12">
     <div class="well">
-      <%= form_for(@handler, as: :ticket, method: :put, url: ticket_path(@ticket.id)) do |f| %>
-
-        <%= form_group_with_errors f.object, :comment do %>
-          <%= f.text_area :comment, rows: 5, class: "form-control", placeholder: t('zendesk.comments.new.placeholder') %>
-        <% end %>
-
-        <p><%= submit_tag t('zendesk.comments.new.submit'), class: "btn btn-large btn-primary" %></p>
-      <% end %>
+      <%= render 'comment_form', comment: @comment %>
     </div>
   </div>
 </div>
 
 <div class="row">
   <div class="col-md-12">
-    <% @handler.comments.each do |comment| %>
-      <div class="well comment">
+    <% @ticket.comments.each do |comment| %>
+      <div class="well zendesk-comment">
         <div class="row">
           <% if photo = comment.author.photo %>
             <div class="col-xs-2 col-md-1">
@@ -31,8 +24,8 @@
             </div>
           <% end %>
           <div class="<%= photo ? 'col-xs-10 col-md-11' : 'col-md-12' %>">
-            <div class="comment-body"><%= raw comment.html_body %></div>
-            <small class="comment-details">
+            <div class="zendesk-comment-body"><%= raw comment.html_body %></div>
+            <small class="zendesk-comment-details">
               <%= t 'zendesk.comments.details', time: format_time(comment.created_at), user: comment.author.name %>
             </small>
           </div>
@@ -40,4 +33,4 @@
       </div>
     <% end %>
   </div>
-</div>
+</div>

data/config/locales/zendesk_rails.yml

@@ -2,6 +2,10 @@ en:
   zendesk:
     app_name: Help
     tickets:
+      none: |
+        You haven't submitted any tickets, yet. Once you submit a ticket,
+        it will appear here so you can come back to it later.
+      not_found: We were unable to locate the requested ticket.
       status:
         new: warning
         open: danger

data/lib/zendesk_rails/configuration.rb

@@ -1,19 +1,5 @@
 module ZendeskRails
   class Configuration
-    CLIENT_OPTIONS = [
-      :username,
-      :password,
-      :token,
-      :url,
-      :retry,
-      :logger,
-      :client_options,
-      :adapter,
-      :allow_http,
-      :access_token,
-      :url_based_access_token
-    ]
-
     DEFAULT_SORTING = {
       sort_by: :created_at,
       sort_order: :desc
@@ -24,7 +10,6 @@ module ZendeskRails
       email: :email
     }
 
-    attr_accessor *CLIENT_OPTIONS
     attr_accessor :layout
     attr_writer :devise_scope
     attr_writer :app_name
@@ -35,6 +20,13 @@ module ZendeskRails
     attr_writer :comment_list_options
     attr_writer :ticket_create_params
 
+    def initialize(&block)
+      @zendesk_api_client = ZendeskAPI::Client.new do |config|
+        @zendesk_api_config = config
+        yield self
+      end
+    end
+
     def devise_scope
       @current_user_method || :user
     end
@@ -67,24 +59,26 @@ module ZendeskRails
       (@comment_list_options || {}).reverse_merge(DEFAULT_SORTING)
     end
 
-    def build_client
-      client_class.new do |client_config|
-        CLIENT_OPTIONS.each do |opt|
-          if value = send(opt)
-            client_config.send("#{opt}=", value)
-          end
+    def client
+      @client ||= begin
+        if test_mode?
+          require 'zendesk_rails/testing'
+          ZendeskRails::Testing::Client.new
+        else
+          @zendesk_api_client
         end
       end
     end
 
-    private
+    def respond_to_missing?(meth, *)
+      @zendesk_api_config.respond_to?(meth) || super
+    end
 
-    def client_class
-      if test_mode?
-        require 'zendesk_rails/testing'
-        ZendeskRails::Testing::Client
+    def method_missing(meth, *args, &block)
+      if @zendesk_api_config.respond_to?(meth)
+        @zendesk_api_config.send(meth, *args, &block)
       else
-        ::ZendeskAPI::Client
+        super
       end
     end
   end

data/lib/zendesk_rails/engine.rb

@@ -1,15 +1,8 @@
 require 'zendesk_api'
 require 'zendesk_rails/configuration'
-require 'zendesk_rails/controller_helpers'
 
 module ZendeskRails
   class Engine < ::Rails::Engine
     isolate_namespace ZendeskRails
-
-    initializer "zendesk_rails.helpers" do
-      ActiveSupport.on_load(:action_controller) do
-        include ZendeskRails::ControllerHelpers
-      end
-    end
   end
 end

data/lib/zendesk_rails/testing.rb

@@ -2,7 +2,7 @@ module ZendeskRails
   module Testing
     class Resource
       def initialize(attributes)
-        @attributes = attributes.symbolize_keys
+        @attributes = attributes.with_indifferent_access
       end
 
       def method_missing(method, *args, &block)
@@ -17,8 +17,11 @@ module ZendeskRails
         def all
           (@all ||= []).sort { |a, b| b.created_at <=> a.created_at }
         end
-
         delegate *Array.instance_methods(false), to: :all
+
+        def clear!
+          @all = []
+        end
       end
     end
 

data/lib/zendesk_rails/version.rb

@@ -1,3 +1,3 @@
 module ZendeskRails
-  VERSION = '0.0.1'
+  VERSION = '0.1.1'
 end

data/lib/zendesk_rails.rb

@@ -1,11 +1,13 @@
 require 'zendesk_rails/engine'
 
 module ZendeskRails
-  mattr_reader :config, :client
+  class << self
+    attr_reader :config
+    delegate :client, to: :config
 
-  def self.configure
-    @@config = ZendeskRails::Configuration.new
-    yield config
-    @@client = config.build_client
+    def configure(&block)
+      @config = Configuration.new(&block)
+      @config.client
+    end
   end
 end

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.1
 platform: ruby
 authors:
 - Ray Zane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: zendesk_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A Rails engine to add help desk ticketing using the Zendesk API.
@@ -136,9 +136,12 @@ files:
 - app/assets/stylesheets/zendesk_rails/application.css
 - app/controllers/zendesk_rails/tickets_controller.rb
 - app/helpers/zendesk_rails/tickets_helper.rb
-- app/models/zendesk_rails/comment_handler.rb
-- app/models/zendesk_rails/ticket_handler.rb
+- app/models/zendesk_rails/comment.rb
+- app/models/zendesk_rails/resource.rb
+- app/models/zendesk_rails/ticket.rb
 - app/views/layouts/zendesk_rails/tickets.html.erb
+- app/views/zendesk_rails/tickets/_comment_form.html.erb
+- app/views/zendesk_rails/tickets/_form.html.erb
 - app/views/zendesk_rails/tickets/index.html.erb
 - app/views/zendesk_rails/tickets/new.html.erb
 - app/views/zendesk_rails/tickets/show.html.erb
@@ -147,7 +150,6 @@ files:
 - lib/tasks/zendesk_rails_tasks.rake
 - lib/zendesk_rails.rb
 - lib/zendesk_rails/configuration.rb
-- lib/zendesk_rails/controller_helpers.rb
 - lib/zendesk_rails/engine.rb
 - lib/zendesk_rails/testing.rb
 - lib/zendesk_rails/version.rb
@@ -161,12 +163,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []

data/app/models/zendesk_rails/comment_handler.rb

@@ -1,40 +0,0 @@
-module ZendeskRails
-  class CommentHandler
-    include ActiveModel::Validations
-    include ActiveModel::Conversion
-    extend ActiveModel::Naming
-
-    attr_reader :ticket
-    attr_accessor :comment, :requester_id
-
-    validates_presence_of :comment, :requester_id
-
-    def initialize(ticket, attributes = {})
-      @ticket = ticket
-      @requester_id = ticket.requester_id
-
-      attributes.each do |key, value|
-        send("#{key}=", value)
-      end
-    end
-
-    def save
-      return false unless valid?
-
-      ticket.comment = {
-        body: comment,
-        author_id: ticket.requester_id
-      }
-
-      ticket.save
-    end
-
-    def comments
-      @comments ||= ticket.comments(ZendeskRails.config.comment_list_options)
-    end
-
-    def persisted?
-      false
-    end
-  end
-end

data/app/models/zendesk_rails/ticket_handler.rb

@@ -1,74 +0,0 @@
-require 'active_model'
-
-module ZendeskRails
-  class TicketHandler
-    include ActiveModel::Validations
-    include ActiveModel::Conversion
-    extend ActiveModel::Naming
-
-    attr_reader :ticket
-    attr_accessor :name, :email, :subject, :body, :requester, :comment
-
-    validates :subject, :body, :requester, presence: true
-    validate :requester_email_presence, :requester_name_presence
-
-    def initialize(attributes = {})
-      attributes.each do |key, value|
-        send("#{key}=", value)
-      end
-    end
-
-    def create
-      @ticket = self.class.client.tickets.create(create_params) if valid?
-    end
-
-    def create_params
-      {
-        subject: subject,
-        comment: { value: body },
-        requester: requester
-      }.merge(ZendeskRails.config.ticket_create_params)
-    end
-
-    def persisted?
-      false
-    end
-
-    def requester_email_presence
-      if requester && requester[:email].blank?
-        errors.add(:email, "can't be blank")
-      end
-    end
-
-    def requester_name_presence
-      if requester && requester[:name].blank?
-        errors.add(:name, "can't be blank")
-      end
-    end
-
-    class << self
-      delegate :client, to: ZendeskRails
-
-      def search(conditions = {})
-        conditions[:query] = to_query(conditions[:query])
-        conditions.merge!(ZendeskRails.config.ticket_list_options)
-        client.search(conditions)
-      end
-
-      def find_request(id)
-        client.requests.find(id: id)
-      end
-
-      def find_ticket(id)
-        client.tickets.find(id: id)
-      end
-
-      private
-
-      def to_query(query)
-        return query unless query.respond_to?(:keys)
-        query.to_a.map { |a| a.join(':') }.join('+')
-      end
-    end
-  end
-end

data/lib/zendesk_rails/controller_helpers.rb

@@ -1,41 +0,0 @@
-module ZendeskRails
-  module ControllerHelpers
-    extend ActiveSupport::Concern
-
-    included do
-      delegate :config, to: :ZendeskRails, prefix: :zendesk
-      delegate :layout, to: :zendesk_config, prefix: :zendesk
-
-      helper_method :zendesk_config,
-                    :zendesk_current_user,
-                    :zendesk_user_signed_in?,
-                    :zendesk_user_attribute
-    end
-
-    def zendesk_current_user
-      send "current_#{zendesk_config.devise_scope}"
-    end
-
-    def zendesk_user_signed_in?
-      send "#{zendesk_config.devise_scope}_signed_in?"
-    end
-
-    # Gets the value of a user's name/emails based on
-    # configurable attribute names
-    def zendesk_user_attribute(attribute)
-      attr_name = zendesk_config.user_attributes[attribute]
-      zendesk_current_user.try(attr_name)
-    end
-
-    # The user will be redirected to this URL when a
-    # ticket is successfully created
-    def after_zendesk_ticket_created_path_for(ticket)
-      ticket_path(ticket.id)
-    end
-
-    # Render will be called with these arguments when a ticket is invalid
-    def after_zendesk_ticket_invalid_template
-      'new'
-    end
-  end
-end