diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
new file mode 100644
index 0000000..bd3bd75
--- /dev/null
+++ b/app/views/users/_form.html.erb
@@ -0,0 +1,48 @@
+<% if @user.errors.any? %>
+
+ <% end %>
+<% end %>
+
+<%= simple_form_for @user, url: user_path, html: {class: "form-horizontal"} do |f| %>
+
+ <%= f.input :first_name, input_html: {placeholder: "e.g. Carlos"} %>
+
+
+<% end %>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
new file mode 100644
index 0000000..fe50172
--- /dev/null
+++ b/app/views/users/edit.html.erb
@@ -0,0 +1,4 @@
+
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index d686285..97f67ce 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -1,40 +1,5 @@
-
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
new file mode 100644
index 0000000..1da7a19
--- /dev/null
+++ b/app/views/users/show.html.erb
@@ -0,0 +1,16 @@
+
+
<%= @user.full_name %>
+
+
Recent 5 Posts Created:
+
+ <% @user.recent_five_made.each do |post| %>
+ - <%= link_to post.title, post_path(post) %>
+ <% end %>
+
+
+
Recent 5 Posts Joined
+
+ <% @user.recent_five_joins.each do |post| %>
+ - <%= link_to post.title, post_path(post) %>
+ <% end %>
+
diff --git a/bin/delayed_job b/bin/delayed_job
new file mode 100755
index 0000000..edf1959
--- /dev/null
+++ b/bin/delayed_job
@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'config', 'environment'))
+require 'delayed/command'
+Delayed::Command.new(ARGV).daemonize
diff --git a/config/application.rb b/config/application.rb
index 5d45ded..f19e5cd 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -17,6 +17,8 @@
module RailsBlog
class Application < Rails::Application
+ config.active_job.queue_adapter = :delayed_job
+
# Settings in config/environments/* take precedence over those specified here.
# Application configuration should go into files in config/initializers
# -- all .rb files in that directory are automatically loaded.
diff --git a/config/initializers/setup_mailer.rb b/config/initializers/setup_mailer.rb
new file mode 100644
index 0000000..d7eb465
--- /dev/null
+++ b/config/initializers/setup_mailer.rb
@@ -0,0 +1,8 @@
+ActionMailer::Base.smtp_settings = {
+ address: "smtp.gmail.com",
+ port: "587",
+ enable_starttls_auto: true,
+ authentication: :plain,
+ user_name: ENV["email_user_name"],
+ password: ENV["email_password"]
+}
diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb
new file mode 100644
index 0000000..d5492e5
--- /dev/null
+++ b/config/initializers/simple_form.rb
@@ -0,0 +1,166 @@
+# Use this setup block to configure all options available in SimpleForm.
+SimpleForm.setup do |config|
+ # Wrappers are used by the form builder to generate a
+ # complete input. You can remove any component from the
+ # wrapper, change the order or even add your own to the
+ # stack. The options given below are used to wrap the
+ # whole input.
+ config.wrappers :default, class: :input,
+ hint_class: :field_with_hint, error_class: :field_with_errors do |b|
+ ## Extensions enabled by default
+ # Any of these extensions can be disabled for a
+ # given input by passing: `f.input EXTENSION_NAME => false`.
+ # You can make any of these extensions optional by
+ # renaming `b.use` to `b.optional`.
+
+ # Determines whether to use HTML5 (:email, :url, ...)
+ # and required attributes
+ b.use :html5
+
+ # Calculates placeholders automatically from I18n
+ # You can also pass a string as f.input placeholder: "Placeholder"
+ b.use :placeholder
+
+ ## Optional extensions
+ # They are disabled unless you pass `f.input EXTENSION_NAME => true`
+ # to the input. If so, they will retrieve the values from the model
+ # if any exists. If you want to enable any of those
+ # extensions by default, you can change `b.optional` to `b.use`.
+
+ # Calculates maxlength from length validations for string inputs
+ b.optional :maxlength
+
+ # Calculates pattern from format validations for string inputs
+ b.optional :pattern
+
+ # Calculates min and max from length validations for numeric inputs
+ b.optional :min_max
+
+ # Calculates readonly automatically from readonly attributes
+ b.optional :readonly
+
+ ## Inputs
+ b.use :label_input
+ b.use :hint, wrap_with: { tag: :span, class: :hint }
+ b.use :error, wrap_with: { tag: :span, class: :error }
+
+ ## full_messages_for
+ # If you want to display the full error message for the attribute, you can
+ # use the component :full_error, like:
+ #
+ # b.use :full_error, wrap_with: { tag: :span, class: :error }
+ end
+
+ # The default wrapper to be used by the FormBuilder.
+ config.default_wrapper = :default
+
+ # Define the way to render check boxes / radio buttons with labels.
+ # Defaults to :nested for bootstrap config.
+ # inline: input + label
+ # nested: label > input
+ config.boolean_style = :nested
+
+ # Default class for buttons
+ config.button_class = 'btn'
+
+ # Method used to tidy up errors. Specify any Rails Array method.
+ # :first lists the first message for each field.
+ # Use :to_sentence to list all errors for each field.
+ # config.error_method = :first
+
+ # Default tag used for error notification helper.
+ config.error_notification_tag = :div
+
+ # CSS class to add for error notification helper.
+ config.error_notification_class = 'error_notification'
+
+ # ID to add for error notification helper.
+ # config.error_notification_id = nil
+
+ # Series of attempts to detect a default label method for collection.
+ # config.collection_label_methods = [ :to_label, :name, :title, :to_s ]
+
+ # Series of attempts to detect a default value method for collection.
+ # config.collection_value_methods = [ :id, :to_s ]
+
+ # You can wrap a collection of radio/check boxes in a pre-defined tag, defaulting to none.
+ # config.collection_wrapper_tag = nil
+
+ # You can define the class to use on all collection wrappers. Defaulting to none.
+ # config.collection_wrapper_class = nil
+
+ # You can wrap each item in a collection of radio/check boxes with a tag,
+ # defaulting to :span. Please note that when using :boolean_style = :nested,
+ # SimpleForm will force this option to be a label.
+ # config.item_wrapper_tag = :span
+
+ # You can define a class to use in all item wrappers. Defaulting to none.
+ # config.item_wrapper_class = nil
+
+ # How the label text should be generated altogether with the required text.
+ # config.label_text = lambda { |label, required, explicit_label| "#{required} #{label}" }
+
+ # You can define the class to use on all labels. Default is nil.
+ # config.label_class = nil
+
+ # You can define the default class to be used on forms. Can be overriden
+ # with `html: { :class }`. Defaulting to none.
+ # config.default_form_class = nil
+
+ # You can define which elements should obtain additional classes
+ # config.generate_additional_classes_for = [:wrapper, :label, :input]
+
+ # Whether attributes are required by default (or not). Default is true.
+ # config.required_by_default = true
+
+ # Tell browsers whether to use the native HTML5 validations (novalidate form option).
+ # These validations are enabled in SimpleForm's internal config but disabled by default
+ # in this configuration, which is recommended due to some quirks from different browsers.
+ # To stop SimpleForm from generating the novalidate option, enabling the HTML5 validations,
+ # change this configuration to true.
+ config.browser_validations = false
+
+ # Collection of methods to detect if a file type was given.
+ # config.file_methods = [ :mounted_as, :file?, :public_filename ]
+
+ # Custom mappings for input types. This should be a hash containing a regexp
+ # to match as key, and the input type that will be used when the field name
+ # matches the regexp as value.
+ # config.input_mappings = { /count/ => :integer }
+
+ # Custom wrappers for input types. This should be a hash containing an input
+ # type as key and the wrapper that will be used for all inputs with specified type.
+ # config.wrapper_mappings = { string: :prepend }
+
+ # Namespaces where SimpleForm should look for custom input classes that
+ # override default inputs.
+ # config.custom_inputs_namespaces << "CustomInputs"
+
+ # Default priority for time_zone inputs.
+ # config.time_zone_priority = nil
+
+ # Default priority for country inputs.
+ # config.country_priority = nil
+
+ # When false, do not use translations for labels.
+ # config.translate_labels = true
+
+ # Automatically discover new inputs in Rails' autoload path.
+ # config.inputs_discovery = true
+
+ # Cache SimpleForm inputs discovery
+ # config.cache_discovery = !Rails.env.development?
+
+ # Default class for inputs
+ # config.input_class = nil
+
+ # Define the default class of the input wrapper of the boolean input.
+ config.boolean_label_class = 'checkbox'
+
+ # Defines if the default input wrapper class should be included in radio
+ # collection wrappers.
+ # config.include_default_input_wrapper_class = true
+
+ # Defines which i18n scope will be used in Simple Form.
+ # config.i18n_scope = 'simple_form'
+end
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
new file mode 100644
index 0000000..2374383
--- /dev/null
+++ b/config/locales/simple_form.en.yml
@@ -0,0 +1,31 @@
+en:
+ simple_form:
+ "yes": 'Yes'
+ "no": 'No'
+ required:
+ text: 'required'
+ mark: '*'
+ # You can uncomment the line below if you need to overwrite the whole required html.
+ # When using html, text and mark won't be used.
+ # html: '
*'
+ error_notification:
+ default_message: "Please review the problems below:"
+ # Examples
+ # labels:
+ # defaults:
+ # password: 'Password'
+ # user:
+ # new:
+ # email: 'E-mail to sign in.'
+ # edit:
+ # email: 'E-mail.'
+ # hints:
+ # defaults:
+ # username: 'User name to sign in.'
+ # password: 'No special characters, please.'
+ # include_blanks:
+ # defaults:
+ # age: 'Rather not say'
+ # prompts:
+ # defaults:
+ # age: 'Select your age'
diff --git a/config/routes.rb b/config/routes.rb
index 4902941..94cc82f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,11 +1,6 @@
Rails.application.routes.draw do
- resources :users, except: [:edit, :update] do
- get :edit, on: :collection
-
- patch :update, on: :collection
-
- end
+ resources :users
resources :categories
@@ -13,6 +8,7 @@
resources :comments
resources :likes, only: [:create, :destroy]
resources :votes, only: [:create, :destroy, :update]
+ resources :favourites, only: [:create, :destroy]
resources :collaborations
end
@@ -24,4 +20,7 @@
get "/about" => "homes#about"
+ match "/delayed_job" => DelayedJobWeb, :anchor => false, via: [:get, :post]
+
+
end
diff --git a/db/migrate/20150630021324_add_avatar_to_users.rb b/db/migrate/20150630021324_add_avatar_to_users.rb
new file mode 100644
index 0000000..7b4de37
--- /dev/null
+++ b/db/migrate/20150630021324_add_avatar_to_users.rb
@@ -0,0 +1,5 @@
+class AddAvatarToUsers < ActiveRecord::Migration
+ def change
+ add_column :users, :avatar, :string
+ end
+end
diff --git a/db/migrate/20150701011946_create_favourites.rb b/db/migrate/20150701011946_create_favourites.rb
new file mode 100644
index 0000000..bf98360
--- /dev/null
+++ b/db/migrate/20150701011946_create_favourites.rb
@@ -0,0 +1,10 @@
+class CreateFavourites < ActiveRecord::Migration
+ def change
+ create_table :favourites do |t|
+ t.references :user, index: true, foreign_key: true
+ t.references :post, index: true, foreign_key: true
+
+ t.timestamps null: false
+ end
+ end
+end
diff --git a/db/migrate/20150701022427_create_delayed_jobs.rb b/db/migrate/20150701022427_create_delayed_jobs.rb
new file mode 100644
index 0000000..27fdcf6
--- /dev/null
+++ b/db/migrate/20150701022427_create_delayed_jobs.rb
@@ -0,0 +1,22 @@
+class CreateDelayedJobs < ActiveRecord::Migration
+ def self.up
+ create_table :delayed_jobs, force: true do |table|
+ table.integer :priority, default: 0, null: false # Allows some jobs to jump to the front of the queue
+ table.integer :attempts, default: 0, null: false # Provides for retries, but still fail eventually.
+ table.text :handler, null: false # YAML-encoded string of the object that will do work
+ table.text :last_error # reason for last failure (See Note below)
+ table.datetime :run_at # When to run. Could be Time.zone.now for immediately, or sometime in the future.
+ table.datetime :locked_at # Set when a client is working on this object
+ table.datetime :failed_at # Set when all retries have failed (actually, by default, the record is deleted instead)
+ table.string :locked_by # Who is working on this object (if locked)
+ table.string :queue # The name of the queue this job is in
+ table.timestamps null: true
+ end
+
+ add_index :delayed_jobs, [:priority, :run_at], name: "delayed_jobs_priority"
+ end
+
+ def self.down
+ drop_table :delayed_jobs
+ end
+end
diff --git a/db/migrate/20150703005252_add_image_to_post.rb b/db/migrate/20150703005252_add_image_to_post.rb
new file mode 100644
index 0000000..4e159e6
--- /dev/null
+++ b/db/migrate/20150703005252_add_image_to_post.rb
@@ -0,0 +1,5 @@
+class AddImageToPost < ActiveRecord::Migration
+ def change
+ add_column :posts, :image, :string
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 8d40ae6..3485fe2 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: 20150625023057) do
+ActiveRecord::Schema.define(version: 20150703005252) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -52,6 +52,32 @@
t.datetime "updated_at", null: false
end
+ create_table "delayed_jobs", force: :cascade do |t|
+ t.integer "priority", default: 0, null: false
+ t.integer "attempts", default: 0, null: false
+ t.text "handler", null: false
+ t.text "last_error"
+ t.datetime "run_at"
+ t.datetime "locked_at"
+ t.datetime "failed_at"
+ t.string "locked_by"
+ t.string "queue"
+ t.datetime "created_at"
+ t.datetime "updated_at"
+ end
+
+ add_index "delayed_jobs", ["priority", "run_at"], name: "delayed_jobs_priority", using: :btree
+
+ create_table "favourites", force: :cascade do |t|
+ t.integer "user_id"
+ t.integer "post_id"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ end
+
+ add_index "favourites", ["post_id"], name: "index_favourites_on_post_id", using: :btree
+ add_index "favourites", ["user_id"], name: "index_favourites_on_user_id", using: :btree
+
create_table "likes", force: :cascade do |t|
t.integer "user_id"
t.integer "post_id"
@@ -69,6 +95,7 @@
t.datetime "updated_at", null: false
t.integer "user_id"
t.integer "category_id"
+ t.string "image"
end
add_index "posts", ["body"], name: "index_posts_on_body", using: :btree
@@ -99,6 +126,7 @@
t.string "password_digest"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
+ t.string "avatar"
end
add_index "users", ["email"], name: "index_users_on_email", using: :btree
@@ -117,6 +145,8 @@
add_foreign_key "collaborations", "posts"
add_foreign_key "collaborations", "users"
add_foreign_key "comments", "users"
+ add_foreign_key "favourites", "posts"
+ add_foreign_key "favourites", "users"
add_foreign_key "likes", "posts"
add_foreign_key "likes", "users"
add_foreign_key "posts", "categories"
diff --git a/db/seeds.rb b/db/seeds.rb
index 4edb1e8..fa0df7b 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1,7 +1,15 @@
-# This file should contain all the record creation needed to seed the database with its default values.
-# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
-#
-# Examples:
-#
-# cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
-# Mayor.create(name: 'Emanuel', city: cities.first)
+100.times do {
+ Post.create(
+ title: Faker::Company.catch_phrase,
+ body: Faker::Lorem.sentence(12)
+ user_id: rand(4)+1
+ category_id: rand(5)+1
+ )
+}
+
+["New Idea", "Recent Events", "Product Review", "Travel", "Random"].each do |name|
+ Category.create(title: name)
+
+["Silly","Too Serious","Shower Thought","Uplifting","Surreal","Inspiring"].each do |name|
+ Tag.create(name: name)
+end
diff --git a/lib/templates/erb/scaffold/_form.html.erb b/lib/templates/erb/scaffold/_form.html.erb
new file mode 100644
index 0000000..201a069
--- /dev/null
+++ b/lib/templates/erb/scaffold/_form.html.erb
@@ -0,0 +1,13 @@
+<%%= simple_form_for(@<%= singular_table_name %>) do |f| %>
+ <%%= f.error_notification %>
+
+
+ <%- attributes.each do |attribute| -%>
+ <%%= f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %> %>
+ <%- end -%>
+
+
+
+ <%%= f.button :submit %>
+
+<%% end %>
diff --git a/public/uploads/post/image/18/red-house-in-the-mountains-nature-hd-wallpaper-1920x1080-22430.jpg b/public/uploads/post/image/18/red-house-in-the-mountains-nature-hd-wallpaper-1920x1080-22430.jpg
new file mode 100644
index 0000000..b08eb6b
Binary files /dev/null and b/public/uploads/post/image/18/red-house-in-the-mountains-nature-hd-wallpaper-1920x1080-22430.jpg differ
diff --git a/public/uploads/post/image/18/resized_image_red-house-in-the-mountains-nature-hd-wallpaper-1920x1080-22430.jpg b/public/uploads/post/image/18/resized_image_red-house-in-the-mountains-nature-hd-wallpaper-1920x1080-22430.jpg
new file mode 100644
index 0000000..8c18711
Binary files /dev/null and b/public/uploads/post/image/18/resized_image_red-house-in-the-mountains-nature-hd-wallpaper-1920x1080-22430.jpg differ
diff --git a/public/uploads/post/image/18/square_thumb_red-house-in-the-mountains-nature-hd-wallpaper-1920x1080-22430.jpg b/public/uploads/post/image/18/square_thumb_red-house-in-the-mountains-nature-hd-wallpaper-1920x1080-22430.jpg
new file mode 100644
index 0000000..752b00b
Binary files /dev/null and b/public/uploads/post/image/18/square_thumb_red-house-in-the-mountains-nature-hd-wallpaper-1920x1080-22430.jpg differ
diff --git a/public/uploads/tmp/1435631091-44997-0966/square_thumb_tree.png b/public/uploads/tmp/1435631091-44997-0966/square_thumb_tree.png
new file mode 100644
index 0000000..4e627ec
Binary files /dev/null and b/public/uploads/tmp/1435631091-44997-0966/square_thumb_tree.png differ
diff --git a/public/uploads/tmp/1435631091-44997-0966/tree.png b/public/uploads/tmp/1435631091-44997-0966/tree.png
new file mode 100644
index 0000000..4e627ec
Binary files /dev/null and b/public/uploads/tmp/1435631091-44997-0966/tree.png differ
diff --git a/public/uploads/user/avatar/3/rick.jpg b/public/uploads/user/avatar/3/rick.jpg
new file mode 100644
index 0000000..6851957
Binary files /dev/null and b/public/uploads/user/avatar/3/rick.jpg differ
diff --git a/public/uploads/user/avatar/3/square_thumb_rick.jpg b/public/uploads/user/avatar/3/square_thumb_rick.jpg
new file mode 100644
index 0000000..f9a437c
Binary files /dev/null and b/public/uploads/user/avatar/3/square_thumb_rick.jpg differ
diff --git a/public/uploads/user/avatar/4/square_thumb_tree.png b/public/uploads/user/avatar/4/square_thumb_tree.png
new file mode 100644
index 0000000..bb0b8e7
Binary files /dev/null and b/public/uploads/user/avatar/4/square_thumb_tree.png differ
diff --git a/public/uploads/user/avatar/4/tree.png b/public/uploads/user/avatar/4/tree.png
new file mode 100644
index 0000000..4e627ec
Binary files /dev/null and b/public/uploads/user/avatar/4/tree.png differ
<%= comment.body %>
+ Posted on: <%= formatted_date(comment.created_at) %> + + + <% if can?(:delete, comment) %> +