party_foul 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dc6bbbeb96e2c2c6baf986e969a9384f259fe18
-  data.tar.gz: d259b9b9e1edbf4a5eb28896deaada03115daa3c
+  metadata.gz: 04841443e30d275130c1d6751de062e44feea034
+  data.tar.gz: d3e1222567bfd402d0d337c37dbbfdab1a2833bc
 SHA512:
-  metadata.gz: c5b2827f54170040d1b6c92391dae766fa9c437246ccf736c73bbddec8e8941ecb711a5dd09854ad4a29fc96e7a56763de04525ec5567cc1802aac242ec45659
-  data.tar.gz: de714911bc267cb9e5977c35307b23c46881125969bd236dcecd6919cfbd3bc5e205ec61ebaf13574c8f83586007fdd35fd531764ec31df803c8cab2d8f03adf
+  metadata.gz: 153edf86b0234e3039b971d4a820456857a3c0e90960e69027094326de56a5e0521b59c715682c9da5d761fbd67121bd818e07ae6bc17c5944af1103f0b65c6e
+  data.tar.gz: bf1114177b74cafc812da05af5c8ee87fc458dcf381c0a8012cd0a75501979cb38f5bb63230f78fd94eb4c80c043ed5921dfef9aebbb32fa4f7f97ba894f93ec

