problem_child 2.1.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23e61aafef42b2d8a22e1eb9cd300108f808d714
-  data.tar.gz: 6dfde2eafb3c1ef44074c76aa94eafea6abfca5e
+  metadata.gz: 3ced371fbdeea3928bd926e3f1af3e9f472b18c5
+  data.tar.gz: 9b4d65b7429a1bbce244ba69b93ec9533e0bf761
 SHA512:
-  metadata.gz: 628253249fe3d9b38f2cace36492c6c9b5752035fca94e98413617d4c811a8822dce803f11da8e7929161fbffdd8009a3a864a61f3d86901542f37370e1c7736
-  data.tar.gz: fc1bbf214d479260fcfc852b935f9e1d9a25df0048f71eae79c7ed4384cd0bf939d7cbd6b8c014474abc4188a6560bc229d499fa207ca1bad1f756e0f76eac43
+  metadata.gz: 66c12bc11831546f120a1d7a4c315c4fdfddcc78d9e8cad3cfccf5b7e3e49a4b36663b59078037f385801c2eb1a21411b9355c0b2b47ae98eae9863ab3bc4545
+  data.tar.gz: eaad18bf0333c3e90c11b89576417b1851f3fe90f4f4d1b2cf0455e0ddeb5162ed4f66c4d55d8e9862bb58063e2c6f5785582900b6af94c4f2374197b51d7150

data/.rubocop.yml

@@ -0,0 +1,11 @@
+Metrics/LineLength:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false

data/README.md

@@ -22,14 +22,6 @@ run ProblemChild::App
 
 Then, follow the configuration options below.
 
-## Requirements
-
-If you have OAuth (e.g., non-anonymous submission), you'll need to have [Redis](http://redis.io/) running to properly maintain sessions and support submissions larger than 4k:
-
-On OS X, run `brew install redis` to install, followed by `redis-server` to run the redis server. The site should work fine, but for tests to pass, you'll want to add `REDIS_URL=redis://localhost:6379` to your `.env` file.
-
-On Heroku you'll want to run `heroku addons:create heroku-redis:hobby-dev` to add a free Redis instance to your app (Heroku will set `REDIS_URL` for you).
-
 ## Configuring
 
 First, you must set the following environmental variable:

data/Rakefile

@@ -1,8 +1,8 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
-desc "Run specs"
+desc 'Run specs'
 RSpec::Core::RakeTask.new do |t|
   t.pattern = 'spec/**/*_spec.rb'
-  t.rspec_opts = ["--order", "rand", "--color"]
+  t.rspec_opts = ['--order', 'rand', '--color']
 end

data/config.ru

@@ -1,3 +1,3 @@
-require "problem_child"
+require 'problem_child'
 
 run ProblemChild::App

data/lib/problem_child/helpers.rb

@@ -1,56 +1,55 @@
 module ProblemChild
   module Helpers
-
     def repo
-      ENV["GITHUB_REPO"]
+      ENV['GITHUB_REPO']
     end
 
     def anonymous_submissions?
-      !!(ENV["GITHUB_TOKEN"] && !ENV["GITHUB_TOKEN"].to_s.empty?)
+      !ENV['GITHUB_TOKEN'].to_s.empty?
     end
 
     def token
       if anonymous_submissions?
-        ENV["GITHUB_TOKEN"]
+        ENV['GITHUB_TOKEN']
       elsif !github_user.nil?
         github_user.token
       end
     end
 
     def client
-      @client ||= Octokit::Client.new :access_token => token
+      @client ||= Octokit::Client.new access_token: token
     end
 
-    def render_template(template, locals={})
-      halt erb template, :layout => :layout, :locals => locals.merge({ :template => template })
+    def render_template(template, locals = {})
+      halt erb template, layout: :layout, locals: locals.merge(template: template)
     end
 
     def issue_title
-      form_data["title"]
+      form_data['title']
     end
 
     def issue_body
-      form_data.reject { |key, value| key == "title" || value.empty? || key == "labels" || value.is_a?(Hash) }.map { |key,value| "* **#{key.humanize}**: #{value}"}.join("\n")
+      form_data.reject { |key, value| key == 'title' || value.empty? || key == 'labels' || value.is_a?(Hash) }.map { |key, value| "* **#{key.humanize}**: #{value}" }.join("\n")
     end
 
     # abstraction to allow cached form data to be used in place of default params
     def form_data
-      session["form_data"].nil? ? params : JSON.parse(session["form_data"])
+      session['form_data'].nil? ? params : JSON.parse(session['form_data'])
     end
 
     def labels
-      form_data["labels"].join(",") if form_data["labels"]
+      form_data['labels'].join(',') if form_data['labels']
     end
 
     def uploads
-      form_data.select do |key, value|
-        value.is_a?(Hash) && ( value.has_key?("filename") || value.has_key?(:filename) )
+      form_data.select do |_key, value|
+        value.is_a?(Hash) && value.key?(:tempfile) && value[:tempfile].is_a?(Tempfile)
       end
     end
 
     def create_issue
-      issue = client.create_issue(repo, form_data["title"], issue_body, :labels => labels)
-      issue["number"] if issue
+      issue = client.create_issue(repo, form_data['title'], issue_body, labels: labels)
+      issue['number'] if issue
     end
 
     # Returns array of Octokit branch objects
@@ -72,11 +71,11 @@ module ProblemChild
     # Starts with patch-1 and keeps going until it finds one not taken
     def patch_branch
       num = 1
-      branch_name = form_data["title"].parameterize
+      branch_name = form_data['title'].parameterize
       return branch_name unless branch_exists?(branch_name)
       branch = "#{branch_name}-#{num}"
-      while branch_exists?(branch) do
-        num = num + 1
+      while branch_exists?(branch)
+        num += 1
         branch = "#{branch_name}-#{num}"
       end
       branch
