rating 0.2.0 → 0.3.0

data/spec/models/rate/rate_for_spec.rb

@@ -3,19 +3,19 @@
 require 'rails_helper'
 
 RSpec.describe Rating::Rate, ':rate_for' do
-  let!(:user)    { create :user }
+  let!(:author)  { create :author }
   let!(:article) { create :article }
 
   context 'with no scopeable' do
     context 'when rate does not exist' do
-      specify { expect(described_class.rate_for(author: user, resource: article)).to eq nil }
+      specify { expect(described_class.rate_for(author: author, resource: article)).to eq nil }
     end
 
     context 'when rate does not exist' do
-      before { described_class.create author: user, resource: article, value: 3 }
+      before { described_class.create author: author, metadata: {}, resource: article, value: 3 }
 
       it 'returns the record' do
-        expect(described_class.rate_for(author: user, resource: article)).to eq described_class.last
+        expect(described_class.rate_for(author: author, resource: article)).to eq described_class.last
       end
     end
   end
@@ -24,14 +24,14 @@ RSpec.describe Rating::Rate, ':rate_for' do
     let!(:category) { create :category }
 
     context 'when rate does not exist' do
-      specify { expect(described_class.rate_for(author: user, resource: article, scopeable: category)).to eq nil }
+      specify { expect(described_class.rate_for(author: author, resource: article, scopeable: category)).to eq nil }
     end
 
     context 'when rate does not exist' do
-      before { described_class.create author: user, resource: article, scopeable: category, value: 3 }
+      before { described_class.create author: author, metadata: {}, resource: article, scopeable: category, value: 3 }
 
       it 'returns the record' do
-        query = described_class.rate_for(author: user, resource: article, scopeable: category)
+        query = described_class.rate_for(author: author, resource: article, scopeable: category)
 
         expect(query).to eq described_class.last
       end

data/spec/models/rate_spec.rb

@@ -15,11 +15,11 @@ RSpec.describe Rating::Rate do
   it { is_expected.to validate_presence_of :resource }
   it { is_expected.to validate_presence_of :value }
 
-  specify do
+  it do
     is_expected.to validate_numericality_of(:value).is_less_than_or_equal_to(100).is_less_than_or_equal_to 100
   end
 
-  specify do
+  it do
     expect(object).to validate_uniqueness_of(:author_id)
       .scoped_to(%i[author_type resource_id resource_type scopeable_id scopeable_type])
       .case_insensitive

data/spec/models/rating/averager_data_spec.rb

@@ -1,48 +1,32 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'support/shared_context/with_database_records'
 
 RSpec.describe Rating::Rating, ':averager_data' do
-  let!(:category) { create :category }
-
-  let!(:user_1) { create :user }
-  let!(:user_2) { create :user }
-
-  let!(:article_1) { create :article }
-  let!(:article_2) { create :article }
-  let!(:article_3) { create :article }
-
-  before do
-    create :rating_rate, author: user_1, resource: article_1, value: 100
-    create :rating_rate, author: user_1, resource: article_2, value: 11
-    create :rating_rate, author: user_1, resource: article_3, value: 10
-    create :rating_rate, author: user_2, resource: article_1, value: 1
-
-    create :rating_rate, author: user_1, resource: article_1, scopeable: category, value: 1
-    create :rating_rate, author: user_2, resource: article_1, scopeable: category, value: 2
-  end
+  include_context 'with_database_records'
 
   context 'with no scopeable' do
-    subject { described_class.averager_data article_1, nil }
+    subject(:result) { described_class.averager_data article_1, nil }
 
     it 'returns the values average of given resource type' do
-      expect(subject.as_json['rating_avg']).to eq 30.5
+      expect(result.as_json['rating_avg']).to eq 30.5
     end
 
     it 'returns the average of number of records for the given resource type' do
-      expect(subject.as_json['count_avg']).to eq 1.3333333333333333
+      expect(result.as_json['count_avg']).to eq 1.3333333333333333
     end
   end
 
   context 'with scopeable' do
-    subject { described_class.averager_data article_1, category }
+    subject(:result) { described_class.averager_data article_1, category }
 
     it 'returns the values average of given resource type' do
-      expect(subject.as_json['rating_avg']).to eq 1.5
+      expect(result.as_json['rating_avg']).to eq 1.5
     end
 
     it 'returns the average of number of records for the given resource type' do
