spree_reviews_rating 0.70.6 → 0.70.6.1

data/app/assets/javascripts/store/review/new.js

@@ -12,6 +12,6 @@ $('.button-submit').click(function (event) {
 		url: $("#new_review").action,
 		data: ({authenticity_token: jQuery('meta[name="csrf-token"]').attr('content'), 'review[]': [$("#new_review").serializeArray()]}),
 		beforeSend: function(r){ $('#new_review').html('<p style="padding: 20px">Loading <img src="/assets/ratyloader.gif"/></p>');},
-		success: function(r){ $('#new_review').html(r);} });
-  });
+		success: function(r){ $('#new_review').html(r);}
+	});
 });

data/app/models/{reviews_ability.rb → ability_decorator.rb}

@@ -1,12 +1,14 @@
-class ReviewsAbility
+class AbilityDecorator
   include CanCan::Ability
 
   def initialize(user)
     can :create, Review do |review|
       user.has_role?(:user) || !Spree::Config[:require_login]
     end
+    can :read, Review
     can :create, FeedbackReview do |review|
       user.has_role?(:user) || !Spree::Config[:require_login]
     end
   end
-end
+  Ability.register_ability(AbilityDecorator)
+end

data/app/models/app_configuration_decorator.rb

@@ -1,16 +1,13 @@
 AppConfiguration.class_eval do
+  
   # include non-approved reviews in (public) listings
   preference :include_unapproved_reviews, :boolean, :default => false
-
   # control how many reviews are shown in summaries etc.
   preference :preview_size, :integer, :default => 3
-
   # show a reviewer's email address
   preference :show_email, :boolean, :default => false
-
   # show helpfullness rating form elements
   preference :feedback_rating, :boolean, :default => false
-
   # require login to post reviews
   preference :require_login, :boolean, :default => true
 end

data/app/models/product_decorator.rb

@@ -2,15 +2,12 @@ Product.class_eval do
   has_many :reviews
 
   def get_stars
-    {:star => avg_rating.round, :rcount => reviews_count}
+    {:star => ((2.0 * self.avg_rating).round / 2.0), :rcount => reviews_count}
   end
 
   def recalculate_rating
-    reviews_count = reviews.reload.approved.count
-    if reviews_count > 0
-      self.update_attributes(:avg_rating => self.reviews.approved.sum(:rating).to_f / reviews_count, :reviews_count => reviews_count)
-    else
-      self.update_attribute :avg_rating, 0
-    end
+    reviews_count = reviews.reload.approved.where('rating IS NOT NULL').count
+    avg_rating = (reviews_count > 0) ? (self.reviews.approved.sum(:rating).to_f / reviews_count) : 0
+    self.update_attributes(:avg_rating => avg_rating, :reviews_count => reviews_count)
   end
 end

data/app/models/review.rb

@@ -4,14 +4,14 @@ class Review < ActiveRecord::Base
   has_many   :feedback_reviews
 
   validates_presence_of :name, :review
-  validates_numericality_of :rating, :only_integer => true
+  validates_numericality_of :rating, :if => Proc.new {|r| !r.rating.blank?}
   default_scope order("created_at DESC")
   scope :not_approved, where("approved = ?", false)
 
   scope :approved, lambda {|*args| {:conditions => ["(? = ?) or (approved = ?)", Spree::Config[:include_unapproved_reviews], true, true ]}}
 
   scope :oldest_first, :order => "created_at asc"
-  scope :preview,      :limit => Spree::Config[:preview_size], :order => "created_at desc"
+  scope :preview, :limit => Spree::Config[:preview_size], :order => "created_at desc"
   attr_protected :user_id, :product_id, :location
 
   def feedback_stars

data/app/models/user_decorator.rb

@@ -0,0 +1,7 @@
+User.class_eval do
+  before_create :set_role
+  
+  def set_role
+    self.role_ids = Role.find_by_name("user").id
+  end    
+end

data/db/migrate/20081020220724_create_reviews.rb

@@ -2,7 +2,7 @@ class CreateReviews < ActiveRecord::Migration
   def self.up
     create_table :reviews do |t|
       t.string  :name, :location
-      t.integer :rating
+      t.decimal :rating
       t.text :review
       t.boolean :approved, :default => false
       

metadata

@@ -1,103 +1,102 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: spree_reviews_rating
-version: !ruby/object:Gem::Version 
-  hash: 267
+version: !ruby/object:Gem::Version
+  version: 0.70.6.1
   prerelease: 
-  segments: 
-  - 0
-  - 70
-  - 6
-  version: 0.70.6
 platform: ruby
-authors: 
+authors:
 - Damiano Giacomello
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: spree_core
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: spree_auth
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: spree_auth
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: formtastic
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: formtastic
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: paperclip
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 5
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: paperclip
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.5.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec-rails
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: damiano.giacomello@diginess.it
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.md
 - lib/generators/spree_reviews_rating/install/install_generator.rb
 - lib/spree_reviews_rating/engine.rb
@@ -141,12 +140,13 @@ files:
 - app/helpers/admin/feedback_reviews_helper.rb
 - app/helpers/feedback_reviews_helper.rb
 - app/helpers/reviews_helper.rb
+- app/models/ability_decorator.rb
 - app/models/app_configuration_decorator.rb
 - app/models/feedback_review.rb
 - app/models/product_decorator.rb
 - app/models/review.rb
 - app/models/review_sweeper.rb
-- app/models/reviews_ability.rb
+- app/models/user_decorator.rb
 - app/overrides/add_review_bottom_sidebar.rb
 - app/overrides/add_reviews_after_product_properties.rb
 - app/overrides/add_reviews_tab_to_admin.rb
@@ -186,38 +186,27 @@ files:
 - config/routes.rb
 homepage: https://github.com/romul/spree-reviews/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-requirements: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - none
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: Basic review and ratings facility for Spree
 test_files: []
-