spree_reviews_rating 0.70.7.1 → 1.0.0

data/app/views/spree/reviews/success.js.erb

@@ -0,0 +1,2 @@
+$("#new_review").addClass("s_bgmsg_green").html("<%= escape_javascript(t('review_successfully_submitted')) %>");
+//setTimeout(function() { $("#reviews_form").show(); }, 1600);

data/app/views/spree/shared/_rating.html.erb

@@ -0,0 +1,28 @@
+<% stars = @product.get_stars
+if !stars.blank? %>
+<div class="rating">
+	<p><%= t('average_customer_rating') %>: </p>
+	<div id="star" data-rating="<%= stars[:star] || 0 %>"></div>
+	<p>(<%= t('based_upon') %> <%= stars[:rcount] %> <%= t('reviews') %>)</p>
+	<div itemprop="aggregateRating" itemscope itemtype="http://schema.org/AggregateRating">
+		<meta itemprop="ratingValue" content="<%= stars[:star] %>" />
+		<meta itemprop="reviewCount" content="<%= stars[:rcount] %>" />
+	</div>
+</div>
+<% end %>
+<script type="text/javascript">
+<!--//
+jQuery(document).ready(function() {
+	$("#star").raty({
+		readOnly: true,
+		start: <%= stars[:star] %>,
+		half:  true,
+		width: 180,
+		starHalf: 'star-half<%= "-big" if (Spree::Config[:star_big] == true) %>.png',
+		starOff: 'star-off<%= "-big" if (Spree::Config[:star_big] == true) %>.png',
+		starOn:	'star-on<%= "-big" if (Spree::Config[:star_big] == true) %>.png',
+		path: '/assets/'
+	});
+});
+//-->
+</script>

data/app/views/spree/shared/_review.html.erb

@@ -0,0 +1,19 @@
+<div class="review" itemprop="reviews" itemscope itemtype="http://schema.org/Review">
+	<% if Spree::Config[:show_email] && review.user %>
+	<p class="author" itemprop="author"><strong><%= review.user.email %></strong>
+	<% else %>
+	<p class="author" itemprop="author"><strong><%= raw review.name %></strong>
+	<% end %>
+		<small itemprop="datePublished"><%= t('submitted_on') %> (<%= l review.created_at.to_date %>)</small>
+	</p>
+	<div class="right">
+      <div class="single_rating_holder">
+		<meta itemprop="reviewRating" content="<%= review.rating %>" />
+        <%= render :partial => "spree/shared/single_rating", :locals => {:review => review} %>
+      </div>
+    </div>
+	<div class="clear"></div>
+	<div itemprop="reviewBody">
+		<%= raw simple_format(review.review) %>
+	</div>
+</div>

data/app/views/spree/shared/_review_summary.html.erb

@@ -0,0 +1,7 @@
+<div id="reviews">
+  <%= render :partial => 'spree/shared/rating', :locals => {:product => @product} %>
+  <% for review in @product.reviews.approved.preview %>
+    <%= render :partial => 'spree/shared/review', :locals => {:review => review} %>
+  <% end %>
+</div>
+

data/app/views/spree/shared/_reviews.html.erb

@@ -0,0 +1,23 @@
+<div id="reviews">
+<% unless @product.reviews.approved.blank? %>
+	<% for review in @product.reviews.approved.page(params[:page]).per(Spree::Config[:preview_size]) %>
+		<%= render :partial => 'spree/shared/review', :locals => {:review => review} %>
+	<% end %>
+<% else %>
+	<div class="review" itemprop="reviews" itemscope itemtype="http://schema.org/Review"><%= t("reviews_rating.no_reviews_found") %></div>
+<% end %>
+	<div class="pagination">
+		<div class="results"><%= paginate @product.reviews.approved.page(params[:page]).per(Spree::Config[:preview_size]) %></div>
+	</div>
+	<% if !Spree::Config[:require_login] || current_user %>
+		<% if !Spree::Config[:form_show] %>
+			<%= link_to(t('write_your_own_review'), new_product_review_path(@product), :class => "button-review", :rel => "nofollow,noindex") %>
+		<% else %>
+			<%= render "spree/reviews/new", :review => Spree::Review.new(:product => @product), :product => @product %>
+		<% end %>
+	<% end %>
+	<div id="new_review"></div>
+	<span class="clear"></span>
+</div>
+<%= javascript_include_tag 'store/review/index.js' %>
+<%= javascript_include_tag 'store/review/new.js' %>

data/app/views/{shared → spree/shared}/_shortrating.html.erb

@@ -1,6 +1,6 @@
 <% stars = product.get_stars %>
 <span style="float:left;" title="<%= txt_stars(stars[:star]) %>">