-      expect(subject.as_json['count_avg']).to eq 2
+      expect(result.as_json['count_avg']).to eq 2
     end
   end
 end

data/spec/models/rating/data_spec.rb

@@ -1,64 +1,48 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'support/shared_context/with_database_records'
 
 RSpec.describe Rating::Rating, ':data' do
-  let!(:category) { create :category }
-
-  let!(:user_1) { create :user }
-  let!(:user_2) { create :user }
-
-  let!(:article_1) { create :article }
-  let!(:article_2) { create :article }
-  let!(:article_3) { create :article }
-
-  before do
-    create :rating_rate, author: user_1, resource: article_1, value: 100
-    create :rating_rate, author: user_1, resource: article_2, value: 11
-    create :rating_rate, author: user_1, resource: article_3, value: 10
-    create :rating_rate, author: user_2, resource: article_1, value: 1
-
-    create :rating_rate, author: user_1, resource: article_1, scopeable: category, value: 1
-    create :rating_rate, author: user_2, resource: article_1, scopeable: category, value: 2
-  end
+  include_context 'with_database_records'
 
   context 'with no scopeable' do
-    subject { described_class.data article_1, nil }
+    subject(:result) { described_class.data article_1, nil }
 
     it 'returns the average of value for a resource' do
-      expect(subject[:average]).to eq 50.5
+      expect(result[:average]).to eq 50.5
     end
 
     it 'returns the sum of values for a resource' do
-      expect(subject[:sum]).to eq 101
+      expect(result[:sum]).to eq 101
     end
 
     it 'returns the count of votes for a resource' do
-      expect(subject[:total]).to eq 2
+      expect(result[:total]).to eq 2
     end
 
     it 'returns the estimate for a resource' do
-      expect(subject[:estimate]).to eq 42.50000000000001
+      expect(result[:estimate]).to eq 42.50000000000001
     end
   end
 
   context 'with scopeable' do
-    subject { described_class.data article_1, category }
+    subject(:result) { described_class.data article_1, category }
 
     it 'returns the average of value for a resource' do
-      expect(subject[:average]).to eq 1.5
+      expect(result[:average]).to eq 1.5
     end
 
     it 'returns the sum of values for a resource' do
-      expect(subject[:sum]).to eq 3
+      expect(result[:sum]).to eq 3
     end
 
     it 'returns the count of votes for a resource' do
-      expect(subject[:total]).to eq 2
+      expect(result[:total]).to eq 2
     end
 
     it 'returns the estimate for a resource' do
-      expect(subject[:estimate]).to eq 1.5
+      expect(result[:estimate]).to eq 1.5
     end
   end
 end

data/spec/models/rating/update_rating_spec.rb

@@ -1,26 +1,10 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'support/shared_context/with_database_records'
 
 RSpec.describe Rating::Rating, ':update_rating' do
-  let!(:category) { create :category }
-
-  let!(:user_1) { create :user }
-  let!(:user_2) { create :user }
-
-  let!(:article_1) { create :article }
-  let!(:article_2) { create :article }
-  let!(:article_3) { create :article }
-
-  before do
-    create :rating_rate, author: user_1, resource: article_1, value: 100
-    create :rating_rate, author: user_1, resource: article_2, value: 11
-    create :rating_rate, author: user_1, resource: article_3, value: 10
-    create :rating_rate, author: user_2, resource: article_1, value: 1
-
-    create :rating_rate, author: user_1, resource: article_1, scopeable: category, value: 1
-    create :rating_rate, author: user_2, resource: article_1, scopeable: category, value: 2
-  end
+  include_context 'with_database_records'
 
   context 'with no scopeable' do
     it 'updates the rating data of the given resource' do

data/spec/models/rating/values_data_spec.rb

@@ -1,56 +1,40 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'support/shared_context/with_database_records'
 
 RSpec.describe Rating::Rating, ':values_data' do
