mirror of
https://github.com/danbee/danbarberphoto
synced 2025-03-04 08:49:07 +00:00
Standard RB
This commit is contained in:
parent
c4ca82d16d
commit
ad13971872
13
.rubocop.yml
13
.rubocop.yml
@ -1,13 +0,0 @@
|
|||||||
Documentation:
|
|
||||||
Enabled: false
|
|
||||||
|
|
||||||
AllCops:
|
|
||||||
Include:
|
|
||||||
- '**/Rakefile'
|
|
||||||
- '**/config.ru'
|
|
||||||
Exclude:
|
|
||||||
- 'db/**/*'
|
|
||||||
- 'config/**/*'
|
|
||||||
- 'script/**/*'
|
|
||||||
- 'bin/**/*'
|
|
||||||
- !ruby/regexp /old_and_unused\.rb$/
|
|
||||||
@ -1 +1 @@
|
|||||||
ruby 2.6.6
|
ruby 2.7.2
|
||||||
|
|||||||
26
Gemfile
26
Gemfile
@ -1,12 +1,12 @@
|
|||||||
source "http://rubygems.org"
|
source "http://rubygems.org"
|
||||||
ruby "2.6.6"
|
ruby "2.7.2"
|
||||||
|
|
||||||
gem "dotenv-rails", groups: [:development, :test]
|
gem "dotenv-rails", groups: %i[development test]
|
||||||
|
|
||||||
gem "rails", "~> 5.1"
|
gem "rails", "~> 5.1"
|
||||||
|
|
||||||
# Bundle edge Rails instead:
|
# Bundle edge Rails instead:
|
||||||
# gem 'rails', :git => 'git://github.com/rails/rails.git'
|
# gem "rails", :git => "git://github.com/rails/rails.git"
|
||||||
|
|
||||||
gem "administrate"
|
gem "administrate"
|
||||||
gem "administrate-field-image"
|
gem "administrate-field-image"
|
||||||
@ -33,28 +33,28 @@ gem "unf"
|
|||||||
# put test-only gems in this group so their generators
|
# put test-only gems in this group so their generators
|
||||||
# and rake tasks are available in development mode:
|
# and rake tasks are available in development mode:
|
||||||
group :development do
|
group :development do
|
||||||
gem "ruby_parser"
|
|
||||||
gem "powder"
|
|
||||||
gem "better_errors"
|
gem "better_errors"
|
||||||
gem "binding_of_caller"
|
gem "binding_of_caller"
|
||||||
gem "letter_opener"
|
gem "letter_opener"
|
||||||
|
gem "powder"
|
||||||
|
gem "ruby_parser"
|
||||||
gem "standardrb"
|
gem "standardrb"
|
||||||
end
|
end
|
||||||
|
|
||||||
group :test, :development do
|
group :test, :development do
|
||||||
gem "rspec-rails"
|
|
||||||
gem "rails-controller-testing"
|
|
||||||
gem "rubocop"
|
|
||||||
gem "pry"
|
gem "pry"
|
||||||
|
gem "rails-controller-testing"
|
||||||
|
gem "rspec-rails"
|
||||||
|
gem "rubocop"
|
||||||
end
|
end
|
||||||
|
|
||||||
group :test do
|
group :test do
|
||||||
gem "factory_bot_rails"
|
|
||||||
gem "shoulda"
|
|
||||||
gem "poltergeist"
|
|
||||||
gem "database_cleaner"
|
|
||||||
gem "fivemat"
|
|
||||||
gem "capybara-screenshot"
|
gem "capybara-screenshot"
|
||||||
|
gem "database_cleaner"
|
||||||
|
gem "factory_bot_rails"
|
||||||
|
gem "fivemat"
|
||||||
|
gem "poltergeist"
|
||||||
|
gem "shoulda"
|
||||||
gem "simplecov"
|
gem "simplecov"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
2
Rakefile
2
Rakefile
@ -2,6 +2,6 @@
|
|||||||
# Add your own tasks in files placed in lib/tasks ending in .rake,
|
# Add your own tasks in files placed in lib/tasks ending in .rake,
|
||||||
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
|
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
|
||||||
|
|
||||||
require File.expand_path('../config/application', __FILE__)
|
require File.expand_path("../config/application", __FILE__)
|
||||||
|
|
||||||
DanBarberPhoto::Application.load_tasks
|
DanBarberPhoto::Application.load_tasks
|
||||||
|
|||||||
@ -18,13 +18,13 @@ class PhotosController < ApplicationController
|
|||||||
def for_category(category_id)
|
def for_category(category_id)
|
||||||
@category = Category.find_by_id(category_id)
|
@category = Category.find_by_id(category_id)
|
||||||
@photos = @category.photos.enabled.order(taken_at: :desc)
|
@photos = @category.photos.enabled.order(taken_at: :desc)
|
||||||
.page(params[:page])
|
.page(params[:page])
|
||||||
@page_title = @category.name
|
@page_title = @category.name
|
||||||
end
|
end
|
||||||
|
|
||||||
def all
|
def all
|
||||||
@photos = Photo.enabled.order(taken_at: :desc)
|
@photos = Photo.enabled.order(taken_at: :desc)
|
||||||
.page(params[:page])
|
.page(params[:page])
|
||||||
@page_title = "All Photos"
|
@page_title = "All Photos"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
module ApplicationHelper
|
module ApplicationHelper
|
||||||
def page_title(title)
|
def page_title(title)
|
||||||
if title.present?
|
if title.present?
|
||||||
"#{title} - #{APP_CONFIG['page_title']}"
|
"#{title} - #{APP_CONFIG["page_title"]}"
|
||||||
else
|
else
|
||||||
APP_CONFIG['page_title']
|
APP_CONFIG["page_title"]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
module PhotosHelper
|
module PhotosHelper
|
||||||
def link_to_photo(photo)
|
def link_to_photo(photo)
|
||||||
link_to '', photo.image.url, rel: 'photos', class: 'fancy', data: { id: photo.id }
|
link_to "", photo.image.url, rel: "photos", class: "fancy", data: {id: photo.id}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
class Notifier < ActionMailer::Base
|
class Notifier < ActionMailer::Base
|
||||||
default from: 'enquiries@danbarberphoto.com'
|
default from: "enquiries@danbarberphoto.com"
|
||||||
|
|
||||||
def contact_notification(sender)
|
def contact_notification(sender)
|
||||||
@sender = sender
|
@sender = sender
|
||||||
mail(to: 'enquiries@danbarberphoto.com', from: sender.email, subject: sender.subject)
|
mail(to: "enquiries@danbarberphoto.com", from: sender.email, subject: sender.subject)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
# This file is used by Rack-based servers to start the application.
|
# This file is used by Rack-based servers to start the application.
|
||||||
|
|
||||||
require ::File.expand_path('../config/environment', __FILE__)
|
require ::File.expand_path("../config/environment", __FILE__)
|
||||||
run DanBarberPhoto::Application
|
run DanBarberPhoto::Application
|
||||||
|
|||||||
@ -1,10 +1,10 @@
|
|||||||
require File.expand_path('../boot', __FILE__)
|
require File.expand_path("../boot", __FILE__)
|
||||||
|
|
||||||
require 'rails/all'
|
require "rails/all"
|
||||||
|
|
||||||
if defined?(Bundler)
|
if defined?(Bundler)
|
||||||
# If you precompile assets before deploying to production, use this line
|
# If you precompile assets before deploying to production, use this line
|
||||||
Bundler.require *Rails.groups(:assets => %w(development test))
|
Bundler.require *Rails.groups(assets: %w[development test])
|
||||||
# If you want your assets lazily compiled in production, use this line
|
# If you want your assets lazily compiled in production, use this line
|
||||||
# Bundler.require(:default, :assets, Rails.env)
|
# Bundler.require(:default, :assets, Rails.env)
|
||||||
end
|
end
|
||||||
@ -30,7 +30,7 @@ module DanBarberPhoto
|
|||||||
# config.time_zone = 'Central Time (US & Canada)'
|
# config.time_zone = 'Central Time (US & Canada)'
|
||||||
|
|
||||||
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
|
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
|
||||||
config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
|
config.i18n.load_path += Dir[Rails.root.join("my", "locales", "*.{rb,yml}").to_s]
|
||||||
config.i18n.enforce_available_locales = true
|
config.i18n.enforce_available_locales = true
|
||||||
config.i18n.default_locale = :en
|
config.i18n.default_locale = :en
|
||||||
|
|
||||||
@ -43,10 +43,10 @@ module DanBarberPhoto
|
|||||||
# Enable the asset pipeline
|
# Enable the asset pipeline
|
||||||
config.assets.enabled = true
|
config.assets.enabled = true
|
||||||
|
|
||||||
config.assets.precompile += %w(favicon.ico fancybox/sprite.png fancybox/loading.gif fancybox/blank.gif fancybox/overlay.png)
|
config.assets.precompile += %w[favicon.ico fancybox/sprite.png fancybox/loading.gif fancybox/blank.gif fancybox/overlay.png]
|
||||||
|
|
||||||
# Version of your assets, change this if you want to expire all your assets
|
# Version of your assets, change this if you want to expire all your assets
|
||||||
config.assets.version = '1.0'
|
config.assets.version = "1.0"
|
||||||
|
|
||||||
# Prefer SASS syntax for stylesheets
|
# Prefer SASS syntax for stylesheets
|
||||||
config.sass.preferred_syntax = :sass
|
config.sass.preferred_syntax = :sass
|
||||||
@ -54,7 +54,7 @@ module DanBarberPhoto
|
|||||||
# Configure factories
|
# Configure factories
|
||||||
config.generators do |g|
|
config.generators do |g|
|
||||||
g.test_framework :rspec, fixture: true
|
g.test_framework :rspec, fixture: true
|
||||||
g.fixture_replacement :factory_girl, dir: 'spec/factories'
|
g.fixture_replacement :factory_girl, dir: "spec/factories"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
require 'rubygems'
|
require "rubygems"
|
||||||
|
|
||||||
# Set up gems listed in the Gemfile.
|
# Set up gems listed in the Gemfile.
|
||||||
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
|
ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
|
||||||
|
|
||||||
require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
|
require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
# Load the rails application
|
# Load the rails application
|
||||||
require File.expand_path('../application', __FILE__)
|
require File.expand_path("../application", __FILE__)
|
||||||
|
|
||||||
# Initialize the rails application
|
# Initialize the rails application
|
||||||
DanBarberPhoto::Application.initialize!
|
DanBarberPhoto::Application.initialize!
|
||||||
|
|||||||
@ -33,6 +33,5 @@ DanBarberPhoto::Application.configure do
|
|||||||
|
|
||||||
config.action_mailer.delivery_method = :letter_opener
|
config.action_mailer.delivery_method = :letter_opener
|
||||||
|
|
||||||
config.action_mailer.default_url_options = { :host => "danbarberphoto.dev" }
|
config.action_mailer.default_url_options = {host: "danbarberphoto.dev"}
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
@ -49,7 +49,7 @@ DanBarberPhoto::Application.configure do
|
|||||||
# config.action_controller.asset_host = "http://assets.example.com"
|
# config.action_controller.asset_host = "http://assets.example.com"
|
||||||
|
|
||||||
# Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
|
# Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
|
||||||
config.assets.precompile += %w(administrate/overrides.css)
|
config.assets.precompile += %w[administrate/overrides.css]
|
||||||
|
|
||||||
# Disable delivery errors, bad email addresses will be ignored
|
# Disable delivery errors, bad email addresses will be ignored
|
||||||
# config.action_mailer.raise_delivery_errors = false
|
# config.action_mailer.raise_delivery_errors = false
|
||||||
@ -66,15 +66,14 @@ DanBarberPhoto::Application.configure do
|
|||||||
|
|
||||||
# Settings for Sendgrid Free on Heroku
|
# Settings for Sendgrid Free on Heroku
|
||||||
ActionMailer::Base.smtp_settings = {
|
ActionMailer::Base.smtp_settings = {
|
||||||
:address => 'smtp.sendgrid.net',
|
address: "smtp.sendgrid.net",
|
||||||
:port => '587',
|
port: "587",
|
||||||
:authentication => :plain,
|
authentication: :plain,
|
||||||
:user_name => ENV['SENDGRID_USERNAME'],
|
user_name: ENV["SENDGRID_USERNAME"],
|
||||||
:password => ENV['SENDGRID_PASSWORD'],
|
password: ENV["SENDGRID_PASSWORD"],
|
||||||
:domain => 'heroku.com'
|
domain: "heroku.com",
|
||||||
}
|
}
|
||||||
ActionMailer::Base.delivery_method = :smtp
|
ActionMailer::Base.delivery_method = :smtp
|
||||||
|
|
||||||
config.action_mailer.default_url_options = { :host => "danbarberphoto.com" }
|
config.action_mailer.default_url_options = {host: "danbarberphoto.com"}
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
@ -24,7 +24,7 @@ DanBarberPhoto::Application.configure do
|
|||||||
config.action_dispatch.show_exceptions = false
|
config.action_dispatch.show_exceptions = false
|
||||||
|
|
||||||
# Disable request forgery protection in test environment
|
# Disable request forgery protection in test environment
|
||||||
config.action_controller.allow_forgery_protection = false
|
config.action_controller.allow_forgery_protection = false
|
||||||
|
|
||||||
# Tell Action Mailer not to deliver emails to the real world.
|
# Tell Action Mailer not to deliver emails to the real world.
|
||||||
# The :test delivery method accumulates sent emails in the
|
# The :test delivery method accumulates sent emails in the
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
# Be sure to restart your server when you modify this file.
|
# Be sure to restart your server when you modify this file.
|
||||||
|
|
||||||
# Version of your assets, change this if you want to expire all your assets.
|
# Version of your assets, change this if you want to expire all your assets.
|
||||||
Rails.application.config.assets.version = '1.0'
|
Rails.application.config.assets.version = "1.0"
|
||||||
|
|
||||||
# Add additional assets to the asset load path
|
# Add additional assets to the asset load path
|
||||||
# Rails.application.config.assets.paths << Emoji.images_path
|
# Rails.application.config.assets.paths << Emoji.images_path
|
||||||
|
|
||||||
# Precompile additional assets.
|
# Precompile additional assets.
|
||||||
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
|
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
|
||||||
Rails.application.config.assets.precompile += %w( administrate/overrides.css )
|
Rails.application.config.assets.precompile += %w[administrate/overrides.css]
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
require 'dragonfly'
|
require "dragonfly"
|
||||||
|
|
||||||
# Configure
|
# Configure
|
||||||
Dragonfly.app.configure do
|
Dragonfly.app.configure do
|
||||||
@ -9,35 +9,35 @@ Dragonfly.app.configure do
|
|||||||
|
|
||||||
url_format "/media/:job/:name"
|
url_format "/media/:job/:name"
|
||||||
|
|
||||||
if Rails.env.in?(%w(development production))
|
if Rails.env.in?(%w[development production])
|
||||||
datastore :s3,
|
datastore :s3,
|
||||||
bucket_name: ENV['AWS_BUCKET'],
|
bucket_name: ENV["AWS_BUCKET"],
|
||||||
access_key_id: ENV['AWS_KEY'],
|
access_key_id: ENV["AWS_KEY"],
|
||||||
secret_access_key: ENV['AWS_SECRET'],
|
secret_access_key: ENV["AWS_SECRET"],
|
||||||
region: 'eu-west-1'
|
region: "eu-west-1"
|
||||||
else
|
else
|
||||||
datastore :file,
|
datastore :file,
|
||||||
root_path: Rails.root.join('public/system/dragonfly', Rails.env),
|
root_path: Rails.root.join("public/system/dragonfly", Rails.env),
|
||||||
server_root: Rails.root.join('public')
|
server_root: Rails.root.join("public")
|
||||||
end
|
end
|
||||||
|
|
||||||
processor :preview do |content| content.process! :thumb, '600x600' end
|
processor :preview do |content| content.process! :thumb, "600x600" end
|
||||||
|
|
||||||
processor :admin do |content| content.process! :thumb, '140x140#' end
|
processor :admin do |content| content.process! :thumb, "140x140#" end
|
||||||
|
|
||||||
processor :size17 do |content| content.process! :thumb, '476x476#' end
|
processor :size17 do |content| content.process! :thumb, "476x476#" end
|
||||||
processor :size11 do |content| content.process! :thumb, '308x308#' end
|
processor :size11 do |content| content.process! :thumb, "308x308#" end
|
||||||
processor :size8 do |content| content.process! :thumb, '224x224#' end
|
processor :size8 do |content| content.process! :thumb, "224x224#" end
|
||||||
processor :size5 do |content| content.process! :thumb, '140x140#' end
|
processor :size5 do |content| content.process! :thumb, "140x140#" end
|
||||||
processor :size3 do |content| content.process! :thumb, '84x84#' end
|
processor :size3 do |content| content.process! :thumb, "84x84#" end
|
||||||
processor :size2 do |content| content.process! :thumb, '56x56#' end
|
processor :size2 do |content| content.process! :thumb, "56x56#" end
|
||||||
|
|
||||||
processor :size17x2 do |content| content.process! :thumb, '952x952#' end
|
processor :size17x2 do |content| content.process! :thumb, "952x952#" end
|
||||||
processor :size11x2 do |content| content.process! :thumb, '616x616#' end
|
processor :size11x2 do |content| content.process! :thumb, "616x616#" end
|
||||||
processor :size8x2 do |content| content.process! :thumb, '448x448#' end
|
processor :size8x2 do |content| content.process! :thumb, "448x448#" end
|
||||||
processor :size5x2 do |content| content.process! :thumb, '280x280#' end
|
processor :size5x2 do |content| content.process! :thumb, "280x280#" end
|
||||||
processor :size3x2 do |content| content.process! :thumb, '168x168#' end
|
processor :size3x2 do |content| content.process! :thumb, "168x168#" end
|
||||||
processor :size2x2 do |content| content.process! :thumb, '112x112#' end
|
processor :size2x2 do |content| content.process! :thumb, "112x112#" end
|
||||||
end
|
end
|
||||||
|
|
||||||
# Logger
|
# Logger
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
# Be sure to restart your server when you modify this file.
|
# Be sure to restart your server when you modify this file.
|
||||||
|
|
||||||
DanBarberPhoto::Application.config.session_store :cookie_store, key: '_danbarberphoto_session'
|
DanBarberPhoto::Application.config.session_store :cookie_store, key: "_danbarberphoto_session"
|
||||||
|
|
||||||
# Use the database for sessions instead of the cookie-based default,
|
# Use the database for sessions instead of the cookie-based default,
|
||||||
# which shouldn't be used to store highly confidential information
|
# which shouldn't be used to store highly confidential information
|
||||||
|
|||||||
@ -6,7 +6,7 @@ SimpleForm.setup do |config|
|
|||||||
# stack. The options given below are used to wrap the
|
# stack. The options given below are used to wrap the
|
||||||
# whole input.
|
# whole input.
|
||||||
config.wrappers :default, class: :input,
|
config.wrappers :default, class: :input,
|
||||||
hint_class: :field_with_hint, error_class: :field_with_errors do |b|
|
hint_class: :field_with_hint, error_class: :field_with_errors do |b|
|
||||||
## Extensions enabled by default
|
## Extensions enabled by default
|
||||||
# Any of these extensions can be disabled for a
|
# Any of these extensions can be disabled for a
|
||||||
# given input by passing: `f.input EXTENSION_NAME => false`.
|
# given input by passing: `f.input EXTENSION_NAME => false`.
|
||||||
@ -41,8 +41,8 @@ SimpleForm.setup do |config|
|
|||||||
|
|
||||||
## Inputs
|
## Inputs
|
||||||
b.use :label_input
|
b.use :label_input
|
||||||
b.use :hint, wrap_with: { tag: :span, class: :hint }
|
b.use :hint, wrap_with: {tag: :span, class: :hint}
|
||||||
b.use :error, wrap_with: { tag: :span, class: :error }
|
b.use :error, wrap_with: {tag: :span, class: :error}
|
||||||
end
|
end
|
||||||
|
|
||||||
# The default wrapper to be used by the FormBuilder.
|
# The default wrapper to be used by the FormBuilder.
|
||||||
@ -55,7 +55,7 @@ SimpleForm.setup do |config|
|
|||||||
config.boolean_style = :nested
|
config.boolean_style = :nested
|
||||||
|
|
||||||
# Default class for buttons
|
# Default class for buttons
|
||||||
config.button_class = 'btn'
|
config.button_class = "btn"
|
||||||
|
|
||||||
# Method used to tidy up errors. Specify any Rails Array method.
|
# Method used to tidy up errors. Specify any Rails Array method.
|
||||||
# :first lists the first message for each field.
|
# :first lists the first message for each field.
|
||||||
@ -66,7 +66,7 @@ SimpleForm.setup do |config|
|
|||||||
config.error_notification_tag = :div
|
config.error_notification_tag = :div
|
||||||
|
|
||||||
# CSS class to add for error notification helper.
|
# CSS class to add for error notification helper.
|
||||||
config.error_notification_class = 'alert alert-error'
|
config.error_notification_class = "alert alert-error"
|
||||||
|
|
||||||
# ID to add for error notification helper.
|
# ID to add for error notification helper.
|
||||||
# config.error_notification_id = nil
|
# config.error_notification_id = nil
|
||||||
@ -95,7 +95,7 @@ SimpleForm.setup do |config|
|
|||||||
# config.label_text = lambda { |label, required| "#{required} #{label}" }
|
# config.label_text = lambda { |label, required| "#{required} #{label}" }
|
||||||
|
|
||||||
# You can define the class to use on all labels. Default is nil.
|
# You can define the class to use on all labels. Default is nil.
|
||||||
config.label_class = 'control-label'
|
config.label_class = "control-label"
|
||||||
|
|
||||||
# You can define the class to use on all forms. Default is simple_form.
|
# You can define the class to use on all forms. Default is simple_form.
|
||||||
# config.form_class = :simple_form
|
# config.form_class = :simple_form
|
||||||
|
|||||||
@ -1,18 +1,18 @@
|
|||||||
workers Integer(ENV['PUMA_WORKERS'] || 3)
|
workers Integer(ENV["PUMA_WORKERS"] || 3)
|
||||||
threads Integer(ENV['MIN_THREADS'] || 1), Integer(ENV['MAX_THREADS'] || 16)
|
threads Integer(ENV["MIN_THREADS"] || 1), Integer(ENV["MAX_THREADS"] || 16)
|
||||||
|
|
||||||
preload_app!
|
preload_app!
|
||||||
|
|
||||||
rackup DefaultRackup
|
rackup DefaultRackup
|
||||||
port ENV['PORT'] || 3000
|
port ENV["PORT"] || 3000
|
||||||
environment ENV['RACK_ENV'] || 'development'
|
environment ENV["RACK_ENV"] || "development"
|
||||||
|
|
||||||
on_worker_boot do
|
on_worker_boot do
|
||||||
# worker specific setup
|
# worker specific setup
|
||||||
ActiveSupport.on_load(:active_record) do
|
ActiveSupport.on_load(:active_record) do
|
||||||
config = ActiveRecord::Base.configurations[Rails.env] ||
|
config = ActiveRecord::Base.configurations[Rails.env] ||
|
||||||
Rails.application.config.database_configuration[Rails.env]
|
Rails.application.config.database_configuration[Rails.env]
|
||||||
config['pool'] = ENV['MAX_THREADS'] || 16
|
config["pool"] = ENV["MAX_THREADS"] || 16
|
||||||
ActiveRecord::Base.establish_connection(config)
|
ActiveRecord::Base.establish_connection(config)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
require 'oath/constraints/signed_in'
|
require "oath/constraints/signed_in"
|
||||||
require 'oath/constraints/signed_out'
|
require "oath/constraints/signed_out"
|
||||||
|
|
||||||
DanBarberPhoto::Application.routes.draw do
|
DanBarberPhoto::Application.routes.draw do
|
||||||
namespace :admin do
|
namespace :admin do
|
||||||
@ -32,6 +32,6 @@ DanBarberPhoto::Application.routes.draw do
|
|||||||
|
|
||||||
resources :contacts, only: [:new, :create]
|
resources :contacts, only: [:new, :create]
|
||||||
|
|
||||||
get '/:name' => 'pages#show', as: :page
|
get "/:name" => "pages#show", :as => :page
|
||||||
root to: 'home#index'
|
root to: "home#index"
|
||||||
end
|
end
|
||||||
|
|||||||
@ -2,9 +2,9 @@ class CreatePhotos < ActiveRecord::Migration
|
|||||||
def self.up
|
def self.up
|
||||||
create_table :photos do |t|
|
create_table :photos do |t|
|
||||||
t.integer :category_id
|
t.integer :category_id
|
||||||
|
|
||||||
t.string :flickr_url
|
t.string :flickr_url
|
||||||
|
|
||||||
t.string :photo_file_name
|
t.string :photo_file_name
|
||||||
t.string :photo_content_type
|
t.string :photo_content_type
|
||||||
t.integer :photo_file_size
|
t.integer :photo_file_size
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
class AddPhotoToCategory < ActiveRecord::Migration
|
class AddPhotoToCategory < ActiveRecord::Migration
|
||||||
def self.up
|
def self.up
|
||||||
add_column :categories, :photo_id, :integer
|
add_column :categories, :photo_id, :integer
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.down
|
def self.down
|
||||||
remove_column :categories, :photo_id
|
remove_column :categories, :photo_id
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
class AddDetailsToPhoto < ActiveRecord::Migration
|
class AddDetailsToPhoto < ActiveRecord::Migration
|
||||||
def self.up
|
def self.up
|
||||||
add_column :photos, :title, :string
|
add_column :photos, :title, :string
|
||||||
add_column :photos, :description, :text
|
add_column :photos, :description, :text
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.down
|
def self.down
|
||||||
remove_column :photos, :title
|
remove_column :photos, :title
|
||||||
remove_column :photos, :description
|
remove_column :photos, :description
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -5,7 +5,7 @@ class AddSortOrders < ActiveRecord::Migration
|
|||||||
end
|
end
|
||||||
|
|
||||||
def self.down
|
def self.down
|
||||||
remove_column :photos, :sort
|
remove_column :photos, :sort
|
||||||
remove_column :categories, :sort
|
remove_column :categories, :sort
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
class MoveToManyToMany < ActiveRecord::Migration
|
class MoveToManyToMany < ActiveRecord::Migration
|
||||||
def self.up
|
def self.up
|
||||||
remove_column :photos, :category_id
|
remove_column :photos, :category_id
|
||||||
create_table :categories_photos, :id => false do |t|
|
create_table :categories_photos, id: false do |t|
|
||||||
t.integer :category_id
|
t.integer :category_id
|
||||||
t.integer :photo_id
|
t.integer :photo_id
|
||||||
end
|
end
|
||||||
|
|||||||
@ -1,15 +1,14 @@
|
|||||||
class CreateAdminUsers < ActiveRecord::Migration
|
class CreateAdminUsers < ActiveRecord::Migration
|
||||||
|
|
||||||
def self.up
|
def self.up
|
||||||
create_table :admin_users do |t|
|
create_table :admin_users do |t|
|
||||||
t.string :first_name, :default => "", :null => false
|
t.string :first_name, default: "", null: false
|
||||||
t.string :last_name, :default => "", :null => false
|
t.string :last_name, default: "", null: false
|
||||||
t.string :role, :null => false
|
t.string :role, null: false
|
||||||
t.string :email, :null => false
|
t.string :email, null: false
|
||||||
t.boolean :status, :default => false
|
t.boolean :status, default: false
|
||||||
t.string :token, :null => false
|
t.string :token, null: false
|
||||||
t.string :salt, :null => false
|
t.string :salt, null: false
|
||||||
t.string :crypted_password, :null => false
|
t.string :crypted_password, null: false
|
||||||
t.string :preferences
|
t.string :preferences
|
||||||
t.timestamps
|
t.timestamps
|
||||||
end
|
end
|
||||||
@ -18,5 +17,4 @@ class CreateAdminUsers < ActiveRecord::Migration
|
|||||||
def self.down
|
def self.down
|
||||||
drop_table :admin_users
|
drop_table :admin_users
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
class PhotoShowcase < ActiveRecord::Migration
|
class PhotoShowcase < ActiveRecord::Migration
|
||||||
def self.up
|
def self.up
|
||||||
add_column :photos, :featured, :boolean, :default => false
|
add_column :photos, :featured, :boolean, default: false
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.down
|
def self.down
|
||||||
remove_column :photos, :featured
|
remove_column :photos, :featured
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
class AddEnabledToPhotos < ActiveRecord::Migration
|
class AddEnabledToPhotos < ActiveRecord::Migration
|
||||||
def self.up
|
def self.up
|
||||||
add_column :photos, :enabled, :boolean, :default => true
|
add_column :photos, :enabled, :boolean, default: true
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.down
|
def self.down
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
class AddTakenDateToPhoto < ActiveRecord::Migration
|
class AddTakenDateToPhoto < ActiveRecord::Migration
|
||||||
def self.up
|
def self.up
|
||||||
add_column :photos, :taken_at, :datetime
|
add_column :photos, :taken_at, :datetime
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.down
|
def self.down
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
class AddViewCountToPhotos < ActiveRecord::Migration
|
class AddViewCountToPhotos < ActiveRecord::Migration
|
||||||
def self.up
|
def self.up
|
||||||
add_column :photos, :views, :integer, :default => 0
|
add_column :photos, :views, :integer, default: 0
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.down
|
def self.down
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
class AddSessionsTable < ActiveRecord::Migration
|
class AddSessionsTable < ActiveRecord::Migration
|
||||||
def up
|
def up
|
||||||
create_table :sessions do |t|
|
create_table :sessions do |t|
|
||||||
t.string :session_id, :null => false
|
t.string :session_id, null: false
|
||||||
t.text :data
|
t.text :data
|
||||||
t.timestamps
|
t.timestamps
|
||||||
end
|
end
|
||||||
|
|||||||
@ -5,14 +5,14 @@ class RemoveAdminUsers < ActiveRecord::Migration
|
|||||||
|
|
||||||
def self.down
|
def self.down
|
||||||
create_table :admin_users do |t|
|
create_table :admin_users do |t|
|
||||||
t.string :first_name, :default => "", :null => false
|
t.string :first_name, default: "", null: false
|
||||||
t.string :last_name, :default => "", :null => false
|
t.string :last_name, default: "", null: false
|
||||||
t.string :role, :null => false
|
t.string :role, null: false
|
||||||
t.string :email, :null => false
|
t.string :email, null: false
|
||||||
t.boolean :status, :default => false
|
t.boolean :status, default: false
|
||||||
t.string :token, :null => false
|
t.string :token, null: false
|
||||||
t.string :salt, :null => false
|
t.string :salt, null: false
|
||||||
t.string :crypted_password, :null => false
|
t.string :crypted_password, null: false
|
||||||
t.string :preferences
|
t.string :preferences
|
||||||
t.timestamps
|
t.timestamps
|
||||||
end
|
end
|
||||||
|
|||||||
@ -2,8 +2,8 @@ class CreateDeviseAdminUsers < ActiveRecord::Migration
|
|||||||
def up
|
def up
|
||||||
create_table(:admin_users) do |t|
|
create_table(:admin_users) do |t|
|
||||||
# Database authenticatable
|
# Database authenticatable
|
||||||
t.string :email, :null => false, :default => ""
|
t.string :email, null: false, default: ""
|
||||||
t.string :encrypted_password, :null => false, :default => ""
|
t.string :encrypted_password, null: false, default: ""
|
||||||
|
|
||||||
# Recoverable
|
# Recoverable
|
||||||
t.string :reset_password_token
|
t.string :reset_password_token
|
||||||
@ -13,7 +13,7 @@ class CreateDeviseAdminUsers < ActiveRecord::Migration
|
|||||||
t.datetime :remember_created_at
|
t.datetime :remember_created_at
|
||||||
|
|
||||||
# Trackable
|
# Trackable
|
||||||
t.integer :sign_in_count, :default => 0
|
t.integer :sign_in_count, default: 0
|
||||||
t.datetime :current_sign_in_at
|
t.datetime :current_sign_in_at
|
||||||
t.datetime :last_sign_in_at
|
t.datetime :last_sign_in_at
|
||||||
t.string :current_sign_in_ip
|
t.string :current_sign_in_ip
|
||||||
@ -26,17 +26,17 @@ class CreateDeviseAdminUsers < ActiveRecord::Migration
|
|||||||
t.string :unconfirmed_email # Only if using reconfirmable
|
t.string :unconfirmed_email # Only if using reconfirmable
|
||||||
|
|
||||||
# Lockable
|
# Lockable
|
||||||
t.integer :failed_attempts, :default => 0 # Only if lock strategy is :failed_attempts
|
t.integer :failed_attempts, default: 0 # Only if lock strategy is :failed_attempts
|
||||||
t.string :unlock_token # Only if unlock strategy is :email or :both
|
t.string :unlock_token # Only if unlock strategy is :email or :both
|
||||||
t.datetime :locked_at
|
t.datetime :locked_at
|
||||||
|
|
||||||
t.timestamps
|
t.timestamps
|
||||||
end
|
end
|
||||||
|
|
||||||
add_index :admin_users, :email, :unique => true
|
add_index :admin_users, :email, unique: true
|
||||||
add_index :admin_users, :reset_password_token, :unique => true
|
add_index :admin_users, :reset_password_token, unique: true
|
||||||
add_index :admin_users, :confirmation_token, :unique => true
|
add_index :admin_users, :confirmation_token, unique: true
|
||||||
add_index :admin_users, :unlock_token, :unique => true
|
add_index :admin_users, :unlock_token, unique: true
|
||||||
# add_index :admin_users, :authentication_token, :unique => true
|
# add_index :admin_users, :authentication_token, :unique => true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@ -6,8 +6,8 @@ class RemoveDeviseAdminUsers < ActiveRecord::Migration
|
|||||||
def down
|
def down
|
||||||
create_table(:admin_users) do |t|
|
create_table(:admin_users) do |t|
|
||||||
# Database authenticatable
|
# Database authenticatable
|
||||||
t.string :email, :null => false, :default => ""
|
t.string :email, null: false, default: ""
|
||||||
t.string :encrypted_password, :null => false, :default => ""
|
t.string :encrypted_password, null: false, default: ""
|
||||||
|
|
||||||
# Recoverable
|
# Recoverable
|
||||||
t.string :reset_password_token
|
t.string :reset_password_token
|
||||||
@ -17,7 +17,7 @@ class RemoveDeviseAdminUsers < ActiveRecord::Migration
|
|||||||
t.datetime :remember_created_at
|
t.datetime :remember_created_at
|
||||||
|
|
||||||
# Trackable
|
# Trackable
|
||||||
t.integer :sign_in_count, :default => 0
|
t.integer :sign_in_count, default: 0
|
||||||
t.datetime :current_sign_in_at
|
t.datetime :current_sign_in_at
|
||||||
t.datetime :last_sign_in_at
|
t.datetime :last_sign_in_at
|
||||||
t.string :current_sign_in_ip
|
t.string :current_sign_in_ip
|
||||||
@ -30,16 +30,16 @@ class RemoveDeviseAdminUsers < ActiveRecord::Migration
|
|||||||
t.string :unconfirmed_email # Only if using reconfirmable
|
t.string :unconfirmed_email # Only if using reconfirmable
|
||||||
|
|
||||||
# Lockable
|
# Lockable
|
||||||
t.integer :failed_attempts, :default => 0 # Only if lock strategy is :failed_attempts
|
t.integer :failed_attempts, default: 0 # Only if lock strategy is :failed_attempts
|
||||||
t.string :unlock_token # Only if unlock strategy is :email or :both
|
t.string :unlock_token # Only if unlock strategy is :email or :both
|
||||||
t.datetime :locked_at
|
t.datetime :locked_at
|
||||||
|
|
||||||
t.timestamps
|
t.timestamps
|
||||||
end
|
end
|
||||||
|
|
||||||
add_index :admin_users, :email, :unique => true
|
add_index :admin_users, :email, unique: true
|
||||||
add_index :admin_users, :reset_password_token, :unique => true
|
add_index :admin_users, :reset_password_token, unique: true
|
||||||
add_index :admin_users, :confirmation_token, :unique => true
|
add_index :admin_users, :confirmation_token, unique: true
|
||||||
add_index :admin_users, :unlock_token, :unique => true
|
add_index :admin_users, :unlock_token, unique: true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
Thread.new do
|
Thread.new {
|
||||||
require "objspace"
|
require "objspace"
|
||||||
ObjectSpace.trace_object_allocations_start
|
ObjectSpace.trace_object_allocations_start
|
||||||
GC.start()
|
GC.start
|
||||||
ObjectSpace.dump_all(output: File.open("heap.json", "w"))
|
ObjectSpace.dump_all(output: File.open("heap.json", "w"))
|
||||||
end.join
|
}.join
|
||||||
|
|||||||
@ -21,7 +21,7 @@ describe ContactsController, type: :controller do
|
|||||||
valid_contact = double(valid?: true)
|
valid_contact = double(valid?: true)
|
||||||
allow(Contact).to receive(:new).and_return(valid_contact)
|
allow(Contact).to receive(:new).and_return(valid_contact)
|
||||||
allow(Notifier).to receive(:contact_notification).and_return(double(deliver: true))
|
allow(Notifier).to receive(:contact_notification).and_return(double(deliver: true))
|
||||||
post :create, params: { contact: contact_params }
|
post :create, params: {contact: contact_params}
|
||||||
|
|
||||||
expect(Notifier).to have_received(:contact_notification).with(valid_contact)
|
expect(Notifier).to have_received(:contact_notification).with(valid_contact)
|
||||||
expect(flash[:notice]).to eql(I18n.t("contact.thanks"))
|
expect(flash[:notice]).to eql(I18n.t("contact.thanks"))
|
||||||
@ -30,7 +30,7 @@ describe ContactsController, type: :controller do
|
|||||||
|
|
||||||
it "re-renders the form if params are missing" do
|
it "re-renders the form if params are missing" do
|
||||||
allow(Contact).to receive(:new).and_return(double(valid?: false))
|
allow(Contact).to receive(:new).and_return(double(valid?: false))
|
||||||
post :create, params: { contact: {} }
|
post :create, params: {contact: {}}
|
||||||
expect(flash[:alert]).to eql(I18n.t("contact.invalid"))
|
expect(flash[:alert]).to eql(I18n.t("contact.invalid"))
|
||||||
expect(response).to render_template(:new)
|
expect(response).to render_template(:new)
|
||||||
end
|
end
|
||||||
|
|||||||
@ -5,12 +5,12 @@ describe PagesController, type: :controller do
|
|||||||
let(:test_page) { create(:page) }
|
let(:test_page) { create(:page) }
|
||||||
|
|
||||||
it "renders a page" do
|
it "renders a page" do
|
||||||
get :show, params: { name: test_page.name }
|
get :show, params: {name: test_page.name}
|
||||||
expect(response).to render_template(:show)
|
expect(response).to render_template(:show)
|
||||||
end
|
end
|
||||||
|
|
||||||
it "renders 404 for a non existant page" do
|
it "renders 404 for a non existant page" do
|
||||||
get :show, params: { name: "not-a-page" }
|
get :show, params: {name: "not-a-page"}
|
||||||
expect(response.status).to eql(404)
|
expect(response.status).to eql(404)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -6,12 +6,12 @@ RSpec.describe ViewsController, type: :controller do
|
|||||||
|
|
||||||
it "logs a photo view" do
|
it "logs a photo view" do
|
||||||
expect_any_instance_of(Photo).to receive(:log_view).once
|
expect_any_instance_of(Photo).to receive(:log_view).once
|
||||||
post :create, params: { photo_id: photo.id }
|
post :create, params: {photo_id: photo.id}
|
||||||
expect(response).to be_successful
|
expect(response).to be_successful
|
||||||
end
|
end
|
||||||
|
|
||||||
it "responds with not_found if the photo is not present" do
|
it "responds with not_found if the photo is not present" do
|
||||||
post :create, params: { photo_id: 999 }
|
post :create, params: {photo_id: 999}
|
||||||
expect(response.status).to eql(404)
|
expect(response.status).to eql(404)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -5,8 +5,8 @@ describe Contact do
|
|||||||
it { is_expected.to validate_presence_of(:name) }
|
it { is_expected.to validate_presence_of(:name) }
|
||||||
it { is_expected.to validate_presence_of(:message) }
|
it { is_expected.to validate_presence_of(:message) }
|
||||||
|
|
||||||
it { is_expected.to allow_value('test@test.com').for(:email) }
|
it { is_expected.to allow_value("test@test.com").for(:email) }
|
||||||
it { is_expected.not_to allow_value('test@test').for(:email) }
|
it { is_expected.not_to allow_value("test@test").for(:email) }
|
||||||
|
|
||||||
let(:contact) { build(:contact) }
|
let(:contact) { build(:contact) }
|
||||||
end
|
end
|
||||||
|
|||||||
@ -1,12 +1,12 @@
|
|||||||
# This file is copied to spec/ when you run 'rails generate rspec:install'
|
# This file is copied to spec/ when you run 'rails generate rspec:install'
|
||||||
ENV['RAILS_ENV'] ||= 'test'
|
ENV["RAILS_ENV"] ||= "test"
|
||||||
require File.expand_path('../../config/environment', __FILE__)
|
require File.expand_path("../../config/environment", __FILE__)
|
||||||
require 'rspec/rails'
|
require "rspec/rails"
|
||||||
require 'capybara/rspec'
|
require "capybara/rspec"
|
||||||
require 'capybara/poltergeist'
|
require "capybara/poltergeist"
|
||||||
|
|
||||||
# For code coverage
|
# For code coverage
|
||||||
require 'simplecov'
|
require "simplecov"
|
||||||
SimpleCov.start
|
SimpleCov.start
|
||||||
|
|
||||||
# Use Poltergeist
|
# Use Poltergeist
|
||||||
@ -14,7 +14,7 @@ Capybara.javascript_driver = :poltergeist
|
|||||||
|
|
||||||
# Requires supporting ruby files with custom matchers and macros, etc,
|
# Requires supporting ruby files with custom matchers and macros, etc,
|
||||||
# in spec/support/ and its subdirectories.
|
# 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|
|
RSpec.configure do |config|
|
||||||
# ## Mock Framework
|
# ## Mock Framework
|
||||||
@ -46,7 +46,7 @@ RSpec.configure do |config|
|
|||||||
# order dependency and want to debug it, you can fix the order by providing
|
# order dependency and want to debug it, you can fix the order by providing
|
||||||
# the seed, which is printed after each run.
|
# the seed, which is printed after each run.
|
||||||
# --seed 1234
|
# --seed 1234
|
||||||
config.order = 'random'
|
config.order = "random"
|
||||||
|
|
||||||
config.before(:suite) do
|
config.before(:suite) do
|
||||||
DatabaseCleaner.clean_with(:truncation)
|
DatabaseCleaner.clean_with(:truncation)
|
||||||
|
|||||||
@ -2,7 +2,7 @@ module Ajax
|
|||||||
def wait_for_ajax
|
def wait_for_ajax
|
||||||
Timeout.timeout(Capybara.default_max_wait_time) do
|
Timeout.timeout(Capybara.default_max_wait_time) do
|
||||||
loop do
|
loop do
|
||||||
active = page.evaluate_script('jQuery.active')
|
active = page.evaluate_script("jQuery.active")
|
||||||
break if active == 0
|
break if active == 0
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user