ratable 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b73a6b2a07a0e7148f91bdfa503d6d849e0621e
-  data.tar.gz: 1f5ee31f7d742e84326135d5c4042be6cfe0fc5c
+  metadata.gz: 470dfee1c88fb9bb6abffaeb5b94b495cf130ae6
+  data.tar.gz: 7bc55d4ff107ed5027cdfae16b8cf84890275da7
 SHA512:
-  metadata.gz: 35e0271f3f1855f1fb22a53e546f97554c9ca98367d25390b478fa11119c96887d629cb5befc955ba39a3261ba8a8b8bf4b2ee1fc62f494432568819f2bfff62
-  data.tar.gz: 5e4383b223bf6cf7ae9a988abb0d7226b9f96ddf0a8de514a3a0f00d5b5bf76a4e1f170b001ab3ff78e8fa9a72a464a8f205fc0300e4e0665a1bb1a775dd33e8
+  metadata.gz: 79a3ec8426be004245a8a30f8e10fa211f9a361ff35c0206645e485bfd13e7aa96d601234e44d7e4c425943adc4d52b83b7735f293aa61ea4ba882d40c414a92
+  data.tar.gz: 209666038eb795fa6751c0f8b22738cf46744ee80f69a675e6b7e1a442aca226665dfeda46edb513b5316afa0071d90722ac465223637628c258b869601f7b15

data/app/models/ratable/rating.rb

@@ -7,8 +7,5 @@ module Ratable
 
     scope :by_ratee, -> (ratee) { where(ratee: ratee) }
     scope :by_rater, -> (rater) { where(rater: rater) }
-
-    def average
-    end
   end
 end

data/app/models/ratable/rating_average.rb

@@ -0,0 +1,14 @@
+module Ratable
+  class RatingAverage
+    include ActiveModel::Model
+
+    attr_accessor :ratings, :value, :rater, :ratee
+
+    def initialize(attributes={})
+      attributes.reject! { |k| k == :value }
+      attributes.each { |k,v| send("#{k}=", v) }
+      @value = @ratings.average(:value).to_i
+    end
+
+  end
+end

data/app/views/ratable/rating_averages/_rating_average.html.erb

@@ -0,0 +1 @@
+<div class="rating-average" data-rating="<%= rating_average.value %>"></div>

data/lib/generators/ratable/views_generator.rb

@@ -3,5 +3,6 @@ class Ratable::ViewsGenerator < Rails::Generators::Base
 
   def copy_views
     directory('ratings', 'app/views/ratable/ratings')
+    directory('rating_averages', 'app/views/ratable/rating_averages')
   end
 end

data/lib/ratable/models/ratee.rb

@@ -17,7 +17,15 @@ module Ratable
         if @has_one
           has_one :rating, class_name: 'Ratable::Rating', dependent: :destroy, as: :ratee
         else
-          has_many :ratings, class_name: 'Ratable::Rating', dependent: :destroy, as: :ratee
+          has_many :ratings, -> { order(updated_at: :desc) }, class_name: 'Ratable::Rating', dependent: :destroy, as: :ratee
+        end
+      end
+
+      def rating_average
+        if @has_one
+          ::Ratable::RatingAverage.new(ratings: rating, ratee: self)
+        else
+          ::Ratable::RatingAverage.new(ratings: ratings, ratee: self)
         end
       end
 

data/lib/ratable/models/ratee_rater.rb

@@ -23,12 +23,28 @@ module Ratable
         if @has_one_ratee
           has_one :ratee_rating, class_name: 'Ratable::Rating', dependent: :destroy, as: :ratee
         else
-          has_many :ratee_ratings, class_name: 'Ratable::Rating', dependent: :destroy, as: :ratee
+          has_many :ratee_ratings, -> { order(updated_at: :desc) }, class_name: 'Ratable::Rating', dependent: :destroy, as: :ratee
         end
         if @has_one_rater
           has_one :rater_rating, class_name: 'Ratable::Rating', dependent: :destroy, as: :rater
         else