-  let!(:category) { create :category }
-
-  let!(:user_1) { create :user }
-  let!(:user_2) { create :user }
-
-  let!(:article_1) { create :article }
-  let!(:article_2) { create :article }
-  let!(:article_3) { create :article }
-
-  before do
-    create :rating_rate, author: user_1, resource: article_1, value: 100
-    create :rating_rate, author: user_1, resource: article_2, value: 11
-    create :rating_rate, author: user_1, resource: article_3, value: 10
-    create :rating_rate, author: user_2, resource: article_1, value: 4
-
-    create :rating_rate, author: user_1, resource: article_1, scopeable: category, value: 1
-    create :rating_rate, author: user_2, resource: article_1, scopeable: category, value: 2
-  end
+  include_context 'with_database_records'
 
   context 'with no scopeable' do
-    subject { described_class.values_data article_1, nil }
+    subject(:result) { described_class.values_data article_1, nil }
 
     it 'returns the average of value for a resource' do
-      expect(subject.as_json['rating_avg']).to eq 52.0
+      expect(result.as_json['rating_avg']).to eq 50.5
     end
 
     it 'returns the sum of values for a resource' do
-      expect(subject.as_json['rating_sum']).to eq 104
+      expect(result.as_json['rating_sum']).to eq 101
     end
 
     it 'returns the count of votes for a resource' do
-      expect(subject.as_json['rating_count']).to eq 2
+      expect(result.as_json['rating_count']).to eq 2
     end
   end
 
   context 'with scopeable' do
-    subject { described_class.values_data article_1, category }
+    subject(:result) { described_class.values_data article_1, category }
 
     it 'returns the average of value for a resource' do
-      expect(subject.as_json['rating_avg']).to eq 1.5
+      expect(result.as_json['rating_avg']).to eq 1.5
     end
 
     it 'returns the sum of values for a resource' do
-      expect(subject.as_json['rating_sum']).to eq 3
+      expect(result.as_json['rating_sum']).to eq 3
     end
 
     it 'returns the count of votes for a resource' do
-      expect(subject.as_json['rating_count']).to eq 2
+      expect(result.as_json['rating_count']).to eq 2
     end
   end
 end

data/spec/models/rating_spec.rb

@@ -15,4 +15,10 @@ RSpec.describe Rating::Rating do
   it { is_expected.to validate_presence_of :resource }
   it { is_expected.to validate_presence_of :sum }
   it { is_expected.to validate_presence_of :total }
+
+  it do
+    expect(object).to validate_uniqueness_of(:resource_id)
+      .scoped_to(%i[resource_type scopeable_id scopeable_type])
+      .case_insensitive
+  end
 end

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

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddCommentOnRatingRatesTable < ActiveRecord::Migration[5.0]
+  def change
+    add_column :rating_rates, :comment, :text
+  end
+end

data/spec/support/migrate.rb

@@ -2,8 +2,10 @@
 
 require File.expand_path('../../lib/generators/rating/templates/db/migrate/create_rating_tables.rb', __dir__)
 
+Dir[File.expand_path('db/migrate/*.rb', __dir__)].each { |file| require file }
+
 CreateArticlesTable.new.change
 CreateAuthorsTable.new.change
 CreateCategoriesTable.new.change
 CreateRatingTables.new.change
-CreateUsersTable.new.change
+AddCommentOnRatingRatesTable.new.change

data/spec/support/shared_context/with_database_records.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+RSpec.shared_context 'with_database_records' do
+  let!(:category) { create :category }
+
+  let!(:author_1) { create :author }
+  let!(:author_2) { create :author }
+
+  let!(:article_1) { create :article }
+  let!(:article_2) { create :article }
+  let!(:article_3) { create :article }
+
+  let!(:rate_1) { create :rating_rate, author: author_1, resource: article_1, value: 100 }
+  let!(:rate_2) { create :rating_rate, author: author_1, resource: article_2, value: 11 }
+  let!(:rate_3) { create :rating_rate, author: author_1, resource: article_3, value: 10 }
+  let!(:rate_4) { create :rating_rate, author: author_2, resource: article_1, value: 1 }
+
+  let!(:rate_5) { create :rating_rate, author: author_1, resource: article_1, scopeable: category, value: 1 }
+  let!(:rate_6) { create :rating_rate, author: author_2, resource: article_1, scopeable: category, value: 2 }
+end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: rating
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Washington Botelho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-03 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -149,7 +149,6 @@ files:
 - spec/factories/category.rb
 - spec/factories/rating/rate.rb
 - spec/factories/rating/rating.rb