@@ -95,32 +94,25 @@ module ProblemChild
         uploads.each do |key, upload|
           client.create_contents(
             repo,
-            upload["filename"],
-            "Create #{upload["filename"]}",
-            session["file_#{key}"],
-            :branch => branch
+            upload[:filename],
+            "Create #{upload[:filename]}",
+            branch: branch,
+            file: upload[:tempfile]
           )
           session["file_#{key}"] = nil
         end
       end
-      pr = client.create_pull_request(repo, "master", branch, form_data["title"], issue_body, :labels => labels)
-      pr["number"] if pr
+      pr = client.create_pull_request(repo, 'master', branch, form_data['title'], issue_body, labels: labels)
+      pr['number'] if pr
     end
 
     def repo_access?
       return true unless anonymous_submissions?
-      !client.repository(repo)["private"]
+      !client.repository(repo)['private']
     rescue
       false
     end
 
-    def cache_form_data
-      uploads.each do |key, upload|
-        session["file_#{key}"] = File.open(upload[:tempfile]).read
-      end
-      session[:form_data] = params.to_json
-    end
-
     def auth!
       if anonymous_submissions?
         true
@@ -129,8 +121,7 @@ module ProblemChild
       elsif ENV['GITHUB_ORG_ID']
         github_organization_authenticate!(ENV['GITHUB_ORG_ID'])
       else
-        raise "Must define GITHUB_TEAM_ID, GITHUB_ORG_ID, OR GITHUB_TOKEN"
-        halt 401
+        raise 'Must define GITHUB_TEAM_ID, GITHUB_ORG_ID, OR GITHUB_TOKEN'
       end
     end
   end

data/lib/problem_child/version.rb

@@ -1,3 +1,3 @@
 module ProblemChild
-  VERSION = "2.1.1"
+  VERSION = '3.0.0'.freeze
 end

data/lib/problem_child.rb

@@ -3,21 +3,18 @@ require 'sinatra'
 require 'sinatra_auth_github'
 require 'dotenv'
 require 'json'
-require 'redis'
-require 'rack/session/moneta'
 require 'active_support'
 require 'active_support/core_ext/string'
-require "problem_child/version"
-require "problem_child/helpers"
+require 'problem_child/version'
+require 'problem_child/helpers'
 
 module ProblemChild
-
   def self.root
-    File.expand_path "./problem_child", File.dirname(__FILE__)
+    File.expand_path './problem_child', File.dirname(__FILE__)
   end
 
   def self.views_dir
-    @views_dir ||= File.expand_path "views", ProblemChild.root
+    @views_dir ||= File.expand_path 'views', ProblemChild.root
   end
 
   def self.views_dir=(dir)
@@ -25,7 +22,7 @@ module ProblemChild
   end
 
   def self.public_dir
-    @public_dir ||= File.expand_path "public", ProblemChild.root
+    @public_dir ||= File.expand_path 'public', ProblemChild.root
   end
 
   def self.public_dir=(dir)
@@ -33,18 +30,12 @@ module ProblemChild
   end
 
   class App < Sinatra::Base
-
     include ProblemChild::Helpers
 
-    set :github_options, {
-      :scopes => "repo,read:org"
-    }
+    set :github_options, scopes: 'repo,read:org'
 
-    if ENV["REDIS_URL"] && !ENV["REDIS_URL"].to_s.empty?
-      use Rack::Session::Moneta, store: :Redis, url: ENV["REDIS_URL"]
-    else
-      use Rack::Session::Cookie
-    end
+    use Rack::Session::Cookie, http_only: true,
+                               secret:    ENV['SESSION_SECRET'] || SecureRandom.hex
 
     configure :production do
       require 'rack-ssl-enforcer'
@@ -54,34 +45,32 @@ module ProblemChild
     ENV['WARDEN_GITHUB_VERIFIER_SECRET'] ||= SecureRandom.hex
     register Sinatra::Auth::Github
 
-    set :views, Proc.new { ProblemChild.views_dir }
-    set :root,  Proc.new { ProblemChild.root }
-    set :public_folder, Proc.new { ProblemChild.public_dir }
+    set :views, proc { ProblemChild.views_dir }
+    set :root,  proc { ProblemChild.root }
+    set :public_folder, proc { ProblemChild.public_dir }
 
-    get "/" do
+    get '/' do
       flash = nil
       issue = nil
       access = false
 
-      if session[:form_data]
-        if issue_title.empty?
-          flash = 'Please enter a title.'
-        else
-          issue = uploads.empty? ? create_issue : create_pull_request
-          session[:form_data] = nil
-          access = repo_access?
-        end
-      else
-        auth!
-      end
+      auth!
 
-      halt erb :form, :layout => :layout, :locals => { :repo => repo, :anonymous => anonymous_submissions?, :flash => flash, :issue => issue, :access => access }
+      halt erb :form, layout: :layout, locals: { repo: repo, anonymous: anonymous_submissions?, flash: flash, issue: issue, access: access }
     end
 
-    post "/" do
-      cache_form_data
+    post '/' do
       auth! unless anonymous_submissions?
-      halt redirect "/"
+
+      if issue_title.empty?
+        flash = 'Please enter a title.'
+      else
+        issue = uploads.empty? ? create_issue : create_pull_request
+        session[:form_data] = nil
+        access = repo_access?
+      end
+
+      halt erb :form, layout: :layout, locals: { repo: repo, anonymous: anonymous_submissions?, flash: flash, issue: issue, access: access }
     end
   end
 end

data/problem_child.gemspec

@@ -4,34 +4,33 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'problem_child/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "problem_child"
+  spec.name          = 'problem_child'
   spec.version       = ProblemChild::VERSION
