rating 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a9d42d0b74d27eec90696480e08f53c4ff5cfd8df12bf52b8fe7d993b483479
-  data.tar.gz: fcbaeb118ff6e0c37fcc7ea8d8d9a658e52e4e712bd5251fe948a4ad81a34878
+  metadata.gz: 11fafaaddcc1f4568cfd1412930a42a06aa0467bfa6e68a74d1bd3214f24aa87
+  data.tar.gz: d1dc1822b99b9a928e6bdceabcdd00bed081d08498e7189b1169ce323b3f720d
 SHA512:
-  metadata.gz: cad83ae5235eb83be5fb3fbd729391e9919430d169236f04c5a3a68eeb21e58aece8ef067f72cd513df75103c1777d61c3f51f0e5d0edcff9b19eeb8203ac2b6
-  data.tar.gz: 0da9112657b71a5f5af0abc739d75f780f0a3d3501de94c189ae787074284aae5850bf48f3fe3c8f40d9acf573019acfa5d5a704a307ba0da4882d37353b46ea
+  metadata.gz: 0a636e5f8b60c69b98384343ffa3ddb5023f020d07716917e2e1fe5a5292c8e2c4a28056755a01bae4978365f4b73a8f5e98fb9169f03e0b9825b44a0b6a6fd3
+  data.tar.gz: '09713cd4fd3a48b8433a3482c791eb380231b1a2edec2016d8a909bb3f7b8abbb0020c08d3fe5b68418840f9a017459d40e65672bda38aeb6ffbea6100cc9178'

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## v0.9.0
+
+### News
+
+- Order index keys of template the same way Rails does the query;
+- Limits the `_type` columns to avoid overflow bytes in DBs like MySQL < 5.7.
+
+### Updates
+
+- Update Rails to 2.6.5;
+- Update Activerecord to the last version;
+
 ## v0.8.0
 
 ### News

data/README.md

@@ -410,6 +410,6 @@ author.rate resource, 3
 
 Now the `sum` will be `6` and the `total` will be `3` because all rating will be calculated into just one rating record ignoring the `scopeable` object. The rating record is always saved on the record with `scopeable` as `nil`.
 
-## Love it!
+### References
 