-          has_many :rater_ratings, class_name: 'Ratable::Rating', dependent: :destroy, as: :rater
+          has_many :rater_ratings, -> { order(updated_at: :desc) }, class_name: 'Ratable::Rating', dependent: :destroy, as: :rater
+        end
+      end
+
+      def ratee_rating_average
+        if @has_one_ratee
+          ::Ratable::RatingAverage.new(ratings: ratee_rating, ratee: self)
+        else
+          ::Ratable::RatingAverage.new(ratings: ratee_rating, ratee: self)
+        end
+      end
+
+      def rater_rating_average
+        if @has_one_rater
+          ::Ratable::RatingAverage.new(ratings: rater_rating, rater: self)
+        else
+          ::Ratable::RatingAverage.new(ratings: rater_ratings, rater: self)
         end
       end
 

data/lib/ratable/models/rater.rb

@@ -17,7 +17,15 @@ module Ratable
         if @has_one
           has_one :rating, class_name: 'Ratable::Rating', dependent: :destroy, as: :rater
         else
-          has_many :ratings, class_name: 'Ratable::Rating', dependent: :destroy, as: :rater
+          has_many :ratings, -> { order(updated_at: :desc) }, class_name: 'Ratable::Rating', dependent: :destroy, as: :rater
+        end
+      end
+
+      def rating_average
+        if @has_one
+          ::Ratable::RatingAverage.new(ratings: rating, rater: self)
+        else
+          ::Ratable::RatingAverage.new(ratings: ratings, rater: self)
         end
       end
 

data/lib/ratable/version.rb

@@ -1,3 +1,3 @@
 module Ratable
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/spec/dummy/app/models/user.rb

@@ -4,6 +4,5 @@ class User < ActiveRecord::Base
   devise :database_authenticatable, :registerable,
          :recoverable, :rememberable, :trackable, :validatable
 
-  acts_as_ratee
-  acts_as_rater
+  acts_as_ratee_and_rater
 end

data/spec/dummy/log/development.log

@@ -4275,3 +4275,19 @@ Started GET "/assets/star-off-6aaeebdaab93d594c005d366ce0d94fba02e7a07fd03557dbe
   User Load (0.8ms)  SELECT `users`.* FROM `users` WHERE `users`.`id` IN (1)
   Ratable::Rating Load (0.8ms)  SELECT `ratable_ratings`.* FROM `ratable_ratings` WHERE `ratable_ratings`.`ratee_id` = 1 AND `ratable_ratings`.`ratee_type` = 'Post'
   Ratable::Rating Load (0.8ms)  SELECT `ratable_ratings`.* FROM `ratable_ratings` WHERE `ratable_ratings`.`ratee_id` = 1 AND `ratable_ratings`.`ratee_type` = 'Post' AND `ratable_ratings`.`rater_type` = 'User' AND `ratable_ratings`.`rater_id` = 1
