diff --git a/config/application.rb b/config/application.rb
index cee8a92b..6141e78d 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -27,10 +27,6 @@ class Application < Rails::Application
# Application configuration should go into files in config/initializers
# -- all .rb files in that directory are automatically loaded.
- # Suggested by Thoughtbot, compresses your content with gzip.
- # https://robots.thoughtbot.com/content-compression-with-rack-deflater
- config.middleware.use Rack::Deflater
-
# Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
# Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
# config.time_zone = 'Central Time (US & Canada)'
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 3cecf530..15cd2cd8 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -5,7 +5,7 @@
# Settings specified here will take precedence over those in config/application.rb.
config.action_mailer.default_url_options = { host: 'localhost:3000' }
config.action_mailer.delivery_method = :smtp
- config.action_mailer.smtp_settings = {adress: "localhost", port: 1025}
+ config.action_mailer.smtp_settings = { address: "localhost", port: 1025 }
# In the development environment your application's code is reloaded on
# every request. This slows down response time but is perfect for development
# since you don't have to restart the web server when you make code changes.
@@ -17,6 +17,8 @@
##
# Hack to get images to work properly in development
$IMAGE_PATH = "public/system/fs/:class/:id_:style.:extension"
+ $AVATAR_PATH = "public/system/fs/:class/:id_:style.:extension"
+
# Do not eager load code on boot.
config.eager_load = false
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 9c31f58b..9d709883 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -47,6 +47,11 @@
# Compress JavaScripts and CSS.
config.assets.js_compressor = :uglifier
# config.assets.css_compressor = :sass
+ config.static_cache_control = "public, max-age=#{2.weeks.to_i}"
+
+ # Suggested by Thoughtbot, compresses your content with GZIP.
+ # https://robots.thoughtbot.com/content-compression-with-rack-deflater
+ config.middleware.use Rack::Deflater
# Do not fallback to assets pipeline if a precompiled asset is missed.
config.assets.compile = false
@@ -65,7 +70,7 @@
# config.force_ssl = true
# Set to :debug to see everything in the log.
- config.log_level = :info
+ config.log_level = :warn
# Prepend all log lines with the following tags.
# config.log_tags = [ :subdomain, :uuid ]
diff --git a/config/environments/test.rb b/config/environments/test.rb
index ce2a9660..4fca5e54 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -3,6 +3,8 @@
# Store test files in a temporary directory
Paperclip::Attachment.default_options.merge!({path: "#{Rails.root}/spec/test_files/:class/:id_partition/:style.:extension"})
$IMAGE_PATH = "#{Rails.root}/spec/test_files/:class/:id_partition/:style.:extension"
+ $AVATAR_PATH = "#{Rails.root}/spec/test_files/:class/:id_partition/:style.:extension"
+
# The test environment is used exclusively to run your application's
# test suite. You never need to work with it otherwise. Remember that
# your test database is "scratch space" for the test suite and is wiped
diff --git a/config/fontcustom.yml b/config/fontcustom.yml
new file mode 100644
index 00000000..92a6ab6d
--- /dev/null
+++ b/config/fontcustom.yml
@@ -0,0 +1,26 @@
+# =============================================================================
+# Font Custom Configuration
+# This file should live in the directory where you run `fontcustom compile`.
+# For more info, visit .
+# =============================================================================
+
+font_name: imagehexicons
+css_selector: .icon-{{glyph}}
+preprocessor_path: ""
+autowidth: false
+no_hash: true
+force: false
+debug: false
+quiet: false
+
+input:
+ vectors: app/assets/icons
+ templates: app/assets/icons/templates
+
+output:
+ fonts: app/assets/fonts
+ css: app/assets/stylesheets
+ _imagehexicons.scss: app/assets/stylesheets
+
+templates:
+ - _imagehexicons.scss
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index a1aa2996..3f9e38a5 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -114,7 +114,7 @@
# their account can't be confirmed with the token any more.
# Default is nil, meaning there is no restriction on how long a user can take
# before confirming their account.
- # config.confirm_within = 3.days
+ config.confirm_within = 3.days
# If true, requires any email changes to be confirmed (exactly the same way as
# initial account confirmation) to be applied. Requires additional unconfirmed_email
@@ -127,7 +127,7 @@
# ==> Configuration for :rememberable
# The time the user will be remembered without asking for credentials again.
- # config.remember_for = 2.weeks
+ config.remember_for = 2.weeks
# Invalidates all the remember me tokens when the user signs out.
config.expire_all_remember_me_on_sign_out = true
@@ -151,7 +151,7 @@
# ==> Configuration for :timeoutable
# The time you want to timeout the user session without activity. After this
# time the user will be asked for credentials again. Default is 30 minutes.
- # config.timeout_in = 30.minutes
+ config.timeout_in = 30.minutes
# If true, expires auth token on session timeout.
# config.expire_auth_token_on_timeout = false
@@ -160,7 +160,7 @@
# Defines which strategy will be used to lock an account.
# :failed_attempts = Locks an account after a number of failed attempts to sign in.
# :none = No lock strategy. You should handle locking by yourself.
- # config.lock_strategy = :failed_attempts
+ config.lock_strategy = :failed_attempts
# Defines which key will be used when locking and unlocking an account
# config.unlock_keys = [ :email ]
@@ -170,17 +170,17 @@
# :time = Re-enables login after a certain amount of time (see :unlock_in below)
# :both = Enables both strategies
# :none = No unlock strategy. You should handle unlocking by yourself.
- # config.unlock_strategy = :both
+ config.unlock_strategy = :both
# Number of authentication tries before locking an account if lock_strategy
# is failed attempts.
- # config.maximum_attempts = 20
+ config.maximum_attempts = 12
# Time interval to unlock the account if :time is enabled as unlock_strategy.
- # config.unlock_in = 1.hour
+ config.unlock_in = 1.hour
# Warn on the last attempt before the account is locked.
- # config.last_attempt_warning = true
+ config.last_attempt_warning = true
# ==> Configuration for :recoverable
#
diff --git a/config/initializers/rack_profiler.rb b/config/initializers/rack_profiler.rb
deleted file mode 100644
index 09567d1d..00000000
--- a/config/initializers/rack_profiler.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-if Rails.env == 'development' && ENV["PROFILE"]
- require 'rack-mini-profiler'
- puts "Using rack mini profiler"
- Rack::MiniProfilerRails.initialize!(Rails.application)
-end
-
diff --git a/config/locales/en/collections.en.yml b/config/locales/en/collections.en.yml
index 890435d1..9302c8f3 100644
--- a/config/locales/en/collections.en.yml
+++ b/config/locales/en/collections.en.yml
@@ -8,7 +8,7 @@ en:
following: "Following"
unfollow: "Unfollow"
new:
- new_collection_page_title: "New Collection"
+ new_collection_page_title: "New collection"
title: "Title"
description: "Description"
- create_collection: "Create Collection"
+ create_collection: "Create collection"
diff --git a/config/locales/en/generic.en.yml b/config/locales/en/generic.en.yml
new file mode 100644
index 00000000..428acf3b
--- /dev/null
+++ b/config/locales/en/generic.en.yml
@@ -0,0 +1,13 @@
+# Generic strings.
+
+en:
+ notices:
+ collection_type_not_specified_or_not_applicable: "Collection type not specified or not applicable."
+ youre_not_allowed_to_do_that: "You aren't allowed to do that."
+ image_uploaded_successfully: "Image uploaded successfully."
+ changes_have_been_saved: "Changes have been saved."
+ your_comment_was_submitted_successfully: "Your comment was submitted successfully."
+ tag_group_added: "Tag group added."
+ tag_group_updated: "Tag group updated."
+ report_submitted_thank_you: "Report submitted, thank you!"
+ collection_created_successfully: "Collection created successfully."
diff --git a/config/locales/en/images.en.yml b/config/locales/en/images.en.yml
index ad3548ff..a7d1c803 100644
--- a/config/locales/en/images.en.yml
+++ b/config/locales/en/images.en.yml
@@ -66,3 +66,4 @@ en:
tag_group: "Tag group"
add_a_tag_group: "Add a tag group"
search: "Search"
+ your_search_didnt_bring_up_any_results: "Your search didn't bring up any results."
diff --git a/config/locales/en/static_stuff.en.yml b/config/locales/en/static_stuff.en.yml
index d8aa5b98..3c6071f0 100644
--- a/config/locales/en/static_stuff.en.yml
+++ b/config/locales/en/static_stuff.en.yml
@@ -14,4 +14,8 @@ en:
contact: "Contact"
faq:
faq_title: "Frequently Asked Questions"
- faq: "Frequently Asked Questions"
\ No newline at end of file
+ faq: "Frequently Asked Questions"
+ press:
+ press: "Press"
+ help:
+ help: "Help"
diff --git a/config/locales/nv/static_stuff.nv.yml b/config/locales/nv/static_stuff.nv.yml
index 4196a4cd..6aad89ce 100644
--- a/config/locales/nv/static_stuff.nv.yml
+++ b/config/locales/nv/static_stuff.nv.yml
@@ -14,4 +14,8 @@ nv:
contact: "Contact"
faq:
faq_title: "Questions Which Are Oftentimes Asked"
- faq: "Frequently Asked Questions"
\ No newline at end of file
+ faq: "Frequently Asked Questions"
+ press:
+ press: "Press"
+ help:
+ help: "Help"
diff --git a/db/migrate/20151006202333_add_attachment_avatar_to_users.rb b/db/migrate/20151006202333_add_attachment_avatar_to_users.rb
new file mode 100644
index 00000000..de27a16a
--- /dev/null
+++ b/db/migrate/20151006202333_add_attachment_avatar_to_users.rb
@@ -0,0 +1,13 @@
+class AddAttachmentAvatarToUsers < ActiveRecord::Migration
+ def self.up
+ change_table :users do |t|
+ t.attachment :avatar
+ end
+ remove_column :users, :avatar_id
+ end
+
+ def self.down
+ remove_attachment :users, :avatar
+ add_column :users, :avatar_id
+ end
+end
diff --git a/db/migrate/20151006205509_add_f_file_size_to_images.rb b/db/migrate/20151006205509_add_f_file_size_to_images.rb
new file mode 100644
index 00000000..432f9406
--- /dev/null
+++ b/db/migrate/20151006205509_add_f_file_size_to_images.rb
@@ -0,0 +1,5 @@
+class AddFFileSizeToImages < ActiveRecord::Migration
+ def change
+ add_column :images, :f_file_size, :integer
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a00cb0fa..2e285bae 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20151006035026) do
+ActiveRecord::Schema.define(version: 20151006205509) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -88,6 +88,7 @@
t.boolean "nsfw_nudity", default: false, null: false
t.boolean "nsfw_gore", default: false, null: false
t.boolean "nsfw_sexuality", default: false, null: false
+ t.integer "f_file_size"
end
add_index "images", ["user_id"], name: "index_images_on_user_id", using: :btree
@@ -203,10 +204,13 @@
t.string "unconfirmed_email", limit: 255
t.integer "role", default: 0
t.string "slug"
- t.integer "avatar_id"
t.string "provider"
t.string "uid"
t.jsonb "content_pref", default: {}, null: false
+ t.string "avatar_file_name"
+ t.string "avatar_content_type"
+ t.integer "avatar_file_size"
+ t.datetime "avatar_updated_at"
end
add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
@@ -227,5 +231,4 @@
add_foreign_key "tag_group_changes", "users", on_delete: :nullify
add_foreign_key "tag_groups", "images", on_delete: :cascade
add_foreign_key "user_pages", "users"
- add_foreign_key "users", "images", column: "avatar_id", on_delete: :nullify
end
diff --git a/lib/tasks/icons.rake b/lib/tasks/icons.rake
new file mode 100644
index 00000000..c2204621
--- /dev/null
+++ b/lib/tasks/icons.rake
@@ -0,0 +1,6 @@
+namespace :icons do
+ task :compile do
+ puts "Compiling icons..."
+ puts %x(fontcustom compile)
+ end
+end
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index 7e836a38..bd14991c 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -18,21 +18,14 @@
expect(response).to be_success
end
- end
+ end
describe "put #update" do
describe "updating user page" do
# this works when you test it manually
# TODO: make it work automatically as well
it "allows updating" do
put :update, id: @user.id, user: {user_page:{body:"test"}}
- # expect(@user.reload.user_page.reload.body).to eq("test")
- end
- end
- describe "updating avatar" do
- it "allows updating" do
- img = FactoryGirl.create(:image)
- put :update, id: @user.id, user: {avatar_id: img.id}
- expect(@user.reload.avatar).to eq(img)
+ # expect(@user.reload.user_page.reload.body).to eq("test")
end
end
describe "updating page pref" do
@@ -41,6 +34,11 @@
expect(@user.reload.page_pref).to eq(10)
end
end
+ describe "updating content ratings" do
+ # Can't get this test to work properly, note that I have manually
+ # verified it works
+ it "allows updating"
+ end
end
end
end
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index b9fce54c..d7416a71 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -3,7 +3,6 @@
name { Faker::Internet.user_name(nil, %w(_))}
email { Faker::Internet.email }
password { Faker::Internet.password(8) }
-
end
end
diff --git a/spec/fixtures/files/evil.js b/spec/fixtures/files/evil.js
new file mode 100644
index 00000000..fa106bfa
--- /dev/null
+++ b/spec/fixtures/files/evil.js
@@ -0,0 +1,2 @@
+alert("I am evil JS!");
+
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index dcbe0f2c..2d34cf18 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -9,12 +9,17 @@
# Has many images
it {should have_many(:images)}
describe "avatars" do
- let(:i){FactoryGirl.create(:image)}
- let(:u){FactoryGirl.create(:user, avatar: i)}
- it "has a helper method" do
- expect(u.avatar_img).to eq(i.f(:medium))
+ it "Should allow image avatars" do
+ u = FactoryGirl.create(:user)
+ u.avatar = Rack::Test::UploadedFile.new(Rails.root.join("spec", "fixtures", "files", "test.jpg"), "image/jpg")
+ expect(u).to be_valid
end
- end
+ it "does not allow evil js or other things" do
+ u = FactoryGirl.create(:user)
+ u.avatar = Rack::Test::UploadedFile.new(Rails.root.join("spec", "fixtures", "files", "evil.js"), "application/javascript")
+ expect(u).to_not be_valid
+ end
+ end
describe "curatorships" do
let(:u){FactoryGirl.create(:user)}
let(:c){FactoryGirl.create(:collection)}