-Via [PayPal](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=X8HEP2878NDEG&item_name=rating) or [Patreon](https://www.patreon.com/wbotelhos). Thanks! (:
+- [Evan Miller](http://www.evanmiller.org/ranking-items-with-star-ratings.html)

data/lib/generators/rating/install_generator.rb

@@ -2,7 +2,7 @@
 
 module Rating
   class InstallGenerator < Rails::Generators::Base
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path('templates', __dir__)
 
     desc 'Creates Rating migration'
 

data/lib/generators/rating/templates/db/migrate/create_rate_table.rb

@@ -7,12 +7,16 @@ class CreateRateTable < ActiveRecord::Migration[5.0]
 
       t.references :author,    index: true, null: false, polymorphic: true
       t.references :resource,  index: true, null: false, polymorphic: true
-      t.references :scopeable, index: true, null: true, polymorphic: true
+      t.references :scopeable, index: true, null: true,  polymorphic: true
 
       t.timestamps null: false
     end
 
-    add_index :rating_rates, %i[author_id author_type resource_id resource_type scopeable_id scopeable_type],
+    change_column :rating_rates, :author_type,    :string, limit: 10
+    change_column :rating_rates, :resource_type,  :string, limit: 10
+    change_column :rating_rates, :scopeable_type, :string, limit: 10
+
+    add_index :rating_rates, %i[author_type author_id resource_type resource_id scopeable_type scopeable_id],
       name:   :index_rating_rates_on_author_and_resource_and_scopeable,
       unique: true
   end

data/lib/generators/rating/templates/db/migrate/create_rating_table.rb

@@ -14,7 +14,10 @@ class CreateRatingTable < ActiveRecord::Migration[5.0]
       t.timestamps null: false
     end
 
-    add_index :rating_ratings, %i[resource_id resource_type scopeable_id scopeable_type],
+    change_column :rating_ratings, :resource_type,  :string, limit: 10
+    change_column :rating_ratings, :scopeable_type, :string, limit: 10
+
+    add_index :rating_ratings, %i[resource_type resource_id scopeable_type scopeable_id],
       name:   :index_rating_rating_on_resource_and_scopeable,
       unique: true
   end

data/lib/rating/config.rb

@@ -29,8 +29,8 @@ module Rating
         {
           rate: {
             case_sensitive: config.dig('validations', 'rate', 'case_sensitive') || false,
-            scope:          config.dig('validations', 'rate', 'scope') || default_scope
-          }
+            scope:          config.dig('validations', 'rate', 'scope') || default_scope,
+          },
         }.deep_stringify_keys
       end
     end

data/lib/rating/models/rating/extension.rb

@@ -73,7 +73,7 @@ module Rating
           class_name: '::Rating::Rate',
           dependent:  :destroy
 
-        scope :order_by_rating, ->(column = :estimate, direction = :desc, scope: nil) {
+        scope :order_by_rating, lambda { |column = :estimate, direction = :desc, scope: nil|
           includes(:rating_records)
             .where(Rating.table_name => { scopeable_id: scope&.id, scopeable_type: scope&.class&.base_class&.name })
             .order("#{Rating.table_name}.#{column} #{direction}")

data/lib/rating/models/rating/rate.rb

@@ -16,7 +16,7 @@ module Rating
 
     validates :author_id, uniqueness: {
       case_sensitive: ::Rating::Config.validations['rate']['case_sensitive'],
-      scope:          ::Rating::Config.validations['rate']['scope'].map(&:to_sym)
+      scope:          ::Rating::Config.validations['rate']['scope'].map(&:to_sym),
     }
 
     def self.create(author:, extra_scopes:, metadata:, resource:, scopeable: nil, value:)

data/lib/rating/models/rating/rating.rb

@@ -13,7 +13,7 @@ module Rating
 
     validates :resource_id, uniqueness: {
       case_sensitive: false,
-      scope:          %i[resource_type scopeable_id scopeable_type]
+      scope:          %i[resource_type scopeable_id scopeable_type],
     }
 
     class << self
@@ -43,7 +43,7 @@ module Rating
           average:  values.rating_avg,
           estimate: estimate(averager, values),
           sum:      values.rating_sum,
-          total:    values.rating_count
+          total:    values.rating_count,
         }
       end
 

data/lib/rating/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rating
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 end

data/spec/config/rate_table_spec.rb

@@ -3,11 +3,15 @@
 require 'rails_helper'
 
 RSpec.describe Rating::Config, '.rate_table' do
-  context 'when rating.yml does not exist' do
-    it { expect(subject.rate_table).to eq 'rating_rates' }
-  end if ENV['CONFIG_ENABLED'] != 'true'
+  if ENV['CONFIG_ENABLED'] != 'true'
+    context 'when rating.yml does not exist' do
+      it { expect(subject.rate_table).to eq 'rating_rates' }
+    end
+  end
 
-  context 'when rating.yml exists' do
-    it { expect(subject.rate_table).to eq 'reviews' }
-  end if ENV['CONFIG_ENABLED'] == 'true'
+  if ENV['CONFIG_ENABLED'] == 'true'
+    context 'when rating.yml exists' do
+      it { expect(subject.rate_table).to eq 'reviews' }
+    end
+  end
 end

data/spec/config/rating_table_spec.rb

@@ -3,11 +3,15 @@
 require 'rails_helper'
 
 RSpec.describe Rating::Config, '.rating_table' do
-  context 'when rating.yml does not exist' do
-    it { expect(subject.rating_table).to eq 'rating_ratings' }
-  end if ENV['CONFIG_ENABLED'] != 'true'
+  if ENV['CONFIG_ENABLED'] != 'true'
+    context 'when rating.yml does not exist' do
+      it { expect(subject.rating_table).to eq 'rating_ratings' }
+    end
+  end
 
-  context 'when rating.yml exists' do
-    it { expect(subject.rating_table).to eq 'review_ratings' }
-  end if ENV['CONFIG_ENABLED'] == 'true'
+  if ENV['CONFIG_ENABLED'] == 'true'
+    context 'when rating.yml exists' do
+      it { expect(subject.rating_table).to eq 'review_ratings' }
+    end
+  end
 end

data/spec/config/validations_spec.rb

@@ -3,25 +3,31 @@
 require 'rails_helper'
 
 RSpec.describe Rating::Config, '.validations' do
-  context 'when rating.yml does not exist' do
-    it do
-      expect(subject.validations).to eq({
-        rate: {
-          case_sensitive: false,
-          scope:          %w[author_type resource_id resource_type scopeable_id scopeable_type]
-        }
-      }.deep_stringify_keys)
+  if ENV['CONFIG_ENABLED_WITH_EXTRA_SCOPES'] != 'true'
+    context 'when rating.yml does not exist' do
+      it do
+        expect(subject.validations).to eq({
+          rate: {
+            case_sensitive: false,
+            scope:          %w[author_type resource_id resource_type scopeable_id scopeable_type],
+          },
+        }.deep_stringify_keys
+                                         )
+      end
     end
-  end if ENV['CONFIG_ENABLED_WITH_EXTRA_SCOPES'] != 'true'
+  end
 
-  context 'when rating.yml exists' do
-    it do
-      expect(subject.validations).to eq({
-        rate: {
-          case_sensitive: false,
-          scope:          %w[author_type resource_id resource_type scopeable_id scopeable_type scope_1 scope_2]
-        }
-      }.deep_stringify_keys)
+  if ENV['CONFIG_ENABLED_WITH_EXTRA_SCOPES'] == 'true'
+    context 'when rating.yml exists' do
+      it do
+        expect(subject.validations).to eq({
+          rate: {
+            case_sensitive: false,
+            scope:          %w[author_type resource_id resource_type scopeable_id scopeable_type scope_1 scope_2],
+          },
+        }.deep_stringify_keys
+                                         )
+      end
     end
-  end if ENV['CONFIG_ENABLED_WITH_EXTRA_SCOPES'] == 'true'
+  end
 end

data/spec/factories/rating/rate.rb

@@ -2,7 +2,7 @@
 
 FactoryBot.define do
   factory :rating_rate, class: Rating::Rate do
-    value 100
+    value { 100 }
 
     author   { create :author }
     resource { create :article }

data/spec/factories/rating/rating.rb

@@ -2,10 +2,10 @@
 
 FactoryBot.define do
   factory :rating_rating, class: Rating::Rating do
-    average  100
-    estimate 100
-    sum      100
-    total    1
+    average  { 100 }
+    estimate { 100 }
+    sum      { 100 }
+    total    { 1 }
 
     association :resource, factory: :article, strategy: :build
   end

data/spec/models/extension/order_by_rating_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe Rating::Extension, ':order_by_rating' do
       expect(Article.order_by_rating).to eq [
         article_1,
         article_2,
-        article_3
+        article_3,
       ]
     end
   end
@@ -22,14 +22,14 @@ RSpec.describe Rating::Extension, ':order_by_rating' do
         expect(Article.order_by_rating(:average, :asc)).to eq [
           article_3,
           article_2,
-          article_1
+          article_1,
         ]
       end
 
       context 'with scope' do
         it 'works' do
           expect(Article.order_by_rating(:average, :asc, scope: category)).to eq [
-            article_1
+            article_1,
           ]
         end
       end
@@ -40,14 +40,14 @@ RSpec.describe Rating::Extension, ':order_by_rating' do
         expect(Article.order_by_rating(:average, :desc)).to eq [
           article_1,
           article_2,
-          article_3
+          article_3,
         ]
       end
 
       context 'with scope' do
         it 'works' do
           expect(Article.order_by_rating(:average, :desc, scope: category)).to eq [
-            article_1
+            article_1,
           ]
         end
       end
@@ -60,14 +60,14 @@ RSpec.describe Rating::Extension, ':order_by_rating' do
         expect(Article.order_by_rating(:estimate, :asc)).to eq [
           article_3,
           article_2,
-          article_1
+          article_1,
         ]
       end
 
       context 'with scope' do
         it 'works' do
           expect(Article.order_by_rating(:estimate, :asc, scope: category)).to eq [
-            article_1
+            article_1,
           ]
         end
       end
@@ -78,14 +78,14 @@ RSpec.describe Rating::Extension, ':order_by_rating' do
         expect(Article.order_by_rating(:estimate, :desc)).to eq [
           article_1,
           article_2,
-          article_3
+          article_3,
         ]
       end
 
       context 'with scope' do
         it 'works' do
           expect(Article.order_by_rating(:estimate, :desc, scope: category)).to eq [
-            article_1
+            article_1,
           ]
         end
       end
@@ -98,14 +98,14 @@ RSpec.describe Rating::Extension, ':order_by_rating' do
         expect(Article.order_by_rating(:sum, :asc)).to eq [
           article_3,
           article_2,
-          article_1
+          article_1,
         ]
       end
 
       context 'with scope' do
         it 'works' do
           expect(Article.order_by_rating(:sum, :asc, scope: category)).to eq [
-            article_1
+            article_1,
           ]
         end
       end
@@ -116,14 +116,14 @@ RSpec.describe Rating::Extension, ':order_by_rating' do
         expect(Article.order_by_rating(:sum, :desc)).to eq [
           article_1,
           article_2,
-          article_3
+          article_3,
         ]
       end
 
       context 'with scope' do
         it 'works' do
           expect(Article.order_by_rating(:sum, :desc, scope: category)).to eq [
-            article_1
+            article_1,
           ]
         end
       end
@@ -142,7 +142,7 @@ RSpec.describe Rating::Extension, ':order_by_rating' do
       context 'with scope' do
         it 'works' do
           expect(Article.order_by_rating(:total, :asc, scope: category)).to eq [
-            article_1
+            article_1,
           ]
         end
       end
@@ -159,7 +159,7 @@ RSpec.describe Rating::Extension, ':order_by_rating' do
       context 'with scope' do
         it 'works' do
           expect(Article.order_by_rating(:total, :desc, scope: category)).to eq [
-            article_1
+            article_1,
           ]
         end
       end

data/spec/models/extension/rated_question_spec.rb

@@ -32,15 +32,17 @@ RSpec.describe Rating::Extension, ':rated?' do
     end
   end
 
-  context 'with extra scopes' do
-    before { author.rate resource, 1, extra_scopes: { scope_1: 'scope_1' } }
+  if ENV['CONFIG_ENABLED_WITH_EXTRA_SCOPES'] == 'true'
+    context 'with extra scopes' do
+      before { author.rate resource, 1, extra_scopes: { scope_1: 'scope_1' } }
 
-    context 'when has no rate for the given resource with given extra scopes' do
-      specify { expect(author.rated?(resource, extra_scopes: { scope_1: 'missing' })).to eq false }
-    end
+      context 'when has no rate for the given resource with given extra scopes' do
+        specify { expect(author.rated?(resource, extra_scopes: { scope_1: 'missing' })).to eq false }
+      end
 
-    context 'when has rate for the given resource with given extra scopes' do
-      specify { expect(author.rated?(resource, extra_scopes: { scope_1: 'scope_1' })).to eq true }
+      context 'when has rate for the given resource with given extra scopes' do
+        specify { expect(author.rated?(resource, extra_scopes: { scope_1: 'scope_1' })).to eq true }
+      end
     end
-  end if ENV['CONFIG_ENABLED_WITH_EXTRA_SCOPES'] == 'true'
+  end
 end

data/spec/models/extension/rated_spec.rb

@@ -38,11 +38,13 @@ RSpec.describe Rating::Extension, ':rated' do
     end
   end
 
-  context 'with extra scopes' do
-    let!(:extra_scopes_rate) { author_1.rate article_1, 1, extra_scopes: { scope_1: 'scope_1' } }
+  if ENV['CONFIG_ENABLED_WITH_EXTRA_SCOPES'] == 'true'
+    context 'with extra scopes' do
+      let!(:extra_scopes_rate) { author_1.rate article_1, 1, extra_scopes: { scope_1: 'scope_1' } }
 
-    it 'returns records considering the extra scopes' do
-      expect(author_1.rated(extra_scopes: { scope_1: 'scope_1' })).to eq [extra_scopes_rate]
+      it 'returns records considering the extra scopes' do
+        expect(author_1.rated(extra_scopes: { scope_1: 'scope_1' })).to eq [extra_scopes_rate]
+      end
     end
-  end if ENV['CONFIG_ENABLED_WITH_EXTRA_SCOPES'] == 'true'
+  end
 end

data/spec/models/extension/rates_spec.rb

@@ -38,11 +38,13 @@ RSpec.describe Rating::Extension, ':rates' do
     end
   end
 
-  context 'with extra scopes' do
-    let!(:extra_scopes_rate) { author_1.rate article_1, 1, extra_scopes: { scope_1: 'scope_1' } }
+  if ENV['CONFIG_ENABLED_WITH_EXTRA_SCOPES'] == 'true'
+    context 'with extra scopes' do
+      let!(:extra_scopes_rate) { author_1.rate article_1, 1, extra_scopes: { scope_1: 'scope_1' } }
 
-    it 'returns records considering the extra scopes' do
-      expect(article_1.rates(extra_scopes: { scope_1: 'scope_1' })).to eq [extra_scopes_rate]
+      it 'returns records considering the extra scopes' do
+        expect(article_1.rates(extra_scopes: { scope_1: 'scope_1' })).to eq [extra_scopes_rate]
+      end
     end
-  end if ENV['CONFIG_ENABLED_WITH_EXTRA_SCOPES'] == 'true'
+  end
 end

data/spec/models/rate/create_spec.rb

@@ -194,51 +194,11 @@ RSpec.describe Rating::Rate, ':create' do
     end
   end
 
-  context 'with extra scopes' do
-    let!(:category) { create :category }
-
-    it 'creates a rate entry' do
-      described_class.create(
-        author:       author,
-        extra_scopes: { scope_1: 'scope_1', scope_2: 'scope_2' },
-        metadata:     {},
-        resource:     article,
-        scopeable:    category,
-        value:        1
-      )
-
-      rate = described_class.last
+  if ENV['CONFIG_ENABLED_WITH_EXTRA_SCOPES'] == 'true'
+    context 'with extra scopes' do
+      let!(:category) { create :category }
 
-      expect(rate.author).to    eq author
-      expect(rate.resource).to  eq article
-      expect(rate.scope_1).to   eq 'scope_1'
-      expect(rate.scope_2).to   eq 'scope_2'
-      expect(rate.scopeable).to eq category
-      expect(rate.value).to     eq 1
-    end
-
-    it 'creates a rating entry' do
-      described_class.create(
-        author:       author,
-        extra_scopes: { scope_1: 'scope_1', scope_2: 'scope_2' },
-        metadata:     {},
-        resource:     article,
-        scopeable:    category,
-        value:        1
-      )
-
-      rating = Rating::Rating.last
-
-      expect(rating.average).to   eq 1
-      expect(rating.estimate).to  eq 1
-      expect(rating.resource).to  eq article
-      expect(rating.scopeable).to eq category
-      expect(rating.sum).to       eq 1
-      expect(rating.total).to     eq 1
-    end
-
-    context 'when rate already exists' do
-      before do
+      it 'creates a rate entry' do
         described_class.create(
           author:       author,
           extra_scopes: { scope_1: 'scope_1', scope_2: 'scope_2' },
@@ -247,116 +207,158 @@ RSpec.describe Rating::Rate, ':create' do
           scopeable:    category,
           value:        1
         )
-      end
-
-      it 'updates the rate entry' do
-        described_class.create(
-          author:       author,
-          extra_scopes: { scope_1: 'scope_1', scope_2: 'scope_2' },
-          metadata:     {},
-          resource:     article,
-          scopeable:    category,
-          value:        2
-        )
-
-        rates = described_class.all
 
-        expect(rates.size).to eq 1
-
-        rate = rates[0]
+        rate = described_class.last
 
         expect(rate.author).to    eq author
         expect(rate.resource).to  eq article
         expect(rate.scope_1).to   eq 'scope_1'
         expect(rate.scope_2).to   eq 'scope_2'
         expect(rate.scopeable).to eq category
-        expect(rate.value).to     eq 2
+        expect(rate.value).to     eq 1
       end
 
-      it 'updates the unique rating entry' do
+      it 'creates a rating entry' do
         described_class.create(
           author:       author,
           extra_scopes: { scope_1: 'scope_1', scope_2: 'scope_2' },
           metadata:     {},
           resource:     article,
           scopeable:    category,
-          value:        2
+          value:        1
         )
 
-        ratings = Rating::Rating.all
-
-        expect(ratings.size).to eq 1
-
-        rating = ratings[0]
+        rating = Rating::Rating.last
 
-        expect(rating.average).to   eq 2
-        expect(rating.estimate).to  eq 2
+        expect(rating.average).to   eq 1
+        expect(rating.estimate).to  eq 1
         expect(rating.resource).to  eq article
         expect(rating.scopeable).to eq category
-        expect(rating.sum).to       eq 2
+        expect(rating.sum).to       eq 1
         expect(rating.total).to     eq 1
       end
-    end
-
-    context 'when rate already exists but with at least one extra scope different' do
-      before do
-        described_class.create(
-          author:       author,
-          extra_scopes: { scope_1: 'scope_1', scope_2: 'scope_2' },
-          metadata:     {},
-          resource:     article,
-          scopeable:    category,
-          value:        1
-        )
-
-        described_class.create(
-          author:       author,
-          extra_scopes: { scope_1: 'scope_1', scope_2: 'scope_missing' },
-          metadata:     {},
-          resource:     article,
-          scopeable:    category,
-          value:        2
-        )
-      end
-
-      it 'creates a new rate entry' do
-        rates = described_class.all
-
-        expect(rates.size).to eq 2
-
-        rate = rates[0]
 
-        expect(rate.author).to    eq author
-        expect(rate.resource).to  eq article
-        expect(rate.scope_1).to   eq 'scope_1'
-        expect(rate.scope_2).to   eq 'scope_2'
-        expect(rate.scopeable).to eq category
-        expect(rate.value).to     eq 1
-
-        rate = rates[1]
-
-        expect(rate.author).to    eq author
-        expect(rate.resource).to  eq article
-        expect(rate.scope_1).to   eq 'scope_1'
-        expect(rate.scope_2).to   eq 'scope_missing'
-        expect(rate.scopeable).to eq category
-        expect(rate.value).to     eq 2
+      context 'when rate already exists' do
+        before do
+          described_class.create(
+            author:       author,
+            extra_scopes: { scope_1: 'scope_1', scope_2: 'scope_2' },
+            metadata:     {},
+            resource:     article,
+            scopeable:    category,
+            value:        1
+          )
+        end
+
+        it 'updates the rate entry' do
+          described_class.create(
+            author:       author,
+            extra_scopes: { scope_1: 'scope_1', scope_2: 'scope_2' },
+            metadata:     {},
+            resource:     article,
+            scopeable:    category,
+            value:        2
+          )
+
+          rates = described_class.all
+
+          expect(rates.size).to eq 1
+
+          rate = rates[0]
+
+          expect(rate.author).to    eq author
+          expect(rate.resource).to  eq article
+          expect(rate.scope_1).to   eq 'scope_1'
+          expect(rate.scope_2).to   eq 'scope_2'
+          expect(rate.scopeable).to eq category
+          expect(rate.value).to     eq 2
+        end
+
+        it 'updates the unique rating entry' do
+          described_class.create(
+            author:       author,
+            extra_scopes: { scope_1: 'scope_1', scope_2: 'scope_2' },
+            metadata:     {},
+            resource:     article,
+            scopeable:    category,
+            value:        2
+          )
+
+          ratings = Rating::Rating.all
+
+          expect(ratings.size).to eq 1
+
+          rating = ratings[0]
+
+          expect(rating.average).to   eq 2
+          expect(rating.estimate).to  eq 2
+          expect(rating.resource).to  eq article
+          expect(rating.scopeable).to eq category
+          expect(rating.sum).to       eq 2
+          expect(rating.total).to     eq 1
+        end
       end
 
-      it 'updates the unique rating entry' do
-        ratings = Rating::Rating.all
-
-        expect(ratings.size).to eq 1
-
-        rating = ratings[0]
-
-        expect(rating.average).to   eq 1.5
-        expect(rating.estimate).to  eq 1.5
-        expect(rating.resource).to  eq article
-        expect(rating.scopeable).to eq category
-        expect(rating.sum).to       eq 3
-        expect(rating.total).to     eq 2
+      context 'when rate already exists but with at least one extra scope different' do
+        before do
+          described_class.create(
+            author:       author,
+            extra_scopes: { scope_1: 'scope_1', scope_2: 'scope_2' },
+            metadata:     {},
+            resource:     article,
+            scopeable:    category,
+            value:        1
+          )
+
+          described_class.create(
+            author:       author,
+            extra_scopes: { scope_1: 'scope_1', scope_2: 'scope_missing' },
+            metadata:     {},
+            resource:     article,
+            scopeable:    category,
+            value:        2
+          )
+        end
+
+        it 'creates a new rate entry' do
+          rates = described_class.all
+
+          expect(rates.size).to eq 2
+
+          rate = rates[0]
+
+          expect(rate.author).to    eq author
+          expect(rate.resource).to  eq article
+          expect(rate.scope_1).to   eq 'scope_1'
+          expect(rate.scope_2).to   eq 'scope_2'
+          expect(rate.scopeable).to eq category
+          expect(rate.value).to     eq 1
+
+          rate = rates[1]
+
+          expect(rate.author).to    eq author
+          expect(rate.resource).to  eq article
+          expect(rate.scope_1).to   eq 'scope_1'
+          expect(rate.scope_2).to   eq 'scope_missing'
+          expect(rate.scopeable).to eq category
+          expect(rate.value).to     eq 2
+        end
+
+        it 'updates the unique rating entry' do
+          ratings = Rating::Rating.all
+
+          expect(ratings.size).to eq 1
+
+          rating = ratings[0]
+
+          expect(rating.average).to   eq 1.5
+          expect(rating.estimate).to  eq 1.5
+          expect(rating.resource).to  eq article
+          expect(rating.scopeable).to eq category
+          expect(rating.sum).to       eq 3
+          expect(rating.total).to     eq 2
+        end
       end
     end
-  end if ENV['CONFIG_ENABLED_WITH_EXTRA_SCOPES'] == 'true'
+  end
 end

data/spec/models/rate/rate_for_spec.rb

@@ -51,55 +51,57 @@ RSpec.describe Rating::Rate, ':rate_for' do
     end
   end
 
-  context 'with extra scopes' do
-    let!(:category) { create :category }
-
-    context 'when matches all attributes including the extra scopes' do
-      let!(:record) do
-        described_class.create(
-          author:       author,
-          extra_scopes: { scope_1: 'scope_1', scope_2: 'scope_2' },
-          metadata:     {},
-          resource:     article,
-          scopeable:    category,
-          value:        1
-        )
-      end
-
-      it 'returns the record' do
-        result = described_class.rate_for(
-          author:       author,
-          extra_scopes: { scope_1: 'scope_1', scope_2: 'scope_2' },
-          resource:     article,
-          scopeable:    category
-        )
-
-        expect(result).to eq record
+  if ENV['CONFIG_ENABLED_WITH_EXTRA_SCOPES'] == 'true'
+    context 'with extra scopes' do
+      let!(:category) { create :category }
+
+      context 'when matches all attributes including the extra scopes' do
+        let!(:record) do
+          described_class.create(
+            author:       author,
+            extra_scopes: { scope_1: 'scope_1', scope_2: 'scope_2' },
+            metadata:     {},
+            resource:     article,
+            scopeable:    category,
+            value:        1
+          )
+        end
+
+        it 'returns the record' do
+          result = described_class.rate_for(
+            author:       author,
+            extra_scopes: { scope_1: 'scope_1', scope_2: 'scope_2' },
+            resource:     article,
+            scopeable:    category
+          )
+
+          expect(result).to eq record
+        end
       end
-    end
 
-    context 'when matches all attributes but at least one extra scopes' do
-      before do
-        described_class.create(
-          author:       author,
-          extra_scopes: { scope_1: 'scope_1', scope_2: 'scope_2' },
-          metadata:     {},
-          resource:     article,
-          scopeable:    category,
-          value:        1
-        )
-      end
-
-      it 'does not return the record' do
-        result = described_class.rate_for(
-          author:       author,
-          extra_scopes: { scope_1: 'scope_1', scope_2: 'scope_missing' },
-          resource:     article,
-          scopeable:    category
-        )
-
-        expect(result).to eq nil
+      context 'when matches all attributes but at least one extra scopes' do
+        before do
+          described_class.create(
+            author:       author,
+            extra_scopes: { scope_1: 'scope_1', scope_2: 'scope_2' },
+            metadata:     {},
+            resource:     article,
+            scopeable:    category,
+            value:        1
+          )
+        end
+
+        it 'does not return the record' do
+          result = described_class.rate_for(
+            author:       author,
+            extra_scopes: { scope_1: 'scope_1', scope_2: 'scope_missing' },
+            resource:     article,
+            scopeable:    category
+          )
+
+          expect(result).to eq nil
+        end
       end
     end
-  end if ENV['CONFIG_ENABLED_WITH_EXTRA_SCOPES'] == 'true'
+  end
 end

data/spec/models/rate_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe Rating::Rate do
   it { is_expected.to validate_presence_of :value }
 
   it do
-    is_expected.to validate_numericality_of(:value).is_less_than_or_equal_to(100).is_less_than_or_equal_to 100
+    expect(subject).to validate_numericality_of(:value).is_less_than_or_equal_to(100).is_less_than_or_equal_to 100
   end
 
   it do

data/spec/models/rating/averager_data_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe Rating::Rating, ':averager_data' do
     subject(:result) { described_class.averager_data article_1, nil }
 
     it 'returns the values average of given resource type' do
-      expect(result.as_json['rating_avg']).to eq 30.5
+      expect(result.as_json['rating_avg'].to_f.to_s).to eq '30.5'
     end
 
     it 'returns the average of number of records for the given resource type' do
@@ -22,11 +22,11 @@ RSpec.describe Rating::Rating, ':averager_data' do
     subject(:result) { described_class.averager_data article_1, category }
 
     it 'returns the values average of given resource type' do
-      expect(result.as_json['rating_avg']).to eq 1.5
+      expect(result.as_json['rating_avg'].to_f.to_s).to eq '1.5'
     end
 
     it 'returns the average of number of records for the given resource type' do
-      expect(result.as_json['count_avg']).to eq 2
+      expect(result.as_json['count_avg'].to_f.to_s).to eq '2.0'
     end
   end
 end

data/spec/models/rating/values_data_spec.rb

@@ -10,15 +10,15 @@ RSpec.describe Rating::Rating, ':values_data' do
     subject(:result) { described_class.values_data article_1, nil }
 
     it 'returns the average of value for a resource' do
-      expect(result.as_json['rating_avg']).to eq 50.5
+      expect(result.as_json['rating_avg'].to_f.to_s).to eq '50.5'
     end
 
     it 'returns the sum of values for a resource' do
-      expect(result.as_json['rating_sum']).to eq 101
+      expect(result.as_json['rating_sum'].to_f.to_s).to eq '101.0'
     end
 
     it 'returns the count of votes for a resource' do
-      expect(result.as_json['rating_count']).to eq 2
+      expect(result.as_json['rating_count'].to_f.to_s).to eq '2.0'
     end
   end
 
@@ -26,15 +26,15 @@ RSpec.describe Rating::Rating, ':values_data' do
     subject(:result) { described_class.values_data article_1, category }
 
     it 'returns the average of value for a resource' do
-      expect(result.as_json['rating_avg']).to eq 1.5
+      expect(result.as_json['rating_avg'].to_f.to_s).to eq '1.5'
     end
 
     it 'returns the sum of values for a resource' do
-      expect(result.as_json['rating_sum']).to eq 3
+      expect(result.as_json['rating_sum'].to_f.to_s).to eq '3.0'
     end
 
     it 'returns the count of votes for a resource' do
-      expect(result.as_json['rating_count']).to eq 2
+      expect(result.as_json['rating_count'].to_f.to_s).to eq '2.0'
     end
   end
 end

data/spec/support/db/migrate/add_extra_fields_on_rating_rates_table.rb

@@ -4,7 +4,5 @@ class AddExtraScopesOnRatingRatesTable < ActiveRecord::Migration[5.0]
   def change
     add_column :rating_rates, :scope_1, :string
     add_column :rating_rates, :scope_2, :string
-
-    remove_index :rating_rates, %i[author_id author_type resource_id resource_type scopeable_id scopeable_type]
   end
 end

data/spec/support/db/migrate/create_rates_table.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class CreateRateTable < ActiveRecord::Migration[5.0]
+  def change
+    create_table :rating_rates do |t|
+      t.decimal :value, default: 0, precision: 25, scale: 16
+
+      t.references :author,    index: true, null: false, polymorphic: true
+      t.references :resource,  index: true, null: false, polymorphic: true
+      t.references :scopeable, index: true, null: true,  polymorphic: true
+
+      t.timestamps null: false
+    end
+
+    change_column :rating_rates, :author_type,    :string, limit: 10
+    change_column :rating_rates, :resource_type,  :string, limit: 10
+    change_column :rating_rates, :scopeable_type, :string, limit: 10
+  end
+end

data/spec/support/db/migrate/create_rating_table.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class CreateRatingTable < ActiveRecord::Migration[5.0]
+  def change
+    create_table :rating_ratings do |t|
+      t.decimal :average,  default: 0, mull: false, precision: 25, scale: 16
+      t.decimal :estimate, default: 0, mull: false, precision: 25, scale: 16
+      t.integer :sum,      default: 0, mull: false
+      t.integer :total,    default: 0, mull: false
+
+      t.references :resource,  index: true, null: false, polymorphic: true
+      t.references :scopeable, index: true, null: true,  polymorphic: true
+
+      t.timestamps null: false
+    end
+
+    change_column :rating_ratings, :resource_type,  :string, limit: 10
+    change_column :rating_ratings, :scopeable_type, :string, limit: 10
+  end
+end

data/spec/support/migrate.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require File.expand_path('../../lib/generators/rating/templates/db/migrate/create_rating_table.rb', __dir__)
-require File.expand_path('../../lib/generators/rating/templates/db/migrate/create_rate_table.rb', __dir__)
-
 Dir[File.expand_path('db/migrate/*.rb', __dir__)].each { |file| require file }
 
+CreateRateTable.new.change
+CreateRatingTable.new.change
+
 CreateArticlesTable.new.change
 CreateAuthorsTable.new.change
 
@@ -12,9 +12,9 @@ CreateGlobalsTable.new.change
 CreateCategoriesTable.new.change
 
 CreateCommentsTable.new.change
-CreateRateTable.new.change
-CreateRatingTable.new.change
+
 CreateReviewRatingsTable.new.change
 CreateReviewsTable.new.change
+
 AddCommentOnRatingRatesTable.new.change
-AddExtraScopesOnRatingRatesTable.new.change
+AddExtraScopesOnRatingRatesTable.new.change if ENV['CONFIG_ENABLED_WITH_EXTRA_SCOPES'] == 'true'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rating
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Washington Botelho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2019-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -187,6 +195,8 @@ files:
 - spec/support/db/migrate/create_categories_table.rb
 - spec/support/db/migrate/create_comments_table.rb
 - spec/support/db/migrate/create_globals_table.rb
+- spec/support/db/migrate/create_rates_table.rb
+- spec/support/db/migrate/create_rating_table.rb
 - spec/support/db/migrate/create_review_ratings_table.rb
 - spec/support/db/migrate/create_reviews_table.rb
 - spec/support/factory_bot.rb
@@ -219,8 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A true Bayesian rating system with scope and cache enabled.
@@ -264,11 +273,13 @@ test_files:
 - spec/support/db/migrate/create_authors_table.rb
 - spec/support/db/migrate/create_review_ratings_table.rb
 - spec/support/db/migrate/create_articles_table.rb
+- spec/support/db/migrate/create_rating_table.rb
 - spec/support/db/migrate/add_comment_on_rating_rates_table.rb
 - spec/support/db/migrate/add_extra_fields_on_rating_rates_table.rb
 - spec/support/db/migrate/create_reviews_table.rb
 - spec/support/db/migrate/create_comments_table.rb
 - spec/support/db/migrate/create_globals_table.rb
+- spec/support/db/migrate/create_rates_table.rb
 - spec/support/database_cleaner.rb
 - spec/support/shared_context/with_database_records.rb
 - spec/factories/article.rb