RubyGems - add-to-org - Versions diffs - 2.2.1 → 3.0.0 - Mend

add-to-org 2.2.1 → 3.0.0

Files changed (42) hide show

data/lib/add-to-org/views/forbidden.erb CHANGED Viewed

@@ -1,12 +1,5 @@
-<html>
-  <head>
-    <style>
-      body { padding: 20px; }
-    </style>
-  </head>
-  <body>
-    <h1>Sorry Charlie</h1>
-    <p>We're unable to verify your eligibility at this time.</p>
-    <p>Please contact <a href="mailto:<%= ENV['CONTACT_EMAIL'] %>"><%= ENV['CONTACT_EMAIL'] %></a> if you believe this is in error.</p>
-  </body>
-</html>
+<h1>Sorry Charlie</h1>
+<p>We're unable to verify your eligibility at this time.</p>
+<p>Please contact <a href="mailto:<%= ENV['CONTACT_EMAIL'] %>"><%= ENV['CONTACT_EMAIL'] %></a> if you believe this is in error.</p>

data/lib/add-to-org/views/layout.erb ADDED Viewed

@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>Join <%= ENV['GITHUB_ORG_ID'] %></title>
+    <link rel="stylesheet" href="/vendor/bootstrap/dist/css/bootstrap.min.css">
+    <link rel="stylesheet" href="/vendor/bootstrap/dist/css/bootstrap-theme.min.css">
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+  </head>
+  <body>
+    <div class="container">
+      <%= yield %>
+    </div>
+  </body>
+</html>

data/lib/add-to-org/views/success.erb CHANGED Viewed

@@ -1,12 +1,5 @@
-<html>
-  <head>
-    <style>
-      body { padding: 20px; }
-    </style>
-  </head>
-  <body>
-    <h1>You're all set</h1>
-    <p class="lead">You simply need to <a href="https://github.com/orgs/<%= org_id %>/invitation?return_to=<%= ERB::Util.html_escape(redirect) %>">confirm your invitation to join the organization</a> on GitHub.</p>
-    <p>Once confirmed, you will have access to <a href="<%= ERB::Util.html_escape(redirect) %>"><%= ERB::Util.html_escape(redirect) %></a>, the requested URL.</h1>
-  </body>
-</html>
+<h1>You're all set</h1>
+<p class="lead">You simply need to <a href="https://github.com/orgs/<%= org_id %>/invitation?return_to=<%= ERB::Util.html_escape(redirect) %>">confirm your invitation to join the organization</a> on GitHub.</p>
+<p>Once confirmed, you will have access to <a href="<%= ERB::Util.html_escape(redirect) %>"><%= ERB::Util.html_escape(redirect) %></a>, the requested URL.</h1>

data/lib/add-to-org.rb CHANGED Viewed

@@ -3,9 +3,40 @@ require 'sinatra_auth_github'
 require 'dotenv'
 require_relative 'add-to-org/helpers'
-Dotenv.load
 module AddToOrg
+  def self.root
+    File.expand_path "./add-to-org", File.dirname(__FILE__)
+  end
+  def self.views_dir
+    @views_dir ||= File.expand_path "views", AddToOrg.root
+  end
+  def self.views_dir=(dir)
+    @views_dir = dir
+  end
+  def self.public_dir
+    @public_dir ||= File.expand_path "public", AddToOrg.root
+  end
+  def self.public_dir=(dir)
+    @public_dir = dir
+  end
+  def self.validator=(validator)
+    @validator = validator
+  end
+  def self.set_validator(&block)
+    @validator = block
+  end
+  def self.validator
+    @validator ||= Proc.new { raise "You must define a custom validator to determine eligibility" }
+  end
   class App < Sinatra::Base
     include AddToOrg::Helpers
@@ -22,7 +53,9 @@ module AddToOrg
     ENV['WARDEN_GITHUB_VERIFIER_SECRET'] ||= SecureRandom.hex
     register Sinatra::Auth::Github
-    set :views, File.expand_path("add-to-org/views", File.dirname(__FILE__))
+    set :views, Proc.new { AddToOrg.views_dir }
+    set :root,  Proc.new { AddToOrg.root }
+    set :public_folder, Proc.new { AddToOrg.public_dir }
     # require ssl
     configure :production do
@@ -65,3 +98,5 @@ module AddToOrg
     end
   end
 end