-  <%= render :partial => "reviews/stars", :locals => {:stars => stars[:star]} %>
+  <%= render :partial => "spree/reviews/stars", :locals => {:stars => stars[:star]} %>
 </span>
 <span style="float:right;">
   <%= Review.model_name.human(:count => stars[:rcount]) %>

data/app/views/spree/shared/_single_rating.html.erb

@@ -0,0 +1,20 @@
+<% if !review.rating.blank? %>
+<p class="single_rating rate"><span id="star_s<%= review.id.to_s %>" data-rating="<%= review.rating || 0 %>"></span></p>
+<span class="average"><%= review.rating.to_s + " " + t("reviews_rating.on_stars") + " 5 " + t(:stars) %></span>
+<% end %>
+<script type="text/javascript">
+<!--//
+	jQuery(document).ready(function() {
+		$("#star_s<%= review.id.to_s %>").raty({
+		  readOnly: true,
+		  start: <%= review.rating %>,
+		  half:  true,
+		  width: 180,
+		  starHalf: 'star-half<%= "-big" if (Spree::Config[:star_big] == true) %>.png',
+		  starOff: 'star-off<%= "-big" if (Spree::Config[:star_big] == true) %>.png',
+	 	  starOn:	'star-on<%= "-big" if (Spree::Config[:star_big] == true) %>.png',
+		  path: '/assets/'
+		});
+	});
+//-->
+</script>

data/config/locales/en.yml

@@ -1,5 +1,49 @@
+---
 en:
   activerecord:
+    errors: &errors
+      format: "%{attribute} %{message}\n"
+
+      messages: &errors_messages
+        inclusion: "is not included in the list"
+        exclusion: "is reserved"
+        invalid: "is invalid"
+        confirmation: "doesn't match confirmation"
+        record_invalid: "Validation failed: %{errors}"
+        taken: has already been taken
+        accepted: "must be accepted"
+        empty: "can't be empty"
+        blank: "can't be blank"
+        too_long:
+          one: "is too long (maximum is 1 character)"
+          other: "is too long (maximum is %{count} characters)"
+        too_short:
+          one:  "is too short (minimum is 1 character)"
+          other:  "is too short (minimum is %{count} characters)"
+        wrong_length:
+          one: "is the wrong length (should be 1 character)"
+          other: "is the wrong length (should be %{count} characters)"
+        not_a_number: "is not a number"
+        not_an_integer: "must be an integer"
+        greater_than: "must be greater than %{count}"
+        greater_than_or_equal_to: "must be greater than or equal to %{count}"
+        equal_to: "must be equal to %{count}"
+        less_than: "must be less than %{count}"
+        less_than_or_equal_to: "must be less than or equal to %{count}"
+        odd: "must be odd"
+        even: "must be even"
+
+      models:
+        review:
+          attributes:
+            review:
+              name: Your Name
+              title: Title
+              review: Content
+              rating: Rating
+              created_at: Date
+              ip_address: IP
+              user: User
     attributes:
       review:
         name: Your Name
@@ -12,17 +56,19 @@ en:
     models:
       review:
         one: one review
-        other: "%{count} reviews"
+        many: "%{count} reviews"
   time:
     formats:
       default: "%a %d %b %Y, %H:%M:%S %z"
       short: "%d %b %H:%M"
       long: "%d %B %Y %H:%M"
-      review: "%a %d.%m.%Y"
+      review: "%d/%m/%Y"
       hours: "%H:%M"
       dow: "%A"
 
   approve: Approve
+  on_stars: on
+  stars: stars!
   Approved_reviews: Approved
   approved_text: Unlocked comments will be published within 1-2 business days.
   are_you_sure_review: Are you sure to delete review ?
@@ -43,9 +89,12 @@ en:
   leave_us_a_review: Leave us a review and a rating
   original_version: 'Original version'
   out_of_5: "out of 5"
+  created_at: Created at
   rating: rating
   reviews: Reviews
   review_content: Content
+  review_settings: Reviews Settings
+  manage_review_settings: Manage Reviews Settings
   review_guidelines: Review Guidelines
   review_management: Review Management
   review_management_description: Manage the user-submitted reviews
@@ -53,13 +102,30 @@ en:
   review_successfully_submitted: Review was successfully submitted
   review_not_submitted: Review was not submitted
   review_title: Title
-  spree_reviews:
+  reviews_rating:
+    preview_size: Size of the review snippets
+    include_unapproved_reviews: Include unapproved reviews in listings
+    show_email: Show user email
+    require_login: Authentication required
+    form_show: View form for insert review
+    on_stars: on
+    write: Write
+    a_review: a Review
+    name: Name
+    review: Review
+    note_reviews: Note
+    continue: Send
+    no_reviews_found: No review yet included
+    edited_version: Edited Version
+    original_version: Original Version
+    review_settings: Reviews Setting
+    manage_review_settings: Manage Reviews Setting
+    rating: Rate
+    note_review_description: Do not insert HTML code!
     review_settings: Review Settings
     manage_review_settings: Control the display of reviews
