ratable 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8de164f5d06b448bfc98577762846acbdc799041
-  data.tar.gz: 29a25e193edd57825709c465a800a3025b728715
+  metadata.gz: 0b37b427f57776006d941b8f962e0ac53c332972
+  data.tar.gz: 4784df61824db2de0351693663283bd173713e82
 SHA512:
-  metadata.gz: 6440686c6effdb6c0ceaec022320afb638b1052dcadbc145b5ce56d65674280d83d85e160251c380f3e99cdef81c9120a1f46565b9f587ad84bb9485904fdcef
-  data.tar.gz: a9cfcf73aabf987b78b4ac456bb6f895e72a66e61e09e18e3e600f1fa4396c87747f351491c7607345f5cbfcb71b31489251080fadabbd9424e18f23ca37252a
+  metadata.gz: 0bc3c2714db3e79fba8b448776172340c0717b17fc7bcf59ea5942fab553456f4f5458cc4b16c16eaad6d9cef22de8de09b38c93f3651b6a72ea46dcf5c2fa37
+  data.tar.gz: bc620147f939dbc11733389ea429f6b5f3c9c0276fce72d54a64d991ca3caaf0780caf12ab800df9610092d37eb82dd17a812d037151ab6b6a4cb1d9a1668f2f

data/lib/ratable.rb

@@ -5,5 +5,6 @@ module Ratable
     autoload :Ratable, 'ratable/models/ratable'
     autoload :Ratee, 'ratable/models/ratee'
     autoload :Rater, 'ratable/models/rater'
+    autoload :RateeRater, 'ratable/models/ratee_rater'
   end
 end

data/lib/ratable/engine.rb

@@ -3,7 +3,7 @@ require 'rails'
 module Ratable
   class Engine < ::Rails::Engine
     isolate_namespace Ratable
-    initializer "ratable.models.ratee" do
+    initializer "ratable.models.ratable" do
       ActiveSupport.on_load(:active_record) do
         extend Ratable::Models::Ratable::ActiveRecordExtension
         include Ratable::Models::Ratable::ActiveRecordInclusion
@@ -19,6 +19,11 @@ module Ratable
         extend Ratable::Models::Rater::ActiveRecordExtension
       end
     end
+    initializer "ratable.models.ratee_rater" do
+      ActiveSupport.on_load(:active_record) do
+        extend Ratable::Models::RateeRater::ActiveRecordExtension
+      end
+    end
     config.generators do |g|
       g.test_framework :rspec, :fixture => false
       g.fixture_replacement :factory_girl, :dir => 'spec/factories'

data/lib/ratable/models/ratee.rb

@@ -2,41 +2,66 @@ module Ratable
   module Models
     module Ratee
       extend ActiveSupport::Concern
+      extend Ratable::ActiveRecordExtension
 
       attr_reader :has_one
 
       module ActiveRecordExtension
         def acts_as_ratee(options={has_one: false})
+          throw "To make a model the rater and the ratee use `acts_as_ratee_and_rater`" if acts_like_rater?
           @has_one = options[:has_one]
           include Ratee
         end
       end
 
       included do
-        if @has_one
-          has_one :rating, class_name: 'Ratable::Rating', dependent: :destroy, as: :ratee
+        unless acts_like_rater?
+          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
+          end
         else
-          has_many :ratings, class_name: 'Ratable::Rating', dependent: :destroy, as: :ratee
+          if @has_one
+            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
+          end
         end
-        has_one :rating_summary, class_name: 'Ratable::RatingSummary', as: :ratee
       end
 
       def raters
-        if @has_one
-          rating.rater
+        unless acts_like_rater?
+          if @has_one
+            rating.rater
+          else
+            ratings.includes(:rater).collect { |rating| rating.rater }
+          end
         else
-          ratings.includes(:rater).collect { |rating| rating.rater }
+          if @has_one
+            ratee_rating.rater
+          else
+            ratee_ratings.includes(:rater).collect { |rating| rating.rater }
+          end
         end
       end
 
-      def rate(options={})
-        options.reject! { |k| k == :ratee }
-        if @has_one
-          self.rating.create(options)
-        else
-          self.ratings.create(options)
-        end
-      end
+      # def rate(options={})
+      #   options.reject! { |k| k == :ratee }
+      #   unless acts_like_rater?
+      #     if @has_one
+      #       self.rating.create(options)
+      #     else
+      #       self.ratings.create(options)
+      #     end
+      #   else
+      #     if @has_one
+      #       self.ratee_rating.create(options)
+      #     else
+      #       self.ratee_ratings.create(options)
+      #     end
+      #   end
+      # end
 
     end
   end

data/lib/ratable/models/ratee_rater.rb