-  spec.authors       = ["Ben Balter"]
-  spec.email         = ["ben.balter@github.com"]
-  spec.summary       = "Allows authenticated or anonymous users to fill out a standard web form to creat GitHub issues."
-  spec.homepage      = "https://github.com/benbalter/problem_child"
-  spec.license       = "MIT"
+  spec.authors       = ['Ben Balter']
+  spec.email         = ['ben.balter@github.com']
+  spec.summary       = 'Allows authenticated or anonymous users to fill out a standard web form to creat GitHub issues.'
+  spec.homepage      = 'https://github.com/benbalter/problem_child'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "sinatra", "~> 1.4"
-  spec.add_dependency "octokit", "~> 3.7"
-  spec.add_dependency "dotenv", "~> 1.0"
-  spec.add_dependency "rack-ssl-enforcer", "~> 0.2"
-  spec.add_dependency "sinatra_auth_github", "~> 1.0"
-  spec.add_dependency "activesupport", "~> 4.2"
-  spec.add_dependency "rack", "1.6"
-  spec.add_dependency "redis", "~> 3.2"
-  spec.add_dependency "moneta", "~> 0.8"
+  spec.add_dependency 'sinatra', '~> 1.4'
+  spec.add_dependency 'octokit', '~> 3.7'
+  spec.add_dependency 'dotenv', '~> 1.0'
+  spec.add_dependency 'rack-ssl-enforcer', '~> 0.2'
+  spec.add_dependency 'sinatra_auth_github', '~> 1.0'
+  spec.add_dependency 'activesupport', '~> 4.2'
+  spec.add_dependency 'rack', '1.6'
 
-  spec.add_development_dependency "rspec", "~> 3.1"
-  spec.add_development_dependency "rack-test", "~> 0.6"
-  spec.add_development_dependency "webmock", "~> 1.2 "
-  spec.add_development_dependency "foreman", "~> 0.77"
-  spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake", "~> 10.4"
-  spec.add_development_dependency "pry", "~> 0.10"
+  spec.add_development_dependency 'rspec', '~> 3.1'
+  spec.add_development_dependency 'rack-test', '~> 0.6'
+  spec.add_development_dependency 'webmock', '~> 1.2 '
+  spec.add_development_dependency 'foreman', '~> 0.77'
+  spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency 'rake', '~> 10.4'
+  spec.add_development_dependency 'pry', '~> 0.10'
+  spec.add_development_dependency 'rubocop', '~> 0.41'
 end

data/script/cibuild

@@ -2,4 +2,5 @@
 
 set -e
 bundle exec rake spec
+bundle exec rubocop -S -D
 bundle exec gem build problem_child.gemspec

data/spec/problem_child_helpers_spec.rb

@@ -1,98 +1,84 @@
-require "spec_helper"
-
-describe "ProblemChild::Helpers" do
+require 'spec_helper'
 
+describe 'ProblemChild::Helpers' do
   class TestHelper
     include ProblemChild::Helpers
 
     attr_accessor :session, :params
 
-    def initialize(path=nil)
+    def initialize(path = nil)
       @path = path
     end
 
     def request
-      Rack::Request.new("PATH_INFO" => @path)
+      Rack::Request.new('PATH_INFO' => @path)
     end
   end
 
   before(:each) do
-   @helper = TestHelper.new
-   @helper.session = {}
-   @helper.params = {}
+    @helper = TestHelper.new
+    @helper.session = {}
+    @helper.params = {}
   end
 
-  it "knows the github repo" do
-    with_env "GITHUB_REPO", "foo/bar" do
-      expect(@helper.repo).to eql("foo/bar")
+  it 'knows the github repo' do
+    with_env 'GITHUB_REPO', 'foo/bar' do
+      expect(@helper.repo).to eql('foo/bar')
     end
   end
 
-  it "knows to allow anonymous submisssions when a token is passed" do
-    with_env "GITHUB_TOKEN", "asdf" do
+  it 'knows to allow anonymous submisssions when a token is passed' do
+    with_env 'GITHUB_TOKEN', 'asdf' do
       expect(@helper.anonymous_submissions?).to be(true)
     end
 
-    with_env "GITHUB_TOKEN", "" do
+    with_env 'GITHUB_TOKEN', '' do
       expect(@helper.anonymous_submissions?).to be(false)
     end
   end
 
-  it "knows not to allow anonymous submisssions when no token is passed" do
-    with_env "GITHUB_TOKEN", "" do
+  it 'knows not to allow anonymous submisssions when no token is passed' do
+    with_env 'GITHUB_TOKEN', '' do
       expect(@helper.anonymous_submissions?).to be(false)
     end
 
-    with_env "GITHUB_TOKEN", nil do
+    with_env 'GITHUB_TOKEN', nil do
       expect(@helper.anonymous_submissions?).to be(false)
     end
   end
 
-  it "uses a token if passed" do
-    with_env "GITHUB_TOKEN", "asdf" do
-      expect(@helper.token).to eql("asdf")
+  it 'uses a token if passed' do
+    with_env 'GITHUB_TOKEN', 'asdf' do
+      expect(@helper.token).to eql('asdf')
     end
   end
 
-  it "inits the octokit client" do
-    with_env "GITHUB_TOKEN", "asdf" do
+  it 'inits the octokit client' do
+    with_env 'GITHUB_TOKEN', 'asdf' do
       expect(@helper.client.class).to eql(Octokit::Client)
-      expect(@helper.client.access_token).to eql("asdf")
+      expect(@helper.client.access_token).to eql('asdf')
     end
   end
 
-  it "caches the form data" do
-    @helper.params = {"title" => "title", "foo" => "bar"}
-    @helper.cache_form_data
-    expect(@helper.form_data["foo"]).to eql("bar")
-  end
-
-  it "grabs the form data from the session" do
-    expected = {"title" => "title", "foo" => "bar"}
-    @helper.session["form_data"] = expected.to_json
-    expect(@helper.form_data).to eql(expected)
-  end
-
-  it "grabs the form data when posted" do
-    expected = {"title" => "title", "foo" => "bar"}
+  it 'grabs the form data when posted' do
+    expected = { 'title' => 'title', 'foo' => 'bar' }
     @helper.params = expected
     expect(@helper.form_data).to eql(expected)
   end
 
