diff --git a/app/views/posts/_post.html.erb b/app/views/posts/_post.html.erb
index 7296bd2..33784f5 100644
--- a/app/views/posts/_post.html.erb
+++ b/app/views/posts/_post.html.erb
@@ -38,7 +38,7 @@
|
- <%= raw post.text_parsed %>
+ <%= post.text_parsed.html_safe %>
|
diff --git a/app/views/widgets/_login.html.erb b/app/views/widgets/_login.html.erb
index c8ba1e9..871ec04 100644
--- a/app/views/widgets/_login.html.erb
+++ b/app/views/widgets/_login.html.erb
@@ -3,8 +3,8 @@
- <%= link_to "Register", new_user_path %>
- <%= link_to "Forgot Password?", "/users/forgot/1" %>
+ <%= link_to I18n.t('helpers.submit.user.create'), new_user_path %>
+ <%= link_to I18n.t('sessions.form.forgot_password'), "/users/forgot/1" %>
|
<%= text_field "login", "username" %>
@@ -13,7 +13,7 @@
<%= password_field "login", "password" %>
|
- <%= submit_tag raw("»") %>
+ <%= submit_tag I18n.t('helpers.submit.user.login') %>
|
diff --git a/app/views/widgets/_poll.html.erb b/app/views/widgets/_poll.html.erb
index e11154b..349136c 100644
--- a/app/views/widgets/_poll.html.erb
+++ b/app/views/widgets/_poll.html.erb
@@ -2,6 +2,6 @@
<% @poll = Poll.first :order => "created_at DESC" %>
- <%= render :partial => "polls/show" %>
+ <%= render(:partial => "polls/show") if @poll %>
diff --git a/config/database.yml b/config/database.yml
index d0da08f..c18ed69 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -1,15 +1,14 @@
base: &db
adapter: mysql2
encoding: utf8
- pool: 5
host: localhost
database: <%= ENV['MYSQL_DATABASE'] %>
username: <%= ENV['MYSQL_USERNAME'] %>
password: <%= ENV['MYSQL_PASSWORD'] %>
+ pool: <%= Integer(ENV['MYSQL_CONNECTION_POOL'] || 8) %>
development:
<<: *db
- database: ensl_development
test:
<<: *db
diff --git a/config/deploy.rb b/config/deploy.rb
index 409b370..398a58a 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -19,7 +19,7 @@ set :unicorn_config_path, "config/unicorn.rb"
set :writable_dirs, %w{public tmp}
set :linked_files, %w{.env}
set :linked_dirs, %w{bin log tmp/pids tmp/cache tmp/sockets vendor/bundle
- public/system public/local public/uploads}
+ public/system public/local public/uploads public/files}
set :normalize_asset_timestamps, %{public/images
public/javascripts
diff --git a/config/initializers/bbcoder.rb b/config/initializers/bbcoder.rb
new file mode 100644
index 0000000..670f499
--- /dev/null
+++ b/config/initializers/bbcoder.rb
@@ -0,0 +1,27 @@
+BBCoder.configure do
+ tag :b, :as => :strong
+
+ tag :sub, :singular => true do
+ %(
#{singular? ? meta : content})
+ end
+
+ tag :sup, :singular => true do
+ %(
#{singular? ? meta : content})
+ end
+
+ tag :ul
+ tag :ol
+ tag :li, :parents => [:ol, :ul]
+
+ tag :size do
+ %(
#{content})
+ end
+
+ tag :url do
+ if meta.nil? || meta.empty?
+ %(
#{content})
+ else
+ %(
#{content})
+ end
+ end
+end
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7d2eb7e..0407863 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -81,15 +81,23 @@ en:
votes_success: "Voted successfully."
error: "error"
prohibited: "prohibited"
+ sessions:
+ form:
+ forgot_password: "Forgot password?"
errors:
template:
header: "Please review the following errors:"
helpers:
submit:
user:
+ login: "Login"
create: "Register"
+ post:
+ create: "Create Article"
activerecord:
attributes:
+ article:
+ title: "Title"
user:
username: "Username"
email: "Email"
diff --git a/config/newrelic.yml b/config/newrelic.yml
index 801be41..0709a55 100644
--- a/config/newrelic.yml
+++ b/config/newrelic.yml
@@ -15,7 +15,7 @@ common: &default_settings
# You must specify the license key associated with your New Relic
# account. This key binds your Agent's data to your account in the
# New Relic service.
- license_key: '<%= license_key %>'
+ license_key: '<%= ENV["NEW_RELIC_LICENSE_KEY"] %>'
# Agent Enabled (Ruby/Rails Only)
# Use this setting to force the agent to run or not run.
@@ -42,7 +42,7 @@ common: &default_settings
# - Ajax Service
# - All Services
#
- app_name: <%= @app_name %>
+ app_name: <%= ENV['NEW_RELIC_APP_NAME'] %>
# When "true", the agent collects performance data about your
# application and reports this data to the New Relic service at
@@ -190,7 +190,7 @@ development:
<<: *default_settings
# Turn on communication to New Relic service in development mode
monitor_mode: true
- app_name: <%= @app_name %> (Development)
+ app_name: <%= ENV['NEW_RELIC_APP_NAME'] %> (Development)
# Rails Only - when running in Developer Mode, the New Relic Agent will
# present performance information on the last 100 transactions you have
@@ -222,4 +222,4 @@ production:
staging:
<<: *default_settings
monitor_mode: true
- app_name: <%= @app_name %> (Staging)
+ app_name: <%= ENV['NEW_RELIC_APP_NAME'] %> (Staging)
diff --git a/db/migrate/20140330152235_increase_article_text_limit.rb b/db/migrate/20140330152235_increase_article_text_limit.rb
new file mode 100644
index 0000000..333aa06
--- /dev/null
+++ b/db/migrate/20140330152235_increase_article_text_limit.rb
@@ -0,0 +1,17 @@
+class IncreaseArticleTextLimit < ActiveRecord::Migration
+ def up
+ change_column :articles, :text, :text, :limit => 16777215
+ change_column :articles, :text_parsed, :text, :limit => 16777215
+
+ change_column :article_versions, :text, :text, :limit => 16777215
+ change_column :article_versions, :text_parsed, :text, :limit => 16777215
+ end
+
+ def down
+ change_column :articles, :text, :text, :limit => 65535
+ change_column :articles, :text_parsed, :text, :limit => 65535
+
+ change_column :article_versions, :text, :text, :limit => 65535
+ change_column :article_versions, :text_parsed, :text, :limit => 65535
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 39bd476..59983ad 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20120122001951) do
+ActiveRecord::Schema.define(:version => 20140330152235) do
create_table "admin_requests", :force => true do |t|
t.string "addr"
@@ -31,26 +31,26 @@ ActiveRecord::Schema.define(:version => 20120122001951) do
t.integer "article_id"
t.integer "version"
t.string "title"
- t.text "text"
+ t.text "text", :limit => 16777215
t.datetime "created_at"
t.datetime "updated_at"
- t.text "text_parsed"
- t.integer "text_coding", :default => 0, :null => false
+ t.text "text_parsed", :limit => 16777215
+ t.integer "text_coding", :default => 0, :null => false
end
add_index "article_versions", ["article_id"], :name => "index_article_versions_on_article_id"
create_table "articles", :force => true do |t|
t.string "title"
- t.integer "status", :null => false
+ t.integer "status", :null => false
t.integer "category_id"
- t.text "text"
+ t.text "text", :limit => 16777215
t.integer "user_id"
t.datetime "created_at"
t.datetime "updated_at"
t.integer "version"
- t.text "text_parsed"
- t.integer "text_coding", :default => 0, :null => false
+ t.text "text_parsed", :limit => 16777215
+ t.integer "text_coding", :default => 0, :null => false
end
add_index "articles", ["category_id"], :name => "index_articles_on_category_id"
diff --git a/lib/extra.rb b/lib/extra.rb
index aba3c5b..7d10abf 100644
--- a/lib/extra.rb
+++ b/lib/extra.rb
@@ -18,6 +18,10 @@ module Extra
{CODING_HTML => "Plain HTML", CODING_BBCODE => "BBCode", CODING_MARKDOWN => "Markdown"}
end
+ def bbcode_to_html(text)
+ Sanitize.clean(text.to_s).bbcode_to_html.gsub(/\n|\r\n/, "
").html_safe
+ end
+
def move_up scope, column = "position"
n = 0
objects = self.class.all :conditions => scope, :order => column
diff --git a/spec/factories/article.rb b/spec/factories/article.rb
index e841838..8e03ad7 100644
--- a/spec/factories/article.rb
+++ b/spec/factories/article.rb
@@ -1,14 +1,6 @@
FactoryGirl.define do
- sequence :title do |n|
- "Article #{n}"
- end
-
- sequence :text do |n|
- (0..100).map{ (0...8).map { (65 + rand(26)).chr }.join }.join(" ")
- end
-
factory :article do
- title
- text
+ sequence(:title) { |n| "Article #{n}" }
+ sequence(:text) { |n| (0..100).map{ (0...8).map { (65 + rand(26)).chr }.join }.join(" ") }
end
end
\ No newline at end of file
diff --git a/spec/factories/category.rb b/spec/factories/category.rb
new file mode 100644
index 0000000..5578a38
--- /dev/null
+++ b/spec/factories/category.rb
@@ -0,0 +1,6 @@
+FactoryGirl.define do
+ factory :category do
+ sequence(:name) { |n| "Category #{n}" }
+ sequence(:sort) { |n| n }
+ end
+end
\ No newline at end of file
diff --git a/spec/factories/team.rb b/spec/factories/team.rb
index 02b3623..1a3902b 100644
--- a/spec/factories/team.rb
+++ b/spec/factories/team.rb
@@ -1,10 +1,7 @@
FactoryGirl.define do
- sequence :name do |n|
- "Team ##{n}"
- end
-
factory :team do
- name
+ sequence(:name) { |n| "Team ##{n}" }
+
irc "#team"
web "http://team.com"
tag "[TEAM]"
diff --git a/spec/factories/user.rb b/spec/factories/user.rb
index b1a6895..2f87bc2 100644
--- a/spec/factories/user.rb
+++ b/spec/factories/user.rb
@@ -1,20 +1,9 @@
FactoryGirl.define do
- sequence :username do |n|
- "Player#{n}"
- end
-
- sequence :email do |n|
- "player#{n}@ensl.org"
- end
-
- sequence :steamid do |n|
- "0:1:#{n}"
- end
-
factory :user do
- username
- email
- steamid
+ sequence(:username) { |n| "Player#{n}" }
+ sequence(:email) { |n| "player#{n}@ensl.org" }
+ sequence(:steamid) { |n| "0:1:#{n}" }
+
firstname "ENSL"
lastname "Player"
country "EU"
diff --git a/spec/features/articles/new_article_spec.rb b/spec/features/articles/new_article_spec.rb
index 5eb8b4e..4bcceae 100644
--- a/spec/features/articles/new_article_spec.rb
+++ b/spec/features/articles/new_article_spec.rb
@@ -1,14 +1,39 @@
require 'spec_helper'
feature 'User creates new article' do
- let(:user) { create(:user) }
+ let!(:category) { create(:category, domain: Category::DOMAIN_NEWS) }
let(:article) { attributes_for(:article) }
- before do
- visit new_article_path
+ describe 'with valid Title, Content, Category' do
+ context 'as a basic user' do
+ let!(:user) { create(:user) }
+
+ before do
+ sign_in_as(user)
+ visit new_article_path
+ end
+
+ it 'creates an article successfully' do
+ fill_in attribute_translation(:article, :title), with: article[:title]
+ fill_tinymce "#article_text", article[:text]
+ click_button I18n.t('helpers.submit.post.create')
+
+ expect(page).to have_content(I18n.t('articles_create'))
+ end
+
+ it 'creates an article with a text length greater than 65535 bytes' do
+ fill_in attribute_translation(:article, :title), with: article[:title]
+ fill_tinymce "#article_text", long_text
+ click_button I18n.t('helpers.submit.post.create')
+
+ expect(page).to have_content(I18n.t('articles_create'))
+ end
+ end
end
- describe 'with valid Title, Content: ' do
- describe ''
+ private
+
+ def long_text
+ (0..10000).map{ (0...8).map { (65 + rand(26)).chr }.join }.join(" ") # 90008
end
end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 2aeaec0..10bd3ae 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -10,15 +10,29 @@ require 'rspec/rails'
require 'capybara/rspec'
require 'capybara/poltergeist'
-Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
+Capybara.register_driver :poltergeist do |app|
+ Capybara::Poltergeist::Driver.new(app, :phantomjs_logger => File.open('/dev/null'))
+end
Capybara.javascript_driver = :poltergeist
+Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
+
RSpec.configure do |config|
config.include FactoryGirl::Syntax::Methods
- config.include Controllers::JsonHelpers, :type => :controller
-
+ config.include Controllers::JsonHelpers, type: :controller
+ config.include Features::FormHelpers, type: :feature
+ config.include Features::SessionHelpers, type: :feature
+
config.fixture_path = "#{::Rails.root}/spec/fixtures"
- config.use_transactional_fixtures = true
- config.order = "random"
+ config.order = 'random'
+ config.use_transactional_fixtures = false
+
+ config.before(:each) do
+ if example.metadata[:type] == :feature
+ Capybara.current_driver = :poltergeist
+ else
+ Capybara.use_default_driver
+ end
+ end
end
diff --git a/spec/support/database_cleaner.rb b/spec/support/database_cleaner.rb
new file mode 100644
index 0000000..976608d
--- /dev/null
+++ b/spec/support/database_cleaner.rb
@@ -0,0 +1,21 @@
+RSpec.configure do |config|
+ config.before(:suite) do
+ DatabaseCleaner.clean_with(:deletion)
+ end
+
+ config.before(:each) do
+ DatabaseCleaner.strategy = :deletion
+ end
+
+ config.before(:each, js: true) do
+ DatabaseCleaner.strategy = :deletion
+ end
+
+ config.before(:each) do
+ DatabaseCleaner.start
+ end
+
+ config.after(:each) do
+ DatabaseCleaner.clean
+ end
+end
diff --git a/spec/support/features.rb b/spec/support/features.rb
deleted file mode 100644
index 8ac69c7..0000000
--- a/spec/support/features.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-RSpec.configure do |config|
- config.include Features::FormHelpers, type: :feature
- config.include Features::SessionHelpers, type: :feature
-end
\ No newline at end of file
diff --git a/spec/support/features/form_helpers.rb b/spec/support/features/form_helpers.rb
index 56a7a91..ba0338d 100644
--- a/spec/support/features/form_helpers.rb
+++ b/spec/support/features/form_helpers.rb
@@ -6,12 +6,14 @@ module Features
end
end
+ def fill_tinymce(element, contents)
+ page.execute_script("$('#{element}').tinymce().setContent('#{contents}')")
+ end
+
def submit(model, action)
helper_translation(model, action)
end
- private
-
def attribute_translation(model, attribute)
I18n.t("activerecord.attributes.#{model}.#{attribute}")
end
diff --git a/spec/support/features/session_helpers.rb b/spec/support/features/session_helpers.rb
index 9e62101..b22d459 100644
--- a/spec/support/features/session_helpers.rb
+++ b/spec/support/features/session_helpers.rb
@@ -1,10 +1,12 @@
module Features
module SessionHelpers
- def sign_in
+ def sign_in_as(user)
visit root_path
- user = create(:user)
- fill_form(:user, { email: user.email, password: user.raw_password })
- click_button 'ยป'
+
+ fill_in "login_username", with: user.username
+ fill_in "login_password", with: user.raw_password
+
+ click_button 'Login'
end
end
end
\ No newline at end of file