Skip to content

Commit

Permalink
Bye bye hash rockets and overflow newlines.
Browse files Browse the repository at this point in the history
  • Loading branch information
futhr committed Dec 13, 2014
1 parent e867be3 commit 556b8c3
Show file tree
Hide file tree
Showing 36 changed files with 102 additions and 122 deletions.
4 changes: 2 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ require 'spree/testing_support/common_rake'

RSpec::Core::RakeTask.new

task :default => [:spec]
task default: :spec

desc 'Generates a dummy app for testing'
task :test_app do
ENV['LIB_NAME'] = 'spree_reviews'
Rake::Task['common:test_app'].invoke 'Spree::User'
end
end
1 change: 1 addition & 0 deletions app/controllers/spree/admin/feedback_reviews_controller.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
class Spree::Admin::FeedbackReviewsController < Spree::Admin::ResourceController
belongs_to 'spree/review'

def index
@collection = parent.feedback_reviews
end
Expand Down
2 changes: 0 additions & 2 deletions app/controllers/spree/admin/reviews_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ def index

def approve
r = Spree::Review.find(params[:id])

if r.update_attribute(:approved, true)
flash[:notice] = Spree.t("info_approve_review")
else
Expand All @@ -27,7 +26,6 @@ def edit

def collection
params[:q] ||= {}

@search = Spree::Review.ransack(params[:q])
@collection = @search.result.includes([:product, :user, :feedback_reviews]).page(params[:page]).per(params[:per_page])
end
Expand Down
6 changes: 2 additions & 4 deletions app/controllers/spree/feedback_reviews_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ class Spree::FeedbackReviewsController < Spree::StoreController
before_filter :load_review, only: [:create]

def create

if @review.present?
@feedback_review = @review.feedback_reviews.new(feedback_review_params)
@feedback_review.user = spree_current_user
Expand All @@ -16,12 +15,12 @@ def create

respond_to do |format|
format.html { redirect_to :back }
format.js { render :action => :create }
format.js { render action: :create }
end

end

protected

def load_review
@review ||= Spree::Review.find_by_id!(params[:review_id])
end
Expand All @@ -38,4 +37,3 @@ def sanitize_rating
params[:feedback_review][:rating].to_s.sub!(/\s*[^0-9]*\z/,'') unless (params[:feedback_review] && params[:feedback_review][:rating].blank?)
end
end

7 changes: 3 additions & 4 deletions app/controllers/spree/reviews_controller.rb
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
class Spree::ReviewsController < Spree::StoreController
helper Spree::BaseHelper
before_filter :load_product, :only => [:index, :new, :create]
rescue_from ActiveRecord::RecordNotFound, :with => :render_404
before_filter :load_product, only: [:index, :new, :create]
rescue_from ActiveRecord::RecordNotFound, with: :render_404

def index
@approved_reviews = Spree::Review.approved.where(product: @product)
end

def new
@review = Spree::Review.new(:product => @product)
@review = Spree::Review.new(product: @product)
authorize! :create, @review
end

Expand Down Expand Up @@ -44,5 +44,4 @@ def permitted_review_attributes
def review_params
params.require(:review).permit(permitted_review_attributes)
end

end
6 changes: 2 additions & 4 deletions app/helpers/spree/reviews_helper.rb
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
module Spree::ReviewsHelper

def star(the_class)
content_tag(:span, " &#10030; ".html_safe, :class => the_class)
content_tag(:span, " &#10030; ".html_safe, class: the_class)
end

def mk_stars(m)
(1..5).collect {|n| n <= m ? star("lit") : star("unlit") }.join
end

def txt_stars(n, show_out_of = true)
res = Spree.t('star', :count => n)
res = Spree.t('star', count: n)
res += " #{Spree.t('out_of_5')}" if show_out_of
res
end

end
9 changes: 3 additions & 6 deletions app/models/spree/feedback_review.rb
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
class Spree::FeedbackReview < ActiveRecord::Base
belongs_to :user, :class_name => Spree.user_class.to_s

belongs_to :user, class_name: Spree.user_class.to_s
belongs_to :review, dependent: :destroy
validates :review, presence: true

validates :review, presence: true
validates :rating, numericality: { only_integer: true,
greater_than_or_equal_to: 1,
greater_than_or_equal_to: 1,
less_than_or_equal_to: 5,
message: Spree.t('you_must_enter_value_for_rating') }