-  it "builds the issue body" do
-    expected = {"title" => "title", "foo" => "bar"}
+  it 'builds the issue body' do
+    expected = { 'title' => 'title', 'foo' => 'bar' }
     @helper.params = expected
-    expect(@helper.issue_body).to eql("* **Foo**: bar")
+    expect(@helper.issue_body).to eql('* **Foo**: bar')
   end
 
-  it "submits the issue" do
-    @helper.params = {"title" => "title", "foo" => "bar", "labels" => ["foo", "bar"]}
-    with_env "GITHUB_TOKEN", "1234" do
-      with_env "GITHUB_REPO", "benbalter/test-repo-ignore-me" do
-
-        stub = stub_request(:post, "https://api.github.com/repos/benbalter/test-repo-ignore-me/issues").
-          with(:body => "{\"labels\":[\"foo\",\"bar\"],\"title\":\"title\",\"body\":\"* **Foo**: bar\"}").
-          to_return(:status => 200, :body => '{"number": 1234}', :headers => { 'Content-Type' => 'application/json' })
+  it 'submits the issue' do
+    @helper.params = { 'title' => 'title', 'foo' => 'bar', 'labels' => %w(foo bar) }
+    with_env 'GITHUB_TOKEN', '1234' do
+      with_env 'GITHUB_REPO', 'benbalter/test-repo-ignore-me' do
+        stub = stub_request(:post, 'https://api.github.com/repos/benbalter/test-repo-ignore-me/issues')
+               .with(body: '{"labels":["foo","bar"],"title":"title","body":"* **Foo**: bar"}')
+               .to_return(status: 200, body: '{"number": 1234}', headers: { 'Content-Type' => 'application/json' })
 
         expect(@helper.create_issue).to eql(1234)
         expect(stub).to have_been_requested
@@ -101,158 +87,165 @@ describe "ProblemChild::Helpers" do
   end
 
   it "knows auth'd users can access a repo" do
-    stub_request(:get, "https://api.github.com/repos/benbalter/test-repo-ignore-me").
-      to_return(:status => 200, :body => '{"private": true}', :headers => { 'Content-Type' => 'application/json' })
+    stub_request(:get, 'https://api.github.com/repos/benbalter/test-repo-ignore-me')
+      .to_return(status: 200, body: '{"private": true}', headers: { 'Content-Type' => 'application/json' })
 
-    with_env "GITHUB_TOKEN", nil do
-      with_env "GITHUB_REPO", "benbalter/test-repo-ignore-me" do
+    with_env 'GITHUB_TOKEN', nil do
+      with_env 'GITHUB_REPO', 'benbalter/test-repo-ignore-me' do
         expect(@helper.repo_access?).to eql(true)
       end
     end
   end
 
-  it "knows anonymous users can access public repos" do
-    stub_request(:get, "https://api.github.com/repos/benbalter/test-repo-ignore-me").
-      to_return(:status => 200, :body => '{"private": false}', :headers => { 'Content-Type' => 'application/json' })
+  it 'knows anonymous users can access public repos' do
+    stub_request(:get, 'https://api.github.com/repos/benbalter/test-repo-ignore-me')
+      .to_return(status: 200, body: '{"private": false}', headers: { 'Content-Type' => 'application/json' })
 
-    with_env "GITHUB_TOKEN", "1234" do
-      with_env "GITHUB_REPO", "benbalter/test-repo-ignore-me" do
+    with_env 'GITHUB_TOKEN', '1234' do
+      with_env 'GITHUB_REPO', 'benbalter/test-repo-ignore-me' do
         expect(@helper.repo_access?).to eql(true)
       end
     end
   end
 
   it "knows anonymous users can't access private repos" do
-    stub_request(:get, "https://api.github.com/repos/benbalter/test-repo-ignore-me").
-      to_return(:status => 200, :body => '{"private": true}', :headers => { 'Content-Type' => 'application/json' })
+    stub_request(:get, 'https://api.github.com/repos/benbalter/test-repo-ignore-me')
+      .to_return(status: 200, body: '{"private": true}', headers: { 'Content-Type' => 'application/json' })
 
-    with_env "GITHUB_TOKEN", "1234" do
-      with_env "GITHUB_REPO", "benbalter/test-repo-ignore-me" do
+    with_env 'GITHUB_TOKEN', '1234' do
+      with_env 'GITHUB_REPO', 'benbalter/test-repo-ignore-me' do
         expect(@helper.repo_access?).to eql(false)
       end
     end
   end
 
-  it "knows the labels" do
-    @helper.params["labels"] = ["foo", "bar"]
-    expect(@helper.labels).to eql("foo,bar")
+  it 'knows the labels' do
+    @helper.params['labels'] = %w(foo bar)
+    expect(@helper.labels).to eql('foo,bar')
   end
 
-  context "uploads" do
-    it "can identify uploads" do
-      @helper.params = {"title" => "title", "file" => { :filename => "foo.md"} }
-      expect(@helper.uploads.first[0]).to eql("file")
+  context 'uploads' do
+    it 'can identify uploads' do
+      Tempfile.open do |tempfile|
+        tempfile.write("FOO\n")
+        tempfile.rewind
+        file = { filename: 'foo.md', tempfile: tempfile }
+        @helper.params = { 'title' => 'title', 'file' => file }
+        expect(@helper.uploads.first[0]).to eql('file')
+      end
     end
 
-    it "fetches the branches" do
-      stub_request(:get, "https://api.github.com/repos/benbalter/test-repo-ignore-me/branches").
-         to_return(:status => 200, :body => [{ :name => "master", :commit => { :sha => "1" } }])
+    it 'fetches the branches' do
+      stub_request(:get, 'https://api.github.com/repos/benbalter/test-repo-ignore-me/branches')
+        .to_return(status: 200, body: [{ name: 'master', commit: { sha: '1' } }])
 