-    preview_size: Size of the review snippets
-    include_unapproved: Include unapproved reviews in listings
-    show_email: Show email addresses
     feedback_rating: Rate feedback
+    star_big: Big Star
     require_login: Require user to be logged in
     your_name: Your name
     your_location: Your location

data/config/locales/it.yml

@@ -1,5 +1,49 @@
+---
 it:
   activerecord:
+    errors: &errors
+      format: "%{attribute} %{message}\n"
+      
+      messages: &errors_messages
+        inclusion: "non è incluso nella lista"
+        exclusion: "è riservato"
+        invalid: "non è valido"
+        confirmation: "non coincide con la conferma"
+        record_invalid: "Validazione fallita: %{errors}"
+        taken: è già in uso
+        accepted: "deve essere accettata"
+        empty: "non può essere vuoto"
+        blank: "non può essere lasciato in bianco"
+        too_long:
+          one: "è troppo lungo (il massimo è 1 carattere)"
+          other: "è troppo lungo (il massimo è %{count} caratteri)"
+        too_short:
+          one:  "è troppo corto (il minimo è 1 carattere)"
+          other:  "è troppo corto (il minimo è %{count} caratteri)"
+        wrong_length:
+          one: "è della lunghezza sbagliata (deve essere di 1 carattere)"
+          other: "è della lunghezza sbagliata (deve essere di %{count} caratteri)"
+        not_a_number: "non è un numero"
+        not_an_integer: "non è un intero"
+        greater_than: "deve essere superiore a %{count}"
+        greater_than_or_equal_to: "deve essere superiore o uguale a %{count}"
+        equal_to: "deve essere uguale a %{count}"
+        less_than: "deve essere meno di %{count}"
+        less_than_or_equal_to: "deve essere meno o uguale a %{count}"
+        odd: "deve essere dispari"
+        even: "deve essere pari" 
+      
+      models:
+        review:
+          attributes:
+            review:
+              name: Nome
+              title: Titolo
+              review: Contenuto
+              rating: Voto
+              created_at: Data
+              ip_address: IP
+              user: Utente
     attributes:
       review:
         name: Nome
@@ -12,18 +56,20 @@ it:
     models:
       review:
         one: Recensione
-        other: "%{count} recensioni"
+        many: "%{count} recensioni"
   time:
     formats:
        default: "%a %d %b %Y, %H:%M:%S %z"
        short: "%d %b %H:%M"
        long: "%d %B %Y %H:%M"
-       review: "%a %d.%m.%Y"
+       review: "%d/%m/%Y"
        hours: "%H:%M"
        dow: "%A"
 
   approve: Approvare
-  Approved_reviews: Approvata
+  on_stars: su
+  stars: stelle!
+  Approved_reviews: Approvate
   approved_text: Unlocked comments will be published within 1-2 business days.
   are_you_sure_review: Sei sicuro di eliminare la recensione ?
   average_customer_rating: Voto medio
@@ -44,23 +90,43 @@ it:
   leave_us_a_review: Lasciaci un commento e un voto
   original_version: 'Original version'
   out_of_5: "su 5"
-  rating: voto
+  created_at: Creata il
+  rating: Voto
   review: Recensione
   review_content: Contenuto
   review_guidelines: Review Guidelines
+  review_settings: Configurazioni Recensioni
+  manage_review_settings: Imposta le configurazioni per le recensioni
   review_management: Recensioni
-  review_management_description: Manage the user-submitted reviews
+  review_management_description: Amministra le recensioni inviate
   review_name: Your Name
   review_successfully_submitted: La recensione è stata inviata correttamente
-  review_not_submitted: Non è stato possibile salvare la recensione
+  review_not_submitted: Non è stato possibile salvare la recensione.
   review_title: Title
-  spree_reviews:
-    review_settings: Impostazione recensioni
+  reviews_rating:
+    preview_size: Anteprima recensioni visualizzabili in pagina prodotto
+    include_unapproved_reviews: Includere le recensioni non approvate
+    show_email: Visualizza la mail dell'utente
+    require_login: Autenticazione necessaria
+    form_show: Visualizza direttamente il form di inserimento
+    on_stars: su
+    write: Scrivi
+    a_review: un Commento
+    name: Nome da visualizzare
+    review: Recensione
+    note_reviews: Note
+    continue: Invia
+    no_reviews_found: Nessuna Recensione ancora inserita
+    edited_version: Versione Modificata
+    original_version: Versione Originale
+    review_settings: Impostazioni Recensioni
+    manage_review_settings: Gestione Impostazioni Recensioni
+    rating: Vota
+    note_review_description: Non inserire codice HTML!
+    review_settings: Configurazioni Recensioni
     manage_review_settings: Control the display of reviews
