Merge pull request #612 from errbit/features/extract_issue_tracker

Extract all Issue Tracker in gems

Merge pull request #612 from errbit/features/extract_issue_tracker
Extract all Issue Tracker in gems
Stephen Crosby
2 parents ea168ac7 8dbfda45
Showing 68 changed files with 802 additions and 1416 deletions Show diff stats
Gemfile
Gemfile.lock
app/assets/images/github_create.png
app/assets/images/github_inactive.png
app/assets/stylesheets/issue_tracker_icons.css.erb
app/controllers/apps_controller.rb
app/controllers/problems_controller.rb
app/decorators/app_decorator.rb
app/decorators/issue_tracker_decorator.rb
app/decorators/issue_tracker_field_decorator.rb
app/decorators/watcher_decorator.rb
app/interactors/issue_creation.rb
app/models/app.rb
app/models/issue_tracker.rb
app/models/issue_trackers/bitbucket_issues_tracker.rb
app/models/issue_trackers/fogbugz_tracker.rb
app/models/issue_trackers/github_issues_tracker.rb
app/models/issue_trackers/gitlab_tracker.rb
app/models/issue_trackers/jira_tracker.rb
app/models/issue_trackers/lighthouse_tracker.rb
@@ -25,31 +25,18 @@ gem &#39;rails_autolink&#39;
 # Please don't update hoptoad_notifier to airbrake.
 # It's for internal use only, and we monkeypatch certain methods
 gem 'hoptoad_notifier', "~> 2.4"
-
-
-# Remove / comment out any of the gems below if you want to disable
-# a given issue tracker, notification service, or authentication.
-
-# Issue Trackers
-# ---------------------------------------
-# Lighthouse
-gem 'lighthouse-api'
-# Redmine
-gem 'oruen_redmine_client', :require => 'redmine_client'
-# Pivotal Tracker
-gem 'pivotal-tracker'
-# Fogbugz
-gem 'ruby-fogbugz', :require => 'fogbugz'
-# Github Issues
-gem 'octokit', '~> 2.0'
-# Gitlab
-gem 'gitlab', '~> 3.0.0'
-
-# Bitbucket Issues
-gem 'bitbucket_rest_api', :require => false
-
-# Jira
-gem 'jira-ruby', :require => 'jira'
+gem 'draper', :require => false
+
+gem 'errbit_plugin'
+gem 'errbit_bitbucket_plugin'
+gem 'errbit_fogbugz_plugin'
+gem 'errbit_github_plugin'
+gem 'errbit_gitlab_plugin'
+gem 'errbit_jira_plugin'
+gem 'errbit_lighthouse_plugin'
+gem 'errbit_pivotal_plugin'
+gem 'errbit_redmine_plugin'
+gem 'errbit_unfuddle_plugin'
  
 # Notification services
 # ---------------------------------------
@@ -101,6 +88,7 @@ end
  
 group :test do
   gem 'capybara'
+  gem 'poltergeist'
   gem 'launchy'
   gem 'database_cleaner'
   gem 'email_spec'
@@ -32,7 +32,7 @@ GEM
     activesupport (3.2.21)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    addressable (2.3.5)
+    addressable (2.3.6)
     airbrake (3.1.14)
       builder
       json
@@ -66,6 +66,7 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
+    cliver (0.3.2)
     coderay (1.0.9)
     coveralls (0.7.0)
       multi_json (~> 1.3)
@@ -73,8 +74,8 @@ GEM
       simplecov (>= 0.7)
       term-ansicolor
       thor
-    crack (0.4.1)
-      safe_yaml (~> 0.9.0)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
     css_parser (1.3.5)
       addressable
     database_cleaner (1.2.0)
@@ -88,16 +89,49 @@ GEM
       warden (~> 1.2.3)
     diff-lcs (1.2.4)
     dotenv (0.9.0)
+    draper (1.3.0)
+      actionpack (>= 3.0)
+      activemodel (>= 3.0)
+      activesupport (>= 3.0)
+      request_store (~> 1.0.3)
     email_spec (1.5.0)
       launchy (~> 2.1)
       mail (~> 2.2)
+    errbit_bitbucket_plugin (0.1.0)
+      bitbucket_rest_api
+      errbit_plugin
+      faraday (~> 0.8.1)
+    errbit_fogbugz_plugin (0.1.0)
+      errbit_plugin (~> 0.4, >= 0.4.0)
+      ruby-fogbugz (~> 0.1, >= 0.1)
+    errbit_github_plugin (0.1.0)
+      errbit_plugin
+      octokit
+    errbit_gitlab_plugin (0.1.0)
+      errbit_plugin (~> 0.4, >= 0.4.0)
+      gitlab (~> 3.0.0, >= 3.0.0)
+    errbit_jira_plugin (0.2.0)
+      errbit_plugin
+      jira-ruby
+    errbit_lighthouse_plugin (0.1.0)
+      errbit_plugin (~> 0)
+      lighthouse-api (~> 2)
+    errbit_pivotal_plugin (0.2.0)
+      errbit_plugin (~> 0.4, >= 0.4.0)
+      pivotal-tracker (~> 0.5, >= 0.5.0)
+    errbit_plugin (0.4.0)
+    errbit_redmine_plugin (0.2.0)
+      errbit_plugin (~> 0)
+      oruen_redmine_client (~> 0)
+    errbit_unfuddle_plugin (0.1.0)
+      errbit_plugin (~> 0.4, >= 0.4.0)
     erubis (2.7.0)
     execjs (2.0.2)
-    fabrication (2.8.1)
+    fabrication (2.9.0)
     faraday (0.8.9)
       multipart-post (~> 1.2.0)
-    faraday_middleware (0.9.0)
-      faraday (>= 0.7.4, < 0.9)
+    faraday_middleware (0.9.1)
+      faraday (>= 0.7.4, < 0.10)
     flowdock (0.3.1)
       httparty (~> 0.7)
       multi_json
@@ -111,7 +145,7 @@ GEM
     happymapper (0.4.1)
       libxml-ruby (~> 2.0)
     hashie (2.0.5)
-    highline (1.6.19)
+    highline (1.6.20)
     hike (1.2.3)
     hipchat (0.12.0)
       httparty
@@ -127,10 +161,9 @@ GEM
       multi_xml (>= 0.5.2)
     httpauth (0.2.0)
     i18n (0.6.11)
-    jira-ruby (0.1.2)
+    jira-ruby (0.1.10)
       activesupport
       oauth
-      railties
     journey (1.0.4)
     jquery-rails (2.1.4)
       railties (>= 3.0, < 5.0)
@@ -158,7 +191,7 @@ GEM
       railties
     method_source (0.8.2)
     mime-types (1.25.1)
-    mini_portile (0.5.3)
+    mini_portile (0.6.1)
     mongoid (3.1.5)
       activemodel (~> 3.2)
       moped (~> 1.4)
@@ -184,9 +217,9 @@ GEM
     net-ssh (2.7.0)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    nokogiri-happymapper (0.5.8)
+    nokogiri (1.6.4.1)
+      mini_portile (~> 0.6.0)
+    nokogiri-happymapper (0.5.9)
       nokogiri (~> 1.5)
     oauth (0.4.7)
     oauth2 (0.8.1)
@@ -195,8 +228,8 @@ GEM
       jwt (~> 0.1.4)
       multi_json (~> 1.0)
       rack (~> 1.2)
-    octokit (2.7.1)
-      sawyer (~> 0.5.2)
+    octokit (3.3.1)
+      sawyer (~> 0.5.3)
     omniauth (1.1.4)
       hashie (>= 1.2, < 3)
       rack
@@ -222,6 +255,11 @@ GEM
       rest-client (~> 1.6.0)
     pjax_rails (0.3.4)
       jquery-rails
+    poltergeist (1.5.1)
+      capybara (~> 2.1)
+      cliver (~> 0.3.1)
+      multi_json (~> 1.0)
+      websocket-driver (>= 0.2.0)
     polyglot (0.3.5)
     premailer (1.7.3)
       css_parser (>= 1.1.9)
@@ -268,8 +306,10 @@ GEM
     rdoc (3.12.2)
       json (~> 1.4)
     ref (1.0.5)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
+    request_store (1.0.6)
+    rest-client (1.6.8)
+      mime-types (~> 1.16)
+      rdoc (>= 2.4.2)
     ri_cal (0.8.8)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
@@ -291,11 +331,11 @@ GEM
     rushover (0.3.0)
       json
       rest-client
-    safe_yaml (0.9.7)
-    sawyer (0.5.3)
+    safe_yaml (1.0.4)
+    sawyer (0.5.5)
       addressable (~> 2.3.5)
       faraday (~> 0.8, < 0.10)
-    simple_oauth (0.2.0)
+    simple_oauth (0.3.0)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
@@ -330,18 +370,19 @@ GEM
     tzinfo (0.3.41)
     uglifier (2.2.1)
       execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
+      json (>= 1.8.0)
     underscore-rails (1.5.2)
     unicorn (4.6.3)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
-    useragent (0.8.3)
+    useragent (0.9.0)
     warden (1.2.3)
       rack (>= 1.0)
     webmock (1.15.0)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
+    websocket-driver (0.3.3)
     xmpp4r (0.5.5)
     xpath (2.0.0)
       nokogiri (~> 1.3)
@@ -357,7 +398,6 @@ DEPENDENCIES
   airbrake
   better_errors
   binding_of_caller
-  bitbucket_rest_api
   campy
   capistrano (~> 2.0)
   capybara
@@ -365,32 +405,38 @@ DEPENDENCIES
   database_cleaner
   decent_exposure
   devise
+  draper
   email_spec
+  errbit_bitbucket_plugin
+  errbit_fogbugz_plugin
+  errbit_github_plugin
+  errbit_gitlab_plugin
+  errbit_jira_plugin
+  errbit_lighthouse_plugin
+  errbit_pivotal_plugin
+  errbit_plugin
+  errbit_redmine_plugin
+  errbit_unfuddle_plugin
   execjs
   fabrication
   flowdock
   foreman
-  gitlab (~> 3.0.0)
   haml
   hipchat
   hoi
   hoptoad_notifier (~> 2.4)
   htmlentities
   httparty
-  jira-ruby
   jquery-rails (~> 2.1.4)
   kaminari (>= 0.14.1)
   launchy
-  lighthouse-api
   meta_request
   mongoid
   mongoid-rspec
   mongoid_rails_migrations
-  octokit (~> 2.0)
   omniauth-github
-  oruen_redmine_client
-  pivotal-tracker
   pjax_rails
+  poltergeist
   pry-rails
   puma
   quiet_assets
@@ -400,7 +446,6 @@ DEPENDENCIES
   railties (~> 3.2.21)
   ri_cal
   rspec-rails
-  ruby-fogbugz
   rushover
   strong_parameters
   therubyracer
 /* Issue Tracker inactive, select, create and goto icons */
-<% trackers = IssueTracker.subclasses.map{|t| t.label } << 'none' %>
  
-<% trackers.each do |tracker| %>
-div.issue_tracker.nested label.<%= tracker %> {
-  background: url(<%= asset_path "#{ tracker }_inactive.png" %>) no-repeat;
-}
-div.issue_tracker.nested label.r_on.<%= tracker %> {
-  background: url(<%= asset_path "#{ tracker }_create.png" %>) no-repeat;
-}
-#action-bar a.<%= tracker %>_create {
-  background: transparent url(<%= asset_path "#{ tracker }_create.png" %>) 6px 5px no-repeat;
-}
-#action-bar a.<%= tracker %>_goto {
-  background: transparent url(<%= asset_path "#{ tracker }_goto.png" %>) 6px 5px no-repeat;
-}
+<% ErrbitPlugin::Registry.issue_trackers.keys.each do |label| %>
+div.issue_tracker.nested label.<%= label %> { background: url(<%= asset_path "#{ label }_inactive.png" %>) no-repeat; }
+div.issue_tracker.nested label.r_on.<%= label %> { background: url(<%= asset_path "#{ label }_create.png" %>) no-repeat; }
+#action-bar a.<%= label %>_create { background: transparent url(<%= asset_path "#{ label }_create.png" %>) 6px 5px no-repeat; }
+#action-bar a.<%= label %>_goto { background: transparent url(<%= asset_path "#{ label }_goto.png" %>) 6px 5px no-repeat; }
 <% end %>
  
@@ -16,6 +16,9 @@ class AppsController &lt; ApplicationController
   }
  
   expose(:app, :ancestor => :app_scope)
