mongoid-letsrate 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3164c5447bfe42189414dd97891c3b98f577891
-  data.tar.gz: ca25dd5075b2ba8f5bd3a744ac5efbe7a0080c21
+  metadata.gz: 2b1076405c5d69f606e636b0dd7c6f1ce2626d5e
+  data.tar.gz: 5b4df317255c7239227bd9c099d4afe03b3f3f04
 SHA512:
-  metadata.gz: c906be4921d5d101813607d7aab642403fd4f90b462ff72accaad7fd716333846465962c50fd2891a24d39cc17fdc83736201f1395ed6fd58774087546ebbef4
-  data.tar.gz: 40122580836e47c985ea7150b63fff1fa2e92ef337527f826b9bfbdd60d061a6e56221f17f581f30d84156d679238a5dbb201302b7260f3bec27f9cc84c62b0c
+  metadata.gz: cfbd6c745062b113b8955512648a87a9555c59496a89dea85256ccf9137ed3dff620bdcbbc3b5cdad62248a49881ce22c1a9b78bd43698839139912a2b6a507e
+  data.tar.gz: f0a05ec10dbe82b4c1203726c5d5ea30083e40bd714ee72dd970577fbc0e5b69a25dfff7ca4f4f57a43624528db96f56f3e35c2a9fa29dceff713593f7582b1b

data/.travis.yml

@@ -1,11 +1,8 @@
 language: ruby
 rvm:
-  - "1.9.2"
   - "1.9.3"
   - "2.0.0"
-  - jruby-18mode
+  - "2.1.0"
   - jruby-19mode
-  - rbx-18mode
-  - rbx-19mode
 # uncomment this line if your project needs to run something other than `rake`:
 # script: bundle exec rspec spec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mongoid-letsrate (1.0.9)
+    mongoid-letsrate (1.0.10)
 
 GEM
   remote: http://rubygems.org/

data/README.md

