RubyGems - raygun - Versions diffs - 0.0.13 → 0.0.14 - Mend

raygun 0.0.13 → 0.0.14

Files changed (56) hide show

data/app_prototype/public/index.html CHANGED Viewed

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Project_prototype</title>
+  <title>App Prototype</title>
   <link href="/assets/application.css?body=1" media="all" rel="stylesheet" type="text/css"/>
   <script src="/assets/jquery.js?body=1" type="text/javascript"></script>
   <script src="/assets/jquery_ujs.js?body=1" type="text/javascript"></script>
@@ -15,7 +15,7 @@
           <div class="container">
             <div class="brand">Project_prototype</div>
             <ul class="nav pull-right">
-              <li><a href="/sign_in">Sign in</a></li>
+              <li><a href="/sign_in">Sign In</a></li>
             </ul>
           </div>
         </nav>
@@ -29,7 +29,7 @@
         <p>Custom generator templates create views that are bootstrap compatible and specs that are factory-aware and follow best practices.</p>
         <p>This application also includes authentication and an example of authorization (sign in as user@example.com / password).</p>
-        <p><a class="btn btn-primary btn-large" href="sign_in">Sign in</a></p>
+        <p><a class="btn btn-primary btn-large" href="sign_in">Sign In</a></p>
       </div>
     </div>
     <div class="push"></div>

data/app_prototype/spec/controllers/user_sessions_controller_spec.rb CHANGED Viewed

@@ -2,19 +2,19 @@ require 'spec_helper'
 describe UserSessionsController do
-  describe "GET new" do
+  describe "#new" do
     it "assigns a new user as @user" do
       get :new
-      assigns(:user_session).should_not be_nil
+      expect(assigns(:user_session)).to_not be_nil
     end
   end
-  describe "POST create" do
+  describe "#create" do
     describe "with valid params" do
       it "redirect to the target page" do
         subject.stub(:login) { build_stubbed :user }
         post :create, { user_session: { email: 'valid', password: 'valid' } }, { return_to_url: 'url' }
-        response.should redirect_to('url')
+        expect(response).to redirect_to('url')
       end
     end
@@ -22,12 +22,12 @@ describe UserSessionsController do
       it "re-renders the 'new' template" do
         subject.stub(:login) { nil }
         post :create, { user_session: { email: 'invalid', password: 'invalid' } }
-        response.should render_template('new')
+        expect(response).to render_template('new')
       end
     end
   end
-  describe "DELETE destroy" do
+  describe "#destroy" do
     it "destroys the requested user session" do
       subject.should_receive(:logout)
       delete :destroy
@@ -35,7 +35,7 @@ describe UserSessionsController do
     it "redirects to the sign in page" do
       delete :destroy
-      response.should redirect_to(sign_in_url)
+      expect(response).to redirect_to(sign_in_url)
     end
   end

data/app_prototype/spec/controllers/users_controller_spec.rb CHANGED Viewed

@@ -9,7 +9,7 @@ describe UsersController do
     attributes_for :user
   end
-  # This should return the minimal set of values that should be in the session
+  # This returns the minimal set of values that should be in the session
   # in order to pass any filters (e.g. authentication) defined in
   # UsersController. Be sure to keep this updated too.
   def valid_session
@@ -20,38 +20,38 @@ describe UsersController do
     login_user build :admin
   end
-  describe "GET index" do
+  describe "#index" do
     it "assigns all users as @users" do
       user = User.create! valid_attributes
       get :index, {}, valid_session
-      assigns(:users).should eq([user])
+      expect(assigns(:users)).to eq([user])
     end
   end
-  describe "GET show" do
+  describe "#show" do
     it "assigns the requested user as @user" do
       user = User.create! valid_attributes
       get :show, { id: user.to_param }, valid_session
-      assigns(:user).should eq(user)
+      expect(assigns(:user)).to eq(user)
     end
   end
-  describe "GET new" do
+  describe "#new" do
     it "assigns a new user as @user" do
       get :new, {}, valid_session
-      assigns(:user).should be_a_new(User)
+      expect(assigns(:user)).to be_a_new(User)
     end
   end