+  Post Load (0.5ms)  SELECT  `posts`.* FROM `posts`  ORDER BY `posts`.`id` ASC LIMIT 1
+  Ratable::Rating Load (0.8ms)  SELECT `ratable_ratings`.* FROM `ratable_ratings` WHERE `ratable_ratings`.`ratee_id` = 1 AND `ratable_ratings`.`ratee_type` = 'Post'
+  Post Load (0.7ms)  SELECT  `posts`.* FROM `posts`  ORDER BY `posts`.`id` ASC LIMIT 1
+  Post Load (0.6ms)  SELECT  `posts`.* FROM `posts`  ORDER BY `posts`.`id` ASC LIMIT 1
+  Post Load (0.7ms)  SELECT  `posts`.* FROM `posts`  ORDER BY `posts`.`id` ASC LIMIT 1
+  Post Load (0.6ms)  SELECT  `posts`.* FROM `posts`  ORDER BY `posts`.`id` ASC LIMIT 1
+  Post Load (0.8ms)  SELECT  `posts`.* FROM `posts`  ORDER BY `posts`.`id` ASC LIMIT 1
+   (0.8ms)  SELECT AVG(`ratable_ratings`.`value`) FROM `ratable_ratings` WHERE `ratable_ratings`.`ratee_id` = 1 AND `ratable_ratings`.`ratee_type` = 'Post'
+  Ratable::Rating Load (0.7ms)  SELECT `ratable_ratings`.* FROM `ratable_ratings` WHERE `ratable_ratings`.`ratee_id` = 1 AND `ratable_ratings`.`ratee_type` = 'Post'
+  Post Load (0.5ms)  SELECT  `posts`.* FROM `posts`  ORDER BY `posts`.`id` ASC LIMIT 1
+   (1.6ms)  SELECT AVG(`ratable_ratings`.`value`) FROM `ratable_ratings` WHERE `ratable_ratings`.`ratee_id` = 1 AND `ratable_ratings`.`ratee_type` = 'Post'
+  Post Load (0.6ms)  SELECT  `posts`.* FROM `posts`  ORDER BY `posts`.`id` ASC LIMIT 1
+   (0.8ms)  SELECT AVG(`ratable_ratings`.`value`) FROM `ratable_ratings` WHERE `ratable_ratings`.`ratee_id` = 1 AND `ratable_ratings`.`ratee_type` = 'Post'
+  Post Load (0.6ms)  SELECT  `posts`.* FROM `posts`  ORDER BY `posts`.`id` ASC LIMIT 1
+   (0.7ms)  SELECT AVG(`ratable_ratings`.`value`) FROM `ratable_ratings` WHERE `ratable_ratings`.`ratee_id` = 1 AND `ratable_ratings`.`ratee_type` = 'Post'
+  Ratable::Rating Load (1.0ms)  SELECT `ratable_ratings`.* FROM `ratable_ratings` WHERE `ratable_ratings`.`ratee_id` = 1 AND `ratable_ratings`.`ratee_type` = 'Post'

data/spec/factories/ratable_rating.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :ratable_rating, class: 'Ratable::Rating' do
+
+  end
+end

data/spec/factories/ratable_rating_averages.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :ratable_rating_average, class: 'Ratable::RatingAverage' do
+    
+  end
+end

data/spec/models/ratable/rating_average_spec.rb

@@ -0,0 +1,7 @@
+require 'rails_helper'
+
+module Ratable
+  RSpec.describe RatingAverage, type: :model do
+    pending "add some examples to (or delete) #{__FILE__}"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ratable
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - François Bélanger
@@ -122,6 +122,8 @@ files:
 - app/assets/javascripts/ratable.js.erb
 - app/assets/stylesheets/ratable.scss
 - app/models/ratable/rating.rb
+- app/models/ratable/rating_average.rb
+- app/views/ratable/rating_averages/_rating_average.html.erb
 - app/views/ratable/ratings/_rating.html.erb
 - db/migrate/20160418175804_create_ratable_ratings.rb
 - lib/generators/ratable/install_generator.rb
@@ -596,7 +598,10 @@ files:
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/zl/zlj-FK9QDxF0uO6x4ka6CN3aSaHs5bGTuJm_JMKstaY.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/zp/zpSERRztqsKIBHLay1Pa74kqqJqZJSA3kTjL1BWH40I.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/zx/zxDhIDb-lPPulK9xGZ0mW_Yskyocslvalf6NF5Ys7Oo.cache
-- spec/models/rating_spec.rb
+- spec/factories/ratable_rating.rb
+- spec/factories/ratable_rating_averages.rb
+- spec/models/ratable/rating_average_spec.rb
+- spec/models/ratable/rating_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
 - spec/test_spec.rb
@@ -1090,4 +1095,7 @@ test_files:
 - spec/dummy/README.rdoc
 - spec/rails_helper.rb
 - spec/test_spec.rb
-- spec/models/rating_spec.rb
+- spec/models/ratable/rating_average_spec.rb
+- spec/models/ratable/rating_spec.rb
+- spec/factories/ratable_rating_averages.rb
+- spec/factories/ratable_rating.rb