scope :most_recent_first, -> { order("spree_feedback_reviews.created_at DESC") }
default_scope { most_recent_first }

scope :localized, lambda { |lc| where('spree_feedback_reviews.locale = ?', lc) }

end
2 changes: 0 additions & 2 deletions app/models/spree/product_decorator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ def stars

def recalculate_rating
reviews_count = self.reviews.reload.approved.count

self.reviews_count = reviews_count
if reviews_count > 0
self.avg_rating = self.reviews.approved.sum(:rating).to_f / reviews_count
Expand All @@ -17,5 +16,4 @@ def recalculate_rating
end
self.save
end

end
9 changes: 4 additions & 5 deletions app/models/spree/review.rb
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
class Spree::Review < ActiveRecord::Base
belongs_to :product, touch: true
belongs_to :user, :class_name => Spree.user_class.to_s
belongs_to :user, class_name: Spree.user_class.to_s
has_many :feedback_reviews

after_save :recalculate_product_rating, :if => :approved?
after_save :recalculate_product_rating, if: :approved?
after_destroy :recalculate_product_rating

validates :name, presence: true
validates :review, presence: true

validates :rating, numericality: { only_integer: true,
greater_than_or_equal_to: 1,
greater_than_or_equal_to: 1,
less_than_or_equal_to: 5,
message: Spree.t('you_must_enter_value_for_rating') }


default_scope { order("spree_reviews.created_at DESC") }

scope :localized, ->(lc) { where('spree_reviews.locale = ?', lc) }
scope :most_recent_first, -> { order('spree_reviews.created_at DESC') }
scope :oldest_first, -> { reorder('spree_reviews.created_at ASC') }
Expand Down
14 changes: 7 additions & 7 deletions app/models/spree/reviews_configuration.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@ def self.boolean_preferences
end

# include non-approved reviews in (public) listings
preference :include_unapproved_reviews, :boolean, :default => false
preference :include_unapproved_reviews, :boolean, default: false

# control how many reviews are shown in summaries etc.
preference :preview_size, :integer, :default => 3
preference :preview_size, :integer, default: 3

# show a reviewer's email address
preference :show_email, :boolean, :default => false
preference :show_email, :boolean, default: false

# show helpfullness rating form elements
preference :feedback_rating, :boolean, :default => false
preference :feedback_rating, :boolean, default: false

# require login to post reviews
preference :require_login, :boolean, :default => true
preference :require_login, :boolean, default: true

# whether to keep track of the reviewer's locale
preference :track_locale, :boolean, :default => false
preference :track_locale, :boolean, default: false

# render checkbox for a user to approve to show their identifier (name or email) on their review
preference :render_show_identifier_checkbox, :boolean, :default => false
preference :render_show_identifier_checkbox, :boolean, default: false
end
10 changes: 5 additions & 5 deletions app/overrides/add_reviews_after_product_properties.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Deface::Override.new(:virtual_path => "spree/products/show",
:name => "converted_product_properties_767643482",
:insert_after => "[data-hook='product_properties']",
:partial => "spree/shared/reviews",
:disabled => false)
Deface::Override.new(virtual_path: "spree/products/show",
name: "converted_product_properties_767643482",
insert_after: "[data-hook='product_properties']",
partial: "spree/shared/reviews",
disabled: false)
8 changes: 4 additions & 4 deletions app/overrides/add_reviews_tab_to_admin.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Deface::Override.new(:virtual_path => "spree/admin/shared/_product_sub_menu",
:name => "reviews_admin_tab",
:insert_bottom => "[data-hook='admin_product_sub_tabs']",
:text => "<%= tab(:reviews, :label => 'review_management') %>")
Deface::Override.new(virtual_path: "spree/admin/shared/_product_sub_menu",
name: "reviews_admin_tab",
insert_bottom: "[data-hook='admin_product_sub_tabs']",
text: "<%= tab(:reviews, label: 'review_management') %>")
10 changes: 5 additions & 5 deletions app/overrides/add_reviews_to_admin_configuration_sidebar.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Deface::Override.new(:virtual_path => "spree/admin/shared/_configuration_menu",
:name => "converted_admin_configurations_menu",
:insert_bottom => "[data-hook='admin_configurations_sidebar_menu'], #admin_configurations_sidebar_menu[data-hook]",
:text => "<%= configurations_sidebar_menu_item Spree.t('spree_reviews.review_settings'), edit_admin_review_settings_path %>",
:disabled => false)
Deface::Override.new(virtual_path: "spree/admin/shared/_configuration_menu",
name: "converted_admin_configurations_menu",
insert_bottom: "[data-hook='admin_configurations_sidebar_menu'], #admin_configurations_sidebar_menu[data-hook]",
text: "<%= configurations_sidebar_menu_item Spree.t('spree_reviews.review_settings'), edit_admin_review_settings_path %>",
disabled: false)
6 changes: 3 additions & 3 deletions app/views/spree/admin/feedback_reviews/index.html.erb
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<% content_for :page_title do %>
<%= Spree.t('feedback_review_for', :review => @review.title) %>
<%= Spree.t('feedback_review_for', review: @review.title) %>
<% end %>