-- spec/factories/user.rb
 - spec/models/extension/after_create_spec.rb
 - spec/models/extension/order_by_rating_spec.rb
 - spec/models/extension/rate_for_spec.rb
@@ -172,16 +171,16 @@ files:
 - spec/rails_helper.rb
 - spec/support/common.rb
 - spec/support/database_cleaner.rb
+- spec/support/db/migrate/add_comment_on_rating_rates_table.rb
 - spec/support/db/migrate/create_articles_table.rb
 - spec/support/db/migrate/create_authors_table.rb
-- spec/support/db/migrate/create_category_spec.rb
-- spec/support/db/migrate/create_users_table.rb
+- spec/support/db/migrate/create_categories_table.rb
 - spec/support/factory_bot.rb
 - spec/support/migrate.rb
 - spec/support/models/article.rb
 - spec/support/models/author.rb
 - spec/support/models/category.rb
-- spec/support/models/user.rb
+- spec/support/shared_context/with_database_records.rb
 - spec/support/shoulda.rb
 homepage: https://github.com/wbotelhos/rating
 licenses:
@@ -208,42 +207,41 @@ signing_key:
 specification_version: 4
 summary: A true Bayesian rating system with scope and cache enabled.
 test_files:
-- spec/factories/article.rb
-- spec/factories/author.rb
-- spec/factories/category.rb
-- spec/factories/rating/rate.rb
-- spec/factories/rating/rating.rb
-- spec/factories/user.rb
-- spec/models/extension/after_create_spec.rb
-- spec/models/extension/order_by_rating_spec.rb
-- spec/models/extension/rate_for_spec.rb
-- spec/models/extension/rate_spec.rb
-- spec/models/extension/rated_question_spec.rb
-- spec/models/extension/rated_records_spec.rb
-- spec/models/extension/rated_spec.rb
-- spec/models/extension/rates_records_spec.rb
-- spec/models/extension/rates_spec.rb
-- spec/models/extension/rating_records_spec.rb
-- spec/models/extension/rating_spec.rb
-- spec/models/rate/create_spec.rb
 - spec/models/rate/rate_for_spec.rb
-- spec/models/rate_spec.rb
+- spec/models/rate/create_spec.rb
 - spec/models/rating/averager_data_spec.rb
 - spec/models/rating/data_spec.rb
 - spec/models/rating/update_rating_spec.rb
 - spec/models/rating/values_data_spec.rb
+- spec/models/extension/rated_records_spec.rb
+- spec/models/extension/rating_spec.rb
+- spec/models/extension/rated_question_spec.rb
+- spec/models/extension/order_by_rating_spec.rb
+- spec/models/extension/rate_spec.rb
+- spec/models/extension/rate_for_spec.rb
+- spec/models/extension/after_create_spec.rb
+- spec/models/extension/rates_spec.rb
+- spec/models/extension/rating_records_spec.rb
+- spec/models/extension/rated_spec.rb
+- spec/models/extension/rates_records_spec.rb
 - spec/models/rating_spec.rb
-- spec/rails_helper.rb
-- spec/support/common.rb
-- spec/support/database_cleaner.rb
-- spec/support/db/migrate/create_articles_table.rb
-- spec/support/db/migrate/create_authors_table.rb
-- spec/support/db/migrate/create_category_spec.rb
-- spec/support/db/migrate/create_users_table.rb
-- spec/support/factory_bot.rb
+- spec/models/rate_spec.rb
 - spec/support/migrate.rb
+- spec/support/shoulda.rb
+- spec/support/factory_bot.rb
 - spec/support/models/article.rb
-- spec/support/models/author.rb
 - spec/support/models/category.rb
-- spec/support/models/user.rb
-- spec/support/shoulda.rb
+- spec/support/models/author.rb
+- spec/support/common.rb
+- spec/support/db/migrate/create_categories_table.rb
+- spec/support/db/migrate/create_authors_table.rb
+- spec/support/db/migrate/create_articles_table.rb
+- spec/support/db/migrate/add_comment_on_rating_rates_table.rb
+- spec/support/database_cleaner.rb
+- spec/support/shared_context/with_database_records.rb
+- spec/factories/article.rb
+- spec/factories/category.rb
+- spec/factories/rating/rate.rb
+- spec/factories/rating/rating.rb
+- spec/factories/author.rb
+- spec/rails_helper.rb