+Dotenv.load unless AddToOrg::App.production?

data/spec/add-to-org-helpers_spec.rb CHANGED Viewed

@@ -23,14 +23,14 @@ describe "AddToOrgHelpers" do
   end
   it "initializes the client" do
-    expect(@helper.client.class).to eql(Octokit::Client)
-    expect(@helper.client.instance_variable_get("@access_token")).to eql("asdf1234")
+    expect(@helper.send(:client).class).to eql(Octokit::Client)
+    expect(@helper.send(:client).instance_variable_get("@access_token")).to eql("asdf1234")
   end
   it "initializes the sudo client" do
     with_env "GITHUB_TOKEN", "SUDO_TOKEN" do
-      expect(@helper.sudo_client.class).to eql(Octokit::Client)
-      expect(@helper.sudo_client.instance_variable_get("@access_token")).to eql("SUDO_TOKEN")
+      expect(@helper.send(:sudo_client).class).to eql(Octokit::Client)
+      expect(@helper.send(:sudo_client).instance_variable_get("@access_token")).to eql("SUDO_TOKEN")
     end
   end
@@ -43,13 +43,13 @@ describe "AddToOrgHelpers" do
   it "retrieves the org id" do
     with_env "GITHUB_ORG_ID", "some_org" do
-      expect(@helper.org_id).to eql("some_org")
+      expect(@helper.send(:org_id)).to eql("some_org")
     end
   end
   it "retrieves the team id" do
     with_env "GITHUB_TEAM_ID", "1234" do
-      expect(@helper.team_id).to eql("1234")
+      expect(@helper.send(:team_id)).to eql("1234")
     end
   end
@@ -57,11 +57,11 @@ describe "AddToOrgHelpers" do
     with_env "GITHUB_ORG_ID", "some_org" do
       stub_request(:get, "https://api.github.com/orgs/some_org/members/benbaltertest").
       to_return(:status => 204)
-      expect(@helper.member?).to eql(true)
+      expect(@helper.send(:member?)).to eql(true)
       stub_request(:get, "https://api.github.com/orgs/some_org/members/benbaltertest").
       to_return(:status => 404)
-      expect(@helper.member?).to eql(false)
+      expect(@helper.send(:member?)).to eql(false)
     end
   end
@@ -69,12 +69,17 @@ describe "AddToOrgHelpers" do
     with_env "GITHUB_ORG_ID", "some_org" do
       stub = stub_request(:put, "https://api.github.com/teams/memberships/benbaltertest").
       to_return(:status => 204)
-      @helper.add
+      @helper.send(:add)
       expect(stub).to have_been_requested
     end
   end
   it "throws an error if valid? is not defined" do
-    expect { @helper.valid? }.to raise_error("You must define a custom valid? method to determine eligibility")
+    stub_request(:get, "https://api.github.com/user/emails").
+      to_return(:status => 200, :body => fixture("emails.json"), :headers => { 'Content-Type'=>'application/json' })
+    AddToOrg.validator = nil
+    error = "You must define a custom validator to determine eligibility"
+    expect { @helper.valid? }.to raise_error(error)
   end
 end

data/spec/add-to-org_spec.rb CHANGED Viewed

@@ -1,5 +1,19 @@
 require "spec_helper"
+describe "config" do
+  [:views_dir, :public_dir, :validator].each do |var|
+    after do
+      AddToOrg.send("#{var}=", nil)
+    end
+    it "accepts #{var}" do
+      expected = SecureRandom.hex
+      AddToOrg.send("#{var}=", expected)
+      expect(AddToOrg.send(var)).to eql(expected)
+    end
+  end
+end
 describe "logged out user" do
   include Rack::Test::Methods
@@ -19,14 +33,6 @@ describe "logged in user" do
   include Rack::Test::Methods
-  module AddToOrg
-    class App < Sinatra::Base
-      def valid?
-        verified_emails.any? { |email| email[:email] =~ /@github\.com$/}
-      end
-    end
-  end
   def app
     AddToOrg::App
   end
@@ -54,55 +60,76 @@ describe "logged in user" do
     end
   end
