ratable 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 470dfee1c88fb9bb6abffaeb5b94b495cf130ae6
-  data.tar.gz: 7bc55d4ff107ed5027cdfae16b8cf84890275da7
+  metadata.gz: 9fbc4581b1401c809f581773fd6d220d750fe198
+  data.tar.gz: 51069b25a2e95c8c131b5df048dc8e57b16236a9
 SHA512:
-  metadata.gz: 79a3ec8426be004245a8a30f8e10fa211f9a361ff35c0206645e485bfd13e7aa96d601234e44d7e4c425943adc4d52b83b7735f293aa61ea4ba882d40c414a92
-  data.tar.gz: 209666038eb795fa6751c0f8b22738cf46744ee80f69a675e6b7e1a442aca226665dfeda46edb513b5316afa0071d90722ac465223637628c258b869601f7b15
+  metadata.gz: 3be43b180589b6e2bd49fcd3f5d593c8a9c44e740573b83d3de0303d3311993e76eece845878f958109fed2f2b72a8161c8b09f9e889927e7ef04200dcf32981
+  data.tar.gz: 21582decd51fd7460b114b0d68f583bfc81973068c8d3a0b446d27282764b138921f5c0840e40ddabb78bda459973e5a86e6dee28f774e7d9d8a2af21c3938b8

data/README.rdoc

@@ -1,3 +1,3 @@
 = Ratable
 
-This project rocks and uses MIT-LICENSE.
+This project rocks and uses MIT-LICENSE.

data/lib/ratable/engine.rb

@@ -12,16 +12,13 @@ module Ratable
     initializer "ratable.models.ratee" do
       ActiveSupport.on_load(:active_record) do
         extend Ratable::Models::Ratee::ActiveRecordExtension
+        include Ratable::Models::Ratee::ActiveRecordInclusion
       end
     end
     initializer "ratable.models.rater" do
       ActiveSupport.on_load(:active_record) do
         extend Ratable::Models::Rater::ActiveRecordExtension
-      end
-    end
-    initializer "ratable.models.ratee_rater" do
-      ActiveSupport.on_load(:active_record) do
-        extend Ratable::Models::RateeRater::ActiveRecordExtension
+        include Ratable::Models::Rater::ActiveRecordInclusion
       end
     end
     config.generators do |g|

data/lib/ratable/models/ratable.rb

@@ -1,37 +1,97 @@
 module Ratable
   module Models
     module Ratable
+      extend ActiveSupport::Concern
 
       module ActiveRecordExtension
+        def acts_as_ratable(options={has_one_ratee: false, has_one_rater: false, self_rate: false})
+          @has_one_ratee = options[:has_one_ratee]
+          @has_one_rater = options[:has_one_rater]
+          @self_rate = options[:self_rate]
+          include Ratable
+        end
+
         def acts_like_ratable?
-          classes = ancestors
-          classes.include?(Ratee) || classes.include?(Rater)
+          ancestors.include?(Ratable)
         end
+      end
 
-        def acts_like_ratee?
-          ancestors.include?(Ratee)
+      module ActiveRecordInclusion
+        def acts_like_ratable?
+          ancestors.include?(Ratable)
         end
+      end
 
-        def acts_like_rater?
-          ancestors.include?(Rater)
+      included do
+        if @has_one_ratee
+          has_one :ratee_rating, class_name: 'Ratable::Rating', dependent: :destroy, as: :ratee
+        else
+          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, -> { order(updated_at: :desc) }, class_name: 'Ratable::Rating', dependent: :destroy, as: :rater
         end
       end
 
-      module ActiveRecordInclusion
-        def acts_like_ratable?
-          classes = self.class.ancestors
-          classes.include?(Ratee) || classes.include?(Rater)
+      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
+
+      def ratees
+        if @has_one_ratee
+          rater_rating.ratee
+        else
+          rater_rating.includes(:ratee).collect { |rating| rating.ratee }
         end
+      end
 
-        def acts_like_ratee?
-          self.class.ancestors.include?(Ratee)
+      def raters
+        if @has_one_rater
+          ratee_rating.rater
+        else
+          ratee_ratings.includes(:rater).collect { |rating| rating.rater }
         end
+      end
 
-        def acts_like_rater?
-          self.class.ancestors.include?(Rater)
+      def ratee_rate(options={})
+        options.reject! { |k| k == :ratee }
+        if @has_one_ratee
+          ratee_rating.create(options)
+        else
+          ratee_rating.create(options)
         end
       end
 