-      with_env "GITHUB_TOKEN", "1234" do
-        with_env "GITHUB_REPO", "benbalter/test-repo-ignore-me" do
-          expect(@helper.branches[0][:name]).to eql("master")
+      with_env 'GITHUB_TOKEN', '1234' do
+        with_env 'GITHUB_REPO', 'benbalter/test-repo-ignore-me' do
+          expect(@helper.branches[0][:name]).to eql('master')
         end
       end
     end
 
-    it "fetches the base sha" do
-      stub_request(:get, "https://api.github.com/repos/benbalter/test-repo-ignore-me/branches").
-         to_return(:status => 200, :body => [{ :name => "master", :commit => { :sha => "123" } }])
+    it 'fetches the base sha' do
+      stub_request(:get, 'https://api.github.com/repos/benbalter/test-repo-ignore-me/branches')
+        .to_return(status: 200, body: [{ name: 'master', commit: { sha: '123' } }])
 
-         stub_request(:get, "https://api.github.com/repos/benbalter/test-repo-ignore-me").
-            to_return(:status => 200, :body => {:default_branch => "master"}.to_json,
-            :headers => { "Content-Type" => "application/json" })
+      stub_request(:get, 'https://api.github.com/repos/benbalter/test-repo-ignore-me')
+        .to_return(status: 200, body: { default_branch: 'master' }.to_json,
+                   headers: { 'Content-Type' => 'application/json' })
 
-      with_env "GITHUB_TOKEN", "1234" do
-        with_env "GITHUB_REPO", "benbalter/test-repo-ignore-me" do
-          expect(@helper.base_sha).to eql("123")
+      with_env 'GITHUB_TOKEN', '1234' do
+        with_env 'GITHUB_REPO', 'benbalter/test-repo-ignore-me' do
+          expect(@helper.base_sha).to eql('123')
         end
       end
     end
 
-    it "knows if a branch exists" do
-      stub_request(:get, "https://api.github.com/repos/benbalter/test-repo-ignore-me/branches").
-         to_return(:status => 200, :body => [{ :name => "master", :commit => { :sha => "123" } }].to_json,
-         :headers => { "Content-Type" => "application/json" })
+    it 'knows if a branch exists' do
+      stub_request(:get, 'https://api.github.com/repos/benbalter/test-repo-ignore-me/branches')
+        .to_return(status: 200, body: [{ name: 'master', commit: { sha: '123' } }].to_json,
+                   headers: { 'Content-Type' => 'application/json' })
 
-      with_env "GITHUB_TOKEN", "1234" do
-        with_env "GITHUB_REPO", "benbalter/test-repo-ignore-me" do
-          expect(@helper.branch_exists?("master")).to eql(true)
-          expect(@helper.branch_exists?("master2")).to eql(false)
+      with_env 'GITHUB_TOKEN', '1234' do
+        with_env 'GITHUB_REPO', 'benbalter/test-repo-ignore-me' do
+          expect(@helper.branch_exists?('master')).to eql(true)
+          expect(@helper.branch_exists?('master2')).to eql(false)
         end
       end
     end
 
-    it "creates the branch name" do
-      stub_request(:get, "https://api.github.com/repos/benbalter/test-repo-ignore-me/branches").
-         to_return(:status => 200, :body => [{ :name => "master", :commit => { :sha => "123" } }].to_json,
-         :headers => { "Content-Type" => "application/json" })
+    it 'creates the branch name' do
+      stub_request(:get, 'https://api.github.com/repos/benbalter/test-repo-ignore-me/branches')
+        .to_return(status: 200, body: [{ name: 'master', commit: { sha: '123' } }].to_json,
+                   headers: { 'Content-Type' => 'application/json' })
 
-      with_env "GITHUB_TOKEN", "1234" do
-        with_env "GITHUB_REPO", "benbalter/test-repo-ignore-me" do
-          @helper.params = {"title" => "My title" }
-          expect(@helper.patch_branch).to eql("my-title")
+      with_env 'GITHUB_TOKEN', '1234' do
+        with_env 'GITHUB_REPO', 'benbalter/test-repo-ignore-me' do
+          @helper.params = { 'title' => 'My title' }
+          expect(@helper.patch_branch).to eql('my-title')
 
-          @helper.params = {"title" => "master" }
-          expect(@helper.patch_branch).to eql("master-1")
+          @helper.params = { 'title' => 'master' }
+          expect(@helper.patch_branch).to eql('master-1')
         end
       end
     end
 
-    it "creates a branch" do
-      stub_request(:get, "https://api.github.com/repos/benbalter/test-repo-ignore-me").
-         to_return(:status => 200, :body => {:default_branch => "master"}.to_json,
-         :headers => { "Content-Type" => "application/json" })
+    it 'creates a branch' do
+      stub_request(:get, 'https://api.github.com/repos/benbalter/test-repo-ignore-me')
+        .to_return(status: 200, body: { default_branch: 'master' }.to_json,
+                   headers: { 'Content-Type' => 'application/json' })
 
-       stub_request(:get, "https://api.github.com/repos/benbalter/test-repo-ignore-me/branches").
-          to_return(:status => 200, :body => [{ :name => "master", :commit => { :sha => "123" } }].to_json,
-          :headers => { "Content-Type" => "application/json" })
+      stub_request(:get, 'https://api.github.com/repos/benbalter/test-repo-ignore-me/branches')
+        .to_return(status: 200, body: [{ name: 'master', commit: { sha: '123' } }].to_json,
+                   headers: { 'Content-Type' => 'application/json' })
 