<% content_for :page_actions do %>
<li><%= button_link_to Spree.t(:back_to_reviews), admin_reviews_path, { :icon => 'icon-arrow-left' } %></li>
<li><%= button_link_to Spree.t(:back_to_reviews), admin_reviews_path, { icon: 'icon-arrow-left' } %></li>
<% end %>

<% render 'spree/admin/shared/product_sub_menu' %>
Expand Down Expand Up @@ -31,7 +31,7 @@
<td><%= feedback.rating %></td>
<td><%= l feedback.created_at %></td>
<td class="actions">
<%= link_to_delete feedback, :no_text => true %>
<%= link_to_delete feedback, no_text: true %>
</td>
</tr>
<% end %>
Expand Down
6 changes: 3 additions & 3 deletions app/views/spree/admin/review_settings/edit.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<%= Spree.t("spree_reviews.review_settings") %>
<% end %>

<%= form_tag(admin_review_settings_path, :method => :put) do %>
<%= form_tag(admin_review_settings_path, method: :put) do %>
<fieldset class="no-border-top">
<div class="field">
<%= check_box_tag('preferences[include_unapproved_reviews]', "1", Spree::Reviews::Config[:include_unapproved_reviews]) %>
Expand All @@ -28,13 +28,13 @@
</div>
<div class="field">
<label><%= Spree.t('spree_reviews.preview_size') %></label><br>
<%= text_field_tag('preferences[preview_size]', Spree::Reviews::Config[:preview_size], :size => 3) %>
<%= text_field_tag('preferences[preview_size]', Spree::Reviews::Config[:preview_size], size: 3) %>
</div>

<div class="form-buttons filter-actions actions" data-hook="buttons">
<%= button Spree.t('actions.update'), 'icon-refresh' %>
<span class="or"><%= Spree.t(:or) %></span>
<%= link_to_with_icon 'icon-remove', Spree.t('actions.cancel'), edit_admin_general_settings_url, :class => 'button' %>
<%= link_to_with_icon 'icon-remove', Spree.t('actions.cancel'), edit_admin_general_settings_url, class: 'button' %>
</div>
</fieldset>
<% end %>
10 changes: 5 additions & 5 deletions app/views/spree/admin/reviews/_form.html.erb
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<%= render "spree/shared/error_messages", :target => @review %>
<%= render "spree/shared/error_messages", target: @review %>
<%= f.field_container :name do %>
<%= f.label :name %><br />
<%= f.text_field :name, :maxlength => "255", :size => "60" %>
<%= f.text_field :name, maxlength: "255", size: "60" %>
<% end %>

<%= f.field_container :title do %>
<%= f.label :title %><br />
<%= f.text_field :title, :maxlength => "255", :size => "60" %>
<%= f.text_field :title, maxlength: "255", size: "60" %>
<% end %>

<%= f.field_container :review do %>
<%= f.label :review %><br />
<%= f.text_area :review, :wrap => "virtual", :rows => "10", :cols => "60" %>
<%= f.text_area :review, wrap: "virtual", rows: "10", cols: "60" %>
<% end %>