@@ -0,0 +1,71 @@
+module Ratable
+  module Models
+    module RateeRater
+      extend ActiveSupport::Concern
+      extend Ratable::ActiveRecordExtension
+
+      attr_reader :has_one_ratee, :has_one_rater
+
+      module ActiveRecordExtension
+        def acts_as_ratee_and_rater(options={has_one_ratee: false, has_one_rater: false})
+          @has_one_ratee = options[:has_one_ratee]
+          @has_one_rater = options[:has_one_rater]
+          include RateeRater
+        end
+
+        def acts_as_rater_and_ratee(options={has_one_ratee: false, has_one_rater: false})
+          @has_one_ratee = options[:has_one_ratee]
+          @has_one_rater = options[:has_one_rater]
+          include RateeRater
+        end
+      end
+
+      included do
+        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
+        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
+        end
+      end
+
+      def ratees
+        if @has_one_ratee
+          rater_rating.ratee
+        else
+          rater_rating.includes(:ratee).collect { |rating| rating.ratee }
+        end
+      end
+
+      def raters
+        if @has_one_rater
+          ratee_rating.rater
+        else
+          ratee_ratings.includes(:rater).collect { |rating| rating.rater }
+        end
+      end
+
+      def ratee_rate(options={})
+        options.reject! { |k| k == :ratee }
+        if @has_one_ratee
+          self.ratee_rating.create(options)
+        else
+          self.ratee_rating.creaste(options)
+        end
+      end
+
+      def rater_rate(options)
+        options.reject! { |k| k == :rater }
+        if @has_one_rater
+          self.rater_rating.create(options)
+        else
+          self.rater_ratings.create(options)
+        end
+      end
+    end
+  end
+end

data/lib/ratable/models/rater.rb

@@ -7,6 +7,7 @@ module Ratable
 
       module ActiveRecordExtension
         def acts_as_rater(options={has_one: false})
+          throw "To make a model the rater and the ratee use `acts_as_ratee_and_rater`" if acts_like_ratee?
           @has_one = options[:has_one]
           include Rater
         end
@@ -18,7 +19,6 @@ module Ratable
         else
           has_many :ratings, class_name: 'Ratable::Rating', dependent: :destroy, as: :rater
         end
-        has_one :rating_summary, class_name: 'Ratable::RatingSummary', as: :rater
       end
 
       def ratees

data/lib/ratable/version.rb

@@ -1,3 +1,3 @@
 module Ratable
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

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

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

data/spec/dummy/log/development.log

@@ -4260,3 +4260,18 @@ Started GET "/assets/star-off-6aaeebdaab93d594c005d366ce0d94fba02e7a07fd03557dbe
    (44.0ms)  INSERT INTO `schema_migrations` (version) VALUES ('20160418213647')
    (43.9ms)  INSERT INTO `schema_migrations` (version) VALUES ('20160418191311')
    (43.7ms)  INSERT INTO `schema_migrations` (version) VALUES ('20160418175804')
+  User Load (0.6ms)  SELECT  `users`.* FROM `users`  ORDER BY `users`.`id` ASC LIMIT 1
+  Ratable::Rating Load (0.7ms)  SELECT `ratable_ratings`.* FROM `ratable_ratings` WHERE `ratable_ratings`.`rater_id` = 1 AND `ratable_ratings`.`rater_type` = 'User'
+  Ratable::Rating Load (1.1ms)  SELECT `ratable_ratings`.* FROM `ratable_ratings` WHERE `ratable_ratings`.`ratee_id` = 1 AND `ratable_ratings`.`ratee_type` = 'User'
+  User Load (0.7ms)  SELECT  `users`.* FROM `users`  ORDER BY `users`.`id` ASC LIMIT 1
+  Ratable::Rating Load (1.7ms)  SELECT `ratable_ratings`.* FROM `ratable_ratings` WHERE `ratable_ratings`.`ratee_id` = 1 AND `ratable_ratings`.`ratee_type` = 'User'
+  User Load (0.6ms)  SELECT  `users`.* FROM `users`  ORDER BY `users`.`id` ASC LIMIT 1
+  User Load (0.4ms)  SELECT  `users`.* FROM `users`  ORDER BY `users`.`id` ASC LIMIT 1
+  Ratable::Rating Load (0.6ms)  SELECT `ratable_ratings`.* FROM `ratable_ratings` WHERE `ratable_ratings`.`ratee_id` = 1 AND `ratable_ratings`.`ratee_type` = 'User'
+  Ratable::Rating Load (0.9ms)  SELECT `ratable_ratings`.* FROM `ratable_ratings` WHERE `ratable_ratings`.`rater_id` = 1 AND `ratable_ratings`.`rater_type` = 'User'
+  Post Load (0.7ms)  SELECT  `posts`.* FROM `posts`  ORDER BY `posts`.`id` ASC LIMIT 1
+  Ratable::Rating Load (0.9ms)  SELECT `ratable_ratings`.* FROM `ratable_ratings` WHERE `ratable_ratings`.`ratee_id` = 1 AND `ratable_ratings`.`ratee_type` = 'Post'
+  Admin Load (0.6ms)  SELECT `admins`.* FROM `admins` WHERE `admins`.`id` IN (1)
+  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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ratable
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - François Bélanger
@@ -25,13 +25,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: devise
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jquery-rails
+  name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -131,6 +131,7 @@ files:
 - lib/ratable/engine.rb
 - lib/ratable/models/ratable.rb
 - lib/ratable/models/ratee.rb
+- lib/ratable/models/ratee_rater.rb
 - lib/ratable/models/rater.rb
 - lib/ratable/version.rb
 - lib/tasks/ratable_tasks.rake