-  describe "GET edit" do
+  describe "#edit" do
     it "assigns the requested user as @user" do
       user = User.create! valid_attributes
       get :edit, { id: user.to_param }, valid_session
-      assigns(:user).should eq(user)
+      expect(assigns(:user)).to eq(user)
     end
   end
-  describe "POST create" do
+  describe "#create" do
     describe "with valid params" do
       it "creates a new User" do
         expect {
@@ -61,13 +61,13 @@ describe UsersController do
       it "assigns a newly created user as @user" do
         post :create, {user: valid_attributes }, valid_session
-        assigns(:user).should be_a(User)
-        assigns(:user).should be_persisted
+        expect(assigns(:user)).to be_a(User)
+        expect(assigns(:user)).to be_persisted
       end
       it "redirects to the created user" do
         post :create, { user: valid_attributes }, valid_session
-        response.should redirect_to(User.last)
+        expect(response).to redirect_to(User.last)
       end
     end
@@ -76,19 +76,19 @@ describe UsersController do
         # Trigger the behavior that occurs when invalid params are submitted
         User.any_instance.stub(:save).and_return(false)
         post :create, { user: { "email" => "invalid value" } }, valid_session
-        assigns(:user).should be_a_new(User)
+        expect(assigns(:user)).to be_a_new(User)
       end
       it "re-renders the 'new' template" do
         # Trigger the behavior that occurs when invalid params are submitted
         User.any_instance.stub(:save).and_return(false)
         post :create, { user: { "email" => "invalid value" } }, valid_session
-        response.should render_template("new")
+        expect(response).to render_template("new")
       end
     end
   end
-  describe "PUT update" do
+  describe "#update" do
     describe "with valid params" do
       it "updates the requested user" do
         user = User.create! valid_attributes
@@ -103,13 +103,13 @@ describe UsersController do
       it "assigns the requested user as @user" do
         user = User.create! valid_attributes
         put :update, { id: user.to_param, user: valid_attributes }, valid_session
-        assigns(:user).should eq(user)
+        expect(assigns(:user)).to eq(user)
       end
       it "redirects to the user" do
         user = User.create! valid_attributes
         put :update, { id: user.to_param, user: valid_attributes }, valid_session
-        response.should redirect_to(user)
+        expect(response).to redirect_to(user)
       end
     end
@@ -119,7 +119,7 @@ describe UsersController do
         # Trigger the behavior that occurs when invalid params are submitted
         User.any_instance.stub(:save).and_return(false)
         put :update, { id: user.to_param, user: { "email" => "invalid value" } }, valid_session
-        assigns(:user).should eq(user)
+        expect(assigns(:user)).to eq(user)
       end
       it "re-renders the 'edit' template" do
@@ -127,12 +127,12 @@ describe UsersController do
         # Trigger the behavior that occurs when invalid params are submitted
         User.any_instance.stub(:save).and_return(false)
         put :update, { id: user.to_param, user: { "email" => "invalid value" } }, valid_session
-        response.should render_template("edit")
+        expect(response).to render_template("edit")
       end
     end
   end
-  describe "DELETE destroy" do
+  describe "#destroy" do
     it "destroys the requested user" do
       user = User.create! valid_attributes
       expect {
@@ -143,7 +143,7 @@ describe UsersController do
     it "redirects to the users list" do
       user = User.create! valid_attributes
       delete :destroy, { id: user.to_param }, valid_session
-      response.should redirect_to(users_url)
+      expect(response).to redirect_to(users_url)
     end
   end

data/app_prototype/spec/factories/users.rb CHANGED Viewed

@@ -1,3 +1,5 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
 FactoryGirl.define do
   factory :user do
     sequence(:email) { |n| "person#{n}@example.com" }

data/app_prototype/spec/features/activation_spec.rb ADDED Viewed

@@ -0,0 +1,18 @@
+require 'spec_helper'
+feature "Activation" do
+  scenario "with a valid token should activate the user and sign them in" do
+    @user = create(:user)
+    visit activation_path(@user.activation_token)
+    expect(current_path).to eq sign_in_path
+    expect(page).to have_content "Your account has been activated and you're now signed in."
+  end
+  scenario "with an invalid token should send the user to sign in" do
+    visit activation_path('BOGUS')
+    expect(current_path).to eq sign_in_path
+    expect(page).to have_content "Please sign in first."
+  end
+end

data/app_prototype/spec/features/password_reset_spec.rb ADDED Viewed

@@ -0,0 +1,41 @@
+require 'spec_helper'
+feature "Password Reset" do
+  background do
+    clear_emails
+    @user = create(:user)
+    @user.activate!
+    visit sign_in_path
+    click_link 'Reset Password'
+    fill_in 'Email', with: @user.email
+    click_button 'Reset My Password'
+    @user.reload
+  end
+  after do
+    @user.destroy
+  end
+  scenario "displays a message about the password reset email" do
+    expect(page).to have_content "Password reset instructions have been sent to your email."
+    expect(current_path).to eq sign_in_path
+  end
+  scenario "sends a password reset email with url" do
+    expect(open_email(@user.email)).to_not be_nil
+    expect(current_email).to have_content reset_password_path(@user.reset_password_token)
+  end
+  scenario "resets the password" do
+    visit reset_password_path(@user.reset_password_token)
+    fill_in 'New Password', with: 'som3_g00d_p@ssword'
+    click_button 'Reset Password'
+    expect(page).to have_content "Password was successfully updated."
+    expect(current_path).to eq sign_in_path
+  end
+end

data/app_prototype/spec/features/registration_spec.rb ADDED Viewed

@@ -0,0 +1,39 @@
+require 'spec_helper'
+# http://www.elabs.se/blog/51-simple-tricks-to-clean-up-your-capybara-tests
+feature "Registration" do
+  background do
+    clear_emails
+    @email = 'stan@example.com'
+    visit sign_up_path
+    within '#new_user' do
+      fill_in 'Email',    with: @email
+      fill_in 'Name',     with: 'Stan'
+      fill_in 'Password', with: 'p@ssword'
+      click_button 'Sign Up'
+    end
+    @user = User.find_by_email(@email)
+  end
+  after do
+    @user.destroy
+  end
+  it "creates a new user" do
+    expect(@user).to_not be_nil
+  end
+  it "displays a message about activation" do
+    expect(find('.alert')).to have_content "Thanks for signing up. Please check your email for activation instructions."
+  end
+  it "sends the activation email with url" do
+    expect(open_email(@email)).to_not be_nil
+    expect(current_email).to have_content activation_path(@user.activation_token)
+  end
+end

data/app_prototype/spec/features/sign_in_spec.rb ADDED Viewed

@@ -0,0 +1,30 @@
+require 'spec_helper'
+feature "Sign In" do
+  background(:all) do
+    @user = create(:user)
+    @user.activate!
+  end
+  after(:all) do
+    @user.destroy
+  end
+  scenario "authenticates with valid credentials" do
+    sign_in(@user.email, 'password')
+    expect(find('.alert')).to have_content("Successfully signed in")
+  end
+  scenario "displays a generic error message with an invalid email" do
+    sign_in('this is not valid', 'password')
+    expect(find('.alert')).to have_content("Sign in failed")
+  end
+  scenario "displays a generic error message with an invalid password" do
+    sign_in(@user.email, 'this is not valid')
+    expect(find('.alert')).to have_content("Sign in failed")
+  end
+end

data/app_prototype/spec/mailers/user_mailer_spec.rb CHANGED Viewed

@@ -1,47 +1,47 @@
 require "spec_helper"
 describe UserMailer do
-  let(:user) { build_stubbed(:user) }
+  let(:user) { build_stubbed(:user, activation_state: 'pending', activation_token: 'ABC', reset_password_token: 'XYZ') }
-  describe "activation_needed_email" do
+  describe "#activation_needed_email" do
     let(:mail) { UserMailer.activation_needed_email(user) }
     it "renders the headers" do
-      mail.subject.should eq("Welcome to My Awesome Site!")
-      mail.to.should eq([user.email])
-      mail.from.should eq(['notifications@example.com'])
+      expect(mail.subject).to eq "Welcome to My Awesome Site!"
+      expect(mail.to).to      eq [user.email]
+      expect(mail.from).to    eq %w(notifications@example.com)
     end
     it "renders the body" do
-      mail.body.encoded.should match("Welcome to")
+      expect(mail.body.encoded).to match "Welcome to"
     end
   end
-  describe "activation_success_email" do
+  describe "#activation_success_email" do
     let(:mail) { UserMailer.activation_success_email(user) }
     it "renders the headers" do
-      mail.subject.should eq("Your account has been activated!")
-      mail.to.should eq([user.email])
-      mail.from.should eq(['notifications@example.com'])
+      expect(mail.subject).to eq "Your account has been activated!"
+      expect(mail.to).to      eq [user.email]
+      expect(mail.from).to    eq %w(notifications@example.com)
     end
     it "renders the body" do
-      mail.body.encoded.should match("You have successfully activated")
+      expect(mail.body.encoded).to match "You have successfully activated"
     end
   end
-  describe "reset_password_email" do
+  describe "#reset_password_email" do
     let(:mail) { UserMailer.reset_password_email(user) }
     it "renders the headers" do
-      mail.subject.should eq("Password reset requested")
-      mail.to.should eq([user.email])
-      mail.from.should eq(['notifications@example.com'])
+      expect(mail.subject).to eq "Password reset requested"
+      expect(mail.to).to      eq [user.email]
+      expect(mail.from).to    eq %w(notifications@example.com)
     end
     it "renders the body" do
-      mail.body.encoded.should match("You have requested to reset your password.")
+      expect(mail.body.encoded).to match "You have requested to reset your password."
     end
   end

data/app_prototype/spec/models/user_spec.rb CHANGED Viewed

@@ -7,23 +7,30 @@ describe User do
     describe "name" do
       it "is required" do
-        subject.should_not accept_values(:email, nil, '')
+        expect(subject).to_not accept_values(:email, nil, '')
       end
-      it "should be less than 30 characters"
+      it "should be less than 30 characters" do
+        expect(subject).to     accept_values(:name, 'a' * 30)
+        expect(subject).to_not accept_values(:name, 'a' * 31)
+      end
     end
     describe "email" do
       it "is required" do
-        subject.should_not accept_values(:email, nil, '', ' ')
+        expect(subject).to_not accept_values(:email, nil, '', ' ')
       end
       it "must be properly formatted" do
-        subject.should     accept_values(:email, 'a@b.com', 'a@b.c.com')
-        subject.should_not accept_values(:email, 'a@b', 'a.b.com')
+        expect(subject).to     accept_values(:email, 'a@b.com', 'a@b.c.com')
+        expect(subject).to_not accept_values(:email, 'a@b', 'a.b.com')
       end
-      it "must be unique"
+      it "must be unique" do
+        subject.save
+        stunt_double = subject.dup
+        expect(stunt_double).to_not accept_values(:email, subject.email)
+      end
     end
   end
 end

data/app_prototype/spec/spec_helper.rb CHANGED Viewed

@@ -25,25 +25,17 @@ if ENV['COVERAGE']
   end
 end
-# This file is copied to spec/ when you run 'rails generate rspec:install'
-ENV["RAILS_ENV"] ||= 'test'
-require File.expand_path("../../config/environment", __FILE__)
+ENV['RAILS_ENV'] ||= 'test'
+require File.expand_path('../../config/environment', __FILE__)
 require 'rspec/rails'
 require 'rspec/autorun'
+require 'capybara/email/rspec'
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
+Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
 RSpec.configure do |config|
-  # ## Mock Framework
-  #
-  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
-  #
-  # config.mock_with :mocha
-  # config.mock_with :flexmock
-  # config.mock_with :rr
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
   config.fixture_path = "#{::Rails.root}/spec/fixtures"
@@ -57,6 +49,10 @@ RSpec.configure do |config|
   # rspec-rails.
   config.infer_base_class_for_anonymous_controllers = false
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.

data/app_prototype/spec/support/user_sessions_feature_helper.rb CHANGED Viewed

@@ -10,8 +10,8 @@ module UserSessionsFeatureHelper
     end
   end
-  def sign_out(user = @current_user)
-    # TODO
+  def sign_out
+    visit sign_out_path
   end
 end

data/app_prototype/spec/views/users/edit.html.slim_spec.rb CHANGED Viewed

@@ -11,7 +11,6 @@ describe "users/edit" do
   it "renders the edit user form" do
     render
-    # Run the generator again with the --webrat flag if you want to use webrat matchers
     assert_select "form", action: users_path(@user), method: "post" do
       assert_select "input#user_email", name: "user[email]"
       assert_select "input#user_name", name: "user[name]"

data/app_prototype/spec/views/users/index.html.slim_spec.rb CHANGED Viewed

@@ -16,7 +16,6 @@ describe "users/index" do
   it "renders a list of users" do
     render
-    # Run the generator again with the --webrat flag if you want to use webrat matchers
     assert_select "tr>td", text: "Email".to_s, count: 2
     assert_select "tr>td", text: "Name".to_s, count: 2
   end

data/app_prototype/spec/views/users/new.html.slim_spec.rb CHANGED Viewed

@@ -11,7 +11,6 @@ describe "users/new" do
   it "renders new user form" do
     render
-    # Run the generator again with the --webrat flag if you want to use webrat matchers
     assert_select "form", action: users_path, method: "post" do
       assert_select "input#user_email", name: "user[email]"
       assert_select "input#user_name", name: "user[name]"

data/app_prototype/spec/views/users/show.html.slim_spec.rb CHANGED Viewed

@@ -10,8 +10,7 @@ describe "users/show" do
   it "renders attributes in <p>" do
     render
-    # Run the generator again with the --webrat flag if you want to use webrat matchers
-    rendered.should match(/Email/)
-    rendered.should match(/Name/)
+    expect(rendered).to match /Email/
+    expect(rendered).to match /Name/
   end
 end

data/bin/raygun CHANGED Viewed

@@ -13,6 +13,12 @@ def titleize(underscored_string)
   result.gsub(/\b('?[a-z])/) { $1.capitalize }
 end
+if !ARGV[0]
+  puts "Please specify where raygun should generate a project (e.g. projects/my_new_project)."
+  puts "usage: raygun new_app_directory"
+  exit 1
+end
 app_dir = ARGV[0]
 app_name_snake = File.basename(app_dir)
 app_name_camel = camelize(app_name_snake)
@@ -28,12 +34,13 @@ Dir.chdir(app_dir) do
   `find . -type f -print | xargs sed -i '' 's/AppPrototype/#{app_name_camel}/g'`
   `find . -type f -print | xargs sed -i '' 's/app_prototype/#{app_name_snake}/g'`
   `sed -i '' 's/App Prototype/#{app_name_title}/' app/views/layouts/application.html.slim`
-  `sed -i '' 's/SECRET_TOKEN_REPLACE_ME_TODO/#{SecureRandom.hex(128)}/' config/initializers/secret_token.rb`
+  `sed -i '' 's/SUPER_SECRET_TOKEN_REPLACE_ME_TODO/#{SecureRandom.hex(128)}/' config/initializers/secret_token.rb`
   puts "Done! Next steps..."
   puts ""
   puts "# Install updated dependencies"
   puts "$ cd #{ARGV[0]}"
+  puts "$ gem install bundler"
   puts "$ bundle update"
   puts ""
   puts "# Prepare the database: schema and reference / sample data"

data/cleanup.sh ADDED Viewed

@@ -0,0 +1,8 @@
+#!/bin/sh
+git clean -df
+git checkout app_prototype/config/routes.rb app_prototype/db/schema.rb
+rm -rfv app_prototype/log/*
+rm -rfv app_prototype/tmp/*
+rm -rfv app_prototype/coverage

data/lib/raygun/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Raygun
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

data/raygun.gemspec CHANGED Viewed

@@ -7,7 +7,7 @@ require 'raygun/version'
 Gem::Specification.new do |gem|
   gem.name          = "raygun"
   gem.version       = Raygun::VERSION
-  gem.authors       = ["Christian Nelson"]
+  gem.authors       = ["Christian Nelson", "Jonah Williams", "Jason Wadsworth"]
   gem.email         = ["christian@carbonfive.com"]
   gem.description   = %q{Carbon Five Rails application generator}
   gem.summary       = %q{Generates and customizes Rails applications with Carbon Five best practices baked in.}
@@ -17,6 +17,4 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  gem.add_dependency 'bundler',     '>= 1.2'
 end