-      stub = stub_request(:post, "https://api.github.com/repos/benbalter/test-repo-ignore-me/git/refs").
-         with(:body => "{\"ref\":\"refs/heads/my-branch\",\"sha\":\"123\"}")
+      stub = stub_request(:post, 'https://api.github.com/repos/benbalter/test-repo-ignore-me/git/refs')
+             .with(body: '{"ref":"refs/heads/my-branch","sha":"123"}')
 
-      with_env "GITHUB_TOKEN", "1234" do
-        with_env "GITHUB_REPO", "benbalter/test-repo-ignore-me" do
-          @helper.create_branch("my-branch")
+      with_env 'GITHUB_TOKEN', '1234' do
+        with_env 'GITHUB_REPO', 'benbalter/test-repo-ignore-me' do
+          @helper.create_branch('my-branch')
           expect(stub).to have_been_requested
         end
       end
     end
 
-    it "caches uploads" do
-      path = File.expand_path "./fixtures/file.txt", File.dirname(__FILE__)
-      @helper.params = { "title" => "title", "some_file" => { :filename => "file.txt", :tempfile => path } }
-      @helper.cache_form_data
-      expect(@helper.session["file_some_file"]).to eql("FOO\n")
-    end
-
-    it "creates the pull request" do
-      stub_request(:get, "https://api.github.com/repos/benbalter/test-repo-ignore-me").
-         to_return(:status => 200, :body => {:default_branch => "master"}.to_json,
-         :headers => { "Content-Type" => "application/json" })
-
-       stub_request(:get, "https://api.github.com/repos/benbalter/test-repo-ignore-me/branches").
-          to_return(:status => 200, :body => [{ :name => "master", :commit => { :sha => "123" } }].to_json,
-          :headers => { "Content-Type" => "application/json" })
-
-      stub_request(:post, "https://api.github.com/repos/benbalter/test-repo-ignore-me/git/refs").
-         with(:body => "{\"ref\":\"refs/heads/title\",\"sha\":\"123\"}").
-         to_return(:status => 200)
-
-      push = stub_request(:put, "https://api.github.com/repos/benbalter/test-repo-ignore-me/contents/").
-         with(:body => "{\"branch\":\"title\",\"content\":\"Rk9PCg==\",\"message\":\"Create \"}")
-
-      pr = stub_request(:post, "https://api.github.com/repos/benbalter/test-repo-ignore-me/pulls").
-         with(:body => "{\"labels\":null,\"base\":\"master\",\"head\":\"title\",\"title\":\"title\",\"body\":\"* **Foo**: bar\"}")
-
-      with_env "GITHUB_TOKEN", "1234" do
-        with_env "GITHUB_REPO", "benbalter/test-repo-ignore-me" do
-          path = File.expand_path "./fixtures/file.txt", File.dirname(__FILE__)
-          @helper.params = { "title" => "title", "some_file" => { :filename => "file.txt", :tempfile => path }, "foo" => "bar" }
-          @helper.cache_form_data
-          @helper.create_pull_request
-          expect(push).to have_been_requested
-          expect(pr).to have_been_requested
+    it 'creates the pull request' do
+      stub_request(:get, 'https://api.github.com/repos/benbalter/test-repo-ignore-me')
+        .to_return(status: 200, body: { default_branch: 'master' }.to_json,
+                   headers: { 'Content-Type' => 'application/json' })
+
+      stub_request(:get, 'https://api.github.com/repos/benbalter/test-repo-ignore-me/branches')
+        .to_return(status: 200, body: [{ name: 'master', commit: { sha: '123' } }].to_json,
+                   headers: { 'Content-Type' => 'application/json' })
+
+      stub_request(:post, 'https://api.github.com/repos/benbalter/test-repo-ignore-me/git/refs')
+        .with(body: '{"ref":"refs/heads/title","sha":"123"}')
+        .to_return(status: 200)
+
+      push = stub_request(:put, 'https://api.github.com/repos/benbalter/test-repo-ignore-me/contents/file.txt')
+             .with(body: {
+               branch: 'title',
+               content: 'Rk9PCg==',
+               message: 'Create file.txt'
+             }.to_json)
+
+      pr = stub_request(:post, 'https://api.github.com/repos/benbalter/test-repo-ignore-me/pulls')
+           .with(body: '{"labels":null,"base":"master","head":"title","title":"title","body":"* **Foo**: bar"}')
+
+      with_env 'GITHUB_TOKEN', '1234' do
+        with_env 'GITHUB_REPO', 'benbalter/test-repo-ignore-me' do
+          Tempfile.open do |tempfile|
+            tempfile.write("FOO\n")
+            tempfile.rewind
+            @helper.params = { 'title' => 'title', 'some_file' => {
+              filename: 'file.txt',
+              tempfile: tempfile
+            }, 'foo' => 'bar' }
+            @helper.create_pull_request
+            expect(push).to have_been_requested
+            expect(pr).to have_been_requested
+          end
         end
       end
     end

data/spec/problem_child_spec.rb

@@ -1,34 +1,33 @@
-require "spec_helper"
+require 'spec_helper'
 
-describe "ProblemChild" do
-  it "knows the root" do
-   expected = File.expand_path "../lib/problem_child", File.dirname(__FILE__)
-   expect(ProblemChild.root).to eql(expected)
+describe 'ProblemChild' do
+  it 'knows the root' do
+    expected = File.expand_path '../lib/problem_child', File.dirname(__FILE__)
+    expect(ProblemChild.root).to eql(expected)
   end
 
-  it "knows the views dir" do
-   expected = File.expand_path "../lib/problem_child/views", File.dirname(__FILE__)
-   expect(ProblemChild.views_dir).to eql(expected)
+  it 'knows the views dir' do
+    expected = File.expand_path '../lib/problem_child/views', File.dirname(__FILE__)
+    expect(ProblemChild.views_dir).to eql(expected)
   end
 