-  it "denies acccess to invalid users" do
-    with_env "GITHUB_ORG_ID", "some_org" do
-      stub_request(:get, "https://api.github.com/orgs/some_org/members/benbaltertest").
-      to_return(:status => 404)
+  [:proc, :block, :lambda].each do |method|
+    describe "with validator passed as a #{method}" do
+      before(:each) do
+        if method == :block
+          AddToOrg.set_validator do |github_user, verified_emails, client|
+            verified_emails.any? { |email| email[:email] =~ /@github\.com$/ }
+          end
+        elsif method == :proc
+          AddToOrg.validator = proc { |github_user, verified_emails, client|
+            verified_emails.any? { |email| email[:email] =~ /@github\.com$/ }
+          }
+        elsif method == :lambda
+          AddToOrg.validator = lambda { |github_user, verified_emails, client|
+            verified_emails.any? { |email| email[:email] =~ /@github\.com$/ }
+          }
+        end
+      end
-      stub_request(:get, "https://api.github.com/user/emails").
-      to_return(:status => 200, :body => fixture("invalid_emails.json"), :headers => { 'Content-Type'=>'application/json' })
+      it "denies acccess to invalid users" do
+        with_env "GITHUB_ORG_ID", "some_org" do
+          stub_request(:get, "https://api.github.com/orgs/some_org/members/benbaltertest").
+          to_return(:status => 404)
-      get "/"
-      expect(last_response.status).to eql(403)
-      expect(last_response.body).to match(/We're unable to verify your eligibility at this time/)
-    end
-  end
+          stub_request(:get, "https://api.github.com/user/emails").
+          to_return(:status => 200, :body => fixture("invalid_emails.json"), :headers => { 'Content-Type'=>'application/json' })
-  it "tries to add valid users" do
-    with_env "GITHUB_ORG_ID", "some_org" do
-      stub_request(:get, "https://api.github.com/orgs/some_org/members/benbaltertest").
-      to_return(:status => 404)
+          get "/"
+          expect(last_response.status).to eql(403)
+          expect(last_response.body).to match(/We're unable to verify your eligibility at this time/)
+        end
+      end
-      stub_request(:get, "https://api.github.com/user/emails").
-      to_return(:status => 200, :body => fixture("emails.json"), :headers => { 'Content-Type'=>'application/json' })
+      it "tries to add valid users" do
+        with_env "GITHUB_ORG_ID", "some_org" do
+          stub_request(:get, "https://api.github.com/orgs/some_org/members/benbaltertest").
+          to_return(:status => 404)
-      stub = stub_request(:put, "https://api.github.com/teams/memberships/benbaltertest").
-      to_return(:status => 204)
+          stub_request(:get, "https://api.github.com/user/emails").
+          to_return(:status => 200, :body => fixture("emails.json"), :headers => { 'Content-Type'=>'application/json' })
-      get "/foo"
-      expect(stub).to have_been_requested
-      expect(last_response.status).to eql(200)
-      expect(last_response.body).to match(/confirm your invitation to join the organization/)
-      expect(last_response.body).to match(/https:\/\/github.com\/orgs\/some_org\/invitation/)
-      expect(last_response.body).to match(/\?return_to=https:\/\/github.com\/foo/)
-    end
-  end
+          stub = stub_request(:put, "https://api.github.com/teams/memberships/benbaltertest").
+          to_return(:status => 204)
-  it "includes the requested URL" do
-    with_env "GITHUB_ORG_ID", "some_org" do
-      stub_request(:get, "https://api.github.com/orgs/some_org/members/benbaltertest").
-      to_return(:status => 404)
+          get "/foo"
+          expect(stub).to have_been_requested
+          expect(last_response.status).to eql(200)
+          expect(last_response.body).to match(/confirm your invitation to join the organization/)
+          expect(last_response.body).to match(/https:\/\/github.com\/orgs\/some_org\/invitation/)
+          expect(last_response.body).to match(/\?return_to=https:\/\/github.com\/foo/)
+        end
+      end
-      stub_request(:get, "https://api.github.com/user/emails").
-      to_return(:status => 200, :body => fixture("emails.json"), :headers => { 'Content-Type'=>'application/json' })
+      it "includes the requested URL" do
+        with_env "GITHUB_ORG_ID", "some_org" do
+          stub_request(:get, "https://api.github.com/orgs/some_org/members/benbaltertest").
+          to_return(:status => 404)
-      stub = stub_request(:put, "https://api.github.com/teams/memberships/benbaltertest").
-      to_return(:status => 204)
+          stub_request(:get, "https://api.github.com/user/emails").
+          to_return(:status => 200, :body => fixture("emails.json"), :headers => { 'Content-Type'=>'application/json' })
-      get "/foo/bar"
-      expect(stub).to have_been_requested
-      expect(last_response.status).to eql(200)
-      expect(last_response.body).to match(Regexp.new('<a href="https://github.com/foo/bar">https://github.com/foo/bar</a>'))
+          stub = stub_request(:put, "https://api.github.com/teams/memberships/benbaltertest").
+          to_return(:status => 204)
+          get "/foo/bar"
+          expect(stub).to have_been_requested
+          expect(last_response.status).to eql(200)
+          expect(last_response.body).to match(Regexp.new('<a href="https://github.com/foo/bar">https://github.com/foo/bar</a>'))
+        end
+      end
     end
   end
 end

data/spec/spec_helper.rb CHANGED Viewed

@@ -1,5 +1,6 @@
 require "bundler/setup"
 require 'fileutils'
+require 'securerandom'
 ENV['RACK_ENV'] = 'test'
 ENV['GITHUB_CLIENT_ID'] = "CLIENT_ID"
@@ -26,7 +27,6 @@ def fixture(fixture)
   File.open(fixture_path(fixture)).read
 end
 def with_env(key, value)
   old_env = ENV[key]
   ENV[key] = value

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: add-to-org
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Ben Balter
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-16 00:00:00.000000000 Z
+date: 2015-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: warden-github
@@ -156,6 +156,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".bowerrc"
 - ".gitignore"
 - ".ruby-version"
 - ".travis.yml"
@@ -164,11 +165,38 @@ files:
 - README.md
 - Rakefile
 - add-to-org.gemspec
+- bower.json
 - lib/add-to-org.rb
 - lib/add-to-org/helpers.rb
+- lib/add-to-org/public/vendor/bootstrap/.bower.json
+- lib/add-to-org/public/vendor/bootstrap/LICENSE
+- lib/add-to-org/public/vendor/bootstrap/bower.json
+- lib/add-to-org/public/vendor/bootstrap/dist/css/bootstrap-theme.css
+- lib/add-to-org/public/vendor/bootstrap/dist/css/bootstrap-theme.css.map
+- lib/add-to-org/public/vendor/bootstrap/dist/css/bootstrap-theme.min.css
+- lib/add-to-org/public/vendor/bootstrap/dist/css/bootstrap-theme.min.css.map
+- lib/add-to-org/public/vendor/bootstrap/dist/css/bootstrap.css
+- lib/add-to-org/public/vendor/bootstrap/dist/css/bootstrap.css.map
+- lib/add-to-org/public/vendor/bootstrap/dist/css/bootstrap.min.css
+- lib/add-to-org/public/vendor/bootstrap/dist/css/bootstrap.min.css.map
+- lib/add-to-org/public/vendor/bootstrap/dist/fonts/glyphicons-halflings-regular.eot
+- lib/add-to-org/public/vendor/bootstrap/dist/fonts/glyphicons-halflings-regular.svg
+- lib/add-to-org/public/vendor/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf
+- lib/add-to-org/public/vendor/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
+- lib/add-to-org/public/vendor/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2
+- lib/add-to-org/public/vendor/bootstrap/dist/js/bootstrap.js
+- lib/add-to-org/public/vendor/bootstrap/dist/js/bootstrap.min.js
+- lib/add-to-org/public/vendor/bootstrap/dist/js/npm.js
+- lib/add-to-org/public/vendor/bootstrap/fonts/glyphicons-halflings-regular.eot
+- lib/add-to-org/public/vendor/bootstrap/fonts/glyphicons-halflings-regular.svg
+- lib/add-to-org/public/vendor/bootstrap/fonts/glyphicons-halflings-regular.ttf
+- lib/add-to-org/public/vendor/bootstrap/fonts/glyphicons-halflings-regular.woff
+- lib/add-to-org/public/vendor/bootstrap/fonts/glyphicons-halflings-regular.woff2
+- lib/add-to-org/public/vendor/bootstrap/package.json
 - lib/add-to-org/version.rb
 - lib/add-to-org/views/error.erb
 - lib/add-to-org/views/forbidden.erb
+- lib/add-to-org/views/layout.erb
 - lib/add-to-org/views/success.erb
 - script/bootstrap
 - script/cibuild
@@ -199,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key:
 specification_version: 4
 summary: A simple Oauth App to automatically add users to an organization