+      def rater_rate(options)
+        options.reject! { |k| k == :rater }
+        if @has_one_rater
+          rater_rating.create(options)
+        else
+          rater_ratings.create(options)
+        end
+      end
+
+      def rate(options)
+        if options[:rater]
+          ratee_rate(options)
+        elsif options[:ratee]
+          rater_rate(options)
+        end
+      end
     end
   end
 end

data/lib/ratable/models/ratee.rb

@@ -7,10 +7,20 @@ module Ratable
 
       module ActiveRecordExtension
         def acts_as_ratee(options={has_one: false})
-          raise "To make a model the rater and the ratee use `acts_as_ratee_and_rater`" if acts_like_rater?
+          raise "To make a model the rater and the ratee use `acts_as_ratable`" if acts_like_rater?
           @has_one = options[:has_one]
           include Ratee
         end
+
+        def acts_like_ratee?
+          ancestors.include?(Ratee)
+        end
+      end
+
+      module ActiveRecordInclusion
+        def acts_like_ratee?
+          self.class.ancestors.include?(Ratee)
+        end
       end
 
       included do
@@ -40,9 +50,9 @@ module Ratable
       def rate(options={})
         options.reject! { |k| k == :ratee }
         if @has_one
-          self.rating.create(options)
+          rating.create(options)
         else
-          self.ratings.create(options)
+          ratings.create(options)
         end
       end
 

data/lib/ratable/models/rater.rb

@@ -7,10 +7,20 @@ module Ratable
 
       module ActiveRecordExtension
         def acts_as_rater(options={has_one: false})
-          raise "To make a model the rater and the ratee use `acts_as_ratee_and_rater`" if acts_like_ratee?
+          raise "To make a model the rater and the ratee use `acts_as_ratable`" if acts_like_ratee?
           @has_one = options[:has_one]
           include Rater
         end
+
+        def acts_like_rater?
+          ancestors.include?(Rater)
+        end
+      end
+
+      module ActiveRecordInclusion
+        def acts_like_rater?
+          self.class.ancestors.include?(Rater)
+        end
       end
 
       included do
@@ -40,9 +50,9 @@ module Ratable
       def rate(options={})
         options.reject! { |k| k == :rater }
         if @has_one
-          self.rating.create(options)
+          rating.create(options)
         else
-          self.ratings.create(options)
+          ratings.create(options)
         end
       end
 

data/lib/ratable/version.rb

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

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

@@ -4,5 +4,6 @@ class User < ActiveRecord::Base
   devise :database_authenticatable, :registerable,
          :recoverable, :rememberable, :trackable, :validatable
 
-  acts_as_ratee_and_rater
+  # acts_as_ratee_and_rater
+  acts_as_ratable # omg that was so obvious
 end

data/spec/dummy/log/development.log

@@ -4291,3 +4291,10 @@ Started GET "/assets/star-off-6aaeebdaab93d594c005d366ce0d94fba02e7a07fd03557dbe
   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'
+  User Load (38.0ms)  SELECT `users`.* FROM `users`
+  User Load (1.7ms)  SELECT  `users`.* FROM `users`  ORDER BY `users`.`id` ASC LIMIT 1
+  Ratable::Rating Load (23.0ms)  SELECT `ratable_ratings`.* FROM `ratable_ratings` WHERE `ratable_ratings`.`ratee_id` = 1 AND `ratable_ratings`.`ratee_type` = 'User'  ORDER BY `ratable_ratings`.`updated_at` DESC
+  Ratable::Rating Load (1.1ms)  SELECT `ratable_ratings`.* FROM `ratable_ratings` WHERE `ratable_ratings`.`rater_id` = 1 AND `ratable_ratings`.`rater_type` = 'User'  ORDER BY `ratable_ratings`.`updated_at` DESC
+  User Load (0.6ms)  SELECT  `users`.* FROM `users`  ORDER BY `users`.`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` = 'User'  ORDER BY `ratable_ratings`.`updated_at` DESC
+  Ratable::Rating Load (1.3ms)  SELECT `ratable_ratings`.* FROM `ratable_ratings` WHERE `ratable_ratings`.`rater_id` = 1 AND `ratable_ratings`.`rater_type` = 'User'  ORDER BY `ratable_ratings`.`updated_at` DESC

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ratable
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - François Bélanger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -133,7 +133,6 @@ 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
@@ -609,7 +608,7 @@ homepage: https://github.com/frank184/ratable
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: Feel free to contribute! https://www.github.com/frank184/ratable
 rdoc_options: []
 require_paths:
 - lib

data/lib/ratable/models/ratee_rater.rb

@@ -1,86 +0,0 @@
-module Ratable
-  module Models
-    module RateeRater
-      extend ActiveSupport::Concern
-
-      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, -> { 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, -> { 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
-
-      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