-  it "allows users to set the views dir" do
-   old = ProblemChild.views_dir
-   ProblemChild.views_dir = "./foo"
-   expect(ProblemChild.views_dir).to eql("./foo")
-   ProblemChild.views_dir = old
+  it 'allows users to set the views dir' do
+    old = ProblemChild.views_dir
+    ProblemChild.views_dir = './foo'
+    expect(ProblemChild.views_dir).to eql('./foo')
+    ProblemChild.views_dir = old
   end
 end
 
-describe "logged in user" do
-
+describe 'logged in user' do
   before(:each) do
     @user = make_user('login' => 'benbaltertest')
     login_as @user
 
-    ENV["GITHUB_TEAM_ID"] = nil
-    ENV["GITHUB_ORG_ID"]  = nil
-    ENV["GITHUB_TOKEN"]   = nil
-    ENV["GITHUB_REPO"]    = nil
+    ENV['GITHUB_TEAM_ID'] = nil
+    ENV['GITHUB_ORG_ID']  = nil
+    ENV['GITHUB_TOKEN']   = nil
+    ENV['GITHUB_REPO']    = nil
   end
 
   include Rack::Test::Methods
@@ -37,59 +36,57 @@ describe "logged in user" do
     ProblemChild::App
   end
 
-  it "shows the securocat when github returns an oauth error" do
-    with_env "GITHUB_ORG_ID", "balter-test-org" do
-      get "/auth/github/callback?error=redirect_uri_mismatch"
+  it 'shows the securocat when github returns an oauth error' do
+    with_env 'GITHUB_ORG_ID', 'balter-test-org' do
+      get '/auth/github/callback?error=redirect_uri_mismatch'
       follow_redirect!
-      expect(last_response.body).to match(%r{securocat\.png})
+      expect(last_response.body).to match(/securocat\.png/)
     end
   end
 
   it "shows the form when properly org auth'd" do
-    with_env "GITHUB_ORG_ID", "balter-test-org" do
-      stub_request(:get, "https://api.github.com/orgs/balter-test-org/members/benbaltertest").
-      to_return(:status => 204)
+    with_env 'GITHUB_ORG_ID', 'balter-test-org' do
+      stub_request(:get, 'https://api.github.com/orgs/balter-test-org/members/benbaltertest')
+        .to_return(status: 204)
 
-      get "/"
+      get '/'
       expect(last_response.status).to eql(200)
       expect(last_response.body).to match(/Submit an issue/)
     end
   end
 
   it "shows the form when properly team auth'd" do
-    with_env "GITHUB_TEAM_ID", "1234" do
-      stub_request(:get, "https://api.github.com/teams/1234/members/benbaltertest").
-      to_return(:status => 204)
+    with_env 'GITHUB_TEAM_ID', '1234' do
+      stub_request(:get, 'https://api.github.com/teams/1234/members/benbaltertest')
+        .to_return(status: 204)
 
-      get "/"
+      get '/'
       expect(last_response.status).to eql(200)
       expect(last_response.body).to match(/Submit an issue/)
     end
   end
 
-  it "refuses to show the site with no auth strategy" do
-    with_env "GITHUB_TEAM_ID", nil do
-      with_env "GITHUB_ORG_ID", nil do
-        with_env "GITHUB_TOKEN", nil do
-          expect{get "/"}.to raise_error(/Must define GITHUB_TEAM_ID, GITHUB_ORG_ID, OR GITHUB_TOKEN/)
+  it 'refuses to show the site with no auth strategy' do
+    with_env 'GITHUB_TEAM_ID', nil do
+      with_env 'GITHUB_ORG_ID', nil do
+        with_env 'GITHUB_TOKEN', nil do
+          expect { get '/' }.to raise_error(/Must define GITHUB_TEAM_ID, GITHUB_ORG_ID, OR GITHUB_TOKEN/)
         end
       end
     end
   end
 
-  it "allows the user to create an issue" do
-    with_env "GITHUB_ORG_ID", "balter-test-org" do
-      with_env "GITHUB_REPO", "benbalter/test-repo-ignore-me" do
-
-        stub_request(:get, "https://api.github.com/orgs/balter-test-org/members/benbaltertest").
-        to_return(:status => 204)
+  it 'allows the user to create an issue' do
+    with_env 'GITHUB_ORG_ID', 'balter-test-org' do
+      with_env 'GITHUB_REPO', 'benbalter/test-repo-ignore-me' do
+        stub_request(:get, 'https://api.github.com/orgs/balter-test-org/members/benbaltertest')
+          .to_return(status: 204)
 
-        stub_request(:post, "https://api.github.com/repos/benbalter/test-repo-ignore-me/issues").
-          with(:body => "{\"labels\":[],\"title\":\"title\",\"body\":\"* **Foo**: bar\"}").
-          to_return(:status => 200, :body => '{"number": 1234}', :headers => { 'Content-Type' => 'application/json' })
+        stub_request(:post, 'https://api.github.com/repos/benbalter/test-repo-ignore-me/issues')
+          .with(body: '{"labels":[],"title":"title","body":"* **Foo**: bar"}')
+          .to_return(status: 200, body: '{"number": 1234}', headers: { 'Content-Type' => 'application/json' })
 
-        post "/", :title => "title", :foo => "bar"
-        follow_redirect!
+        post '/', title: 'title', foo: 'bar'
 
         expect(last_response.status).to eql(200)
         expected = '<a href="http://github.com/benbalter/test-repo-ignore-me/issues/1234">benbalter/test-repo-ignore-me#1234</a>'
@@ -99,44 +96,42 @@ describe "logged in user" do
   end
 end
 
-describe "logged out user" do
+describe 'logged out user' do
   include Rack::Test::Methods
 
   def app
     ProblemChild::App
   end
 
