problem_child 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bba9a9faf97164a454765c969947cdd01c0483f8
-  data.tar.gz: c6dc44c535d6cd7e83ccad88c078dfa593b82029
+  metadata.gz: 23e61aafef42b2d8a22e1eb9cd300108f808d714
+  data.tar.gz: 6dfde2eafb3c1ef44074c76aa94eafea6abfca5e
 SHA512:
-  metadata.gz: 9fb22eb689fc603aad6e6ca036bdf258faf5fbaf3ec7b167145f8ae89ad6ef0cb0a341eb36af97fb223a2b77c8873b6942d29f29a0452da04f230ad4fd46b542
-  data.tar.gz: cd2d71646e61d08cd32ab36a9aa5e5d65372a2f9338f96c3822423f3c240e73d2625475d04bed3a6b672b66aeb07f6bf8f1befea0f12a55be3aafdd30424f1a0
+  metadata.gz: 628253249fe3d9b38f2cace36492c6c9b5752035fca94e98413617d4c811a8822dce803f11da8e7929161fbffdd8009a3a864a61f3d86901542f37370e1c7736
+  data.tar.gz: fc1bbf214d479260fcfc852b935f9e1d9a25df0048f71eae79c7ed4384cd0bf939d7cbd6b8c014474abc4188a6560bc229d499fa207ca1bad1f756e0f76eac43

data/.travis.yml

@@ -13,3 +13,4 @@ env:
   global:
     GITHUB_CLIENT_ID: "1234"
     GITHUB_CLIENT_SECRET: "1234"
+    REDIS_URL: "redis://127.0.0.1:6379"

data/README.md

@@ -24,30 +24,27 @@ Then, follow the configuration options below.
 
 ## Requirements
 
-You'll need to have [Redis](http://redis.io/) running.
+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.
+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.
+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
 
-You must set the following as environmental variables:
+First, you must set the following environmental variable:
 
-* `GITHUB_CLIENT_ID` and `GITHUB_CLIENT_SECRET` - Created via [github.com/settings/applications/new](https://github.com/settings/applications/new)
 * `GITHUB_REPO` - the repo to open the issue against in the form of `owner/repo`
 
 You must also set **one** of the following:
 
 * `GITHUB_TOKEN` - A personal access token for a bot account with the ability to create an issue in the `GITHUB_REPO` if you would like all submissions to be anonymous
-* `GITHUB_ORG_ID` - The GitHub Org ID e.g, `@whitehouse` if you'd like all users to authenticate against a GitHub Org prior to being presented the form
+* `GITHUB_ORG_ID` - The GitHub Org ID e.g, `@whitehouse` if you'd like all users to authenticate against a GitHub Org prior to being presented the form, or
 * `GITHUB_TEAM_ID` - The numeric Team ID (e.g., 1234) if you'd like all users to authenticate against a GitHub Team prior to being presented the form
 
-You can also set a variable to enable Google reCAPTCHA support:
-
-* `REACAPTCHA_SITE_KEY` - The key created for your reCAPTCHA site via https://www.google.com/recaptcha/admin
+If you are using OAuth Authentication (e.g., you set `GITHUB_ORG_ID` or `GITHUB_TEAM_ID` so that the user submits as themselves), you must also set the following as environmental variables:
 
-If set, the Problem child default form will include a bit of JavaScript to test if the reCAPTCHA test was passed before submitting.
+* `GITHUB_CLIENT_ID` and `GITHUB_CLIENT_SECRET` - Created via [github.com/settings/applications/new](https://github.com/settings/applications/new)
 
 *Pro-tip*: When developing locally, you can add these values to a `.env` file in the project root, and they will be automatically read in on load
 
@@ -120,4 +117,3 @@ Problem child can also be used to create pull requests. Simply add one or more f
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request
-

data/lib/problem_child/helpers.rb

@@ -17,10 +17,6 @@ module ProblemChild
       end
     end
 
-    def recaptcha
-      ENV["RECAPTCHA_SITE_KEY"] unless ENV["RECAPTCHA_SITE_KEY"].nil? || ENV["RECAPTCHA_SITE_KEY"].to_s.empty?
-    end
-
     def client
       @client ||= Octokit::Client.new :access_token => token
     end
@@ -34,11 +30,7 @@ module ProblemChild
     end
 
     def issue_body
-      form_data.reject { |key, value|
-        key == "title" || value.empty? || key == "labels" || value.is_a?(Hash)
-      }.except( "g-recaptcha-response" ).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

data/lib/problem_child/version.rb

@@ -1,3 +1,3 @@
 module ProblemChild
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

data/lib/problem_child/views/form.erb

@@ -5,10 +5,6 @@
 <% end %>
 </h1>
 
-<div class="alert alert-warning alert-recaptcha hidden" role="alert">
-  Please verify that you are not a robot.
-</div>
-
 <% if issue %>
   <div class="alert alert-success" role="alert">
     Your issue was successfully submitted<% if access %> as <a href="http://github.com/<%= repo %>/issues/<%= issue %>"><%= repo %>#<%= issue %></a><% end %>.
@@ -31,9 +27,5 @@
     <textarea class="form-control" rows="10" id="body" name="body"></textarea>
   </div>
 
-  <% if recaptcha.present? %>
-    <div class="g-recaptcha" data-sitekey="<%= recaptcha %>"></div>
-  <% end %>
-
   <button type="submit" class="btn btn-default">Submit</button>
 </form>

data/lib/problem_child/views/layout.erb

@@ -16,13 +16,6 @@
   <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
   <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
   <![endif]-->
-
-  <% if recaptcha.present? %>
-    <script src='https://www.google.com/recaptcha/api.js'></script>
-  <% end %>
-
-  <script src='https://www.google.com/recaptcha/api.js'></script>
-
 </head>
 <body>
   <div class="container">
@@ -30,25 +23,5 @@
     <%= yield %>
 
   </div>
-
-  <% if recaptcha.present? %>
-    <script src="/vendor/jquery/dist/jquery.min.js"></script>
-
-    <script>
-  $( 'form' ).submit( function( e ) {
-    var prevent = false;
-
-    if ( !grecaptcha.getResponse() ) {
-      $( '.alert-recaptcha' ).removeClass( 'hidden' );
-      prevent = true;
-    }
-
-    if ( prevent ) {
-      e.preventDefault();
-      return false;
-    }
-  } );
-    </script>
-  <% end %>
 </body>
 </html>

data/lib/problem_child.rb

@@ -40,7 +40,11 @@ module ProblemChild
       :scopes => "repo,read:org"
     }
 
-    use Rack::Session::Moneta, store: :Redis, url: ENV["REDIS_URL"]
+    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
 
     configure :production do
       require 'rack-ssl-enforcer'

data/spec/problem_child_helpers_spec.rb

@@ -32,6 +32,10 @@ describe "ProblemChild::Helpers" do
     with_env "GITHUB_TOKEN", "asdf" do
       expect(@helper.anonymous_submissions?).to be(true)
     end
+
+    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
@@ -240,7 +244,7 @@ describe "ProblemChild::Helpers" do
 
       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__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: problem_child
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Ben Balter