<% if Spree::Reviews::Config[:track_locale] %>
<%= f.field_container :locale do %>
<%= f.label :locale %><br />
<%= f.select :locale, I18n.available_locales.map { |lc| [t(lc, :default => lc.to_s), lc.to_s] } %>
<%= f.select :locale, I18n.available_locales.map { |lc| [t(lc, default: lc.to_s), lc.to_s] } %>
<% end %>
<% end %>
4 changes: 2 additions & 2 deletions app/views/spree/admin/reviews/edit.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<% content_for :page_title do %>
<%= Spree.t(:editing_review_for_html, :link => link_to(@review.product.name, product_path(@review.product))) %>
<%= Spree.t(:editing_review_for_html, link: link_to(@review.product.name, product_path(@review.product))) %>
<% end %>

<% render 'spree/admin/shared/product_sub_menu' %>
Expand All @@ -15,7 +15,7 @@
</div>

<div class="omega eight columns">
<%= render 'form', :f => f %>
<%= render 'form', f: f %>
</div>

<div class="clear"></div>
Expand Down
14 changes: 7 additions & 7 deletions app/views/spree/admin/reviews/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@
<div class="alpha three columns">
<div class="field">
<%= label_tag nil, Spree.t(:user) %><br />
<%= f.text_field :name_cont, :size => 25 %>
<%= f.text_field :name_cont, size: 25 %>
</div>
</div>

<div class="seven columns">
<div class="field">
<%= label_tag nil, Spree.t(:title) -%><br/>
<%= f.text_field :title_cont, :size => 25 -%>
<%= f.text_field :title_cont, size: 25 -%>
</div>
</div>

<div class="four columns">
<div class="field">
<%= label_tag nil, Spree.t(:review) -%><br/>
<%= f.text_field :review_cont, :size => 25 -%>
<%= f.text_field :review_cont, size: 25 -%>
</div>
</div>

Expand Down Expand Up @@ -89,14 +89,14 @@
<p><%= Spree::Review.human_attribute_name(:ip_address) %>: <%= review.ip_address ? link_to(review.ip_address, "http://whois.domaintools.com/#{review.ip_address}") : '-' %></p>
</td>
<td class="align-center">
<%= l review.created_at, :format => :short %>
<%= l review.created_at, format: :short %>
</td>
<td class="actions">
<%= link_to_with_icon 'check', Spree.t('approve'), approve_admin_review_url(review), :no_text => true, class: 'approve' unless review.approved %>
<%= link_to_with_icon 'check', Spree.t('approve'), approve_admin_review_url(review), no_text: true, class: 'approve' unless review.approved %>
&nbsp;
<%= link_to_edit review, :no_text => true, :class => 'edit' %>
<%= link_to_edit review, no_text: true, class: 'edit' %>
&nbsp;
<%= link_to_delete review, :no_text => true %>
<%= link_to_delete review, no_text: true %>
</td>
</tr>
<% end %>
Expand Down
6 changes: 3 additions & 3 deletions app/views/spree/feedback_reviews/_form.html.erb
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<%= render 'spree/feedback_reviews/summary', :review => review %>
<%= form_for((@feedback_review ||= review.feedback_reviews.build), :url => feedback_reviews_path(review), :method => :post, :remote => true) do |f| %>
<%= render 'spree/feedback_reviews/summary', review: review %>
<%= form_for((@feedback_review ||= review.feedback_reviews.build), url: feedback_reviews_path(review), method: :post, remote: true) do |f| %>
<% unless @feedback_review.errors.empty? %>
<span class="error"><%= @feedback_review.errors[:rating] %></span>
<br />
<% end %>
<%= Spree.t(:was_this_review_helpful) %>
<% for i in 1..NB_STARS %>
<%= radio_button_tag "feedback_review[rating]",
Spree.t('star', :count => i), false, :class => "star" %>
Spree.t('star', count: i), false, class: "star" %>
<% end %>
<button class="feedback-review"><span><%= Spree.t(:say_yes) %></span></button>
<% end %>
4 changes: 2 additions & 2 deletions app/views/spree/feedback_reviews/_summary.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<p>
<%= Spree.t('voice', :count => review.feedback_reviews.count) %>.
<%= Spree.t('voice', count: review.feedback_reviews.count) %>.
<span title="<%= pluralize(review.feedback_stars, 'star') %> <%= Spree.t('out_of_5') %>">
<%= render 'spree/reviews/stars', :stars => review.feedback_stars %>
<%= render 'spree/reviews/stars', stars: review.feedback_stars %>
</span> &nbsp;
</p>
Loading

0 comments on commit 556b8c3

Please sign in to comment.