data/README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://secure.travis-ci.org/dockyard/party_foul.png?branch=master)](http://travis-ci.org/dockyard/party_foul)
 [![Dependency Status](https://gemnasium.com/dockyard/party_foul.png?travis)](https://gemnasium.com/dockyard/party_foul)
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/dockyard/party_foul)
+[![Code Climate](https://codeclimate.com/github/dockyard/party_foul.png)](https://codeclimate.com/github/dockyard/party_foul)
 
 Rails exceptions automatically opened as issues on GitHub
 
@@ -81,7 +81,7 @@ PartyFoul.configure do |config|
 
   # The API endpoint for GitHub. Unless you are hosting a private
   # instance of Enterprise GitHub you do not need to include this
-  config.endpoint               = 'https://api.github.com'
+  config.api_endpoint           = 'https://api.github.com'
 
   # The Web URL for GitHub. Unless you are hosting a private
   # instance of Enterprise GitHub you do not need to include this
@@ -198,9 +198,9 @@ The code that you want to handle should be wrapped like so:
 ```ruby
 begin
   ... # some code that might raise an error
-rescue => e
-  PartyFoul::RacklessExceptionHandler.handle(e, {class: class_name, method: method_name, params: message)
-  raise e
+rescue => error
+  PartyFoul::RacklessExceptionHandler.handle(error, {class: class_name, method: method_name, params: message)
+  raise error
 end
 ```
 
@@ -215,9 +215,9 @@ module PartyFoul
     def call(worker, msg, queue)
       begin
         yield
-      rescue => ex
-        PartyFoul::RacklessExceptionHandler.handle(ex, {class: worker.class.name, method: queue, params: msg})
-        raise
+      rescue => error
+        PartyFoul::RacklessExceptionHandler.handle(error, {class: worker.class.name, method: queue, params: msg})
+        raise error
       end
     end
   end

data/lib/generators/party_foul/install_generator.rb

@@ -6,18 +6,18 @@ module PartyFoul
     source_root File.expand_path('../templates', __FILE__)
 
     def create_initializer_file
-      login     = ask 'GitHub login:'
-      password  = ask 'GitHub password:'
-      @owner    = ask_with_default "\nRepository owner:", login
-      @repo     = ask 'Repository name:'
-      @endpoint = ask_with_default 'Api Endpoint:', 'https://api.github.com'
-      @web_url  = ask_with_default 'Web URL:', 'https://github.com'
+      login         = ask 'GitHub login:'
+      password      = ask 'GitHub password:'
+      @owner        = ask_with_default "\nRepository owner:", login
+      @repo         = ask 'Repository name:'
+      @api_endpoint = ask_with_default 'Api Endpoint:', 'https://api.github.com'
+      @web_url      = ask_with_default 'Web URL:', 'https://github.com'
 
       begin
-        github       = Github.new :login => login, :password => password, :endpoint => @endpoint
-        @oauth_token = github.oauth.create(scopes: ['repo'], note: "PartyFoul #{@owner}/#{@repo}", note_url: "#{@web_url}/#{@owner}/#{@repo}").token
+        octokit      = Octokit.new :login => login, :password => password, :api_endpoint => @api_endpoint
+        @oauth_token = octokit.create_authorization(scopes: ['repo'], note: "PartyFoul #{@owner}/#{@repo}", note_url: "#{@web_url}/#{@owner}/#{@repo}").token
         template 'party_foul.rb', 'config/initializers/party_foul.rb'
-      rescue Github::Error::Unauthorized
+      rescue Octokit::Unauthorized
         say 'There was an error retrieving your GitHub OAuth token'
       end
     end

data/lib/generators/party_foul/templates/party_foul.rb

@@ -6,9 +6,9 @@ PartyFoul.configure do |config|
   # The OAuth token for the account that is opening the issues on GitHub
   config.oauth_token            = '<%= @oauth_token %>'
 
-  # The API endpoint for GitHub. Unless you are hosting a private
+  # The API api_endpoint for GitHub. Unless you are hosting a private
   # instance of Enterprise GitHub you do not need to include this
-  config.endpoint               = '<%= @endpoint %>'
+  config.api_endpoint           = '<%= @api_endpoint %>'
 
   # The Web URL for GitHub. Unless you are hosting a private
   # instance of Enterprise GitHub you do not need to include this

data/lib/party_foul.rb

@@ -1,12 +1,8 @@
-require 'github_api'
+require 'octokit'
 
 module PartyFoul
   class << self
-    attr_accessor :github, :oauth_token, :endpoint, :owner, :repo, :blacklisted_exceptions, :processor, :web_url, :branch, :whitelisted_rack_variables, :additional_labels, :comment_limit
-  end
-
-  def self.whitelisted_rack_variables
-    @whitelisted_rack_variables ||= %w{GATEWAY_INTERFACE PATH_INFO REMOTE_ADDR REMOTE_HOST REQUEST_METHOD REQUEST_URI SERVER_NAME SERVER_PORT SERVER_PROTOCOL SERVER_SOFTWARE HTTP_HOST HTTP_CONNECTION HTTP_CACHE_CONTROL HTTP_ACCEPT HTTP_USER_AGENT HTTP_ACCEPT_ENCODING HTTP_ACCEPT_LANGUAGE HTTP_ACCEPT_CHARSET rack.version rack.input rack.errors rack.multithread rack.multiprocess rack.run_once rack.url_scheme HTTP_VERSION REQUEST_PATH ORIGINAL_FULLPATH action_dispatch.routes action_dispatch.parameter_filter action_dispatch.secret_token action_dispatch.show_exceptions action_dispatch.show_detailed_exceptions action_dispatch.logger action_dispatch.backtrace_cleaner action_dispatch.request_id action_dispatch.remote_ip rack.session rack.session.options rack.request.cookie_hash rack.request.cookie_string action_dispatch.cookies action_dispatch.request.unsigned_session_cookie action_dispatch.request.path_parameters action_controller.instance action_dispatch.request.request_parameters rack.request.query_string rack.request.query_hash action_dispatch.request.query_parameters action_dispatch.request.parameters action_dispatch.request.formats}
+    attr_accessor :github, :oauth_token, :api_endpoint, :owner, :repo, :blacklisted_exceptions, :processor, :web_url, :branch, :whitelisted_rack_variables, :additional_labels, :comment_limit
   end
 
   # The git branch that is used for linking in the stack trace
@@ -28,8 +24,8 @@ module PartyFoul
   # users
   #
   # @return [String] Defaults to 'https://api.github.com' if not set
-  def self.endpoint
-    @endpoint ||= 'https://api.github.com'
+  def self.api_endpoint
+    @api_endpoint ||= 'https://api.github.com'
   end
 
   # The processor to be used when handling the exception. Defaults to a
@@ -55,12 +51,20 @@ module PartyFoul
     @blacklisted_exceptions || []
   end
 
-  # The url of the repository. Built using the {.web_url}, {.owner}, and {.repo}
+  # The GitHub path to the repo
+  # Built using {.owner} and {.repo}
+  #
+  # @return [String]
+  def self.repo_path
+    "#{owner}/#{repo}"
+  end
+
+  # The url of the repository. Built using the {.web_url} and {.repo_path}
   # values
   #
   # @return [String]
   def self.repo_url
-    "#{web_url}/#{owner}/#{repo}"
+    "#{web_url}/#{repo_path}"
   end
 
   # The configure block for PartyFoul. Use to initialize settings
@@ -76,7 +80,7 @@ module PartyFoul
   # @param [Block]
   def self.configure(&block)
     yield self
-    self.github ||= Github.new oauth_token: oauth_token, endpoint: endpoint
+    self.github ||= Octokit.new oauth_token: oauth_token, api_endpoint: api_endpoint
   end
 end
 

data/lib/party_foul/exception_handler.rb

@@ -36,8 +36,8 @@ class PartyFoul::ExceptionHandler
 
   # Hits the GitHub API to find the matching issue using the fingerprint.
   def find_issue
-    unless issue = PartyFoul.github.search.issues(owner: PartyFoul.owner, repo: PartyFoul.repo, state: 'open', keyword: fingerprint).issues.first
-      issue = PartyFoul.github.search.issues(owner: PartyFoul.owner, repo: PartyFoul.repo, state: 'closed', keyword: fingerprint).issues.first
+    unless issue = PartyFoul.github.search_issues(PartyFoul.repo_path, fingerprint, 'open').first
+      issue = PartyFoul.github.search_issues(PartyFoul.repo_path, fingerprint, 'closed').first
     end
 
     issue
@@ -45,9 +45,9 @@ class PartyFoul::ExceptionHandler
 
   # Will create a new issue and a comment with the proper details. All issues are labeled as 'bug'.
   def create_issue
-    self.sha = PartyFoul.github.git_data.references.get(PartyFoul.owner, PartyFoul.repo, "heads/#{PartyFoul.branch}").object.sha
-    issue = PartyFoul.github.issues.create(PartyFoul.owner, PartyFoul.repo, title: rendered_issue.title, body: rendered_issue.body, labels: ['bug'] + rendered_issue.labels)
-    PartyFoul.github.issues.comments.create(PartyFoul.owner, PartyFoul.repo, issue['number'], body: rendered_issue.comment)
+    self.sha = PartyFoul.github.references(PartyFoul.repo_path, "heads/#{PartyFoul.branch}").object.sha
+    issue = PartyFoul.github.create_issue(PartyFoul.repo_path, rendered_issue.title, rendered_issue.body, labels: ['bug'] + rendered_issue.labels)
+    PartyFoul.github.add_comment(PartyFoul.repo_path, issue['number'], rendered_issue.comment)
   end
 
   # Updates the given issue. If the issue is labeled as 'wontfix' nothing is done. If the issue is closed the issue is reopened and labeled as 'regression'.
@@ -55,16 +55,18 @@ class PartyFoul::ExceptionHandler
   # @param [Hashie::Mash]
   def update_issue(issue)
     unless issue.key?('labels') && issue['labels'].include?('wontfix')
-      params = {body: rendered_issue.update_body(issue['body']), state: 'open'}
+      body = rendered_issue.update_body(issue['body'])
+      params = {state: 'open'}
 
       if issue['state'] == 'closed'
         params[:labels] = (['bug', 'regression'] + issue['labels']).uniq
       end
 
-      self.sha = PartyFoul.github.git_data.references.get(PartyFoul.owner, PartyFoul.repo, "heads/#{PartyFoul.branch}").object.sha
-      PartyFoul.github.issues.edit(PartyFoul.owner, PartyFoul.repo, issue['number'], params)
+      self.sha = PartyFoul.github.references(PartyFoul.repo_path, "heads/#{PartyFoul.branch}").object.sha
+      PartyFoul.github.update_issue(PartyFoul.repo_path, issue['number'], issue.title, body, params)
+
       unless comment_limit_met?(issue['body'])
-        PartyFoul.github.issues.comments.create(PartyFoul.owner, PartyFoul.repo, issue['number'], body: rendered_issue.comment)
+        PartyFoul.github.add_comment(PartyFoul.repo_path, issue['number'], rendered_issue.comment)
       end
     end
   end
@@ -72,7 +74,7 @@ class PartyFoul::ExceptionHandler
   private
 
   def self.clean_env(env)
-    env.select { |key, value| PartyFoul.whitelisted_rack_variables.include?(key) }
+    env.select { |key, value| Marshal.dump(value) rescue false }
   end
 
   def fingerprint

data/lib/party_foul/issue_renderers/base.rb

@@ -53,10 +53,10 @@ BODY
   # @return [String]
   def stack_trace
     exception.backtrace.map do |line|
-      if matches = extract_file_name_and_line_number(line)
-        "<a href='#{PartyFoul.repo_url}/blob/#{sha}/#{matches[2]}#L#{matches[3]}'>#{line}</a>"
+      if (matches = extract_file_name_and_line_number(line))
+        "<a href='#{PartyFoul.repo_url}/blob/#{sha}/#{matches[2]}#L#{matches[3]}'>#{format_line(line)}</a>"
       else
-        line
+        format_line(line)
       end
     end.join("\n")
   end
@@ -107,7 +107,6 @@ BODY
     { 'Occurred At' => occurred_at }
   end
 
-
   # Builds an HTML table from hash
   #
   # @return [String]
@@ -149,6 +148,10 @@ BODY
     Dir.pwd
   end
 
+  def bundle_root
+    Bundler.bundle_path.to_s if defined?(Bundler)
+  end
+
   def extract_file_name_and_line_number(backtrace_line)
     backtrace_line.match(/#{app_root}\/((.+?):(\d+))/)
   end
@@ -156,4 +159,13 @@ BODY
   def raw_title
     raise NotImplementedError
   end
+
+  def format_line(line)
+    if bundle_root
+      line.sub(app_root, '[app]...').sub(bundle_root, '[bundle]...')
+    else
+      line.sub(app_root, '[app]...')
+    end
+  end
+
 end

data/lib/party_foul/issue_renderers/rails.rb

@@ -12,13 +12,13 @@ class PartyFoul::IssueRenderers::Rails < PartyFoul::IssueRenderers::Rack
   # @return [Hash]
   def session
     parameter_filter = ActionDispatch::Http::ParameterFilter.new(env['action_dispatch.parameter_filter'])
-    parameter_filter.filter(env['rack.session'])
+    parameter_filter.filter(env['rack.session'] || { } )
   end
 
   private
 
   def app_root
-    Rails.root
+    Rails.root.to_s
   end
 
   def raw_title

data/lib/party_foul/rackless_exception_handler.rb

@@ -5,7 +5,7 @@ class PartyFoul::RacklessExceptionHandler < PartyFoul::ExceptionHandler
   #
   # @param [Exception, Hash]
   def self.handle(exception, env)
-    self.new(exception, env).run
+    self.new(exception, clean_env(env)).run
   end
 
   # Uses the Rackless IssueRenderer for a rackless environment

data/lib/party_foul/version.rb

@@ -1,3 +1,3 @@
 module PartyFoul
-  VERSION = '1.2.2'
+  VERSION = '1.3.0'
 end

data/test/generator_test.rb

@@ -8,17 +8,14 @@ class PartyFoul::GeneratorTest < Rails::Generators::TestCase
   test 'it copies the initializer' do
     owner = 'test_owner'
     repo  = 'test_repo'
-    oauth = mock('Oauth')
-    oauth.stubs(:create)
-    oauth.expects(:create).with(scopes: ['repo'], note: 'PartyFoul test_owner/test_repo', note_url: 'http://example.com/test_owner/test_repo').returns(Hashie::Mash.new(token: 'test_token'))
-    github = mock('Github')
-    github.stubs(:oauth).returns(oauth)
-    Github.stubs(:new).with(:login => 'test_login', :password => 'test_password', :endpoint => 'http://api.example.com').returns(github)
+    octokit = mock('Octokit')
+    octokit.expects(:create_authorization).with(scopes: ['repo'], note: 'PartyFoul test_owner/test_repo', note_url: 'http://example.com/test_owner/test_repo').returns(Hashie::Mash.new(token: 'test_token'))
+    Octokit.stubs(:new).with(:login => 'test_login', :password => 'test_password', :api_endpoint => 'http://api.example.com').returns(octokit)
     $stdin.stubs(:gets).returns('test_login').then.returns('test_password').then.returns(owner).then.returns(repo).then.returns('http://api.example.com').then.returns('http://example.com').then.returns('')
     run_generator
 
     assert_file 'config/initializers/party_foul.rb' do |initializer|
-      assert_match(/config\.endpoint\s+=\s'http:\/\/api\.example\.com'/, initializer)
+      assert_match(/config\.api_endpoint\s+=\s'http:\/\/api\.example\.com'/, initializer)
       assert_match(/config\.web_url\s+=\s'http:\/\/example\.com'/, initializer)
       assert_match(/config\.owner\s+=\s'test_owner'/, initializer)
       assert_match(/config\.repo\s+=\s'test_repo'/, initializer)

data/test/party_foul/configure_test.rb

@@ -11,7 +11,7 @@ describe 'Party Foul Confg' do
       config.blacklisted_exceptions = ['StandardError']
       config.oauth_token        = 'test_token'
       config.web_url            = 'http://example.com'
-      config.endpoint           = 'http://api.example.com'
+      config.api_endpoint       = 'http://api.example.com'
       config.owner              = 'test_owner'
       config.repo               = 'test_repo'
       config.branch             = 'master'
@@ -19,11 +19,12 @@ describe 'Party Foul Confg' do
     end
 
     PartyFoul.blacklisted_exceptions.must_equal ['StandardError']
-    PartyFoul.github.must_be_instance_of Github::Client
+    PartyFoul.github.must_be_instance_of Octokit::Client
     PartyFoul.github.oauth_token.must_equal 'test_token'
-    PartyFoul.github.endpoint.must_equal 'http://api.example.com'
+    PartyFoul.github.api_endpoint.must_equal 'http://api.example.com'
     PartyFoul.owner.must_equal 'test_owner'
     PartyFoul.repo.must_equal 'test_repo'
+    PartyFoul.repo_path.must_equal 'test_owner/test_repo'
     PartyFoul.repo_url.must_equal 'http://example.com/test_owner/test_repo'
     PartyFoul.branch.must_equal 'master'
     PartyFoul.comment_limit.must_equal 10

data/test/party_foul/exception_handler_test.rb

@@ -9,13 +9,6 @@ describe 'Party Foul Exception Handler' do
     end
 
     PartyFoul.stubs(:branch).returns('deploy')
-    PartyFoul.github.stubs(:issues).returns(mock('Issues'))
-    PartyFoul.github.stubs(:search).returns(mock('Search'))
-    PartyFoul.github.git_data.references.stubs(:get)
-    PartyFoul.github.issues.stubs(:create)
-    PartyFoul.github.issues.stubs(:edit)
-    PartyFoul.github.issues.stubs(:comments).returns(mock('Comments'))
-    PartyFoul.github.issues.comments.stubs(:create)
     PartyFoul::IssueRenderers::Rails.any_instance.stubs(:title).returns('Test Title')
     PartyFoul::IssueRenderers::Rails.any_instance.stubs(:fingerprint).returns('test_fingerprint')
   end
@@ -24,11 +17,11 @@ describe 'Party Foul Exception Handler' do
     it 'will open a new error on GitHub' do
       PartyFoul::IssueRenderers::Rails.any_instance.stubs(:body).returns('Test Body')
       PartyFoul::IssueRenderers::Rails.any_instance.stubs(:comment).returns('Test Comment')
-      PartyFoul.github.search.stubs(:issues).with(owner: 'test_owner', repo: 'test_repo', keyword: 'test_fingerprint', state: 'open').returns(Hashie::Mash.new(issues: []))
-      PartyFoul.github.search.stubs(:issues).with(owner: 'test_owner', repo: 'test_repo', keyword: 'test_fingerprint', state: 'closed').returns(Hashie::Mash.new(issues: []))
-      PartyFoul.github.issues.expects(:create).with('test_owner', 'test_repo', title: 'Test Title', body: 'Test Body', :labels => ['bug']).returns(Hashie::Mash.new('number' => 1))
-      PartyFoul.github.git_data.references.expects(:get).with('test_owner', 'test_repo', 'heads/deploy').returns(Hashie::Mash.new(object: Hashie::Mash.new(sha: 'abcdefg1234567890')))
-      PartyFoul.github.issues.comments.expects(:create).with('test_owner', 'test_repo', 1, body: 'Test Comment')
+      PartyFoul.github.expects(:search_issues).with('test_owner/test_repo', 'test_fingerprint', 'open').returns([])
+      PartyFoul.github.expects(:search_issues).with('test_owner/test_repo', 'test_fingerprint', 'closed').returns([])
+      PartyFoul.github.expects(:create_issue).with('test_owner/test_repo', 'Test Title', 'Test Body', :labels => ['bug']).returns(Hashie::Mash.new('number' => 1))
+      PartyFoul.github.expects(:references).with('test_owner/test_repo', 'heads/deploy').returns(Hashie::Mash.new(object: Hashie::Mash.new(sha: 'abcdefg1234567890')))
+      PartyFoul.github.expects(:add_comment).with('test_owner/test_repo', 1, 'Test Comment')
       PartyFoul::ExceptionHandler.new(nil, {}).run
     end
 
@@ -44,11 +37,11 @@ describe 'Party Foul Exception Handler' do
       it 'will open a new error on GitHub with the additional labels' do
         PartyFoul::IssueRenderers::Rails.any_instance.stubs(:body).returns('Test Body')
         PartyFoul::IssueRenderers::Rails.any_instance.stubs(:comment).returns('Test Comment')
-        PartyFoul.github.search.stubs(:issues).with(owner: 'test_owner', repo: 'test_repo', keyword: 'test_fingerprint', state: 'open').returns(Hashie::Mash.new(issues: []))
-        PartyFoul.github.search.stubs(:issues).with(owner: 'test_owner', repo: 'test_repo', keyword: 'test_fingerprint', state: 'closed').returns(Hashie::Mash.new(issues: []))
-        PartyFoul.github.issues.expects(:create).with('test_owner', 'test_repo', title: 'Test Title', body: 'Test Body', :labels => ['bug', 'custom', 'label']).returns(Hashie::Mash.new('number' => 1))
-        PartyFoul.github.git_data.references.expects(:get).with('test_owner', 'test_repo', 'heads/deploy').returns(Hashie::Mash.new(object: Hashie::Mash.new(sha: 'abcdefg1234567890')))
-        PartyFoul.github.issues.comments.expects(:create).with('test_owner', 'test_repo', 1, body: 'Test Comment')
+        PartyFoul.github.expects(:search_issues).with('test_owner/test_repo', 'test_fingerprint', 'open').returns([])
+        PartyFoul.github.expects(:search_issues).with('test_owner/test_repo', 'test_fingerprint', 'closed').returns([])
+        PartyFoul.github.expects(:create_issue).with('test_owner/test_repo', 'Test Title', 'Test Body', :labels => ['bug', 'custom', 'label']).returns(Hashie::Mash.new('number' => 1))
+        PartyFoul.github.expects(:references).with('test_owner/test_repo', 'heads/deploy').returns(Hashie::Mash.new(object: Hashie::Mash.new(sha: 'abcdefg1234567890')))
+        PartyFoul.github.expects(:add_comment).with('test_owner/test_repo', 1, 'Test Comment')
         PartyFoul::ExceptionHandler.new(nil, {}).run
       end
     end
@@ -66,27 +59,27 @@ describe 'Party Foul Exception Handler' do
         end
         PartyFoul::IssueRenderers::Rails.any_instance.stubs(:body).returns('Test Body')
         PartyFoul::IssueRenderers::Rails.any_instance.stubs(:comment).returns('Test Comment')
-        PartyFoul.github.search.stubs(:issues).with(owner: 'test_owner', repo: 'test_repo', keyword: 'test_fingerprint', state: 'open').returns(Hashie::Mash.new(issues: []))
-        PartyFoul.github.search.stubs(:issues).with(owner: 'test_owner', repo: 'test_repo', keyword: 'test_fingerprint', state: 'closed').returns(Hashie::Mash.new(issues: []))
-        PartyFoul.github.git_data.references.expects(:get).with('test_owner', 'test_repo', 'heads/deploy').returns(Hashie::Mash.new(object: Hashie::Mash.new(sha: 'abcdefg1234567890')))
-        PartyFoul.github.issues.comments.expects(:create).with('test_owner', 'test_repo', 1, body: 'Test Comment')
+        PartyFoul.github.expects(:search_issues).with('test_owner/test_repo', 'test_fingerprint', 'open').returns([])
+        PartyFoul.github.expects(:search_issues).with('test_owner/test_repo', 'test_fingerprint', 'closed').returns([])
+        PartyFoul.github.expects(:references).with('test_owner/test_repo', 'heads/deploy').returns(Hashie::Mash.new(object: Hashie::Mash.new(sha: 'abcdefg1234567890')))
+        PartyFoul.github.expects(:add_comment).with('test_owner/test_repo', 1, 'Test Comment')
       end
       after do
         clean_up_party
       end
 
       it 'will open a new error on GitHub with the default labels if no additional labels are returned from the proc' do
-        PartyFoul.github.issues.expects(:create).with('test_owner', 'test_repo', title: 'Test Title', body: 'Test Body', :labels => ['bug']).returns(Hashie::Mash.new('number' => 1))
+        PartyFoul.github.expects(:create_issue).with('test_owner/test_repo', 'Test Title', 'Test Body', :labels => ['bug']).returns(Hashie::Mash.new('number' => 1))
         PartyFoul::ExceptionHandler.new(stub(:message => ''), {}).run
       end
 
       it 'will open a new error on GitHub with the additional labels based on the exception message' do
-        PartyFoul.github.issues.expects(:create).with('test_owner', 'test_repo', title: 'Test Title', body: 'Test Body', :labels => ['bug', 'database_error']).returns(Hashie::Mash.new('number' => 1))
+        PartyFoul.github.expects(:create_issue).with('test_owner/test_repo', 'Test Title', 'Test Body', :labels => ['bug', 'database_error']).returns(Hashie::Mash.new('number' => 1))
         PartyFoul::ExceptionHandler.new(stub(:message => 'Database'), {}).run
       end
 
       it 'will open a new error on GitHub with the additional labels based on the env' do
-        PartyFoul.github.issues.expects(:create).with('test_owner', 'test_repo', title: 'Test Title', body: 'Test Body', :labels => ['bug', 'beta']).returns(Hashie::Mash.new('number' => 1))
+        PartyFoul.github.expects(:create_issue).with('test_owner/test_repo', 'Test Title', 'Test Body', :labels => ['bug', 'beta']).returns(Hashie::Mash.new('number' => 1))
         PartyFoul::ExceptionHandler.new(stub(:message => ''), {:http_host => 'beta.example.com'}).run
       end
     end
@@ -100,13 +93,13 @@ describe 'Party Foul Exception Handler' do
 
     context 'and open' do
       before do
-        PartyFoul.github.search.stubs(:issues).with(owner: 'test_owner', repo: 'test_repo', keyword: 'test_fingerprint', state: 'open').returns(Hashie::Mash.new(issues: [{title: 'Test Title', body: 'Test Body', state: 'open', number: 1}]))
-        PartyFoul.github.issues.expects(:edit).with('test_owner', 'test_repo', 1, body: 'New Body', state: 'open')
-        PartyFoul.github.issues.comments.expects(:create).with('test_owner', 'test_repo', 1, body: 'Test Comment')
-        PartyFoul.github.git_data.references.expects(:get).with('test_owner', 'test_repo', 'heads/deploy').returns(Hashie::Mash.new(object: Hashie::Mash.new(sha: 'abcdefg1234567890')))
+        PartyFoul.github.expects(:search_issues).with('test_owner/test_repo', 'test_fingerprint', 'open').returns([Hashie::Mash.new(title: 'Test Title', body: 'Test Body', state: 'open', number: 1)])
+        PartyFoul.github.expects(:update_issue).with('test_owner/test_repo', 1, 'Test Title', 'New Body', state: 'open')
+        PartyFoul.github.expects(:references).with('test_owner/test_repo', 'heads/deploy').returns(Hashie::Mash.new(object: Hashie::Mash.new(sha: 'abcdefg1234567890')))
       end
 
       it 'will update the issue' do
+        PartyFoul.github.expects(:add_comment).with('test_owner/test_repo', 1, 'Test Comment')
         PartyFoul::ExceptionHandler.new(nil, {}).run
       end
 
@@ -115,19 +108,18 @@ describe 'Party Foul Exception Handler' do
           config.comment_limit = 10
         end
         PartyFoul::ExceptionHandler.any_instance.expects(:occurrence_count).returns(10)
-        PartyFoul.github.issues.comments.unstub(:create) # Necessary for the `never` expectation to work.
-        PartyFoul.github.issues.comments.expects(:create).never
+        PartyFoul.github.expects(:add_comment).never
         PartyFoul::ExceptionHandler.new(nil, {}).run
       end
     end
 
     context 'and closed' do
       it 'will update the count on the body and re-open the issue' do
-        PartyFoul.github.search.stubs(:issues).with(owner: 'test_owner', repo: 'test_repo', keyword: 'test_fingerprint', state: 'open').returns(Hashie::Mash.new(issues: []))
-        PartyFoul.github.search.stubs(:issues).with(owner: 'test_owner', repo: 'test_repo', keyword: 'test_fingerprint', state: 'closed').returns(Hashie::Mash.new(issues: [{title: 'Test Title', body: 'Test Body', state: 'closed', number: 1, labels: ['staging']}]))
-        PartyFoul.github.issues.expects(:edit).with('test_owner', 'test_repo', 1, body: 'New Body', state: 'open', labels: ['bug', 'regression', 'staging'])
-        PartyFoul.github.issues.comments.expects(:create).with('test_owner', 'test_repo', 1, body: 'Test Comment')
-        PartyFoul.github.git_data.references.expects(:get).with('test_owner', 'test_repo', 'heads/deploy').returns(Hashie::Mash.new(object: Hashie::Mash.new(sha: 'abcdefg1234567890')))
+        PartyFoul.github.expects(:search_issues).with('test_owner/test_repo', 'test_fingerprint', 'open').returns([])
+        PartyFoul.github.expects(:search_issues).with('test_owner/test_repo', 'test_fingerprint', 'closed').returns([Hashie::Mash.new(title: 'Test Title', body: 'Test Body', state: 'closed', number: 1, labels: ['staging'])])
+        PartyFoul.github.expects(:update_issue).with('test_owner/test_repo', 1, 'Test Title', 'New Body', state: 'open', labels: ['bug', 'regression', 'staging'])
+        PartyFoul.github.expects(:add_comment).with('test_owner/test_repo', 1, 'Test Comment')
+        PartyFoul.github.expects(:references).with('test_owner/test_repo', 'heads/deploy').returns(Hashie::Mash.new(object: Hashie::Mash.new(sha: 'abcdefg1234567890')))
         PartyFoul::ExceptionHandler.new(nil, {}).run
       end
     end
@@ -136,12 +128,12 @@ describe 'Party Foul Exception Handler' do
   context 'when issue is marked as "wontfix"' do
     it 'does nothing' do
       PartyFoul::IssueRenderers::Rails.any_instance.stubs(:body).returns('Test Body')
-      PartyFoul.github.search.stubs(:issues).with(owner: 'test_owner', repo: 'test_repo', keyword: 'test_fingerprint', state: 'open').returns(Hashie::Mash.new(issues: []))
-      PartyFoul.github.search.stubs(:issues).with(owner: 'test_owner', repo: 'test_repo', keyword: 'test_fingerprint', state: 'closed').returns(Hashie::Mash.new(issues: [{title: 'Test Title', body: 'Test Body', state: 'closed', number: 1, 'labels' => ['wontfix']}]))
-      PartyFoul.github.issues.expects(:create).never
-      PartyFoul.github.issues.expects(:edit).never
-      PartyFoul.github.issues.comments.expects(:create).never
-      PartyFoul.github.git_data.references.expects(:get).never
+      PartyFoul.github.expects(:search_issues).with('test_owner/test_repo', 'test_fingerprint', 'open').returns([])
+      PartyFoul.github.expects(:search_issues).with('test_owner/test_repo', 'test_fingerprint', 'closed').returns([Hashie::Mash.new(title: 'Test Title', body: 'Test Body', state: 'closed', number: 1, labels: ['wontfix'])])
+      PartyFoul.github.expects(:create_issue).never
+      PartyFoul.github.expects(:update_issue).never
+      PartyFoul.github.expects(:add_comment).never
+      PartyFoul.github.expects(:references).never
       PartyFoul::ExceptionHandler.new(nil, {}).run
     end
   end

data/test/party_foul/issue_renderers/base_test.rb

@@ -112,4 +112,33 @@ Fingerprint: `abcdefg1234567890`
       rendered_issue.title.must_equal 'Error for #<ClassName:0xXXXXXX>'
     end
   end
+
+  describe '#stack_trace' do
+    it 'returns the stack trace' do
+      exception = mock do
+        stubs backtrace: ['/path/to/gems/gem-name/lib/some/file.rb:123 in `method`']
+      end
+      rendered_issue = PartyFoul::IssueRenderers::Base.new(exception, nil)
+      rendered_issue.stack_trace.must_equal exception.backtrace.first
+    end
+
+    it 'formats the stack trace with shortened bundle paths' do
+      exception = mock do
+        stubs backtrace: ["#{Bundler.bundle_path}/some_gem/lib/some/file.rb:123 in `method`"]
+      end
+      rendered_issue = PartyFoul::IssueRenderers::Base.new(exception, nil)
+      rendered_issue.stack_trace.must_equal '[bundle].../some_gem/lib/some/file.rb:123 in `method`'
+    end
+
+    it 'formats the stack trace with link to shortened application path' do
+      exception = mock do
+        stubs backtrace: ['/path/to/app/lib/some/file.rb:123 in `method`']
+      end
+      rendered_issue = PartyFoul::IssueRenderers::Base.new(exception, nil)
+      rendered_issue.stubs app_root: '/path/to/app'
+      rendered_issue.stack_trace.must_match "<a href='https://github.com/"
+      rendered_issue.stack_trace.must_match ">[app].../lib/some/file.rb:123 in `method`</a>"
+    end
+  end
+
 end

data/test/party_foul/issue_renderers/rails_test.rb

@@ -13,14 +13,27 @@ describe 'Rails Issue Renderer' do
   end
 
   describe '#session' do
+    let(:params) { {'action_dispatch.parameter_filter' => ['password'], 'rack.session' => { 'status' => 'ok', 'password' => 'test' }, 'QUERY_STRING' => { 'status' => 'fail' } } }
+
     before do
-      @rendered_issue = PartyFoul::IssueRenderers::Rails.new(nil, {'action_dispatch.parameter_filter' => ['password'], 'rack.session' => { 'status' => 'ok', 'password' => 'test' }, 'QUERY_STRING' => { 'status' => 'fail' } })
+      @rendered_issue = PartyFoul::IssueRenderers::Rails.new(nil, params)
     end
 
     it 'returns ok' do
       @rendered_issue.session['status'].must_equal 'ok'
       @rendered_issue.session['password'].must_equal '[FILTERED]'
     end
+
+    context "without session" do
+
+      let(:params) { {'action_dispatch.parameter_filter' => ['password'], 'QUERY_STRING' => { 'status' => 'fail' } } }
+
+      it 'returns empty hash' do
+        @rendered_issue.session.must_be_empty
+      end
+    end
+
+
   end
 
   describe '#raw_title' do

data/test/test_helper.rb

@@ -6,12 +6,13 @@ else
   require 'minitest/autorun'
 end
 begin
-  require 'debugger'
+  require 'byebug'
 rescue LoadError
 end
 require 'rack/test'
 require 'mocha/setup'
 require 'party_foul'
+require 'hashie/mash'
 
 class MiniTest::Spec
   class << self
@@ -24,7 +25,7 @@ module MiniTest::Expectations
 end
 
 def clean_up_party
-  %w{github oauth_token endpoint owner repo blacklisted_exceptions processor web_url branch additional_labels comment_limit}.each do |attr|
+  %w{github oauth_token api_endpoint owner repo blacklisted_exceptions processor web_url branch additional_labels comment_limit}.each do |attr|
     PartyFoul.send("#{attr}=", nil)
   end
 end

data/test/tmp/config/initializers/party_foul.rb

@@ -6,9 +6,9 @@ PartyFoul.configure do |config|
   # The OAuth token for the account that is opening the issues on GitHub
   config.oauth_token            = 'test_token'
 
-  # The API endpoint for GitHub. Unless you are hosting a private
+  # The API api_endpoint for GitHub. Unless you are hosting a private
   # instance of Enterprise GitHub you do not need to include this
-  config.endpoint               = 'http://api.example.com'
+  config.api_endpoint           = 'http://api.example.com'
 
   # The Web URL for GitHub. Unless you are hosting a private
   # instance of Enterprise GitHub you do not need to include this

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: party_foul
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Brian Cardarella
@@ -9,78 +9,78 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: github_api
+  name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0.b1
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0.b1
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0.b1
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0.b1
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0.b1
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0.b1
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -137,7 +137,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Auto-submit Rails exceptions as new isues on GitHub
+description: Auto-submit Rails exceptions as new issues on GitHub
 email:
 - bcardarella@gmail.com
 - rubygems@danmcclain.net
@@ -187,7 +187,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '1.9'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -195,10 +195,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: Auto-submit Rails exceptions as new isues on GitHub
+summary: Auto-submit Rails exceptions as new issues on GitHub
 test_files:
 - test/generator_test.rb
 - test/party_foul/configure_test.rb