+  expose(:app_decorate) do
+    AppDecorator.new(app)
+  end
  
   expose(:all_errs) {
     !!params[:all_errs]
@@ -50,7 +53,6 @@ class AppsController &lt; ApplicationController
   end
  
   def create
-    initialize_subclassed_issue_tracker
     initialize_subclassed_notification_service
     if app.save
       redirect_to app_url(app), :flash => { :success => I18n.t('controllers.apps.flash.create.success') }
@@ -61,7 +63,6 @@ class AppsController &lt; ApplicationController
   end
  
   def update
-    initialize_subclassed_issue_tracker
     initialize_subclassed_notification_service
     if app.save
       redirect_to app_url(app), :flash => { :success => I18n.t('controllers.apps.flash.update.success') }
@@ -91,17 +92,6 @@ class AppsController &lt; ApplicationController
  
   protected
  
-    def initialize_subclassed_issue_tracker
-      # set the app's issue tracker
-      if params[:app][:issue_tracker_attributes] && tracker_type = params[:app][:issue_tracker_attributes][:type]
-        available_tracker_classes = [IssueTracker] + IssueTracker.subclasses
-        tracker_class = available_tracker_classes.detect{|c| c.name == tracker_type}
-        if !tracker_class.nil?
-          app.issue_tracker = tracker_class.new(params[:app][:issue_tracker_attributes])
-        end
-      end
-    end
-
     def initialize_subclassed_notification_service
       # set the app's notification service
       if params[:app][:notification_service_attributes] && notification_type = params[:app][:notification_service_attributes][:type]
@@ -115,7 +105,7 @@ class AppsController &lt; ApplicationController
  
     def plug_params app
       app.watchers.build if app.watchers.none?
-      app.issue_tracker = IssueTracker.new unless app.issue_tracker_configured?
+      app.issue_tracker ||= IssueTracker.new
       app.notification_service = NotificationService.new unless app.notification_service_configured?
       app.copy_attributes_from(params[:copy_attributes_from]) if params[:copy_attributes_from]
     end
@@ -62,8 +62,7 @@ class ProblemsController &lt; ApplicationController
   end
  
   def create_issue
-    IssueTracker.update_url_options(request)
-    issue_creation = IssueCreation.new(problem, current_user, params[:tracker])
+    issue_creation = IssueCreation.new(problem, current_user, params[:tracker], request)
  
     unless issue_creation.execute
       flash[:error] = issue_creation.errors.full_messages.join(', ')
@@ -0,0 +1,19 @@
+class AppDecorator < Draper::Decorator
+
+  decorates_association :watchers
+  decorates_association :issue_tracker, :with => IssueTrackerDecorator
+  delegate_all
+
+  def email_at_notices
+    object.email_at_notices.join(', ')
+  end
+
+  def notify_user_display
+    object.notify_all_users ? 'display: none;' : ''
+  end
+
+  def notify_err_display
+    object.notify_on_errs ? '' : 'display: none;'
+  end
+
+end
@@ -0,0 +1,37 @@
+class IssueTrackerDecorator < Draper::Decorator
+
+  def initialize(object, key)
+    @object = object
+    @key = key
+  end
+  attr_reader :key
+
+  delegate_all
+
+  def issue_trackers
+    ErrbitPlugin::Registry.issue_trackers.each do |key, object|
+      yield IssueTrackerDecorator.new(object, key)
+    end
+  end
+
+  def note
+    object.note.html_safe
+  end
+
+  def fields
+    object.fields.each do |field, field_info|
+      yield IssueTrackerFieldDecorator.new(field, field_info)
+    end
+  end
+
+  def params_class(tracker)
+    [chosen?(tracker), label].join(" ").strip
+  end
+
+  private
+
+  def chosen?(issue_tracker)
+    key == issue_tracker.type_tracker.to_s ? 'chosen' : ''
+  end
+
+end
@@ -0,0 +1,27 @@
+class IssueTrackerFieldDecorator < Draper::Decorator
+
+  def initialize(field, field_info)
+    @object = field
+    @field_info = field_info
+  end
+  attr_reader :object, :field_info
+
+  alias :key :object
+
+  def label
+    field_info[:label] || object.to_s.titleize
+  end
+
+
+  def input(form, issue_tracker)
+    form.send(input_field, key.to_s,
+              :placeholder => field_info[:placeholder],
+              :value => issue_tracker.options[key.to_s])
+  end
+
+  private
+
+  def input_field
+    object == :password ? :password_field : :text_field
+  end
+end
@@ -0,0 +1,9 @@
+class WatcherDecorator < Draper::Decorator
+
+  delegate_all
+
+  def email_choosen
+    object.email.blank? ? 'chosen' : ''
+  end
+
+end
@@ -5,12 +5,24 @@ class IssueCreation
  
   delegate :app, :to => :problem
  
-  def initialize(problem, user, tracker_name)
+  def initialize(problem, user, tracker_name, request)
     @problem = problem
     @user    = user
     @tracker_name = tracker_name
+    IssueTracker.update_url_options(request)
   end
  
+  def execute
+    tracker.create_issue(problem, user) if tracker
+    errors.empty?
+  rescue => ex
+    Rails.logger.error "Error during issue creation: " << ex.message
+    errors.add :base, "There was an error during issue creation: #{ex.message}"
+    false
+  end
+
+  private
+
   def tracker
     return @tracker if @tracker
  
@@ -21,10 +33,11 @@ class IssueCreation
       elsif !user.github_account?
         errors.add :base, "You haven't linked your Github account."
       else
-        @tracker = GithubIssuesTracker.new(
-          :app         => app,
-          :username    => user.github_login,
-          :oauth_token => user.github_oauth_token
+        @tracker = ErrbitGithubPlugin::IssueTracker.new(
+          app, {
+            :username    => user.github_login,
+            :oauth_token => user.github_oauth_token
+          }
         )
       end
  
@@ -39,13 +52,4 @@ class IssueCreation
  
     @tracker
   end
-
-  def execute
-    tracker.create_issue problem, user if tracker
-    errors.empty?
-  rescue => ex
-    Rails.logger.error "Error during issue creation: " << ex.message
-    errors.add :base, "There was an error during issue creation: #{ex.message}"
-    false
-  end
 end
@@ -26,7 +26,7 @@ class App
  
   embeds_many :watchers
   embeds_many :deploys
-  embeds_one :issue_tracker
+  embeds_one :issue_tracker, :class_name => 'IssueTracker'
   embeds_one :notification_service
  
   has_many :problems, :inverse_of => :app, :dependent => :destroy
@@ -44,7 +44,7 @@ class App
   accepts_nested_attributes_for :watchers, :allow_destroy => true,
     :reject_if => proc { |attrs| attrs[:user_id].blank? && attrs[:email].blank? }
   accepts_nested_attributes_for :issue_tracker, :allow_destroy => true,
-    :reject_if => proc { |attrs| !IssueTracker.subclasses.map(&:to_s).include?(attrs[:type].to_s) }
+    :reject_if => proc { |attrs| !ErrbitPlugin::Registry.issue_trackers.keys.map(&:to_s).include?(attrs[:type_tracker].to_s) }
   accepts_nested_attributes_for :notification_service, :allow_destroy => true,
     :reject_if => proc { |attrs| !NotificationService.subclasses.map(&:to_s).include?(attrs[:type].to_s) }
  
@@ -120,7 +120,7 @@ class App
  
  
   def issue_tracker_configured?
-    !!(issue_tracker.class < IssueTracker && issue_tracker.configured?)
+    !!issue_tracker && !!(issue_tracker.configured?)
   end
  
   def notification_service_configured?
@@ -175,6 +175,13 @@ class App
     set(:api_key, SecureRandom.hex)
   end
  
+  ##
+  # Check if comments can be allowed on this application
+  #
+  def comments_allowed?
+    !issue_tracker || issue_tracker.comments_allowed?
+  end
+
   protected
  
     def store_cached_attributes_on_problems
@@ -202,5 +209,6 @@ class App
       github_repo.sub!(/(git@|https?:\/\/)#{github_host}(\/|:)/, '')
       github_repo.sub!(/\.git$/, '')
     end
+
 end
  
 class IssueTracker
   include Mongoid::Document
   include Mongoid::Timestamps
-  include HashHelper
+
   include Rails.application.routes.url_helpers
+
   default_url_options[:host] = ActionMailer::Base.default_url_options[:host]
   default_url_options[:port] = ActionMailer::Base.default_url_options[:port]
  
   embedded_in :app, :inverse_of => :issue_tracker
  
-  field :project_id, :type => String
-  field :alt_project_id, :type => String # Specify an alternative project id. e.g. for viewing files
-  field :api_token, :type => String
-  field :account, :type => String
-  field :username, :type => String
-  field :password, :type => String
-  field :ticket_properties, :type => String
-  field :subdomain, :type => String
-  field :milestone_id, :type => String
-
-  # Is there any better way to enhance the props? Putting them into the subclass leads to
-  # an error while rendering the form fields -.-
-  field :base_url, :type => String
-  field :context_path, :type => String
-  field :issue_type, :type => String
-  field :issue_component, :type => String
-  field :issue_priority, :type => String
-
-  validate :check_params
-
-  # Subclasses are responsible for overwriting this method.
-  def check_params; true; end
-
-  def issue_title(problem)
-    "[#{ problem.environment }][#{ problem.where }] #{problem.message.to_s.truncate(100)}"
-  end
-
-  # Allows us to set the issue tracker class from a single form.
-  def type; self._type; end
-  def type=(t); self._type=t; end
+  field :type_tracker, :type => String
+  field :options, :type => Hash, :default => {}
  
-  def url; nil; end
-
-  # Retrieve tracker label from either class or instance.
-  Label = ''
-  def self.label; self::Label; end
-  def label; self.class.label; end
-
-  def configured?
-    project_id.present?
-  end
+  validate :validate_tracker
  
   ##
   # Update default_url_option with valid data from the request information
@@ -60,4 +24,23 @@ class IssueTracker
     IssueTracker.default_url_options[:port] = request.port
     IssueTracker.default_url_options[:protocol] = request.scheme
   end
+
+  def tracker
+    klass = ErrbitPlugin::Registry.issue_trackers[self.type_tracker]
+    klass = ErrbitPlugin::NoneIssueTracker unless klass
+
+    @tracker = klass.new(app, self.options)
+  end
+
+  # Allow the tracker to validate its own params
+  def validate_tracker
+    (tracker.errors || {}).each do |k,v|
+      errors.add k, v
+    end
+  end
+
+  delegate :configured?, :to => :tracker
+  delegate :create_issue, :to => :tracker
+  delegate :comments_allowed?, :to => :tracker
+  delegate :url, :to => :tracker
 end
@@ -1,55 +0,0 @@
-begin
-  require 'bitbucket_rest_api'
-rescue LoadError
-end
-
-if defined? BitBucket
-  class IssueTrackers::BitbucketIssuesTracker < IssueTracker
-    Label = "bitbucket"
-    Note = 'Please configure your Bitbucket repository in the <strong>BITBUCKET REPO</strong> field above.'
-    Fields = [
-      [:api_token, {
-        :placeholder => "Your username on Bitbucket account",
-        :label => "Username"
-      }],
-      [:project_id, {
-        :placeholder => "Password for your Bitbucket account",
-        :label => "Password"
-      }]
-    ]
-
-    def check_params
-      if Fields.detect {|f| self[f[0]].blank? }
-        errors.add :base, 'You must specify your Bitbucket username and password'
-      end
-    end
-
-    def repo_name
-      app.bitbucket_repo
-    end
-
-    def create_issue(problem, reported_by = nil)
-      bitbucket = BitBucket.new :basic_auth => "#{api_token}:#{project_id}"
-
-      begin
-        r_user = repo_name.split('/')[0]
-        r_name = repo_name.split('/')[1]
-        issue = bitbucket.issues.create r_user, r_name, :title => issue_title(problem), :content => body_template.result(binding), :priority => 'critical'
-        problem.update_attributes(
-          :issue_link => "https://bitbucket.org/#{repo_name}/issue/#{issue.local_id}/",
-          :issue_type => Label
-        )
-      rescue BitBucket::Error::Unauthorized
-        raise IssueTrackers::AuthenticationError, "Could not authenticate with BitBucket. Please check your username and password."
-      end
-    end
-
-    def body_template
-      @@body_template ||= ERB.new(File.read(Rails.root + "app/views/issue_trackers/bitbucket_issues_body.txt.erb"))
-    end
-
-    def url
-      "https://www.bitbucket.org/#{repo_name}/issues"
-    end
-  end
-end
@@ -1,53 +0,0 @@
-if defined? Fogbugz
-  class IssueTrackers::FogbugzTracker < IssueTracker
-    Label = "fogbugz"
-    Fields = [
-      [:project_id, {
-        :label       => "Area Name"
-      }],
-      [:account, {
-        :label       => "FogBugz URL",
-        :placeholder => "abc from http://abc.fogbugz.com/"
-      }],
-      [:username, {
-        :placeholder => "Username/Email for your account"
-      }],
-      [:password, {
-        :placeholder => "Password for your account"
-      }]
-    ]
-
-    def check_params
-      if Fields.detect {|f| self[f[0]].blank? }
-        errors.add :base, 'You must specify your FogBugz Area Name, FogBugz URL, Username, and Password'
-      end
-    end
-
-    def create_issue(problem, reported_by = nil)
-      fogbugz = Fogbugz::Interface.new(:email => username, :password => password, :uri => "https://#{account}.fogbugz.com")
-      fogbugz.authenticate
-
-      issue = {}
-      issue['sTitle'] = issue_title problem
-      issue['sArea'] = project_id
-      issue['sEvent'] = body_template.result(binding)
-      issue['sTags'] = ['errbit'].join(',')
-      issue['cols'] = ['ixBug'].join(',')
-
-      fb_resp = fogbugz.command(:new, issue)
-      problem.update_attributes(
-        :issue_link => "https://#{account}.fogbugz.com/default.asp?#{fb_resp['case']['ixBug']}",
-        :issue_type => Label
-      )
-
-    end
-
-    def body_template
-      @@body_template ||= ERB.new(File.read(Rails.root + "app/views/issue_trackers/fogbugz_body.txt.erb"))
-    end
-
-    def url
-      "http://#{account}.fogbugz.com/"
-    end
-  end
-end
@@ -1,61 +0,0 @@
-if defined? Octokit
-  class IssueTrackers::GithubIssuesTracker < IssueTracker
-    Label = "github"
-    Note = 'Please configure your github repository in the <strong>GITHUB REPO</strong> field above.<br/>' <<
-           'Instead of providing your username & password, you can link your Github account ' <<
-           'to your user profile, and allow Errbit to create issues using your OAuth token.'
-
-    Fields = [
-      [:username, {
-        :placeholder => "Your username on GitHub"
-      }],
-      [:password, {
-        :placeholder => "Password for your account"
-      }]
-    ]
-
-    attr_accessor :oauth_token
-
-    def project_id
-      app.github_repo
-    end
-
-    def check_params
-      if Fields.detect {|f| self[f[0]].blank? }
-        errors.add :base, 'You must specify your GitHub username and password'
-      end
-    end
-
-    def create_issue(problem, reported_by = nil)
-      # Login using OAuth token, if given.
-      if oauth_token
-        client = Octokit::Client.new(:login => username, :access_token => oauth_token)
-      else
-        client = Octokit::Client.new(:login => username, :password => password)
-      end
-
-      begin
-        issue = client.create_issue(
-          project_id,
-          issue_title(problem),
-          body_template.result(binding).unpack('C*').pack('U*')
-        )
-        problem.update_attributes(
-          :issue_link => issue.rels[:html].href,
-          :issue_type => Label
-        )
-
-      rescue Octokit::Unauthorized
-        raise IssueTrackers::AuthenticationError, "Could not authenticate with GitHub. Please check your username and password."
-      end
-    end
-
-    def body_template
-      @@body_template ||= ERB.new(File.read(Rails.root + "app/views/issue_trackers/github_issues_body.txt.erb").gsub(/^\s*/, ''))
-    end
-
-    def url
-      "https://github.com/#{project_id}/issues"
-    end
-  end
-end
@@ -1,53 +0,0 @@
-if defined? Gitlab
-  class IssueTrackers::GitlabTracker < IssueTracker
-    Label = "gitlab"
-    Fields = [
-      [:account, {
-        :label       => "Gitlab URL",
-        :placeholder => "e.g. https://example.net"
-      }],
-      [:api_token, {
-        :placeholder => "API Token for your account"
-      }],
-      [:project_id, {
-        :label       => "Ticket Project ID (use Number)",
-        :placeholder => "Gitlab Project where issues will be created"
-      }],
-      [:alt_project_id, {
-        :label       => "Project Name (namespace/project)",
-        :placeholder => "Gitlab Project where issues will be created"
-      }]
-    ]
-
-    def check_params
-      if Fields.detect {|f| self[f[0]].blank?}
-        errors.add :base, 'You must specify your Gitlab URL, API token, Project ID and Project Name'
-      end
-    end
-
-    def create_issue(problem, reported_by = nil)
-      Gitlab.configure do |config|
-        config.endpoint = "#{account}/api/v3"
-        config.private_token = api_token
-        config.user_agent = 'Errbit User Agent'
-      end
-      title = issue_title problem
-      description_summary = summary_template.result(binding)
-      description_body = body_template.result(binding)
-      ticket = Gitlab.create_issue(project_id, title, { :description => description_summary, :labels => "errbit" } )
-      Gitlab.create_issue_note(project_id, ticket.id, description_body)
-    end
-
-    def summary_template
-      @@summary_template ||= ERB.new(File.read(Rails.root + "app/views/issue_trackers/gitlab_summary.txt.erb").gsub(/^\s*/, ''))
-    end
-
-    def body_template
-      @@body_template ||= ERB.new(File.read(Rails.root + "app/views/issue_trackers/gitlab_body.txt.erb").gsub(/^\s*/, ''))
-    end
-
-    def url
-      "#{account}/#{alt_project_id}/issues"
-    end
-  end
-end
@@ -1,110 +0,0 @@
-if defined? JIRA
-  class IssueTrackers::JiraTracker < IssueTracker
-    Label = 'jira'
-
-    Fields = [
-        [:base_url, {
-            :label => 'Jira URL without trailing slash',
-            :placeholder => 'https://jira.example.org/'
-        }],
-        [:context_path, {
-            :optional => true,
-            :label => 'Context Path (Just "/" if empty otherwise with leading slash)',
-            :placeholder => "/jira"
-        }],
-        [:username, {
-            :optional => true,
-            :label => 'HTTP Basic Auth User',
-            :placeholder => 'johndoe'
-        }],
-        [:password, {
-            :optional => true,
-            :label => 'HTTP Basic Auth Password',
-            :placeholder => 'p@assW0rd'
-        }],
-        [:project_id, {
-            :label => 'Project Key',
-            :placeholder => 'The project Key where the issue will be created'
-        }],
-        [:account, {
-            :optional => true,
-            :label => 'Assign to this user. If empty, Jira takes the project default.',
-            :placeholder => "username"
-        }],
-        [:issue_component, {
-            :label => 'Issue category',
-            :placeholder => 'Website - Other'
-        }],
-        [:issue_type, {
-            :label => 'Issue type',
-            :placeholder => 'Bug'
-        }],
-        [:issue_priority, {
-            :label => 'Priority',
-            :placeholder => 'Normal'
-        }]
-    ]
-
-    def check_params
-      if Fields.detect { |f| self[f[0]].blank? && !f[1][:optional] }
-        errors.add :base, 'You must specify all non optional values!'
-      end
-    end
-
-
-    #
-    # @param problem Problem
-    def create_issue(problem, reported_by = nil)
-      options = {
-          :username => username,
-          :password => password,
-          :site => base_url,
-          :context_path => context_path,
-          :auth_type => :basic,
-          :use_ssl => base_url.match(/^https/) ? true : false
-      }
-      client = JIRA::Client.new(options)
-
-      issue = {
-          :fields => {
-              :project => {
-                  :key => project_id
-              },
-              :summary => issue_title(problem),
-              :description => body_template.result(binding),
-              :issuetype => {
-                  :name => issue_type
-              },
-              :priority => {
-                  :name => issue_priority,
-              },
-
-              :components => [{:name => issue_component}]
-          }
-      }
-
-      issue[:fields][:assignee] = {:name => account} if account
-
-      issue_build = client.Issue.build
-      issue_build.save(issue)
-      issue_build.fetch
-
-      problem.update_attributes(
-          :issue_link => "#{base_url}#{context_path}browse/#{issue_build.key}",
-          :issue_type => Label
-      )
-
-      # Maybe in a later version?
-      #remote_link = {
-      #    :url => app_problem_url(problem.app, problem),
-      #    :name => "Link to Errbit Issue"
-      #}
-      #remote_link_build = issue_build.remotelink.build
-      #remote_link_build.save(remote_link)
-    end
-
-    def body_template
-      @@body_template ||= ERB.new(File.read(Rails.root + "app/views/issue_trackers/jira_body.txt.erb"))
-    end
-  end
-end
 \ No newline at end of file
@@ -1,53 +0,0 @@
-if defined? Lighthouse
-  class IssueTrackers::LighthouseTracker < IssueTracker
-    Label = "lighthouseapp"
-    Fields = [
-      [:account, {
-        :label       => "Subdomain",
-        :placeholder => "subdomain from http://{{subdomain}}.lighthouseapp.com"
-      }],
-      [:api_token, {
-        :label       => "API Token",
-        :placeholder => "123456789abcdef123456789abcdef"
-      }],
-      [:project_id, {
-        :label       => "Project ID",
-        :placeholder => "123456"
-      }]
-    ]
-
-    def check_params
-      if Fields.detect {|f| self[f[0]].blank? }
-        errors.add :base, 'You must specify your Lighthouseapp Subdomain, API token and Project ID'
-      end
-    end
-
-    def create_issue(problem, reported_by = nil)
-      Lighthouse.account = account
-      Lighthouse.token = api_token
-      # updating lighthouse account
-      Lighthouse::Ticket.site
-      Lighthouse::Ticket.format = :xml
-      ticket = Lighthouse::Ticket.new(:project_id => project_id)
-      ticket.title = issue_title problem
-
-      ticket.body = body_template.result(binding)
-
-      ticket.tags << "errbit"
-      ticket.save!
-      problem.update_attributes(
-        :issue_link => "#{Lighthouse::Ticket.site.to_s.sub(/#{Lighthouse::Ticket.site.path}$/, '')}#{Lighthouse::Ticket.element_path(ticket.id, :project_id => project_id)}".sub(/\.xml$/, ''),
-        :issue_type => Label
-      )
-
-    end
-
-    def body_template
-      @@body_template ||= ERB.new(File.read(Rails.root + "app/views/issue_trackers/lighthouseapp_body.txt.erb").gsub(/^\s*/, ''))
-    end
-
-    def url
-      "http://#{account}.lighthouseapp.com"
-    end
-  end
-end
 \ No newline at end of file
@@ -1,71 +0,0 @@
-class IssueTrackers::MingleTracker < IssueTracker
-  Label = "mingle"
-  Note = "Note: <strong>CARD PROPERTIES</strong> must be comma separated <em>key = value</em> pairs"
-
-  Fields = [
-    [:account, {
-      :label       => "Mingle URL",
-      :placeholder => "http://mingle.example.com/"
-    }],
-    [:project_id, {
-      :placeholder => "Mingle project"
-    }],
-    [:ticket_properties, {
-      :label       => "Card Properties",
-      :placeholder => "card_type = Defect, defect_status = Open, priority = Essential"
-    }],
-    [:username, {
-      :label       => "Sign-in name",
-      :placeholder => "Sign-in name for your account"
-    }],
-    [:password, {
-      :placeholder => "Password for your account"
-    }]
-  ]
-
-  def check_params
-    if Fields.detect {|f| self[f[0]].blank? } or !ticket_properties_hash["card_type"]
-      errors.add :base, 'You must specify your Mingle URL, Project ID, Card Type (in default card properties), Sign-in name, and Password'
-    end
-  end
-
-  def create_issue(problem, reported_by = nil)
-    properties = ticket_properties_hash
-    basic_auth = account.gsub(/https?:\/\//, "https://#{username}:#{password}@")
-    Mingle.set_site "#{basic_auth}/api/v1/projects/#{project_id}/"
-
-    card = Mingle::Card.new
-    card.card_type_name = properties.delete("card_type")
-    card.name = issue_title(problem)
-    card.description = body_template.result(binding)
-    properties.each do |property, value|
-      card.send("cp_#{property}=", value)
-    end
-
-    card.save!
-    problem.update_attributes(
-      :issue_link => URI.parse("#{account}/projects/#{project_id}/cards/#{card.id}").to_s,
-      :issue_type => Label
-    )
-  end
-
-  def body_template
-    @@body_template ||= ERB.new(File.read(Rails.root + "app/views/issue_trackers/textile_body.txt.erb"))
-  end
-
-  def ticket_properties_hash
-    # Parses 'key=value, key2=value2' from ticket_properties into a ruby hash.
-    self.ticket_properties.to_s.split(",").inject({}) do |hash, pair|
-      key, value = pair.split("=").map(&:strip)
-      hash[key] = value
-      hash
-    end
-  end
-
-  def url
-    acc_url = account.start_with?('http') ? account : "http://#{account}"
-    URI.parse("#{acc_url}/projects/#{project_id}").to_s
-  rescue URI::InvalidURIError
-  end
-end
-
@@ -1,43 +0,0 @@
-if defined? PivotalTracker
-  class IssueTrackers::PivotalLabsTracker < IssueTracker
-    Label = "pivotal"
-    Fields = [
-      [:api_token, {
-        :placeholder => "API Token for your account"
-      }],
-      [:project_id, {}]
-    ]
-
-    def check_params
-      if Fields.detect {|f| self[f[0]].blank? }
-        errors.add :base, 'You must specify your Pivotal Tracker API token and Project ID'
-      end
-    end
-
-    def create_issue(problem, reported_by = nil)
-      PivotalTracker::Client.token = api_token
-      PivotalTracker::Client.use_ssl = true
-      project = PivotalTracker::Project.find project_id.to_i
-      story = project.stories.create :name => issue_title(problem),
-        :story_type => 'bug', :description => body_template.result(binding),
-        :requested_by => reported_by.name
-
-      if story.errors.present?
-        raise IssueTrackers::IssueTrackerError, story.errors.first
-      else
-        problem.update_attributes(
-          :issue_link => "https://www.pivotaltracker.com/story/show/#{story.id}",
-          :issue_type => Label
-        )
-      end
-    end
-
-    def body_template
-      @@body_template ||= ERB.new(File.read(Rails.root + "app/views/issue_trackers/pivotal_body.txt.erb"))
-    end
-
-    def url
-      "https://www.pivotaltracker.com/"
-    end
-  end
-end
 \ No newline at end of file
@@ -1,75 +0,0 @@
-if defined? RedmineClient
-  class IssueTrackers::RedmineTracker < IssueTracker
-    Label = "redmine"
-    Fields = [
-      [:account, {
-        :label       => "Redmine URL",
-        :placeholder => "http://www.redmine.org/"
-      }],
-      [:api_token, {
-        :placeholder => "API Token for your account"
-      }],
-      [:username, {
-        :placeholder => "Your username"
-      }],
-      [:password, {
-        :placeholder => "Your password"
-      }],
-      [:project_id, {
-        :label       => "Ticket Project",
-        :placeholder => "Redmine Project where tickets will be created"
-      }],
-      [:alt_project_id, {
-        :optional    => true,
-        :label       => "App Project",
-        :placeholder => "Where app's files & revisions can be viewed. (Leave blank to use the above project by default)"
-      }]
-    ]
-
-    def check_params
-      if Fields.detect {|f| self[f[0]].blank? && !f[1][:optional]}
-        errors.add :base, 'You must specify your Redmine URL, API token, Username, Password and Project ID'
-      end
-    end
-
-    def create_issue(problem, reported_by = nil)
-      token = api_token
-      acc = account
-      user = username
-      passwd = password
-      RedmineClient::Base.configure do
-        self.token = token
-        self.user = user
-        self.password = passwd
-        self.site = acc
-        self.format = :xml
-      end
-      issue = RedmineClient::Issue.new(:project_id => project_id)
-      issue.subject = issue_title problem
-      issue.description = body_template.result(binding)
-      issue.save!
-      problem.update_attributes(
-        :issue_link => "#{RedmineClient::Issue.site.to_s.sub(/#{RedmineClient::Issue.site.path}$/, '')}#{RedmineClient::Issue.element_path(issue.id, :project_id => project_id)}".sub(/\.xml\?project_id=#{project_id}$/, "\?project_id=#{project_id}"),
-        :issue_type => Label
-      )
-    end
-
-    def url_to_file(file_path, line_number = nil)
-      # alt_project_id let's users specify a different project for tickets / app files.
-      project = self.alt_project_id.present? ? self.alt_project_id : self.project_id
-      url = "#{self.account.gsub(/\/$/, '')}/projects/#{project}/repository/revisions/#{app.repository_branch}/entry/#{file_path.sub(/\[PROJECT_ROOT\]/, '').sub(/^\//,'')}"
-      line_number ? url << "#L#{line_number}" : url
-    end
-
-    def body_template
-      @@body_template ||= ERB.new(File.read(Rails.root + "app/views/issue_trackers/redmine_body.txt.erb"))
-    end
-
-    def url
-      acc_url = account.start_with?('http') ? account : "http://#{account}"
-      acc_url = acc_url.gsub(/\/$/, '')
-      URI.parse("#{acc_url}/projects/#{project_id}").to_s
-    rescue URI::InvalidURIError
-    end
-  end
-end
@@ -1,69 +0,0 @@
-class IssueTrackers::UnfuddleTracker < IssueTracker
-  Label = "unfuddle"
-  Fields = [
-
-            [:account, {
-               :placeholder => "Your domain"
-             }],
-
-
-            [:username, {
-               :placeholder => "Your username"
-             }],
-
-            [:password, {
-               :placeholder => "Your password"
-             }],
-
-            [:project_id, {
-               :label       => "Ticket Project",
-               :placeholder => "Project where tickets will be created"
-             }],
-
-            [:milestone_id, {
-               :optional    => true,
-               :label       => "Ticket Milestone",
-               :placeholder => "Milestone where tickets will be created"
-             }]
-
-
-           ]
-
-  def check_params
-    if Fields.detect {|f| self[f[0]].blank? && !f[1][:optional]}
-      errors.add :base, 'You must specify your Account, Username, Password and Project ID'
-    end
-  end
-
-  def create_issue(problem, reported_by = nil)
-
-    Unfuddle.config(account, username, password)
-    begin
-      issue_options = {:project_id => project_id,
-        :summary => issue_title(problem),
-        :priority => '5',
-        :status => "new",
-        :description => body_template.result(binding),
-        'description-format' => 'textile' }
-
-      issue_options[:milestone_id] = milestone_id if milestone_id.present?
-
-      issue = Unfuddle::Ticket.create(issue_options)
-      problem.update_attributes(
-                                :issue_link => File.join("#{url}/tickets/#{issue.id}"),
-                                :issue_type => Label
-                                )
-    rescue ActiveResource::UnauthorizedAccess
-      raise ActiveResource::UnauthorizedAccess, "Could not authenticate with Unfuddle. Please check your username and password."
-    end
-
-  end
-
-  def body_template
-    @@body_template ||= ERB.new(File.read(Rails.root + "app/views/issue_trackers/textile_body.txt.erb"))
-  end
-
-  def url
-    "https://#{account}.unfuddle.com/projects/#{project_id}"
-  end
-end
@@ -62,12 +62,19 @@ class Problem
     env.present? ? where(:environment => env) : scoped
   end
  
+  def url
+    Rails.application.routes.url_helpers.app_problem_url(app, self,
+      :host => Errbit::Config.host,
+      :port => Errbit::Config.port
+    )
+  end
+
   def notices
     Notice.for_errs(errs).ordered
   end
  
   def comments_allowed?
-    Errbit::Config.allow_comments_with_issue_tracker || !app.issue_tracker_configured?
+    Errbit::Config.allow_comments_with_issue_tracker || app.comments_allowed?
   end
  
   def resolve!
@@ -148,7 +155,7 @@ class Problem
   def issue_type
     # Return issue_type if configured, but fall back to detecting app's issue tracker
     attributes['issue_type'] ||=
-    (app.issue_tracker_configured? && app.issue_tracker.label) || nil
+    (app.issue_tracker_configured? && app.issue_tracker.type_tracker) || nil
   end
  
   def self.search(value)
@@ -32,9 +32,9 @@
     = f.check_box :notify_on_errs, 'data-show-when-checked' => '.email_at_notices_nested'
     = f.label :notify_on_errs, 'Notify on errors'
   - if Errbit::Config.per_app_email_at_notices
-    %div.email_at_notices_nested{:style => f.object.notify_on_errs ? '' : 'display: none;'}
+    %div.email_at_notices_nested{:style => app_decorate.notify_err_display}
       .field-helpertext Send a notification every
-      = f.text_field :email_at_notices, :value => f.object.email_at_notices.join(", ")
+      = f.text_field :email_at_notices, :value => app_decorate.email_at_notices
       .field-helpertext times an error occurs (comma separated).
   %div.checkbox
     = f.check_box :notify_on_deploys
@@ -45,13 +45,13 @@
   = f.label :notify_all_users, 'Send notifications to all users'
  
  
-%fieldset.watchers.nested-wrapper{:style => f.object.notify_all_users ? 'display: none;' : ''}
+%fieldset.watchers.nested-wrapper{:style => app_decorate.notify_user_display}
   %legend Watchers
   = f.fields_for :watchers do |w|
     %div.watcher.nested
       %div.choose
         = w.radio_button :watcher_type, :user
-        = label_tag :watcher_type_user, 'User', :for => label_for_attr(w, 'watcher_type_user')
+        = w.label :watcher_type_user, 'User'
         = w.radio_button :watcher_type, :email
         = label_tag :watcher_type_email, 'Email Address', :for => label_for_attr(w, 'watcher_type_email')
       %div.watcher_params.user{:class => w.object.email.blank? ? 'chosen' : nil}
 %fieldset
-  %legend Issue tracker
-  = f.fields_for :issue_tracker do |w|
+  %legend= t('.legend')
+  = f.fields_for :issue_tracker do |issue_tracker_form|
     %div.issue_tracker.nested
       %div.choose
-        = label_tag :type_none, :for => label_for_attr(w, 'type_issuetracker'), :class => "label_radio none" do
-          = w.radio_button :type, "IssueTracker", 'data-section' => 'none'
-          (None)
-        - IssueTracker.subclasses.each do |tracker|
-          = label_tag "type_#{tracker.label}:", :for => label_for_attr(w, "type_#{tracker.name.downcase.gsub(':','')}"), :class => "label_radio #{tracker.label}" do
-            = w.radio_button :type, tracker.name, 'data-section' => tracker.label
-            = tracker.name[/::(.*)Tracker/,1].titleize
+        - issue_tracker_form.object.issue_trackers do |tracker|
+          = issue_tracker_form.label :type_tracker, :class => "label_radio #{tracker.label}", :value => tracker.key do
+            = issue_tracker_form.radio_button :type_tracker, tracker.key, 'data-section' => tracker.label
+            = tracker.label
  
-      %div.tracker_params.none{:class => (w.object && !(w.object.class < IssueTracker)) ? 'chosen' : nil}
-        %p When no issue tracker has been configured, you will be able to leave comments on errors.
-      - IssueTracker.subclasses.each do |tracker|
-        %div.tracker_params{:class => (w.object.is_a?(tracker) ? 'chosen ' : '') << tracker.label}
-          - if defined?(tracker::Note)
-            %p= tracker::Note.html_safe
-          - tracker::Fields.each do |field, field_info|
-            = w.label field, field_info[:label] || field.to_s.titleize
-            - field_type = field == :password ? :password_field : :text_field
-            = w.send field_type, field, :placeholder => field_info[:placeholder], :value => w.object.send(field)
+      - issue_tracker_form.object.issue_trackers do |tracker|
+        %div.tracker_params{:class => tracker.params_class(issue_tracker_form.object)}
+          = issue_tracker_form.fields_for(:options) do |options_form|
+            %p= tracker.note
+            - tracker.fields do |field|
+              = options_form.label field.key, field.label
+              = field.input(options_form, issue_tracker_form.object)
  
       .image_preloader
-        - (IssueTracker.subclasses.map{|t| t.label } << 'none').each do |tracker|
-          = image_tag "#{tracker}_inactive.png"
-          = image_tag "#{tracker}_create.png"
+        - issue_tracker_form.object.issue_trackers do |tracker|
+          = image_tag "#{tracker.label}_inactive.png"
+          = image_tag "#{tracker.label}_create.png"
  
-- content_for :title, 'Edit App'
+- content_for :title, t('.title')
 - content_for :action_bar do
   = link_to_copy_attributes_from_other_app
   = link_to 'delete all errs', destroy_all_app_problems_path(app), :method => :post,
     :data => { :confirm => t('apps.confirm_destroy_all_problems') }, :class => 'button'
   = link_to 'delete application', app_path(app), :method => :delete,
     :data => { :confirm => t('apps.confirm_delete') }, :class => 'button'
-  = link_to('cancel', app_path(app), :class => 'button')
+  = link_to(t('.cancel'), app_path(app), :class => 'button')
  
-= form_for app do |f|
+= form_for app_decorate do |f|
  
   = render 'fields', :f => f
  
-  %div.buttons= f.submit 'Update App'
+  %div.buttons= f.submit t('.update')
  
@@ -36,7 +36,7 @@
         - if any_issue_trackers?
           %td.issue_tracker
             - if app.issue_tracker_configured?
-              - tracker_img = image_tag("#{app.issue_tracker.label}_goto.png")
+              - tracker_img = image_tag("#{app.issue_tracker.type_tracker}_goto.png")
               - if app.issue_tracker.url
                 = link_to( tracker_img, app.issue_tracker.url )
               - else
-- content_for :title, 'Add App'
+- content_for :title, t('.title')
 - content_for :action_bar do
   = link_to_copy_attributes_from_other_app
-  = link_to('cancel', apps_path, :class => 'button')
+  = link_to(t('.cancel'), apps_path, :class => 'button')
  
-= form_for app do |f|
+= form_for app_decorate do |f|
  
   = render 'fields', :f => f
  
-  %div.buttons= f.submit 'Add App'
+  %div.buttons= f.submit t('.add_app')
  
@@ -6,10 +6,10 @@
     %span.disabled= link_to 'creating...', '#', :class => "#{problem.issue_type}_inactive create-issue"
     = link_to 'retry', create_issue_app_problem_path(app, problem), :method => :post
   - else
-    - if app.github_repo?
+    - if app.issue_tracker_configured? && !app.issue_tracker.type_tracker.eql?('github')
+      %span= link_to 'create issue', create_issue_app_problem_path(app, problem), :method => :post, :class => "#{app.issue_tracker.type_tracker}_create create-issue"
+    - elsif app.github_repo?
       - if current_user.can_create_github_issues?
         %span= link_to 'create issue', create_issue_app_problem_path(app, problem, :tracker => 'user_github'), :method => :post, :class => "github_create create-issue"
-      - elsif app.issue_tracker_configured? && app.issue_tracker.label.eql?('github')
+      - elsif app.issue_tracker_configured? && app.issue_tracker.type_tracker.eql?('github')
         %span= link_to 'create issue', create_issue_app_problem_path(app, problem), :method => :post, :class => "github_create create-issue"
-    - if app.issue_tracker_configured? && !app.issue_tracker.label.eql?('github')
-      %span= link_to 'create issue', create_issue_app_problem_path(app, problem), :method => :post, :class => "#{app.issue_tracker.label}_create create-issue"
@@ -9,6 +9,8 @@ require &quot;action_mailer/railtie&quot;
 require 'mongoid/railtie'
 require "sprockets/railtie"
  
+require 'draper'
+
 if defined?(Bundler)
   # If you precompile assets before deploying to production, use this line
   Bundler.require(*Rails.groups(:assets => %w(development test)))
@@ -1,7 +0,0 @@
-# Require all issue tracker apis in lib/issue_tracker_apis
-Dir.glob(Rails.root.join('lib/issue_trackers/apis/*.rb')).each {|t| require t }
-# Require issue tracker error classes
-require Rails.root.join('lib/issue_trackers/errors')
-
-# Include nested issue tracker models
-include IssueTrackers
@@ -127,4 +127,16 @@ en:
       watchers: Watchers
       when:  When
       who: Who
+    issue_tracker_fields:
+      legend: Issue Tracker
+    new:
+      add_app: "Add App"
+      cancel: "cancel"
+      title: "Add App"
+    edit:
+      title: 'Edit App'
+      destroy: 'destroy application'
+      cancel: 'cancel'
+      seriously: 'Seriously?'
+      update: 'Update App'
  
@@ -5,21 +5,27 @@ class MoveIssueTrackersToSti &lt; Mongoid::Migration
       # All issue trackers now subclass the IssueTracker model,
       # and their class is stored in the '_type' field, which is
       # also aliased to 'type'.
-      if app.issue_tracker && app.issue_tracker.attributes["issue_tracker_type"]
-        app.issue_tracker._type = case app.issue_tracker.issue_tracker_type
-        when 'lighthouseapp'; "LighthouseTracker"
-        when 'redmine'; "RedmineTracker"
-        when 'pivotal'; "PivotalLabsTracker"
-        when 'fogbugz'; "FogbugzTracker"
-        when 'mingle'; "MingleTracker"
+      tracker = app.attributes['issue_tracker']
+      if tracker && tracker['issue_tracker_type']
+        tracker['_type'] = case tracker['issue_tracker_type']
+        when 'lighthouseapp'; "IssueTrackers::LighthouseTracker"
+        when 'redmine'; "IssueTrackers::RedmineTracker"
+        when 'pivotal'; "IssueTrackers::PivotalLabsTracker"
+        when 'fogbugz'; "IssueTrackers::FogbugzTracker"
+        when 'mingle'; "IssueTrackers::MingleTracker"
         else; nil
         end
-        if app.issue_tracker.issue_tracker_type == "none"
-          app.issue_tracker = nil
+
+        if tracker['issue_tracker_type'] == "none"
+          App.collection.where({ _id: app.id }).update({
+            "$unset" => { :issue_tracker => 1 }
+          })
         else
-          app.issue_tracker.issue_tracker_type = nil
+          tracker.delete('issue_tracker_type')
+          App.collection.where({ _id: app.id }).update({
+            "$set" => { :issue_tracker => tracker }
+          })
         end
-        app.save
       end
     end
   end
 class ChangeGithubUrlToGithubRepo < Mongoid::Migration
+  def self.normalize_github_repo(repo)
+    return if repo.blank?
+    github_host = URI.parse(Errbit::Config.github_url).host
+    github_host = Regexp.escape(github_host)
+    repo.strip!
+    repo.sub!(/(git@|https?:\/\/)#{github_host}(\/|:)/, '')
+    repo.sub!(/\.git$/, '')
+    repo
+  end
+
   def self.up
     App.collection.find.update({'$rename' => {'github_url' => 'github_repo'}}, :multi => true, :safe => true)
     App.all.each do |app|
-      app.send :normalize_github_repo
-      app.save
+      normalized_repo = self.normalize_github_repo(app.attributes['github_repo'])
+      App.collection.where({ _id: app.id }).update({
+        "$set" => { :github_repo =>  normalized_repo }
+      })
     end
   end
  
@@ -0,0 +1,48 @@
+class ExtractIssueTracker < Mongoid::Migration
+
+  TRACKER_MAPPING = {
+    'ErrbitTracPlugin::IssueTracker' => 'trac',
+    'IssueTrackers::BitbucketIssuesTracker' => 'bitbucket',
+    'IssueTrackers::FogbugzTracker' => 'fogbugz',
+    'IssueTrackers::GithubIssuesTracker' => 'github',
+    'IssueTrackers::GitlabTracker' => 'gitlab',
+    'IssueTrackers::JiraTracker' => 'jira',
+    'IssueTrackers::LighthouseTracker' => 'lighthouse',
+    'IssueTrackers::PivotalLabsTracker' => 'pivotal',
+    'IssueTrackers::RedmineTracker' => 'redmine',
+    'IssueTrackers::UnfuddleTracker' => 'unfuddle'
+  }
+
+  def self.up
+    App.all.each do |app|
+      require 'pry'
+      binding.pry
+      next unless app.attributes['issue_tracker'].present?
+      next unless app.attributes['issue_tracker']['_type'].present?
+
+      options = app['issue_tracker'].dup
+      options.delete('_type')
+      options.delete('_id')
+
+      _type = app.attributes['issue_tracker']['_type']
+      updated_at = options.delete('updated_at')
+      created_at = options.delete('created_at')
+
+      if TRACKER_MAPPING.include?(_type)
+        tracker = {
+          'type_tracker' => TRACKER_MAPPING[_type],
+          'options' => options,
+          'updated_at' => updated_at,
+          'created_at' => created_at
+        }
+
+        App.collection.where({ _id: app.id }).update({
+          "$set" => { :issue_tracker => tracker }
+        })
+      end
+    end
+  end
+
+  def self.down
+  end
+end
@@ -20,3 +20,12 @@ After you just need launch the script with adapting runner of mongoid.
  
 In my case, the complete test suite down to 2min after a 16min long
 before.
+
+## Avoid running acceptance test with phantomjs
+
+Some acceptance test use phantomjs to interpret the Javascript in page.
+To avoid this test you can launch your test by skipping js tag
+
+```
+bundle exec rspec spec --tag="~js"
+```
@@ -1,17 +0,0 @@
-require 'active_resource'
-
-module Mingle
-  class Card < ActiveResource::Base
-    # site template ~> "https://username:password@mingle.example.com/api/v1/projects/:project_id/"
-    self.format = :xml
-  end
-  def self.set_site(site)
-    # ActiveResource seems to clone and freeze the @site variable
-    # after the first use. It seems that the only way to change @site
-    # is to drop the subclass, and then reload it.
-    Mingle.send(:remove_const, :Card)
-    load File.join(Rails.root,'lib','issue_trackers', 'apis','mingle.rb')
-    Mingle::Card.site = site
-  end
-end
-
@@ -1,13 +0,0 @@
-require 'active_resource'
-
-module Unfuddle
-  class Ticket < ActiveResource::Base
-    self.format = :xml
-  end
-
-  def self.config(account, username, password)
-    Unfuddle::Ticket.site = "https://#{account}.unfuddle.com/api/v1/projects/:project_id"
-    Unfuddle::Ticket.user = username
-    Unfuddle::Ticket.password = password
-  end
-end
@@ -1,4 +0,0 @@
-module IssueTrackers
-  class IssueTrackerError < StandardError; end
-  class AuthenticationError < IssueTrackerError; end
-end
 require 'spec_helper'
 require 'capybara/rspec'
+require 'capybara/poltergeist'
+
+Capybara.javascript_driver = :poltergeist
  
 OmniAuth.config.test_mode = true
  
 require 'acceptance/acceptance_helper'
  
 feature "Regeneration api_Key" do
-  let!(:app) { Fabricate(:app) }
-  let!(:admin) { Fabricate(:admin) }
+  let(:app) { Fabricate(:app) }
+  let(:admin) { Fabricate(:admin) }
   let(:user) {
     Fabricate(:user_watcher, :app => app).user
   }
  
+  before do
+    app && admin
+  end
+
   scenario "an admin change api_key" do
     visit '/'
     log_in admin
@@ -28,5 +32,65 @@ feature &quot;Regeneration api_Key&quot; do
     click_link app.name if page.current_url != app_url(app)
     expect(page).to_not have_button I18n.t('apps.show.edit')
   end
+end
+
+feature "Create an application" do
+
+  let(:admin) { Fabricate(:admin) }
+  let(:user) {
+    Fabricate(:user_watcher, :app => app).user
+  }
+
+  before do
+    admin
+  end
  
+  scenario "create an apps without issue tracker and edit it" do
+    visit '/'
+    log_in admin
+    click_on I18n.t('apps.index.new_app')
+    fill_in 'app_name', :with => 'My new app'
+    click_on I18n.t('apps.new.add_app')
+    page.has_content?(I18n.t('controllers.apps.flash.create.success'))
+    expect(App.where(:name => 'My new app').count).to eql 1
+    expect(App.where(:name => 'My new app 2').count).to eql 0
+
+
+    click_on I18n.t('shared.navigation.apps')
+    click_on 'My new app'
+    click_link I18n.t('apps.show.edit')
+    fill_in 'app_name', :with => 'My new app 2'
+    click_on I18n.t('apps.edit.update')
+    page.has_content?(I18n.t('controllers.apps.flash.update.success'))
+    expect(App.where(:name => 'My new app').count).to eql 0
+    expect(App.where(:name => 'My new app 2').count).to eql 1
+
+  end
+
+  scenario "create an apps with issue tracker and edit it", :js => true do
+    visit '/'
+    log_in admin
+    click_on I18n.t('apps.index.new_app')
+    fill_in 'app_name', :with => 'My new app'
+    find('.label_radio.github').click
+    within ".github.tracker_params" do
+      fill_in 'app_issue_tracker_attributes_options_username', :with => 'token'
+      fill_in 'app_issue_tracker_attributes_options_password', :with => 'pass'
+    end
+    click_on I18n.t('apps.new.add_app')
+    expect(page.has_content?(I18n.t('controllers.apps.flash.create.success'))).to eql true
+    app = App.where(:name => 'My new app').first
+    expect(app.issue_tracker.type_tracker).to eql 'github'
+    expect(app.issue_tracker.options['username']).to eql 'token'
+    expect(app.issue_tracker.options['password']).to eql 'pass'
+
+    click_on I18n.t('shared.navigation.apps')
+    click_on 'My new app'
+    click_link I18n.t('apps.show.edit')
+    find('.issue_tracker .label_radio.none').click
+    click_on I18n.t('apps.edit.update')
+    expect(page.has_content?(I18n.t('controllers.apps.flash.update.success'))).to eql true
+    app = App.where(:name => 'My new app').first
+    expect(app.issue_tracker.tracker).to be_a ErrbitPlugin::NoneIssueTracker
+  end
 end
@@ -299,7 +299,7 @@ describe AppsController do
         context "unknown tracker type" do
           before(:each) do
             put :update, :id => @app.id, :app => { :issue_tracker_attributes => {
-              :type => 'unknown', :project_id => '1234', :api_token => '123123', :account => 'myapp'
+              :type_tracker => 'unknown', :options => {:project_id => '1234', :api_token => '123123', :account => 'myapp'}
             } }
             @app.reload
           end
@@ -309,33 +309,35 @@ describe AppsController do
           end
         end
  
-        IssueTracker.subclasses.each do |tracker_klass|
-          context tracker_klass do
+        ErrbitPlugin::Registry.issue_trackers.each do |key, klass|
+          context key do
             it "should save tracker params" do
-              params = tracker_klass::Fields.inject({}){|hash,f| hash[f[0]] = "test_value"; hash }
-              params[:ticket_properties] = "card_type = defect" if tracker_klass == MingleTracker
-              params[:type] = tracker_klass.to_s
+              params = {
+                :options => klass.fields.inject({}){|hash,f| hash[f[0]] = "test_value"; hash },
+                :type_tracker => key.dup.to_s
+              }
               put :update, :id => @app.id, :app => {:issue_tracker_attributes => params}
  
               @app.reload
  
               tracker = @app.issue_tracker
-              expect(tracker).to be_a(tracker_klass)
-              tracker_klass::Fields.each do |field, field_info|
+              expect(tracker.tracker).to be_a(ErrbitPlugin::Registry.issue_trackers[key])
+              klass.fields.each do |field, field_info|
                 case field
-                when :ticket_properties
-                  expect(tracker.send(field.to_sym)).to eq 'card_type = defect'
-                else
-                  expect(tracker.send(field.to_sym)).to eq 'test_value'
+                when :ticket_properties; tracker.send(field.to_sym).should == 'card_type = defect'
+                else tracker.options[field.to_s].should == 'test_value'
                 end
               end
             end
  
             it "should show validation notice when sufficient params are not present" do
               # Leave out one required param
-              params = tracker_klass::Fields[1..-1].inject({}){|hash,f| hash[f[0]] = "test_value"; hash }
-              params[:type] = tracker_klass.to_s
-              put :update, :id => @app.id, :app => {:issue_tracker_attributes => params}
+              # TODO. previous test was not relevant because one params can be enough. So put noone
+              put :update, :id => @app.id, :app => {
+                :issue_tracker_attributes => {
+                  :type_tracker => key.dup.to_s
+                }
+              }
  
               @app.reload
               expect(@app.issue_tracker_configured?).to eq false
@@ -8,15 +8,16 @@ describe ProblemsController do
   :params => {:app_id => 'dummyid', :id => 'dummyid'}
  
   let(:app) { Fabricate(:app) }
-  let(:err) { Fabricate(:err, :problem => Fabricate(:problem, :app => app, :environment => "production")) }
+  let(:err) { Fabricate(:err, :problem => problem) }
+  let(:admin) { Fabricate(:admin) }
+  let(:problem) { Fabricate(:problem, :app => app, :environment => "production") }
  
  
   describe "GET /problems" do
     #render_views
     context 'when logged in as an admin' do
       before(:each) do
-        @user = Fabricate(:admin)
-        sign_in @user
+        sign_in admin
         @problem = Fabricate(:notice, :err => Fabricate(:err, :problem => Fabricate(:problem, :app => app, :environment => "production"))).problem
       end
  
@@ -31,7 +32,7 @@ describe ProblemsController do
         end
  
         it "should be able to override default per_page value" do
-          @user.update_attribute :per_page, 10
+          admin.update_attribute :per_page, 10
           get :index
           expect(controller.problems.to_a.size).to eq 10
         end
@@ -98,7 +99,7 @@ describe ProblemsController do
   describe "GET /problems - previously all" do
     context 'when logged in as an admin' do
       it "gets a paginated list of all problems" do
-        sign_in Fabricate(:admin)
+        sign_in admin
         problems = Kaminari.paginate_array((1..30).to_a)
         3.times { problems << Fabricate(:err).problem }
         3.times { problems << Fabricate(:err, :problem => Fabricate(:problem, :resolved => true)).problem }
@@ -153,7 +154,7 @@ describe ProblemsController do
  
     context 'when logged in as an admin' do
       before do
-        sign_in Fabricate(:admin)
+        sign_in admin
       end
  
       it "finds the app" do
@@ -217,7 +218,7 @@ describe ProblemsController do
  
   describe "PUT /apps/:app_id/problems/:id/resolve" do
     before do
-      sign_in Fabricate(:admin)
+      sign_in admin
  
       @problem = Fabricate(:err)
       App.stub(:find).with(@problem.app.id.to_s).and_return(@problem.app)
@@ -256,76 +257,50 @@ describe ProblemsController do
   end
  
   describe "POST /apps/:app_id/problems/:id/create_issue" do
-    #render_views
  
     before(:each) do
-      sign_in Fabricate(:admin)
+      sign_in admin
     end
  
     context "successful issue creation" do
       context "lighthouseapp tracker" do
         let(:notice) { Fabricate :notice }
-        let(:tracker) { Fabricate :lighthouse_tracker, :app => notice.app }
         let(:problem) { notice.problem }
  
         before(:each) do
-          number = 5
-          @issue_link = "http://#{tracker.account}.lighthouseapp.com/projects/#{tracker.project_id}/tickets/#{number}.xml"
-          body = "<ticket><number type=\"integer\">#{number}</number></ticket>"
-          stub_request(:post, "http://#{tracker.account}.lighthouseapp.com/projects/#{tracker.project_id}/tickets.xml").
-                       to_return(:status => 201, :headers => {'Location' => @issue_link}, :body => body )
-
+          controller.stub(:problem).and_return(problem)
+          controller.stub(:current_user).and_return(admin)
+          IssueCreation.should_receive(:new).with(problem, admin, nil, request).and_return(double(:execute => true))
           post :create_issue, :app_id => problem.app.id, :id => problem.id
-          problem.reload
         end
  
         it "should redirect to problem page" do
           expect(response).to redirect_to( app_problem_path(problem.app, problem) )
+          expect(flash[:error]).to be_blank
         end
       end
     end
  
-    context "absent issue tracker" do
-      let(:problem) { Fabricate :problem }
-
+    context "error during request to a tracker" do
       before(:each) do
+        IssueCreation.should_receive(:new).with(problem, admin, nil, request).and_return(
+          double(:execute => false, :errors => double(:full_messages => ['not create']))
+        )
+        controller.stub(:problem).and_return(problem)
         post :create_issue, :app_id => problem.app.id, :id => problem.id
       end
  
       it "should redirect to problem page" do
         expect(response).to redirect_to( app_problem_path(problem.app, problem) )
-      end
-
-      it "should set flash error message telling issue tracker of the app doesn't exist" do
-        expect(flash[:error]).to eq "This app has no issue tracker setup."
+        expect(flash[:error]).to eql 'not create'
       end
     end
  
-    context "error during request to a tracker" do
-      context "lighthouseapp tracker" do
-        let(:tracker) { Fabricate :lighthouse_tracker }
-        let(:err) { Fabricate(:err, :problem => Fabricate(:problem, :app => tracker.app)) }
-
-        before(:each) do
-          stub_request(:post, "http://#{tracker.account}.lighthouseapp.com/projects/#{tracker.project_id}/tickets.xml").to_return(:status => 500)
-
-          post :create_issue, :app_id => err.app.id, :id => err.problem.id
-        end
-
-        it "should redirect to problem page" do
-          expect(response).to redirect_to( app_problem_path(err.app, err.problem) )
-        end
-
-        it "should notify of connection error" do
-          expect(flash[:error]).to include("There was an error during issue creation:")
-        end
-      end
-    end
   end
  
   describe "DELETE /apps/:app_id/problems/:id/unlink_issue" do
     before(:each) do
-      sign_in Fabricate(:admin)
+      sign_in admin
     end
  
     context "problem with issue" do
@@ -361,7 +336,7 @@ describe ProblemsController do
  
   describe "Bulk Actions" do
     before(:each) do
-      sign_in Fabricate(:admin)
+      sign_in admin
       @problem1 = Fabricate(:err, :problem => Fabricate(:problem, :resolved => true)).problem
       @problem2 = Fabricate(:err, :problem => Fabricate(:problem, :resolved => false)).problem
     end
@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe AppDecorator do
+
+  describe "#email_at_notices" do
+
+    it 'return the list separate by comma' do
+      expect(AppDecorator.new(double(:email_at_notices => [2,3])).email_at_notices).to eql '2, 3'
+    end
+
+  end
+
+  describe "#notify_user_display" do
+
+    it 'return display:none if notify' do
+      expect(AppDecorator.new(double(:notify_all_users => true)).notify_user_display).to eql 'display: none;'
+    end
+
+    it 'return blank if no notify' do
+      expect(AppDecorator.new(double(:notify_all_users => false)).notify_user_display).to eql ''
+    end
+
+  end
+
+  describe "#notify_err_display" do
+
+    it 'return display:none if no notify' do
+      expect(AppDecorator.new(double(:notify_on_errs => false)).notify_err_display).to eql 'display: none;'
+    end
+
+    it 'return blank if no notify' do
+      expect(AppDecorator.new(double(:notify_on_errs => true)).notify_err_display).to eql ''
+    end
+
+  end
+
+end
@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe IssueTrackerDecorator do
+  let(:fake_tracker) do
+    Class.new(ErrbitPlugin::IssueTracker) do
+      def self.label; 'fake'; end
+      def self.note; 'a note'; end
+      def self.fields
+        {
+          :foo => {:label => 'foo'},
+          :bar => {:label => 'bar'}
+        }
+      end
+
+      def configured?; true; end
+    end
+  end
+
+  let(:decorator) do
+    IssueTrackerDecorator.new(fake_tracker, 'fake')
+  end
+
+  describe "#note" do
+    it 'return the html_safe of Note' do
+      expect(decorator.note).to eql fake_tracker.note
+    end
+  end
+
+  describe "#issue_trackers" do
+    it 'return an array of IssueTrackerDecorator' do
+      decorator.issue_trackers do |it|
+        expect(it).to be_a(IssueTrackerDecorator)
+      end
+    end
+  end
+
+  describe "#fields" do
+    it 'return all Fields define decorate' do
+      decorator.fields do |itf|
+        expect(itf).to be_a(IssueTrackerFieldDecorator)
+        expect([:foo, :bar]).to be_include(itf.object)
+        expect([{:label => 'foo'}, {:label => 'bar'}]).to be_include(itf.field_info)
+      end
+    end
+  end
+
+  describe "#params_class" do
+    it 'add the label in class' do
+      expect(decorator.params_class(IssueTracker.new(:type_tracker => 'none'))).to eql 'fake'
+    end
+    it 'add chosen class if _type is same' do
+      expect(decorator.params_class(IssueTracker.new(:type_tracker => 'fake'))).to eql 'chosen fake'
+    end
+  end
+end
@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe IssueTrackerFieldDecorator do
+
+  describe "#label" do
+    it 'return the label of field_info by default' do
+      expect(IssueTrackerFieldDecorator.new(:foo, {:label => 'hello'}).label).to eq 'hello'
+    end
+    it 'return the key of field if no label define' do
+      expect(IssueTrackerFieldDecorator.new(:foo, {}).label).to eq 'foo'
+    end
+  end
+
+end
@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe WatcherDecorator do
+  describe "#email_choosen" do
+    context "with email define" do
+      it 'return blank' do
+        expect(WatcherDecorator.new(double(:email => 'foo')).email_choosen).to eql ''
+      end
+    end
+
+    context "without email define" do
+      it 'return choosen' do
+        expect(WatcherDecorator.new(double(:email => '')).email_choosen).to eql 'chosen'
+      end
+    end
+  end
+end
 Fabricator :issue_tracker do
-  app
-  api_token { sequence :word }
-  project_id { sequence :word }
-  account { sequence :word }
-  username { sequence :word }
-  password { sequence :word }
-end
-
-%w(lighthouse pivotal_labs fogbugz).each do |t|
-  Fabricator "#{t}_tracker".to_sym, :from => :issue_tracker, :class_name => "IssueTrackers::#{t.camelcase}Tracker"
-end
-
-Fabricator :redmine_tracker, :from => :issue_tracker, :class_name => "IssueTrackers::RedmineTracker" do
-  account 'http://redmine.example.com'
-end
-
-Fabricator :gitlab_tracker, :from => :issue_tracker, :class_name => "IssueTrackers::GitlabTracker" do
-  account 'http://gitlab.example.com'
-  alt_project_id 'foo'
-end
+  type_tracker 'fake'
+  options {{
+    :foo => 'one',
+    :bar => 'two'
+  }}
  
-Fabricator :mingle_tracker, :from => :issue_tracker, :class_name => "IssueTrackers::MingleTracker" do
-  account 'https://mingle.example.com'
-  ticket_properties 'card_type = Defect, defect_status = open, priority = essential'
-end
-
-Fabricator :github_issues_tracker, :from => :issue_tracker, :class_name => "IssueTrackers::GithubIssuesTracker" do
-  project_id 'test_account/test_project'
-  username 'test_username'
-end
-
-Fabricator :bitbucket_issues_tracker, :from => :issue_tracker, :class_name => "IssueTrackers::BitbucketIssuesTracker" do
-  project_id 'password'
-  api_token 'test_username'
-end
-
-Fabricator :unfuddle_issues_tracker, :from => :issue_tracker, :class_name => "IssueTrackers::UnfuddleTracker" do
-  account 'test'
-  project_id 15
+  app
 end
 require 'spec_helper'
  
 describe IssueCreation do
-  subject(:issue_creation) { IssueCreation.new(problem, user, tracker_name) }
+  subject(:issue_creation) do
+    IssueCreation.new(problem, user, tracker_name, request)
+  end
  
+  let(:request) do
+    double(:request,
+           :host => 'github.com',
+           :port => '80',
+           :scheme => 'http'
+          )
+  end
   let(:problem) { notice.problem }
   let(:notice)  { Fabricate(:notice) }
   let(:user)    { Fabricate(:admin) }
@@ -15,8 +24,7 @@ describe IssueCreation do
   end
  
   it 'creates an issue if issue tracker is configured' do
-    tracker = Fabricate(:lighthouse_tracker, :app => notice.app)
-    expect(tracker).to receive(:create_issue)
+    problem.app.issue_tracker = Fabricate(:issue_tracker)
     issue_creation.execute
     expect(errors).to be_empty
   end
@@ -44,7 +52,9 @@ describe IssueCreation do
         user.github_oauth_token = 'oauthtoken'
         user.save!
  
-        GithubIssuesTracker.any_instance.should_receive(:create_issue)
+        ErrbitGithubPlugin::IssueTracker.should_receive(:new).and_return(
+          double(:create_issue => true)
+        )
         issue_creation.execute
         expect(errors).to be_empty
       end
@@ -74,7 +74,7 @@ describe ProblemUpdaterCache do
         end
  
         it 'update last_notice_at' do
-          expect(problem.last_notice_at.to_i).to be_within(1).of(notice.created_at.to_i)
+          expect(problem.last_notice_at.to_i).to be_within(2).of(notice.created_at.to_i)
         end
  
         it 'update stats messages' do
 require 'spec_helper'
  
 describe App do
+
   context "Attributes" do
     it { should have_field(:_id).of_type(String) }
     it { should have_field(:name).of_type(String) }
@@ -220,5 +221,26 @@ describe App do
     end
   end
  
+  describe "#comments_allowed?" do
+    context "without issue_tracker" do
+      it 'return true' do
+        expect(App.new.comments_allowed?).to be_true
+      end
+    end
+
+    context "with issue_tracker" do
+      let(:issue_tracker) do
+        ist = IssueTracker.new
+        ist.stub(:comments_allowed?).and_return('foo')
+        ist
+      end
+      it 'delegate to issue_tracker' do
+        expect(App.new(
+          :issue_tracker => issue_tracker
+        ).comments_allowed?).to eql 'foo'
+      end
+    end
+  end
+
 end
  
@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe IssueTracker do
+  describe "Association" do
+    it { should be_embedded_in(:app) }
+  end
+
+  describe "Attributes" do
+    it { should have_field(:type_tracker).of_type(String) }
+    it { should have_field(:options).of_type(Hash).with_default_value_of({}) }
+  end
+
+  describe "#tracker" do
+    context "with type_tracker class not exist" do
+      it 'return NullIssueTracker' do
+        expect(IssueTracker.new(:type_tracker => 'Foo').tracker).to be_a ErrbitPlugin::NoneIssueTracker
+      end
+    end
+  end
+end
@@ -1,40 +0,0 @@
-require 'spec_helper'
-
-describe IssueTrackers::BitbucketIssuesTracker do
-  it "should create an issue on BitBucket Issues with problem params, and set issue link for problem" do
-    repo = "test_user/test_repo"
-    notice = Fabricate :notice
-    notice.app.bitbucket_repo = repo
-    tracker = Fabricate :bitbucket_issues_tracker, :app => notice.app
-    problem = notice.problem
-
-    number = 123
-    @issue_link = "https://bitbucket.org/#{repo}/issue/#{number}/"
-    body = <<EOF
-{
-    "status": "new",
-    "priority": "critical",
-    "title": "[production][foo#bar] FooError: Too Much Bar",
-    "comment_count": 0,
-    "content": "This is the content",
-    "created_on": "2012-07-29 04:35:38",
-    "local_id": 123,
-    "follower_count": 0,
-    "utc_created_on": "2012-07-29 02:35:38+00:00",
-    "resource_uri": "/1.0/repositories/test_user/test_repo/issue/123/",
-    "is_spam": false
-}
-EOF
-
-    stub_request(:post, "https://#{tracker.api_token}:#{tracker.project_id}@bitbucket.org/api/1.0/repositories/test_user/test_repo/issues/").to_return(:status => 200, :headers => {}, :body => body )
-
-    problem.app.issue_tracker.create_issue(problem)
-    problem.reload
-
-    requested = have_requested(:post, "https://#{tracker.api_token}:#{tracker.project_id}@bitbucket.org/api/1.0/repositories/test_user/test_repo/issues/")
-    expect(WebMock).to requested.with(:title => /[production][foo#bar] FooError: Too Much Bar/)
-    expect(WebMock).to requested.with(:content => /See this exception on Errbit/)
-
-    expect(problem.issue_link).to eq @issue_link
-  end
-end
@@ -1,23 +0,0 @@
-require 'spec_helper'
-
-describe IssueTrackers::FogbugzTracker do
-  it "should create an issue on Fogbugz with problem params, and set issue link for problem" do
-    notice = Fabricate :notice
-    tracker = Fabricate :fogbugz_tracker, :app => notice.app
-    problem = notice.problem
-
-    number = 123
-    @issue_link = "https://#{tracker.account}.fogbugz.com/default.asp?#{number}"
-    response = "<response><token>12345</token><case><ixBug>123</ixBug></case></response>"
-    http_mock = double
-    expect(http_mock).to receive(:new).and_return(http_mock)
-    expect(http_mock).to receive(:request).twice.and_return(response)
-    Fogbugz.adapter[:http] = http_mock
-
-    problem.app.issue_tracker.create_issue(problem)
-    problem.reload
-
-    expect(problem.issue_link).to eq @issue_link
-  end
-end
-
@@ -1,73 +0,0 @@
-require 'spec_helper'
-
-describe IssueTrackers::GithubIssuesTracker do
-
-  let(:repo) { "test_user/test_repo" }
-
-  let(:notice) do
-    Fabricate :notice
-  end
-
-  let(:problem) do
-    notice.problem
-  end
-
-  let!(:tracker) do
-    notice.app.github_repo = repo
-    Fabricate :github_issues_tracker, app: notice.app
-  end
-
-  let(:number) { 5 }
-  let(:issue_link) { "https://github.com/#{repo}/issues/#{number}" }
-  let(:body) do
-    <<EOF
-{
-  "position": 1.0,
-  "number": #{number},
-  "votes": 0,
-  "created_at": "2010/01/21 13:45:59 -0800",
-  "comments": 0,
-  "body": "Test Body",
-  "title": "Test Issue",
-  "user": "test_user",
-  "state": "open",
-  "html_url": "#{issue_link}"
-}
-EOF
-end
-
-  it "should create an issue on GitHub Issues with problem params, and set issue link for problem" do
-    stub_request(:post,
-                 "https://#{tracker.username}:#{tracker.password}@api.github.com/repos/#{repo}/issues").
-      to_return(:status => 201,
-                :headers => {
-        'Location' => issue_link,
-        'Content-Type' => 'application/json',
-      },
-      :body => body )
-
-    problem.app.issue_tracker.create_issue(problem)
-    problem.reload
-
-    requested = have_requested(:post, "https://#{tracker.username}:#{tracker.password}@api.github.com/repos/#{repo}/issues")
-    expect(WebMock).to requested.with(:body => /[production][foo#bar] FooError: Too Much Bar/)
-    expect(WebMock).to requested.with(:body => /See this exception on Errbit/)
-
-    expect(problem.issue_link).to eq issue_link
-  end
-
-  it "should create an issue with oauth token" do
-    issue_tracker = problem.app.issue_tracker
-    issue_tracker.oauth_token = 'secret_token'
-
-    stub_request(:post, "https://api.github.com/repos/#{repo}/issues").
-      to_return({
-        status: 201,
-        headers: {'Location' => issue_link, 'Content-Type' => 'application/json' },
-        body: body })
-
-    issue_tracker.create_issue(problem)
-    requested = have_requested(:post, "https://api.github.com/repos/#{repo}/issues")
-    expect(WebMock).to requested.with(headers: {'Authorization'=>'token secret_token'})
-  end
-end
@@ -1,32 +0,0 @@
-require 'spec_helper'
-
-describe IssueTrackers::GitlabTracker do
-  it "should create an issue on Gitlab with problem params" do
-    notice = Fabricate :notice
-    tracker = Fabricate :gitlab_tracker, :app => notice.app
-    problem = notice.problem
-
-    issue_id = 5
-    note_id = 10
-    issue_body = {:id => issue_id, :title => "[production][foo#bar] FooError: Too Much Bar", :description => "[See this exception on Errbit]"}.to_json
-    note_body = {:id => note_id, :body => "Example note body"}.to_json
-
-    stub_request(:post, "#{tracker.account}/api/v3/projects/#{tracker.project_id}/issues?private_token=#{tracker.api_token}").
-      with(:body => /.+/, :headers => {'Accept'=>'application/json'}).
-      to_return(:status => 200, :body => issue_body, :headers => {'Accept'=>'application/json'})
-
-    stub_request(:post, "#{tracker.account}/api/v3/projects/#{tracker.project_id}/issues/#{issue_id}/notes?private_token=#{tracker.api_token}").
-      with(:body => /.+/, :headers => {'Accept'=>'application/json'}).
-      to_return(:status => 200, :body => note_body, :headers => {'Accept'=>'application/json'})
-
-    problem.app.issue_tracker.create_issue(problem)
-    problem.reload
-
-    requested_issue = have_requested(:post, "#{tracker.account}/api/v3/projects/#{tracker.project_id}/issues?private_token=#{tracker.api_token}").with(:body => /.+/, :headers => {'Accept'=>'application/json'})
-    requested_note = have_requested(:post, "#{tracker.account}/api/v3/projects/#{tracker.project_id}/issues/#{issue_id}/notes?private_token=#{tracker.api_token}")
-    expect(WebMock).to requested_issue.with(:body => /%5Bproduction%5D%5Bfoo%23bar%5D%20FooError%3A%20Too%20Much%20Bar/)
-    expect(WebMock).to requested_issue.with(:body => /See%20this%20exception%20on%20Errbit/)
-
-  end
-end
-
@@ -1,27 +0,0 @@
-require 'spec_helper'
-
-describe IssueTrackers::LighthouseTracker do
-  it "should create an issue on Lighthouse with problem params, and set issue link for problem" do
-    notice = Fabricate :notice
-    tracker = Fabricate :lighthouse_tracker, :app => notice.app
-    problem = notice.problem
-
-    number = 5
-    @issue_link = "http://#{tracker.account}.lighthouseapp.com/projects/#{tracker.project_id}/tickets/#{number}.xml"
-    body = "<ticket><number type=\"integer\">#{number}</number></ticket>"
-    stub_request(:post, "http://#{tracker.account}.lighthouseapp.com/projects/#{tracker.project_id}/tickets.xml").
-                 to_return(:status => 201, :headers => {'Location' => @issue_link}, :body => body )
-
-    problem.app.issue_tracker.create_issue(problem)
-    problem.reload
-
-    requested = have_requested(:post, "http://#{tracker.account}.lighthouseapp.com/projects/#{tracker.project_id}/tickets.xml")
-    expect(WebMock).to requested.with(:headers => {'X-Lighthousetoken' => tracker.api_token})
-    expect(WebMock).to requested.with(:body => /<tag>errbit<\/tag>/)
-    expect(WebMock).to requested.with(:body => /<title>\[#{ problem.environment }\]\[#{problem.where}\] #{problem.message.to_s.truncate(100)}<\/title>/)
-    expect(WebMock).to requested.with(:body => /<body>.+<\/body>/m)
-
-    expect(problem.issue_link).to eq @issue_link.sub(/\.xml$/, '')
-  end
-end
-
@@ -1,28 +0,0 @@
-require 'spec_helper'
-
-describe IssueTrackers::MingleTracker do
-  it "should create an issue on Mingle with problem params, and set issue link for problem" do
-    notice = Fabricate :notice
-    tracker = Fabricate :mingle_tracker, :app => notice.app
-    problem = notice.problem
-
-    number = 5
-    @issue_link = "#{tracker.account}/projects/#{tracker.project_id}/cards/#{number}.xml"
-    @basic_auth = tracker.account.gsub("://", "://#{tracker.username}:#{tracker.password}@")
-    body = "<card><id type=\"integer\">#{number}</id></card>"
-    stub_request(:post, "#{@basic_auth}/api/v1/projects/#{tracker.project_id}/cards.xml").
-                 to_return(:status => 201, :headers => {'Location' => @issue_link}, :body => body )
-
-    problem.app.issue_tracker.create_issue(problem)
-    problem.reload
-
-    requested = have_requested(:post, "#{@basic_auth}/api/v1/projects/#{tracker.project_id}/cards.xml")
-    expect(WebMock).to requested.with(:headers => {'Content-Type' => 'application/xml'})
-    expect(WebMock).to requested.with(:body => /FooError: Too Much Bar/)
-    expect(WebMock).to requested.with(:body => /See this exception on Errbit/)
-    expect(WebMock).to requested.with(:body => /<card-type-name>Defect<\/card-type-name>/)
-
-    expect(problem.issue_link).to eq @issue_link.sub(/\.xml$/, '')
-  end
-end
-
@@ -1,46 +0,0 @@
-require 'spec_helper'
-
-describe IssueTrackers::PivotalLabsTracker do
-
-  let(:user) { Fabricate(:user) }
-  let(:notice) { Fabricate(:notice) }
-  let(:tracker) { Fabricate :pivotal_labs_tracker, :app => notice.app, :project_id => 10 }
-  let(:problem) { notice.problem }
-  let(:story_id) { 5 }
-  let(:issue_link) { "https://www.pivotaltracker.com/story/show/#{story_id}" }
-
-  it "creates an issue on Pivotal Tracker with problem params, and set issue link for problem" do
-    project_body = "<project><id>#{tracker.project_id}</id><name>TestProject</name></project>"
-    stub_request(:get, "https://www.pivotaltracker.com/services/v3/projects/#{tracker.project_id}").
-                 to_return(:status => 200, :headers => {'Location' => issue_link}, :body => project_body )
-    story_body = "<story><name>Test Story</name><id>#{story_id}</id></story>"
-    stub_request(:post, "https://www.pivotaltracker.com/services/v3/projects/#{tracker.project_id}/stories").
-                 to_return(:status => 201, :headers => {'Location' => issue_link}, :body => story_body )
-
-    problem.app.issue_tracker.create_issue(problem, user)
-    problem.reload
-
-    requested = have_requested(:post, "https://www.pivotaltracker.com/services/v3/projects/#{tracker.project_id}/stories")
-    expect(WebMock).to requested.with(:headers => {'X-Trackertoken' => tracker.api_token})
-    expect(WebMock).to requested.with(:body => /See this exception on Errbit/)
-    expect(WebMock).to requested.with(:body => /<name>\[#{ problem.environment }\]\[#{problem.where}\] #{problem.message.to_s.truncate(100)}<\/name>/)
-    expect(WebMock).to requested.with(:body => /<description>.+<\/description>/m)
-
-    expect(problem.issue_link).to eq issue_link
-  end
-
-  it "raises IssueTrackers::IssueTrackerError exception when invalid params and does not set issue link for problem" do
-    project_body = "<project><id>#{tracker.project_id}</id><name>TestProject</name></project>"
-    stub_request(:get, "https://www.pivotaltracker.com/services/v3/projects/#{tracker.project_id}").
-      to_return(:status => 200, :body => project_body )
-    story_body = "<errors><error>Requested by can't be blank</error><error>Requested by can't be blank</error></errors>"
-    stub_request(:post, "https://www.pivotaltracker.com/services/v3/projects/#{tracker.project_id}/stories").
-                 to_return(:status => 422, :body => story_body )
-
-    expect{
-            problem.app.issue_tracker.create_issue(problem, user)
-          }.to raise_exception(IssueTrackers::IssueTrackerError, "Requested by can't be blank")
-    expect(problem.issue_link).to be_nil
-  end
-end
-
@@ -1,45 +0,0 @@
-require 'spec_helper'
-
-describe IssueTrackers::RedmineTracker do
-  it "should create an issue on Redmine with problem params, and set issue link for problem" do
-    notice = Fabricate(:notice)
-    tracker = Fabricate(:redmine_tracker, :app => notice.app, :project_id => 10)
-    problem = notice.problem
-    number = 5
-    @issue_link = "#{tracker.account}/issues/#{number}.xml?project_id=#{tracker.project_id}"
-    body = "<issue><subject>my subject</subject><id>#{number}</id></issue>"
-
-    # Build base url with account URL, and username/password basic auth
-    base_url = tracker.account.gsub 'http://', "http://#{tracker.username}:#{tracker.password}@"
-
-    stub_request(:post, "#{base_url}/issues.xml").
-                 to_return(:status => 201, :headers => {'Location' => @issue_link}, :body => body )
-
-    problem.app.issue_tracker.create_issue(problem)
-    problem.reload
-
-    requested = have_requested(:post, "#{base_url}/issues.xml")
-    expect(WebMock).to requested.with(:headers => {'X-Redmine-API-Key' => tracker.api_token})
-    expect(WebMock).to requested.with(:body => /<project-id>#{tracker.project_id}<\/project-id>/)
-    expect(WebMock).to requested.with(:body => /<subject>\[#{ problem.environment }\]\[#{problem.where}\] #{problem.message.to_s.truncate(100)}<\/subject>/)
-    expect(WebMock).to requested.with(:body => /<description>.+<\/description>/m)
-
-    expect(problem.issue_link).to eq @issue_link.sub(/\.xml/, '')
-  end
-
-  it "should generate a url where a file with line number can be viewed" do
-    t = Fabricate(:redmine_tracker, :account => 'http://redmine.example.com', :project_id => "errbit")
-    expect(t.url_to_file("/example/file")).
-      to eq 'http://redmine.example.com/projects/errbit/repository/revisions/master/entry/example/file'
-    expect(t.url_to_file("/example/file", 25)).
-      to eq 'http://redmine.example.com/projects/errbit/repository/revisions/master/entry/example/file#L25'
-  end
-
-  it "should use the alt_project_id to generate a file/linenumber url, if given" do
-    t = Fabricate(:redmine_tracker, :account => 'http://redmine.example.com',
-                                  :project_id => "errbit",
-                                  :alt_project_id => "actual_project")
-    expect(t.url_to_file("/example/file", 25)).
-      to eq 'http://redmine.example.com/projects/actual_project/repository/revisions/master/entry/example/file#L25'
-  end
-end
@@ -1,92 +0,0 @@
-require 'spec_helper'
-
-describe IssueTrackers::UnfuddleTracker do
-
-  let(:issue_link) { "https://test.unfuddle.com/projects/15/tickets/2436" }
-  let(:notice) { Fabricate :notice }
-  let(:tracker) { Fabricate :unfuddle_issues_tracker, :app => notice.app }
-  let(:problem) { notice.problem }
-
-  it "should create an issue on Unfuddle Issues with problem params, and set issue link for problem" do
-project_xml = <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-  <account-id type="integer">1</account-id>
-  <archived type="boolean">false</archived>
-  <assignee-on-resolve>reporter</assignee-on-resolve>
-  <backup-frequency type="integer">0</backup-frequency>
-  <close-ticket-simultaneously-default type="boolean">false</close-ticket-simultaneously-default>
-  <default-ticket-report-id type="integer" nil="true"></default-ticket-report-id>
-  <description nil="true"></description>
-  <disk-usage type="integer">27932</disk-usage>
-  <enable-time-tracking type="boolean">true</enable-time-tracking>
-  <id type="integer">#{tracker.project_id}</id>
-  <s3-access-key-id></s3-access-key-id>
-  <s3-backup-enabled type="boolean">false</s3-backup-enabled>
-  <s3-bucket-name></s3-bucket-name>
-  <short-name>test-project</short-name>
-  <theme>blue</theme>
-  <ticket-field1-active type="boolean">false</ticket-field1-active>
-  <ticket-field1-disposition>text</ticket-field1-disposition>
-  <ticket-field1-title>Field 1</ticket-field1-title>
-  <ticket-field2-active type="boolean">false</ticket-field2-active>
-  <ticket-field2-disposition>text</ticket-field2-disposition>
-  <ticket-field2-title>Field 2</ticket-field2-title>
-  <ticket-field3-active type="boolean">false</ticket-field3-active>
-  <ticket-field3-disposition>text</ticket-field3-disposition>
-  <ticket-field3-title>Field 3</ticket-field3-title>
-  <title>test-project</title>
-  <created-at>2011-04-25T09:21:43Z</created-at>
-  <updated-at>2013-03-08T08:03:02Z</updated-at>
-</project>
-EOF
-
-    ticket_xml =<<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<ticket>
-  <assignee-id type="integer">40</assignee-id>
-  <component-id type="integer" nil="true"></component-id>
-  <description nil="true"></description>
-  <description-format>markdown</description-format>
-  <due-on type="date" nil="true"></due-on>
-  <field1-value-id type="integer" nil="true"></field1-value-id>
-  <field2-value-id type="integer" nil="true"></field2-value-id>
-  <field3-value-id type="integer" nil="true"></field3-value-id>
-  <hours-estimate-current type="float">1268.7</hours-estimate-current>
-  <hours-estimate-initial type="float">0.0</hours-estimate-initial>
-  <id type="integer">2436</id>
-  <milestone-id type="integer">78</milestone-id>
-  <number type="integer">119</number>
-  <priority>3</priority>
-  <project-id type="integer">15</project-id>
-  <reporter-id type="integer">40</reporter-id>
-  <resolution></resolution>
-  <resolution-description></resolution-description>
-  <resolution-description-format>markdown</resolution-description-format>
-  <severity-id type="integer" nil="true"></severity-id>
-  <status>reopened</status>
-  <summary>TEST-ticket.</summary>
-  <version-id type="integer" nil="true"></version-id>
-  <created-at>2012-06-27T17:49:06Z</created-at>
-  <updated-at>2013-03-07T16:04:05Z</updated-at>
-</ticket>
-EOF
-
-    stub_request(:get, "https://#{tracker.username}:#{tracker.password}@test.unfuddle.com/api/v1/projects/#{tracker.project_id}.xml").
-      to_return(:status => 200, :body => project_xml, :headers => {})
-
-
-    stub_request(:post, "https://#{tracker.username}:#{tracker.password}@test.unfuddle.com/api/v1/projects/#{tracker.project_id}/tickets.xml").
-      to_return(:status => 200, :body => ticket_xml, :headers => {})
-
-    problem.app.issue_tracker.create_issue(problem)
-    problem.reload
-
-    requested = have_requested(:post,"https://#{tracker.username}:#{tracker.password}@test.unfuddle.com/api/v1/projects/#{tracker.project_id}/tickets.xml" )
-    expect(WebMock).to requested.with(:title => /[production][foo#bar] FooError: Too Much Bar/)
-    expect(WebMock).to requested.with(:content => /See this exception on Errbit/)
-
-    expect(problem.issue_link).to eq issue_link
-    expect(problem.issue_type).to eq IssueTrackers::UnfuddleTracker::Label
-  end
-end
@@ -370,6 +370,53 @@ describe Problem do
     end
   end
  
+  describe "#issue_type" do
+    context "without issue_type fill in Problem" do
+      let(:problem) do
+        Problem.new(:app => app)
+      end
+
+      let(:app) do
+        App.new(:issue_tracker => issue_tracker)
+      end
+
+      context "without issue_tracker associate to app" do
+        let(:issue_tracker) do
+          nil
+        end
+        it 'return nil' do
+          expect(problem.issue_type).to be_nil
+        end
+      end
+
+      context "with issue_tracker valid associate to app" do
+        let(:issue_tracker) do
+          Fabricate(:issue_tracker)
+        end
+
+        it 'return the issue_tracker label' do
+          expect(problem.issue_type).to eql 'fake'
+        end
+      end
+
+      context "with issue_tracker not valid associate to app" do
+        let(:issue_tracker) do
+          IssueTracker.new(:type_tracker => 'fake')
+        end
+
+        it 'return nil' do
+          expect(problem.issue_type).to be_nil
+        end
+      end
+    end
+
+    context "with issue_type fill in Problem" do
+      it 'return the value associate' do
+        expect(Problem.new(:issue_type => 'foo').issue_type).to eql 'foo'
+      end
+    end
+  end
+
  
 end
  
@@ -19,11 +19,13 @@ end
  
 require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
+require 'email_spec'
 require 'database_cleaner'
 require 'webmock/rspec'
 require 'xmpp4r'
 require 'xmpp4r/muc'
 require 'mongoid-rspec'
+require 'errbit_plugin/issue_trackers/fake'
  
  
 # Requires supporting files with custom matchers and macros, etc,
@@ -54,8 +56,8 @@ RSpec.configure do |config|
     init_haml_helpers
   end
  
-  config.after(:all) do
-    WebMock.disable_net_connect! :allow => /coveralls\.io/
+  config.before(:all) do
+    WebMock.disable_net_connect! :allow => /coveralls\.io|127\.0\.0\.1/
   end
 end
  
@@ -2,8 +2,10 @@ require &#39;spec_helper&#39;
  
 describe "apps/edit.html.haml" do
   let(:app) { stub_model(App) }
+  let(:app_decorate) { AppDecorator.new(app) }
   before do
     view.stub(:app).and_return(app)
+    view.stub(:app_decorate).and_return(app_decorate)
     controller.stub(:current_user) { stub_model(User) }
   end
  
@@ -2,8 +2,10 @@ require &#39;spec_helper&#39;
  
 describe "apps/new.html.haml" do
   let(:app) { stub_model(App) }
+  let(:app_decorate) { AppDecorator.new(app) }
   before do
     view.stub(:app).and_return(app)
+    view.stub(:app_decorate).and_return(app_decorate)
     controller.stub(:current_user) { stub_model(User) }
   end
  
@@ -3,6 +3,28 @@ require &#39;spec_helper&#39;
 describe "problems/show.html.haml" do
   let(:problem) { Fabricate(:problem) }
   let(:comment) { Fabricate(:comment) }
+  let(:pivotal_tracker) {
+    Class.new(ErrbitPlugin::IssueTracker) do
+      def self.label; 'pivotal'; end
+      def initialize(app, params); end
+      def configured?; true; end
+      def comments_allowed?; false; end
+    end
+  }
+  let(:github_tracker) {
+    Class.new(ErrbitPlugin::IssueTracker) do
+      def initialize(app, params); end
+      def label; 'github'; end
+      def configured?; true; end
+      def comments_allowed?; false; end
+    end
+  }
+  let(:trackers) {
+    {
+      'github' => github_tracker,
+      'pivotal' => pivotal_tracker
+    }
+  }
  
   before do
     view.stub(:app).and_return(problem.app)
@@ -16,7 +38,8 @@ describe &quot;problems/show.html.haml&quot; do
   end
  
   def with_issue_tracker(tracker, problem)
-    problem.app.issue_tracker = tracker.new :api_token => "token token token", :project_id => "1234"
+    problem.app.issue_tracker = IssueTracker.new :type_tracker => tracker, :options => {:api_token => "token token token", :project_id => "1234"}
+    ErrbitPlugin::Registry.stub(:issue_trackers).and_return(trackers)
     view.stub(:problem).and_return(problem)
     view.stub(:app).and_return(problem.app)
   end
@@ -75,7 +98,7 @@ describe &quot;problems/show.html.haml&quot; do
  
       it 'should allow creating issue for github if application has a github tracker' do
         problem = Fabricate(:problem_with_comments, :app => Fabricate(:app, :github_repo => "test_user/test_repo"))
-        with_issue_tracker(GithubIssuesTracker, problem)
+        with_issue_tracker("github", problem)
         view.stub(:problem).and_return(problem)
         view.stub(:app).and_return(problem.app)
         render
@@ -96,30 +119,53 @@ describe &quot;problems/show.html.haml&quot; do
  
       end
  
-      context "with lighthouse tracker on app" do
-        let(:app) { App.new(:new_record => false, :issue_tracker => tracker ) }
-        let(:tracker) {
-          IssueTrackers::LighthouseTracker.new(:project_id => 'x')
-        }
-        context "with problem without issue link" do
+      context "with tracker associate on app" do
+        before do
+          with_issue_tracker("pivotal", problem)
+        end
+
+        context "with app having github_repo" do
+          let(:app) { App.new(:new_record => false, :github_repo => 'foo/bar') }
           let(:problem){ Problem.new(:new_record => false, :app => app) }
-          it 'not see link if no issue tracker' do
-            view.stub(:problem).and_return(problem)
-            view.stub(:app).and_return(problem.app)
+
+          before do
+            problem.issue_link = nil
+            user = Fabricate(:user, :github_login => 'test_user', :github_oauth_token => 'abcdef')
+            controller.stub(:current_user) { user }
+          end
+
+          it 'links to the associated tracker' do
             render
-            expect(view.content_for(:action_bar)).to match(/create issue/)
+            expect(view.content_for(:action_bar)).to match(".pivotal_create.create-issue")
           end
  
+          it 'does not link to github' do
+            render
+            expect(view.content_for(:action_bar)).to_not match(".github_create.create-issue")
+          end
         end
  
-        context "with problem with issue link" do
-          let(:problem){ Problem.new(:new_record => false, :app => app, :issue_link => 'http://foo') }
+        context "without app having github_repo" do
+          context "with problem without issue link" do
+            before do
+              problem.issue_link = nil
+            end
+            it 'not see link if no issue tracker' do
+              render
+              expect(view.content_for(:action_bar)).to match(/create issue/)
+            end
  
-          it 'not see link if no issue tracker' do
-            view.stub(:problem).and_return(problem)
-            view.stub(:app).and_return(problem.app)
-            render
-            expect(view.content_for(:action_bar)).to_not match(/create issue/)
+          end
+
+          context "with problem with issue link" do
+            before do
+              problem.issue_link = 'http://foo'
+            end
+
+            it 'not see link if no issue tracker' do
+              render
+              expect(view.content_for(:action_bar)).to_not match(/create issue/)
+            end
           end
         end
  
@@ -147,7 +193,7 @@ describe &quot;problems/show.html.haml&quot; do
     context "with issue tracker" do
       it 'should not display the comments section' do
         problem = Fabricate(:problem)
-        with_issue_tracker(PivotalLabsTracker, problem)
+        with_issue_tracker("pivotal", problem)
         render
         expect(view.view_flow.get(:comments)).to be_blank
       end
@@ -155,7 +201,7 @@ describe &quot;problems/show.html.haml&quot; do
       it 'should display existing comments' do
         problem = Fabricate(:problem_with_comments)
         problem.reload
-        with_issue_tracker(PivotalLabsTracker, problem)
+        with_issue_tracker("pivotal", problem)
         render
  
         expect(view.content_for(:comments)).to include('Test comment')
...	...	@@ -25,31 +25,18 @@ gem 'rails_autolink'
25	25	# Please don't update hoptoad_notifier to airbrake.
26	26	# It's for internal use only, and we monkeypatch certain methods
27	27	gem 'hoptoad_notifier', "~> 2.4"
28		-
29		-
30		-# Remove / comment out any of the gems below if you want to disable
31		-# a given issue tracker, notification service, or authentication.
32		-
33		-# Issue Trackers
34		-# ---------------------------------------
35		-# Lighthouse
36		-gem 'lighthouse-api'
37		-# Redmine
38		-gem 'oruen_redmine_client', :require => 'redmine_client'
39		-# Pivotal Tracker
40		-gem 'pivotal-tracker'
41		-# Fogbugz
42		-gem 'ruby-fogbugz', :require => 'fogbugz'
43		-# Github Issues
44		-gem 'octokit', '~> 2.0'
45		-# Gitlab
46		-gem 'gitlab', '~> 3.0.0'
47		-
48		-# Bitbucket Issues
49		-gem 'bitbucket_rest_api', :require => false
50		-
51		-# Jira
52		-gem 'jira-ruby', :require => 'jira'
	28	+gem 'draper', :require => false
	29	+
	30	+gem 'errbit_plugin'
	31	+gem 'errbit_bitbucket_plugin'
	32	+gem 'errbit_fogbugz_plugin'
	33	+gem 'errbit_github_plugin'
	34	+gem 'errbit_gitlab_plugin'
	35	+gem 'errbit_jira_plugin'
	36	+gem 'errbit_lighthouse_plugin'
	37	+gem 'errbit_pivotal_plugin'
	38	+gem 'errbit_redmine_plugin'
	39	+gem 'errbit_unfuddle_plugin'
53	40
54	41	# Notification services
55	42	# ---------------------------------------
...	...	@@ -101,6 +88,7 @@ end
101	88
102	89	group :test do
103	90	gem 'capybara'
	91	+ gem 'poltergeist'
104	92	gem 'launchy'
105	93	gem 'database_cleaner'
106	94	gem 'email_spec'
...	...
...	...	@@ -32,7 +32,7 @@ GEM
32	32	activesupport (3.2.21)
33	33	i18n (~> 0.6, >= 0.6.4)
34	34	multi_json (~> 1.0)
35		- addressable (2.3.5)
	35	+ addressable (2.3.6)
36	36	airbrake (3.1.14)
37	37	builder
38	38	json
...	...	@@ -66,6 +66,7 @@ GEM
66	66	rack (>= 1.0.0)
67	67	rack-test (>= 0.5.4)
68	68	xpath (~> 2.0)
	69	+ cliver (0.3.2)
69	70	coderay (1.0.9)
70	71	coveralls (0.7.0)
71	72	multi_json (~> 1.3)
...	...	@@ -73,8 +74,8 @@ GEM
73	74	simplecov (>= 0.7)
74	75	term-ansicolor
75	76	thor
76		- crack (0.4.1)
77		- safe_yaml (~> 0.9.0)
	77	+ crack (0.4.2)
	78	+ safe_yaml (~> 1.0.0)
78	79	css_parser (1.3.5)
79	80	addressable
80	81	database_cleaner (1.2.0)
...	...	@@ -88,16 +89,49 @@ GEM
88	89	warden (~> 1.2.3)
89	90	diff-lcs (1.2.4)
90	91	dotenv (0.9.0)
	92	+ draper (1.3.0)
	93	+ actionpack (>= 3.0)
	94	+ activemodel (>= 3.0)
	95	+ activesupport (>= 3.0)
	96	+ request_store (~> 1.0.3)
91	97	email_spec (1.5.0)
92	98	launchy (~> 2.1)
93	99	mail (~> 2.2)
	100	+ errbit_bitbucket_plugin (0.1.0)
	101	+ bitbucket_rest_api
	102	+ errbit_plugin
	103	+ faraday (~> 0.8.1)
	104	+ errbit_fogbugz_plugin (0.1.0)
	105	+ errbit_plugin (~> 0.4, >= 0.4.0)
	106	+ ruby-fogbugz (~> 0.1, >= 0.1)
	107	+ errbit_github_plugin (0.1.0)
	108	+ errbit_plugin
	109	+ octokit
	110	+ errbit_gitlab_plugin (0.1.0)
	111	+ errbit_plugin (~> 0.4, >= 0.4.0)
	112	+ gitlab (~> 3.0.0, >= 3.0.0)
	113	+ errbit_jira_plugin (0.2.0)
	114	+ errbit_plugin
	115	+ jira-ruby
	116	+ errbit_lighthouse_plugin (0.1.0)
	117	+ errbit_plugin (~> 0)
	118	+ lighthouse-api (~> 2)
	119	+ errbit_pivotal_plugin (0.2.0)
	120	+ errbit_plugin (~> 0.4, >= 0.4.0)
	121	+ pivotal-tracker (~> 0.5, >= 0.5.0)
	122	+ errbit_plugin (0.4.0)
	123	+ errbit_redmine_plugin (0.2.0)
	124	+ errbit_plugin (~> 0)
	125	+ oruen_redmine_client (~> 0)
	126	+ errbit_unfuddle_plugin (0.1.0)
	127	+ errbit_plugin (~> 0.4, >= 0.4.0)
94	128	erubis (2.7.0)
95	129	execjs (2.0.2)
96		- fabrication (2.8.1)
	130	+ fabrication (2.9.0)
97	131	faraday (0.8.9)
98	132	multipart-post (~> 1.2.0)
99		- faraday_middleware (0.9.0)
100		- faraday (>= 0.7.4, < 0.9)
	133	+ faraday_middleware (0.9.1)
	134	+ faraday (>= 0.7.4, < 0.10)
101	135	flowdock (0.3.1)
102	136	httparty (~> 0.7)
103	137	multi_json
...	...	@@ -111,7 +145,7 @@ GEM
111	145	happymapper (0.4.1)
112	146	libxml-ruby (~> 2.0)
113	147	hashie (2.0.5)
114		- highline (1.6.19)
	148	+ highline (1.6.20)
115	149	hike (1.2.3)
116	150	hipchat (0.12.0)
117	151	httparty
...	...	@@ -127,10 +161,9 @@ GEM
127	161	multi_xml (>= 0.5.2)
128	162	httpauth (0.2.0)
129	163	i18n (0.6.11)
130		- jira-ruby (0.1.2)
	164	+ jira-ruby (0.1.10)
131	165	activesupport
132	166	oauth
133		- railties
134	167	journey (1.0.4)
135	168	jquery-rails (2.1.4)
136	169	railties (>= 3.0, < 5.0)
...	...	@@ -158,7 +191,7 @@ GEM
158	191	railties
159	192	method_source (0.8.2)
160	193	mime-types (1.25.1)
161		- mini_portile (0.5.3)
	194	+ mini_portile (0.6.1)
162	195	mongoid (3.1.5)
163	196	activemodel (~> 3.2)
164	197	moped (~> 1.4)
...	...	@@ -184,9 +217,9 @@ GEM
184	217	net-ssh (2.7.0)
185	218	net-ssh-gateway (1.2.0)
186	219	net-ssh (>= 2.6.5)
187		- nokogiri (1.6.1)
188		- mini_portile (~> 0.5.0)
189		- nokogiri-happymapper (0.5.8)
	220	+ nokogiri (1.6.4.1)
	221	+ mini_portile (~> 0.6.0)
	222	+ nokogiri-happymapper (0.5.9)
190	223	nokogiri (~> 1.5)
191	224	oauth (0.4.7)
192	225	oauth2 (0.8.1)
...	...	@@ -195,8 +228,8 @@ GEM
195	228	jwt (~> 0.1.4)
196	229	multi_json (~> 1.0)
197	230	rack (~> 1.2)
198		- octokit (2.7.1)
199		- sawyer (~> 0.5.2)
	231	+ octokit (3.3.1)
	232	+ sawyer (~> 0.5.3)
200	233	omniauth (1.1.4)
201	234	hashie (>= 1.2, < 3)
202	235	rack
...	...	@@ -222,6 +255,11 @@ GEM
222	255	rest-client (~> 1.6.0)
223	256	pjax_rails (0.3.4)
224	257	jquery-rails
	258	+ poltergeist (1.5.1)
	259	+ capybara (~> 2.1)
	260	+ cliver (~> 0.3.1)
	261	+ multi_json (~> 1.0)
	262	+ websocket-driver (>= 0.2.0)
225	263	polyglot (0.3.5)
226	264	premailer (1.7.3)
227	265	css_parser (>= 1.1.9)
...	...	@@ -268,8 +306,10 @@ GEM
268	306	rdoc (3.12.2)
269	307	json (~> 1.4)
270	308	ref (1.0.5)
271		- rest-client (1.6.7)
272		- mime-types (>= 1.16)
	309	+ request_store (1.0.6)
	310	+ rest-client (1.6.8)
	311	+ mime-types (~> 1.16)
	312	+ rdoc (>= 2.4.2)
273	313	ri_cal (0.8.8)
274	314	rspec (2.14.1)
275	315	rspec-core (~> 2.14.0)
...	...	@@ -291,11 +331,11 @@ GEM
291	331	rushover (0.3.0)
292	332	json
293	333	rest-client
294		- safe_yaml (0.9.7)
295		- sawyer (0.5.3)
	334	+ safe_yaml (1.0.4)
	335	+ sawyer (0.5.5)
296	336	addressable (~> 2.3.5)
297	337	faraday (~> 0.8, < 0.10)
298		- simple_oauth (0.2.0)
	338	+ simple_oauth (0.3.0)
299	339	simplecov (0.7.1)
300	340	multi_json (~> 1.0)
301	341	simplecov-html (~> 0.7.1)
...	...	@@ -330,18 +370,19 @@ GEM
330	370	tzinfo (0.3.41)
331	371	uglifier (2.2.1)
332	372	execjs (>= 0.3.0)
333		- multi_json (~> 1.0, >= 1.0.2)
	373	+ json (>= 1.8.0)
334	374	underscore-rails (1.5.2)
335	375	unicorn (4.6.3)
336	376	kgio (~> 2.6)
337	377	rack
338	378	raindrops (~> 0.7)
339		- useragent (0.8.3)
	379	+ useragent (0.9.0)
340	380	warden (1.2.3)
341	381	rack (>= 1.0)
342	382	webmock (1.15.0)
343	383	addressable (>= 2.2.7)
344	384	crack (>= 0.3.2)
	385	+ websocket-driver (0.3.3)
345	386	xmpp4r (0.5.5)
346	387	xpath (2.0.0)
347	388	nokogiri (~> 1.3)
...	...	@@ -357,7 +398,6 @@ DEPENDENCIES
357	398	airbrake
358	399	better_errors
359	400	binding_of_caller
360		- bitbucket_rest_api
361	401	campy
362	402	capistrano (~> 2.0)
363	403	capybara
...	...	@@ -365,32 +405,38 @@ DEPENDENCIES
365	405	database_cleaner
366	406	decent_exposure
367	407	devise
	408	+ draper
368	409	email_spec
	410	+ errbit_bitbucket_plugin
	411	+ errbit_fogbugz_plugin
	412	+ errbit_github_plugin
	413	+ errbit_gitlab_plugin
	414	+ errbit_jira_plugin
	415	+ errbit_lighthouse_plugin
	416	+ errbit_pivotal_plugin
	417	+ errbit_plugin
	418	+ errbit_redmine_plugin
	419	+ errbit_unfuddle_plugin
369	420	execjs
370	421	fabrication
371	422	flowdock
372	423	foreman
373		- gitlab (~> 3.0.0)
374	424	haml
375	425	hipchat
376	426	hoi
377	427	hoptoad_notifier (~> 2.4)
378	428	htmlentities
379	429	httparty
380		- jira-ruby
381	430	jquery-rails (~> 2.1.4)
382	431	kaminari (>= 0.14.1)
383	432	launchy
384		- lighthouse-api
385	433	meta_request
386	434	mongoid
387	435	mongoid-rspec
388	436	mongoid_rails_migrations
389		- octokit (~> 2.0)
390	437	omniauth-github
391		- oruen_redmine_client
392		- pivotal-tracker
393	438	pjax_rails
	439	+ poltergeist
394	440	pry-rails
395	441	puma
396	442	quiet_assets
...	...	@@ -400,7 +446,6 @@ DEPENDENCIES
400	446	railties (~> 3.2.21)
401	447	ri_cal
402	448	rspec-rails
403		- ruby-fogbugz
404	449	rushover
405	450	strong_parameters
406	451	therubyracer
...	...
1	1	/* Issue Tracker inactive, select, create and goto icons */
2		-<% trackers = IssueTracker.subclasses.map{\|t\| t.label } << 'none' %>
3	2
4		-<% trackers.each do \|tracker\| %>
5		-div.issue_tracker.nested label.<%= tracker %> {
6		- background: url(<%= asset_path "#{ tracker }_inactive.png" %>) no-repeat;
7		-}
8		-div.issue_tracker.nested label.r_on.<%= tracker %> {
9		- background: url(<%= asset_path "#{ tracker }_create.png" %>) no-repeat;
10		-}
11		-#action-bar a.<%= tracker %>_create {
12		- background: transparent url(<%= asset_path "#{ tracker }_create.png" %>) 6px 5px no-repeat;
13		-}
14		-#action-bar a.<%= tracker %>_goto {
15		- background: transparent url(<%= asset_path "#{ tracker }_goto.png" %>) 6px 5px no-repeat;
16		-}
	3	+<% ErrbitPlugin::Registry.issue_trackers.keys.each do \|label\| %>
	4	+div.issue_tracker.nested label.<%= label %> { background: url(<%= asset_path "#{ label }_inactive.png" %>) no-repeat; }
	5	+div.issue_tracker.nested label.r_on.<%= label %> { background: url(<%= asset_path "#{ label }_create.png" %>) no-repeat; }
	6	+#action-bar a.<%= label %>_create { background: transparent url(<%= asset_path "#{ label }_create.png" %>) 6px 5px no-repeat; }
	7	+#action-bar a.<%= label %>_goto { background: transparent url(<%= asset_path "#{ label }_goto.png" %>) 6px 5px no-repeat; }
17	8	<% end %>
18	9
...	...
...	...	@@ -16,6 +16,9 @@ class AppsController < ApplicationController
16	16	}
17	17
18	18	expose(:app, :ancestor => :app_scope)
	19	+ expose(:app_decorate) do
	20	+ AppDecorator.new(app)
	21	+ end
19	22
20	23	expose(:all_errs) {
21	24	!!params[:all_errs]
...	...	@@ -50,7 +53,6 @@ class AppsController < ApplicationController
50	53	end
51	54
52	55	def create
53		- initialize_subclassed_issue_tracker
54	56	initialize_subclassed_notification_service
55	57	if app.save
56	58	redirect_to app_url(app), :flash => { :success => I18n.t('controllers.apps.flash.create.success') }
...	...	@@ -61,7 +63,6 @@ class AppsController < ApplicationController
61	63	end
62	64
63	65	def update
64		- initialize_subclassed_issue_tracker
65	66	initialize_subclassed_notification_service
66	67	if app.save
67	68	redirect_to app_url(app), :flash => { :success => I18n.t('controllers.apps.flash.update.success') }
...	...	@@ -91,17 +92,6 @@ class AppsController < ApplicationController
91	92
92	93	protected
93	94
94		- def initialize_subclassed_issue_tracker
95		- # set the app's issue tracker
96		- if params[:app][:issue_tracker_attributes] && tracker_type = params[:app][:issue_tracker_attributes][:type]
97		- available_tracker_classes = [IssueTracker] + IssueTracker.subclasses
98		- tracker_class = available_tracker_classes.detect{\|c\| c.name == tracker_type}
99		- if !tracker_class.nil?
100		- app.issue_tracker = tracker_class.new(params[:app][:issue_tracker_attributes])
101		- end
102		- end
103		- end
104		-
105	95	def initialize_subclassed_notification_service
106	96	# set the app's notification service
107	97	if params[:app][:notification_service_attributes] && notification_type = params[:app][:notification_service_attributes][:type]
...	...	@@ -115,7 +105,7 @@ class AppsController < ApplicationController
115	105
116	106	def plug_params app
117	107	app.watchers.build if app.watchers.none?
118		- app.issue_tracker = IssueTracker.new unless app.issue_tracker_configured?
	108	+ app.issue_tracker \|\|= IssueTracker.new
119	109	app.notification_service = NotificationService.new unless app.notification_service_configured?
120	110	app.copy_attributes_from(params[:copy_attributes_from]) if params[:copy_attributes_from]
121	111	end
...	...
...	...	@@ -62,8 +62,7 @@ class ProblemsController < ApplicationController
62	62	end
63	63
64	64	def create_issue
65		- IssueTracker.update_url_options(request)
66		- issue_creation = IssueCreation.new(problem, current_user, params[:tracker])
	65	+ issue_creation = IssueCreation.new(problem, current_user, params[:tracker], request)
67	66
68	67	unless issue_creation.execute
69	68	flash[:error] = issue_creation.errors.full_messages.join(', ')
...	...
...	...	@@ -0,0 +1,19 @@
	1	+class AppDecorator < Draper::Decorator
	2	+
	3	+ decorates_association :watchers
	4	+ decorates_association :issue_tracker, :with => IssueTrackerDecorator
	5	+ delegate_all
	6	+
	7	+ def email_at_notices
	8	+ object.email_at_notices.join(', ')
	9	+ end
	10	+
	11	+ def notify_user_display
	12	+ object.notify_all_users ? 'display: none;' : ''
	13	+ end
	14	+
	15	+ def notify_err_display
	16	+ object.notify_on_errs ? '' : 'display: none;'
	17	+ end
	18	+
	19	+end
...	...
...	...	@@ -0,0 +1,37 @@
	1	+class IssueTrackerDecorator < Draper::Decorator
	2	+
	3	+ def initialize(object, key)
	4	+ @object = object
	5	+ @key = key
	6	+ end
	7	+ attr_reader :key
	8	+
	9	+ delegate_all
	10	+
	11	+ def issue_trackers
	12	+ ErrbitPlugin::Registry.issue_trackers.each do \|key, object\|
	13	+ yield IssueTrackerDecorator.new(object, key)
	14	+ end
	15	+ end
	16	+
	17	+ def note
	18	+ object.note.html_safe
	19	+ end
	20	+
	21	+ def fields
	22	+ object.fields.each do \|field, field_info\|
	23	+ yield IssueTrackerFieldDecorator.new(field, field_info)
	24	+ end
	25	+ end
	26	+
	27	+ def params_class(tracker)
	28	+ [chosen?(tracker), label].join(" ").strip
	29	+ end
	30	+
	31	+ private
	32	+
	33	+ def chosen?(issue_tracker)
	34	+ key == issue_tracker.type_tracker.to_s ? 'chosen' : ''
	35	+ end
	36	+
	37	+end
...	...
...	...	@@ -0,0 +1,27 @@
	1	+class IssueTrackerFieldDecorator < Draper::Decorator
	2	+
	3	+ def initialize(field, field_info)
	4	+ @object = field
	5	+ @field_info = field_info
	6	+ end
	7	+ attr_reader :object, :field_info
	8	+
	9	+ alias :key :object
	10	+
	11	+ def label
	12	+ field_info[:label] \|\| object.to_s.titleize
	13	+ end
	14	+
	15	+
	16	+ def input(form, issue_tracker)
	17	+ form.send(input_field, key.to_s,
	18	+ :placeholder => field_info[:placeholder],
	19	+ :value => issue_tracker.options[key.to_s])
	20	+ end
	21	+
	22	+ private
	23	+
	24	+ def input_field
	25	+ object == :password ? :password_field : :text_field
	26	+ end
	27	+end
...	...
...	...	@@ -0,0 +1,9 @@
	1	+class WatcherDecorator < Draper::Decorator
	2	+
	3	+ delegate_all
	4	+
	5	+ def email_choosen
	6	+ object.email.blank? ? 'chosen' : ''
	7	+ end
	8	+
	9	+end
...	...
...	...	@@ -5,12 +5,24 @@ class IssueCreation
5	5
6	6	delegate :app, :to => :problem
7	7
8		- def initialize(problem, user, tracker_name)
	8	+ def initialize(problem, user, tracker_name, request)
9	9	@problem = problem
10	10	@user = user
11	11	@tracker_name = tracker_name
	12	+ IssueTracker.update_url_options(request)
12	13	end
13	14
	15	+ def execute
	16	+ tracker.create_issue(problem, user) if tracker
	17	+ errors.empty?
	18	+ rescue => ex
	19	+ Rails.logger.error "Error during issue creation: " << ex.message
	20	+ errors.add :base, "There was an error during issue creation: #{ex.message}"
	21	+ false
	22	+ end
	23	+
	24	+ private
	25	+
14	26	def tracker
15	27	return @tracker if @tracker
16	28
...	...	@@ -21,10 +33,11 @@ class IssueCreation
21	33	elsif !user.github_account?
22	34	errors.add :base, "You haven't linked your Github account."
23	35	else
24		- @tracker = GithubIssuesTracker.new(
25		- :app => app,
26		- :username => user.github_login,
27		- :oauth_token => user.github_oauth_token
	36	+ @tracker = ErrbitGithubPlugin::IssueTracker.new(
	37	+ app, {
	38	+ :username => user.github_login,
	39	+ :oauth_token => user.github_oauth_token
	40	+ }
28	41	)
29	42	end
30	43
...	...	@@ -39,13 +52,4 @@ class IssueCreation
39	52
40	53	@tracker
41	54	end
42		-
43		- def execute
44		- tracker.create_issue problem, user if tracker
45		- errors.empty?
46		- rescue => ex
47		- Rails.logger.error "Error during issue creation: " << ex.message
48		- errors.add :base, "There was an error during issue creation: #{ex.message}"
49		- false
50		- end
51	55	end
...	...