-  it "asks the user to log in" do
-    with_env "GITHUB_ORG_ID", "balter-test-org" do
-      with_env "GITHUB_TOKEN", nil do
-        get "/"
+  it 'asks the user to log in' do
+    with_env 'GITHUB_ORG_ID', 'balter-test-org' do
+      with_env 'GITHUB_TOKEN', nil do
+        get '/'
         expect(last_response.status).to eql(302)
         expect(last_response.headers['Location']).to match(%r{^https://github\.com/login/oauth/authorize})
       end
     end
   end
 
-  it "allows anonymous users to see the form" do
-    with_env "GITHUB_TOKEN", "1234" do
-      get "/"
+  it 'allows anonymous users to see the form' do
+    with_env 'GITHUB_TOKEN', '1234' do
+      get '/'
       expect(last_response.status).to eql(200)
       expect(last_response.body).to match(/Submit an issue/)
     end
   end
 
-  it "allows anonymous submissions" do
-    with_env "GITHUB_TOKEN", "1234" do
-      with_env "GITHUB_REPO", "benbalter/test-repo-ignore-me" do
-
-        stub_request(:post, "https://api.github.com/repos/benbalter/test-repo-ignore-me/issues").
-          with(:body => "{\"labels\":[],\"title\":\"title\",\"body\":\"* **Foo**: bar\"}").
-          to_return(:status => 200, :body => '{"number": 1234}', :headers => { 'Content-Type' => 'application/json' })
+  it 'allows anonymous submissions' do
+    with_env 'GITHUB_TOKEN', '1234' do
+      with_env 'GITHUB_REPO', 'benbalter/test-repo-ignore-me' do
+        stub_request(:post, 'https://api.github.com/repos/benbalter/test-repo-ignore-me/issues')
+          .with(body: '{"labels":[],"title":"title","body":"* **Foo**: bar"}')
+          .to_return(status: 200, body: '{"number": 1234}', headers: { 'Content-Type' => 'application/json' })
 
-        stub_request(:get, "https://api.github.com/repos/benbalter/test-repo-ignore-me").
-          to_return(:status => 200, :body => '{"private": true}', :headers => { 'Content-Type' => 'application/json' })
+        stub_request(:get, 'https://api.github.com/repos/benbalter/test-repo-ignore-me')
+          .to_return(status: 200, body: '{"private": true}', headers: { 'Content-Type' => 'application/json' })
 
-        post "/", :title => "title", :foo => "bar"
-        follow_redirect!
+        post '/', title: 'title', foo: 'bar'
 
         expect(last_response.status).to eql(200)
         expect(last_response.body).to match(/Your issue was successfully submitted\./)
@@ -144,20 +139,19 @@ describe "logged out user" do
     end
   end
 
-  it "supports submissions > 4k" do
-    with_env "GITHUB_TOKEN", "1234" do
-      with_env "GITHUB_REPO", "benbalter/test-repo-ignore-me" do
-        long_string =  "0" * 5000
+  it 'supports submissions > 4k' do
+    with_env 'GITHUB_TOKEN', '1234' do
+      with_env 'GITHUB_REPO', 'benbalter/test-repo-ignore-me' do
+        long_string = '0' * 5000
 
-        stub_request(:post, "https://api.github.com/repos/benbalter/test-repo-ignore-me/issues").
-          with(:body => "{\"labels\":[],\"title\":\"title\",\"body\":\"* **Foo**: #{long_string}\"}").
-          to_return(:status => 200, :body => '{"number": 1234}', :headers => { 'Content-Type' => 'application/json' })
+        stub_request(:post, 'https://api.github.com/repos/benbalter/test-repo-ignore-me/issues')
+          .with(body: "{\"labels\":[],\"title\":\"title\",\"body\":\"* **Foo**: #{long_string}\"}")
+          .to_return(status: 200, body: '{"number": 1234}', headers: { 'Content-Type' => 'application/json' })
 
-        stub_request(:get, "https://api.github.com/repos/benbalter/test-repo-ignore-me").
-          to_return(:status => 200, :body => '{"private": true}', :headers => { 'Content-Type' => 'application/json' })
+        stub_request(:get, 'https://api.github.com/repos/benbalter/test-repo-ignore-me')
+          .to_return(status: 200, body: '{"private": true}', headers: { 'Content-Type' => 'application/json' })
 
-        post "/", :title => "title", :foo => long_string
-        follow_redirect!
+        post '/', title: 'title', foo: long_string
 
         expect(last_response.status).to eql(200)
         expect(last_response.body).to match(/Your issue was successfully submitted\./)

data/spec/spec_helper.rb

@@ -1,22 +1,22 @@
-require "bundler/setup"
+require 'bundler/setup'
 
 ENV['RACK_ENV'] = 'test'
-$:.push File.join(File.dirname(__FILE__), '..', 'lib')
+$LOAD_PATH.push File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'rack/test'
 require 'sinatra/auth/github'
 require 'sinatra/auth/github/test/test_helper'
 require 'webmock/rspec'
 
-require_relative "../lib/problem_child"
+require_relative '../lib/problem_child'
 WebMock.disable_net_connect!
 
 RSpec.configure do |config|
   config.include(Sinatra::Auth::Github::Test::Helper)
 end
 
-ENV["GITHUB_CLIENT_ID"] = "1234"
-ENV["GITHUB_CLIENT_SECRET"] = "asdf"
+ENV['GITHUB_CLIENT_ID'] = '1234'
+ENV['GITHUB_CLIENT_SECRET'] = 'asdf'
 
 def with_env(key, value)
   old_env = ENV[key]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: problem_child
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-25 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -108,34 +108,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: moneta
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +206,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.41'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.41'
 description: 
 email:
 - ben.balter@github.com
@@ -243,6 +229,7 @@ extra_rdoc_files: []
 files:
 - ".bowerrc"
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -330,7 +317,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Allows authenticated or anonymous users to fill out a standard web form to
@@ -340,4 +327,3 @@ test_files:
 - spec/problem_child_helpers_spec.rb
 - spec/problem_child_spec.rb
 - spec/spec_helper.rb
-has_rdoc: