Merge branch 'atomaka/refactor/metric-clean-up' into 'master'

Clean up metric_fu violations

Clean up many of our violations. Most of these are meaningless fixes that do not resolve the actual issue.  For example, we use delegate to remove the law of demeter violations, but that doesn't really resolve the issue.  We pass some more stuff though and that's good enough for now.

See merge request !23

app/controllers/application_controller.rb

@@ -1,3 +1,4 @@
+# controllers/application_controller.rb
 class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
 

app/controllers/comments_controller.rb

@@ -1,3 +1,4 @@
+# controllers/comments_controller.rb
 class CommentsController < ApplicationController
   before_filter :set_comment, only: [:show, :edit, :update, :destroy]
   before_filter :set_post

app/controllers/posts_controller.rb

@@ -1,3 +1,4 @@
+# controllers/posts_controller.rb
 class PostsController < ApplicationController
   before_filter :set_post, except: [:index, :new, :create]
   before_filter :set_subcreddit

app/controllers/subcreddits_controller.rb

@@ -1,3 +1,4 @@
+# controllers/subcreddits_controller.rb
 class SubcredditsController < ApplicationController
   before_filter :set_subcreddit, only: [:show, :edit, :update]
 

app/controllers/user_sessions_controller.rb

@@ -1,3 +1,4 @@
+# controllers/user_sessions_controller.rb
 class UserSessionsController < ApplicationController
   def new
     @user_session = UserSession.new

app/controllers/users_controller.rb

@@ -1,3 +1,4 @@
+# controllers/users_controller.rb
 class UsersController < ApplicationController
   def show
     @user = User.friendly.find(params[:id])

app/helpers/application_helper.rb

@@ -1,3 +1,4 @@
+# helpers/application_helper.rb
 module ApplicationHelper
   def bootstrap_class_for(flash_type)
     bootstrap_classes[flash_type] || flash_type.to_s

app/helpers/comments_helper.rb

@@ -1,7 +1,8 @@
+# helpers/comments_helper.rb
 module CommentsHelper
   def nested_comments(comments)
     comments.map do |comment, sub_comments|
-      render(comment, post: comment.post, subcreddit: comment.post.subcreddit) +
+      render(comment, post: comment.post, subcreddit: comment.post_subcreddit) +
         content_tag(:div,
                     nested_comments(sub_comments),
                     class: 'nested_comments')

app/helpers/subcreddits_helper.rb

@@ -1,9 +1,12 @@
+# helpers/subcreddits__helper.rb
 module SubcredditsHelper
-  def subcreddit_name(subcreddit)
+  def subcreddit_name(subcreddit = '')
-    if subcreddit
+    if subcreddit.blank?
-      content_for(:title) { link_to subcreddit.name, subcreddit }
+      link = link_to 'frontpage', root_path
     else
-      content_for(:title) { link_to 'frontpage', root_path }
+      link =  link_to subcreddit.name, subcreddit
     end
+
+    content_for(:title) { link }
   end
 end

app/models/comment.rb

@@ -1,3 +1,4 @@
+# models/comment.rb
 class Comment < ActiveRecord::Base
   has_ancestry
 
@@ -5,6 +6,7 @@ class Comment < ActiveRecord::Base
   belongs_to :post, counter_cache: true
 
   delegate :username, to: :user, prefix: true
+  delegate :subcreddit, to: :post, prefix: true
 
   validates :content, presence: true
 

app/models/post.rb

@@ -1,3 +1,4 @@
+# models/post.rb
 class Post < ActiveRecord::Base
   belongs_to :user
   belongs_to :subcreddit
@@ -5,6 +6,7 @@ class Post < ActiveRecord::Base
   has_many :comments
 
   delegate :username, to: :user, prefix: true
+  delegate :slug, to: :subcreddit, prefix: true
 
   validates :title,
     presence: true,

app/models/subcreddit.rb

@@ -1,3 +1,4 @@
+# models/subcreddit.rb
 class Subcreddit < ActiveRecord::Base
   extend FriendlyId
 

app/models/user.rb

@@ -1,3 +1,4 @@
+# models/user.rb
 class User < ActiveRecord::Base
   extend FriendlyId
 

app/models/user_session.rb

@@ -1,3 +1,4 @@
+# models/user_session.rb
 class UserSession < ActiveRecord::Base
   belongs_to :user
 

app/validators/sluguuidless_validator.rb

@@ -1,7 +1,8 @@
+# validators/sluguuidless_validator.rb
 class SluguuidlessValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     if record.slug.match /([a-z0-9]+\-){4}[a-z0-9]+\z/
-      record.errors[attribute] << 'must be unique'
+      record.errors[attribute] << "#{value} must be unique"
     end
   end
 end

app/views/posts/_post_meta.html.slim

@@ -1,15 +1,15 @@
 .posts.contents
   ul
-    - @posts.order('created_at DESC').each_with_index do |post, rank|
+    - posts.order('created_at DESC').each_with_index do |post, rank|
       li
         .post
           p.title= link_to post.title, subcreddit_post_path(post.subcreddit, post)
           p.details
             = "submitted #{distance_of_time_in_words post.created_at, Time.now} ago by "
             == link_to post.user_username, post.user
-            - if @subcreddit == nil
+            - if subcreddit == nil
               = " to "
-              == link_to "/c/#{post.subcreddit.slug}", post.subcreddit
+              == link_to "/c/#{post.subcreddit_slug}", post.subcreddit
           ul.links.list-inline
             li= link_to "#{post.comments_count} comments", subcreddit_post_path(post.subcreddit, post)
             li= link_to 'share', ''

app/views/posts/index.html.slim

@@ -1 +1,2 @@
-== render 'post_meta'
+- subcreddit_name
+== render 'post_meta', posts: @posts, subcreddit: @subcreddit

app/views/subcreddits/show.html.slim

@@ -2,4 +2,4 @@
 - if @subcreddit && @subcreddit.closed?
   = "Board has been closed"
 - else
-  == render partial: 'posts/post_meta'
+  == render 'posts/post_meta', posts: @posts, subcreddit: @subcreddit

spec/models/comment_spec.rb

@@ -7,6 +7,7 @@ describe Comment, type: :model do
   it { should belong_to(:post).counter_cache(true) }
 
   it { should delegate_method(:username).to(:user).with_prefix }
+  it { should delegate_method(:subcreddit).to(:post).with_prefix }
 
   context 'with valid data' do
     it 'should be valid' do

spec/models/post_spec.rb

@@ -8,6 +8,7 @@ describe Post, type: :model do
   it { should have_many(:comments) }
 
   it { should delegate_method(:username).to(:user).with_prefix }
+  it { should delegate_method(:slug).to(:subcreddit).with_prefix }
 
   context 'when adding a comment' do
     let(:post) { create(:post) }