-    preview_size: Size of the review snippets
-    include_unapproved: Include unapproved reviews in listings
-    show_email: Mostra indirizzo email
     feedback_rating: Rate feedback
+    star_big: Stelle Grandi
     require_login: Devi essere loggato per procedere
     your_name: Il tuo nome
     your_location: La tua posizione
@@ -73,7 +139,7 @@ it:
   terms_text: All opinions must comply with our terms and conditions
   terms_and_conditions: Terms & Conditions
   the_fine_print: The fine print
-  Unapproved_reviews: Non approvata
+  Unapproved_reviews: Non approvate
   voice:
     one: "1 voice"
     other: "%{count} voices"

data/config/routes.rb

@@ -1,26 +1,19 @@
-Rails.application.routes.draw do
+Spree::Core::Engine.routes.prepend do
+  
   namespace :admin do
-    resources :feedback_reviews
     resources :reviews do
       member do
         get :approve
       end
-      resources :feedback_reviews
     end
     resource :review_settings
   end
 
   resources :products do
     resources :reviews do
-      collection do
-        get :terms
-        get "submissionguidelines"
-      end
     end
   end
-  #resources :reviews
   
-  match "/reviews/:review_id/feedback(.:format)" => "feedback_reviews#create", :via => :post, :as => "feedback_review"
   match "/reviews/all_list", :to => "reviews#all_list", :as => :all_reviews
   
 end

data/db/migrate/20081020220724_create_reviews.rb

@@ -1,6 +1,6 @@
 class CreateReviews < ActiveRecord::Migration
-  def self.up
-    create_table :reviews do |t|
+  def change
+    create_table :spree_reviews do |t|
       t.string  :name, :location
       t.decimal :rating
       t.text :review
@@ -11,8 +11,4 @@ class CreateReviews < ActiveRecord::Migration
       t.timestamps
     end
   end
-
-  def self.down
-    drop_table :reviews
-  end
 end

data/db/migrate/20110406083603_add_rating_to_products.rb

@@ -1,11 +1,6 @@
 class AddRatingToProducts < ActiveRecord::Migration
-  def self.up
-    add_column :products, :avg_rating, :decimal, :default => 0.0, :null => false, :precision => 7, :scale => 5
-    add_column :products, :reviews_count, :integer, :default => 0, :null => false
-  end
-
-  def self.down
-    remove_column :products, :reviews_count
-    remove_column :products, :avg_rating
+  def change
+    add_column :spree_products, :avg_rating, :decimal, :default => 0.0, :null => false, :precision => 7, :scale => 5
+    add_column :spree_products, :reviews_count, :integer, :default => 0, :null => false
   end
 end

data/db/migrate/20120123141326_recalculate_ratings.rb

@@ -1,8 +1,8 @@
 class RecalculateRatings < ActiveRecord::Migration
   def change
-    Product.reset_column_information
-    Product.all.each do |p|
-      Product.update_counters p.id, :reviews_count => p.reviews.length
+    Spree::Product.reset_column_information
+    Spree::Product.all.each do |p|
+      Spree::Product.update_counters p.id, :reviews_count => p.reviews.length
       p.recalculate_rating
     end
   end

data/db/migrate/20120323165848_reviews_rating_namespace.rb

@@ -0,0 +1,5 @@
+class ReviewsRatingNamespace < ActiveRecord::Migration
+  def change
+    rename_table :reviews, :spree_reviews
+  end
+end

data/lib/generators/spree_reviews_rating/install/install_generator.rb

@@ -1,19 +1,9 @@
 module SpreeReviewsRating
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      
-      def add_formtastic
-        res = ask "Would you like to run the formtastic install now? [Y/n]"
-        if res == "" || res.downcase == "y"
-          run 'rails generate formtastic:install'
-        else
-          puts "Skiping rails generate formtastic:install, don't forget to run it!"
-        end
-      end
-      
+
       def add_javascripts
         append_file "app/assets/javascripts/store/all.js", "//= require store/spree_reviews_rating\n"
-        #append_file "app/assets/javascripts/admin/all.js", "//= require admin/spree_reviews_rating\n"
       end
 
       def add_stylesheets

data/lib/spree_reviews_rating.rb

@@ -1,3 +1,2 @@
 require 'spree_core'
-require 'formtastic'
 require 'spree_reviews_rating/engine'