@@ -6,7 +6,7 @@ Provides the best way to add rating capabilites to your Rails application with j
 
 [![Build Status](https://secure.travis-ci.org/malagant/mongoid-letsrate.png)](http://travis-ci.org/malagant/mongoid-letsrate)
 [![Dependency Status](https://gemnasium.com/malagant/mongoid-letsrate.png)](https://gemnasium.com/malagant/mongoid-letsrate)
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/malagant/mongoid-letsrate)
+[![Code Climate](https://codeclimate.com/github/malagant/mongoid-letsrate.png)](https://codeclimate.com/github/malagant/mongoid-letsrate)
 
 Find it at [github.com/malagant/mongoid-letsrate](https://github.com/malagant/mongoid-letsrate)
 
@@ -50,19 +50,24 @@ I suppose you have a car model
 rails g model car name:string
 ```
 
-You should add the mongoid-letsrate_rateable function with its dimensions option. You can add multiple dimensions.
+You should add the letsrate_rateable function.
 
 ```ruby
-class Car < ActiveRecord::Base
-  mongoid-letsrate_rateable "speed", "engine", "price"
+class Car
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  letsrate_rateable
 end
 ```
 
-Then you need to add a call mongoid-letsrate_rater in the user model.
+Then you need to add a call letsrate_rater in the user model.
 
 ```ruby
-class User < ActiveRecord::Base
-  mongoid-letsrate_rater
+class User
+  include Mongoid::Document
+
+  letsrate_rater
 end
 ```
 
@@ -74,23 +79,19 @@ new rating value from authenticated user.
 ```erb
 <%# show.html.erb -> /cars/1 %>
 
-Speed : <%= rating_for @car, "speed" %>
-Engine : <%= rating_for @car, "engine" %>
-Price : <%= rating_for @car, "price" %>
+Rating : <%= rating_for @car %>
 ```
 
 If you need to change the star number, you should use star option like below.
 
 ```erb
-Speed : <%= rating_for @car, "speed", :star => 10 %>
-Speed : <%= rating_for @car, "engine", :star => 7 %>
-Speed : <%= rating_for @car, "price" %>
+Rating : <%= rating_for @car, :star => 10 %>
 ```
 
 You can use the rating_for_user helper method to show the star rating for the user.
 
 ```erb
-Speed : <%= rating_for_user @car, current_user, "speed", :star => 10 %>
+Rating : <%= rating_for_user @car, current_user, :star => 10 %>
 ```
 
 

data/lib/generators/{letsrate → mongoid_letsrate}/mongoid_letsrate_generator.rb

@@ -1,4 +1,5 @@
-class MongoidLetsrateGenerator < Rails::Generators::Base
+# -*- encoding : utf-8 -*-
+class MongoidLetsrateGenerator < Rails::Generators::NamedBase
   source_root File.expand_path('../templates', __FILE__)
 
   desc 'copying jquery.raty files to assets directory ...'

data/lib/generators/{letsrate → mongoid_letsrate}/templates/cache_model.rb

@@ -1,10 +1,10 @@
+# -*- encoding : utf-8 -*-
 class RatingCache
   include Mongoid::Document
   include Mongoid::Timestamps
 
-  field :avg, type: Float, null: false
-  field :qty, type: Integer, null: false
-  field :dimension, type: String
+  field :avg, type: Float
+  field :qty, type: Integer
 
   belongs_to :cacheable, :polymorphic => true
-end
+end

data/lib/generators/{letsrate → mongoid_letsrate}/templates/letsrate.js.erb

@@ -17,7 +17,6 @@ $(function(){
         $.post('<%= Rails.application.class.routes.url_helpers.rate_path %>',
         {
           score: score,
-          dimension: $(this).attr('data-dimension'),
           id: $(this).attr('data-id'),
           klass: $(this).attr('data-classname')
         },

data/lib/generators/{letsrate → mongoid_letsrate}/templates/model.rb

@@ -1,10 +1,10 @@
+# -*- encoding : utf-8 -*-
 class Rate
   include Mongoid::Document
   include Mongoid::Timestamps
 
-  field :stars, type: Float, null: false
-  field :dimension, type: String
+  field :stars, type: Float
 
   belongs_to :rater, :class_name => '<%= file_name.classify %>'
   belongs_to :rateable, :polymorphic => true
-end
+end

data/lib/generators/{letsrate → mongoid_letsrate}/templates/rater_controller.rb

@@ -1,8 +1,9 @@
+# -*- encoding : utf-8 -*-
 class RaterController < ApplicationController
   def create
     if user_signed_in?
       obj = params[:klass].classify.constantize.find(params[:id])
-      obj.rate params[:score].to_i, current_user, params[:dimension]
+      obj.rate params[:score].to_i, current_user
 
       render :json => true
     else

data/lib/{mongoid_letsrate → mongoid/letsrate}/helpers.rb

@@ -1,7 +1,8 @@
+# -*- encoding : utf-8 -*-
 module Helpers
-  def rating_for(rateable_obj, dimension=nil, options={})
+  def rating_for(rateable_obj, options={})
 
-    cached_average = rateable_obj.average dimension
+    cached_average = rateable_obj.average
 
     avg = cached_average ? cached_average.avg : 0
 
@@ -9,35 +10,34 @@ module Helpers
 
     disable_after_rate = options[:disable_after_rate] || true
 
-    readonly = !(current_user && rateable_obj.can_rate?(current_user, dimension))
+    readonly = !(current_user && rateable_obj.can_rate?(current_user))
 
-    content_tag :div, '', "data-dimension" => dimension, :class => "star", "data-rating" => avg,
+    content_tag :div, '', :class => "star", "data-rating" => avg,
                 "data-id" => rateable_obj.id, "data-classname" => rateable_obj.class.name,
                 "data-disable-after-rate" => disable_after_rate,
                 "data-readonly" => readonly,
                 "data-star-count" => star
   end
 
-  def rating_for_user(rateable_obj, rating_user, dimension = nil, options = {})
+  def rating_for_user(rateable_obj, rating_user, options = {})
     @object = rateable_obj
     @user = rating_user
-	  @rating = Rate.find_by_rater_id_and_rateable_id_and_dimension(@user.id, @object.id, dimension)
-	  stars = @rating ? @rating.stars : 0
+    @rating = Rate.find_by_rater_id_and_rateable_id(@user.id, @object.id)
+    stars = @rating ? @rating.stars : 0
 
     disable_after_rate = options[:disable_after_rate] || false
 
     readonly=false
     if disable_after_rate
-      readonly = current_user.present? ? !rateable_obj.can_rate?(current_user.id, dimension) : true
+      readonly = current_user.present? ? !rateable_obj.can_rate?(current_user.id) : true
     end
 
-    content_tag :div, '', "data-dimension" => dimension, :class => "star", "data-rating" => stars,
+    content_tag :div, '', :class => "star", "data-rating" => stars,
                 "data-id" => rateable_obj.id, "data-classname" => rateable_obj.class.name,
                 "data-disable-after-rate" => disable_after_rate,
                 "data-readonly" => readonly,
                 "data-star-count" => stars
   end
-
 end
 
 class ActionView::Base

data/lib/mongoid/letsrate/model.rb

@@ -0,0 +1,85 @@
+# -*- encoding : utf-8 -*-
+require 'active_support/concern'
+
+module Mongoid
+  module Letsrate
+    extend ActiveSupport::Concern
+
+    def rate(stars, user, dirichlet_method=false)
+      if can_rate? user
+        rates.create! do |r|
+          r.stars = stars
+          r.rater = user
+        end
+        if dirichlet_method
+          update_rate_average_dirichlet(stars)
+        else
+          update_rate_average(stars)
+        end
+      else
+        raise 'User has already rated.'
+      end
+    end
+
+    def update_rate_average_dirichlet(stars)
+      ## assumes 5 possible vote categories
+      dp = {1 => 1, 2 => 1, 3 => 1, 4 => 1, 5 => 1}
+      stars_group = Hash[rates.group(:stars).count.map { |k, v| [k.to_i, v] }]
+      posterior = dp.merge(stars_group) { |key, a, b| a + b }
+      sum = posterior.map { |i, v| v }.inject { |a, b| a + b }
+      davg = posterior.map { |i, v| i * v }.inject { |a, b| a + b }.to_f / sum
+
+      if average.nil?
+        RatingCache.create! do |avg|
+          avg.cacheable_id = self.id
+          avg.cacheable_type = self.class.name
+          avg.qty = 1
+          avg.avg = davg
+        end
+      else
+        a = average
+        a.qty = rates.count
+        a.avg = davg
+        a.save!(validate: false)
+      end
+    end
+
+    def update_rate_average(stars)
+      if average.nil?
+        RatingCache.create! do |avg|
+          avg.cacheable_id = self.id
+          avg.cacheable_type = self.class.name
+          avg.avg = stars
+          avg.qty = 1
+        end
+      else
+        a = average
+        a.qty = rates.count
+        a.avg = rates.average(:stars)
+        a.save!(validate: false)
+      end
+    end
+
+    def can_rate?(user)
+      user.ratings_given.where(rateable_id: id, rateable_type: self.class.name).size.zero?
+    end
+
+    module ClassMethods
+
+      def letsrate_rater
+        has_many :ratings_given, :class_name => 'Rate'
+        belongs_to :rater
+      end
+
+      def letsrate_rateable
+        has_many :rates, :as => :rateable, :class_name => 'Rate', :dependent => :destroy
+        has_many :raters
+
+        has_one :average, :as => :cacheable,
+                :class_name => 'RatingCache', :dependent => :destroy
+      end
+    end
+  end
+end
+
+ActiveSupport.run_load_hooks(:mongoid_letsrate, Mongoid::Letsrate)

data/lib/mongoid/letsrate/version.rb

@@ -0,0 +1,6 @@
+# -*- encoding : utf-8 -*-
+module Mongoid
+  module Letsrate
+    VERSION = '1.0.10'
+  end
+end

data/lib/mongoid-letsrate.rb

@@ -0,0 +1,4 @@
+# -*- encoding : utf-8 -*-
+require 'mongoid/letsrate/version'
+require 'mongoid/letsrate/model'
+require 'mongoid/letsrate/helpers'

data/mongoid-letsrate.gemspec

@@ -1,10 +1,12 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path('../lib', __FILE__)
-require 'mongoid_letsrate/version'
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+require 'mongoid/letsrate/version'
 
 Gem::Specification.new do |s|
   s.name        = 'mongoid-letsrate'
-  s.version     = MongoidLetsrate::VERSION
+  s.version     = Mongoid::Letsrate::VERSION
   s.authors     = ['Michael Johann','Murat GUZEL']
   s.email       = ['mjohann@rails-experts.com']
   s.homepage    = 'http://github.com/malagant/mongoid-letsrate'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-letsrate
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Michael Johann
@@ -24,21 +24,20 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
-- lib/generators/letsrate/USAGE
-- lib/generators/letsrate/mongoid_letsrate_generator.rb
-- lib/generators/letsrate/templates/cache_model.rb
-- lib/generators/letsrate/templates/jquery.raty.js
-- lib/generators/letsrate/templates/letsrate.js.erb
-- lib/generators/letsrate/templates/migration.rb
-- lib/generators/letsrate/templates/model.rb
-- lib/generators/letsrate/templates/rater_controller.rb
-- lib/generators/letsrate/templates/star-half.png
-- lib/generators/letsrate/templates/star-off.png
-- lib/generators/letsrate/templates/star-on.png
-- lib/mongoid_letsrate.rb
-- lib/mongoid_letsrate/helpers.rb
-- lib/mongoid_letsrate/model.rb
-- lib/mongoid_letsrate/version.rb
+- lib/generators/mongoid_letsrate/USAGE
+- lib/generators/mongoid_letsrate/mongoid_letsrate_generator.rb
+- lib/generators/mongoid_letsrate/templates/cache_model.rb
+- lib/generators/mongoid_letsrate/templates/jquery.raty.js
+- lib/generators/mongoid_letsrate/templates/letsrate.js.erb
+- lib/generators/mongoid_letsrate/templates/model.rb
+- lib/generators/mongoid_letsrate/templates/rater_controller.rb
+- lib/generators/mongoid_letsrate/templates/star-half.png
+- lib/generators/mongoid_letsrate/templates/star-off.png
+- lib/generators/mongoid_letsrate/templates/star-on.png
+- lib/mongoid-letsrate.rb
+- lib/mongoid/letsrate/helpers.rb
+- lib/mongoid/letsrate/model.rb
+- lib/mongoid/letsrate/version.rb
 - mongoid-letsrate.gemspec
 homepage: http://github.com/malagant/mongoid-letsrate
 licenses: []

data/lib/generators/letsrate/templates/migration.rb

@@ -1,20 +0,0 @@
-class CreateRates < ActiveRecord::Migration
-
-  def self.up
-      create_table :rates do |t|
-        t.belongs_to :rater
-        t.belongs_to :rateable, :polymorphic => true
-        t.float :stars, :null => false
-        t.string :dimension
-        t.timestamps
-      end
-
-      add_index :rates, :rater_id
-      add_index :rates, [:rateable_id, :rateable_type]
-    end
-
-    def self.down
-      drop_table :rates
-    end
-
-end

data/lib/mongoid_letsrate/model.rb

@@ -1,109 +0,0 @@
-require 'active_support/concern'
-module MongoidLetsrate
-  extend ActiveSupport::Concern
-
-  def rate(stars, user, dimension=nil, dirichlet_method=false)
-    dimension = nil if dimension.blank?
-
-    if can_rate? user, dimension
-      rates(dimension).create! do |r|
-        r.stars = stars
-        r.rater = user
-      end
-      if dirichlet_method
-        update_rate_average_dirichlet(stars, dimension)
-      else
-        update_rate_average(stars, dimension)
-      end
-    else
-      raise 'User has already rated.'
-    end
-  end
-
-  def update_rate_average_dirichlet(stars, dimension=nil)
-    ## assumes 5 possible vote categories
-    dp = {1 => 1, 2 => 1, 3 => 1, 4 => 1, 5 => 1}
-    stars_group = Hash[rates(dimension).group(:stars).count.map{|k,v| [k.to_i,v] }]
-    posterior = dp.merge(stars_group){|key, a, b| a + b}
-    sum = posterior.map{ |i, v| v }.inject { |a, b| a + b }
-    davg = posterior.map{ |i, v| i * v }.inject { |a, b| a + b }.to_f / sum
-
-    if average(dimension).nil?
-      RatingCache.create! do |avg|
-        avg.cacheable_id = self.id
-        avg.cacheable_type = self.class.name
-        avg.qty = 1
-        avg.avg = davg
-        avg.dimension = dimension
-      end
-    else
-      a = average(dimension)
-      a.qty = rates(dimension).count
-      a.avg = davg
-      a.save!(validate: false)
-    end
-  end
-
-  def update_rate_average(stars, dimension=nil)
-    if average(dimension).nil?
-      RatingCache.create! do |avg|
-        avg.cacheable_id = self.id
-        avg.cacheable_type = self.class.name
-        avg.avg = stars
-        avg.qty = 1
-        avg.dimension = dimension
-      end
-    else
-      a = average(dimension)
-      a.qty = rates(dimension).count
-      a.avg = rates(dimension).average(:stars)
-      a.save!(validate: false)
-    end
-  end
-
-  def average(dimension=nil)
-    dimension ?  self.send("#{dimension}_average") : rate_average_without_dimension
-  end
-
-  def can_rate?(user, dimension=nil)
-    user.ratings_given.where(dimension: dimension, rateable_id: id, rateable_type: self.class.name).size.zero?
-  end
-
-  def rates(dimension=nil)
-    dimension ? self.send("#{dimension}_rates") : rates_without_dimension
-  end
-
-  def raters(dimension=nil)
-    dimension ? self.send("#{dimension}_raters") : raters_without_dimension
-  end
-
-  module ClassMethods
-
-    def letsrate_rater
-      has_many :ratings_given, :class_name => "Rate", :foreign_key => :rater_id
-    end
-
-    def letsrate_rateable(*dimensions)
-      has_many :rates_without_dimension, -> { where dimension: nil}, :as => :rateable, :class_name => "Rate", :dependent => :destroy
-      has_many :raters_without_dimension, :through => :rates_without_dimension, :source => :rater
-
-      has_one :rate_average_without_dimension, -> { where dimension: nil}, :as => :cacheable,
-              :class_name => "RatingCache", :dependent => :destroy
-
-
-      dimensions.each do |dimension|
-        has_many "#{dimension}_rates".to_sym, -> {where dimension: dimension.to_s},
-                                              :dependent => :destroy,
-                                              :class_name => "Rate",
-                                              :as => :rateable
-
-        has_many "#{dimension}_raters".to_sym, :through => "#{dimension}_rates", :source => :rater
-
-        has_one "#{dimension}_average".to_sym, -> { where dimension: dimension.to_s },
-                                              :as => :cacheable, :class_name => "RatingCache",
-                                              :dependent => :destroy
-      end
-    end
-  end
-
-end

data/lib/mongoid_letsrate/version.rb

@@ -1,3 +0,0 @@
-module MongoidLetsrate
-  VERSION = '1.0.9'
-end

data/lib/mongoid_letsrate.rb

@@ -1,7 +0,0 @@
-require 'mongoid_letsrate/version'
-require 'mongoid_letsrate/model'
-require 'mongoid_letsrate/helpers'
-
-module MongoidLetsrate
-    
-end