seems_rateable 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0eb8a1e5c55ccaff4c140702bdd45ae130ab3adb
-  data.tar.gz: 6e6172c3197be41dafd85972be9a6a453bf82e5e
+  metadata.gz: e92afbf1216b55fc3629fd9dc830ace41d6f74e5
+  data.tar.gz: 05bcffa91c9f3283436c050b4e4947db993f54d6
 SHA512:
-  metadata.gz: fcc9344aa5b330b35c220208a910929f3396a8cf579e4a56e63bc9d0c6dff2bb64b371135a23478ad6b0cd9dab1f7de1743eb32d91a0426762d9d1f8cd5a27ca
-  data.tar.gz: fc8d7526d7726c2b16f07b72f7e2794a6a716f4b945e92313c522812dc6c3c683c49b18db28aaface6fbd4159d4967a9ff654fdcba563b0adace5c40776a50d8
+  metadata.gz: 6b0c3a1a4e6eabe2f23b18463a33c122f654bd0449656bc8af3f2d0073878427fdae9016de8b5f47b67a747c302b78da664b61c2fe0ee60bbac509bac70e0544
+  data.tar.gz: 68e21d5a5865df84608105641c80b2434705e2c92fa7e941ec5f6eee854b0cff3334aa9de5a6f1547a3c2f47216d04ee8cf44d459c415af6b2fac13edabde7e1

data/app/controllers/seems_rateable/application_controller.rb

@@ -1,4 +1,7 @@
 module SeemsRateable
-  class ApplicationController < ActionController::Base
+ class ApplicationController < ::ApplicationController
+  rescue_from SeemsRateable::Errors::AlreadyRatedError do |exception|
+	render :json => {:error => true}
   end
+ end
 end

data/app/controllers/seems_rateable/ratings_controller.rb

@@ -1,17 +1,13 @@
 require_dependency "seems_rateable/application_controller"
 
 module SeemsRateable
-  class RatingsController < ::ApplicationController
-    def create
-		 raise NoCurrentUserInstanceError unless current_user
-		 
-		 obj = params[:kls].classify.constantize.find(params[:idBox])
-		 begin
-			obj.rate(params[:rate].to_i, current_user.id, params[:dimension])
-			render :json => true
-		 rescue Errors::AlreadyRatedError
-			render :json => {:error => true}
-		 end
-	 end
+ class RatingsController < ApplicationController
+  def create
+   raise NoCurrentUserInstanceError unless current_user
+	obj = params[:kls].classify.constantize.find(params[:idBox])
+	obj.rate(params[:rate].to_i, current_user.id, params[:dimension])
+	
+	render :json => true
   end
+ end
 end

data/app/models/seems_rateable/cached_rating.rb

@@ -1,5 +1,5 @@
 module SeemsRateable
-  class CachedRating < ActiveRecord::Base
-	belongs_to :cacheable, :polymorphic => true 
-  end
+ class CachedRating < ActiveRecord::Base
+  belongs_to :cacheable, :polymorphic => true 
+ end
 end

data/app/models/seems_rateable/rate.rb

@@ -1,6 +1,6 @@
 module SeemsRateable
-  class Rate < ActiveRecord::Base
-	belongs_to :rater, :class_name => SeemsRateable::Engine.config.owner_class
-	belongs_to :rateable, :polymorphic => true
-  end
+ class Rate < ActiveRecord::Base
+  belongs_to :rater, :class_name => SeemsRateable::Engine.config.owner_class
+  belongs_to :rateable, :polymorphic => true
+ end
 end

data/config/routes.rb

@@ -1,3 +1,3 @@
 SeemsRateable::Engine.routes.draw do
-  resources :ratings, :only => :create
+ resources :ratings, :only => :create
 end

data/lib/generators/seems_rateable/install/install_generator.rb

@@ -2,38 +2,41 @@ require 'rails/generators/migration'
 require 'fileutils'
 
 module SeemsRateable
-	module Generators
-		class InstallGenerator < ::Rails::Generators::Base
-			include Rails::Generators::Migration
-			source_root File.expand_path('../templates', __FILE__)
-			
-			def self.next_migration_number(path)
-			  unless @prev_migration_nr
-				 @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
-			  else
-				 @prev_migration_nr += 1
-			  end
-			  @prev_migration_nr.to_s
-			end
+ module Generators
+  class InstallGenerator < ::Rails::Generators::Base
+   include Rails::Generators::Migration
+	source_root File.expand_path('../templates', __FILE__)
+	
+   def self.next_migration_number(path)
+	 unless @prev_migration_nr
+	  @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
+	 else
+	  @prev_migration_nr += 1
+	 end
+	 @prev_migration_nr.to_s
+	end
 			
-			desc "generating migration files"
-			def copy_migrations
-			  migration_template "rates_migration.rb", "db/migrate/create_seems_rateable_rates.rb"
-			  migration_template "cached_ratings_migration.rb", "db/migrate/create_seems_rateable_cached_ratings.rb"
-			end
+	def routegen
+	 route("seems_rateable")
+	end
 			
-			desc "generating initializer"
-			def copy_initializer
-				template "initializer.rb", "config/initializers/seems_rateable.rb"
-			end
+	desc "generating migration files"
+	 def copy_migrations
+	  migration_template "rates_migration.rb", "db/migrate/create_seems_rateable_rates.rb"
+	  migration_template "cached_ratings_migration.rb", "db/migrate/create_seems_rateable_cached_ratings.rb"
+	 end
 			
-			desc "generating javascript files"
-			def copy_javascript_asset
-				Dir.mkdir "app/assets/javascripts/rateable" unless File.directory?("app/assets/javascripts/rateable")
-				copy_file "rateable.js.erb", "app/assets/javascripts/rateable/rateable.js.erb" unless File.exists?("app/assets/javascripts/rateable/rateable.js.erb")
-				copy_file "jRating.js.erb", "app/assets/javascripts/rateable/jRating.js.erb" unless File.exists?("app/assets/javascripts/rateable/jRating.js.erb")
-			end
+  	desc "generating initializer"
+	 def copy_initializer
+	  template "initializer.rb", "config/initializers/seems_rateable.rb"
+	 end
 			
-		end
-	end
+	desc "generating javascript files"
+	 def copy_javascript_asset
+	  Dir.mkdir "app/assets/javascripts/rateable" unless File.directory?("app/assets/javascripts/rateable")
+	  copy_file "rateable.js.erb", "app/assets/javascripts/rateable/rateable.js.erb" unless File.exists?("app/assets/javascripts/rateable/rateable.js.erb")
+	  copy_file "jRating.js.erb", "app/assets/javascripts/rateable/jRating.js.erb" unless File.exists?("app/assets/javascripts/rateable/jRating.js.erb")
+	 end
+  end
+ end
 end

data/lib/generators/seems_rateable/install/templates/jRating.js.erb

@@ -12,8 +12,8 @@
 	$.fn.jRating = function(op) {
 		var defaults = {
 			/** String vars **/
-			bigStarsPath : '<%= image_path "seems_rateable/stars.png" %>', // path of the icon stars.png
-			smallStarsPath : '<%= image_path "seems_rateable/small.png" %>', // path of the icon small.png
+			bigStarsPath : '<%= asset_path "seems_rateable/stars.png" %>', // path of the icon stars.png
+			smallStarsPath : '<%= asset_path "seems_rateable/small.png" %>', // path of the icon small.png
 			path : '<%= SeemsRateable::Engine.routes.url_helpers.ratings_path %>',
 			type : 'big', // can be set to 'small' or 'big'
 

data/lib/seems_rateable/engine.rb

@@ -1,17 +1,16 @@
 module SeemsRateable
-  class Engine < ::Rails::Engine
-    isolate_namespace SeemsRateable
+ class Engine < ::Rails::Engine
+  isolate_namespace SeemsRateable
    
-    config.generators do |g|
-		g.test_framework :rspec, :fixture => false
-		g.fixture_replacement :factory_girl, :dir => 'spec/factories'
-    end
-    
-    initializer :seems_rateable do
-		ActiveRecord::Base.send :include, SeemsRateable::Model
-		ActionView::Base.send :include, SeemsRateable::Helpers
-		ActionDispatch::Routing::Mapper.send :include, SeemsRateable::Routes
-    end
-        
+  config.generators do |g|
+   g.test_framework :rspec, :fixture => false
+	g.fixture_replacement :factory_girl, :dir => 'spec/factories'
   end
+    
+  initializer :seems_rateable do
+	ActiveRecord::Base.send :include, SeemsRateable::Model
+	ActionView::Base.send :include, SeemsRateable::Helpers
+	ActionDispatch::Routing::Mapper.send :include, SeemsRateable::Routes
+  end     
+ end
 end

data/lib/seems_rateable/errors.rb

@@ -1,21 +1,21 @@
 module SeemsRateable
-	module Errors
-		class InvalidRateableObjectError < StandardError
-			def to_s
-				"Stated object is not rateable. Add 'seems_rateable' to your object's class model."
-			end
-		end
+ module Errors
+  class InvalidRateableObjectError < StandardError
+	def to_s
+	 "Stated object is not rateable. Add 'seems_rateable' to your object's class model."
+	end
+  end
 		
-		class NoCurrentUserInstanceError < StandardError
-			def to_s
-				"User instance current_user is not available."
-			end
-		end
+  class NoCurrentUserInstanceError < StandardError
+	def to_s
+	 "User instance current_user is not available."
+	end
+  end
 		
-		class AlreadyRatedError < StandardError
-			def to_s
-				"User has already rated an object."
-			end
-		end	
+  class AlreadyRatedError < StandardError
+	def to_s
+	 "User has already rated an object."
 	end
+  end	
+ end
 end

data/lib/seems_rateable/helpers.rb

@@ -1,27 +1,27 @@
 module SeemsRateable
-	module Helpers  		
-		def rating_for(obj, opts={})
-			raise Errors::InvalidRateableObjectError unless obj.class.respond_to?(:rateable?) 
+ module Helpers  		
+  def rating_for(obj, opts={})
+   raise Errors::InvalidRateableObjectError unless obj.class.respond_to?(:rateable?) 
 			
-			options = {
-				:dimension => nil,
-				:static => false,
-				:class => 'rateable',
-				:id => nil
-			}.update(opts)
+	options = {
+	 :dimension => nil,
+	 :static => false,
+	 :class => 'rateable',
+	 :id => nil
+	}.update(opts)
 				  	
-			content_tag :div, "", "data-average" => obj.average(options[:dimension]) ? obj.average(options[:dimension]).avg : 0, :id => options[:id],
-							:class => "#{options[:class]}#{jdisabled?(options[:static])}",
-							"data-id" => obj.id, "data-kls" => obj.class.name, "data-dimension" => options[:dimension]    
-		end
+	content_tag :div, "", "data-average" => obj.average(options[:dimension]) ? obj.average(options[:dimension]).avg : 0, :id => options[:id],
+	       		:class => "#{options[:class]}#{jdisabled?(options[:static])}",
+					"data-id" => obj.id, "data-kls" => obj.class.name, "data-dimension" => options[:dimension]    
+  end
 		
-		def seems_rateable_stylesheet
-			stylesheet_link_tag    "seems_rateable/application", media: "all", "data-turbolinks-track" => true 
-		end
-		
-		private
-		def jdisabled?(option)
-			" jDisabled" if option || !current_user
-		end
-	end
+  def seems_rateable_stylesheet
+	stylesheet_link_tag    "seems_rateable/application", media: "all", "data-turbolinks-track" => true 
+  end
+   	
+  private
+  def jdisabled?(option)
+   " jDisabled" if option || !current_user
+  end
+ end
 end

data/lib/seems_rateable/model.rb

@@ -1,111 +1,111 @@
 require 'active_support/concern'
 module SeemsRateable
-	module Model
-		extend ActiveSupport::Concern
+ module Model
+  extend ActiveSupport::Concern
 			
-		def rate(stars, user_id, dimension=nil)
-			if !has_rated?(user_id, dimension)   
-			  self.rates.create do |r| 
-				 r.stars = stars
-				 r.rater_id = user_id 
-			  end
-			  update_overall_average_rating(stars, dimension) 
-			elsif has_rated?(user_id, dimension) && can_update?
-			  update_users_rating(stars, user_id, dimension)    
-			else
-			  raise Errors::AlreadyRatedError  
-			end		
-		end
+  def rate(stars, user_id, dimension=nil)
+	if !has_rated?(user_id, dimension)   
+	 self.rates.create do |r| 
+	  r.stars = stars
+	  r.rater_id = user_id 
+	 end
+	 update_overall_average_rating(stars, dimension) 
+	elsif has_rated?(user_id, dimension) && can_update?
+	 update_users_rating(stars, user_id, dimension)    
+	else
+	 raise Errors::AlreadyRatedError  
+	end		
+  end
 			
-		def update_overall_average_rating(stars, dimension=nil)
-			 if average(dimension).nil?
-			  CachedRating.create do |r|
-				 r.avg = stars
-				 r.dimension = dimension
-				 r.cacheable_id = self.id
-				 r.cacheable_type = self.class.name
-				 r.cnt = 1
-			  end						                   
-			 else
-				r = average(dimension)
-				r.avg = (r.avg * r.cnt + stars) / (r.cnt+1)
-				r.cnt += 1
-				r.save!
-			 end   
-		end  
+  def update_overall_average_rating(stars, dimension=nil)
+	if average(dimension).nil?
+	 CachedRating.create do |r|
+	  r.avg = stars
+	  r.dimension = dimension
+	  r.cacheable_id = self.id
+	  r.cacheable_type = self.class.name
+	  r.cnt = 1
+	 end						                   
+	else
+	 r = average(dimension)
+	 r.avg = (r.avg * r.cnt + stars) / (r.cnt+1)
+	 r.cnt += 1
+	 r.save!
+	end   
+  end  
 			
-		def update_users_rating(stars, user_id, dimension=nil)
-			obj = rates(dimension).where(:rater_id => user_id).first
-			current_record = average(dimension)
-			current_record.avg = (current_record.avg*current_record.cnt - obj.stars + stars) / (current_record.cnt)
-			current_record.save!
-			obj.stars = stars
-			obj.save!
-		end
+  def update_users_rating(stars, user_id, dimension=nil)
+	obj = rates(dimension).where(:rater_id => user_id).first
+	current_record = average(dimension)
+	current_record.avg = (current_record.avg*current_record.cnt - obj.stars + stars) / (current_record.cnt)
+	current_record.save!
+	obj.stars = stars
+	obj.save!
+  end
 			
 			
-		def average(dimension=nil)
-		 if dimension.nil?
-			self.send "rate_average_without_dimension"
-		 else
-			self.send "#{dimension}_average"
-		 end      
-		end
+  def average(dimension=nil)
+	if dimension.nil?
+	 self.send "rate_average_without_dimension"
+	else
+	 self.send "#{dimension}_average"
+	end      
+  end
 			
-		def rates(dimension=nil)
-			if dimension.nil?
-			 self.send "rates_without_dimension"
-			else
-			 self.send "#{dimension}_rates"
-			end
-		 end
+  def rates(dimension=nil)
+	if dimension.nil?
+	 self.send "rates_without_dimension"
+   else
+	 self.send "#{dimension}_rates"
+	end
+  end
 		
-		def raters(dimension=nil)
-			if dimension.nil?
-				self.send "raters_without_dimension"
-			else
-				self.send "#{dimension}_raters"
-			end
-		end
+  def raters(dimension=nil)
+	if dimension.nil?
+	 self.send "raters_without_dimension"
+	else
+	 self.send "#{dimension}_raters"
+	end
+  end
 			
-		def has_rated?(user_id, dimension=nil)
-			record = self.rates(dimension).where(:rater_id => user_id)  
-			record.empty? ? false : true				       
-		end 	  
+  def has_rated?(user_id, dimension=nil)
+	record = self.rates(dimension).where(:rater_id => user_id)  
+	record.empty? ? false : true				       
+  end 	  
 			
-		def can_update?
-			self.class.can_update?
-		end
+  def can_update?
+	self.class.can_update?
+  end
 
-		module ClassMethods
-		  def seems_rateable(opts={})               
-			#has_many :rates_without_dimension, -> { where(dimension: nil) }, :as => :rateable, :class_name => SeemsRateable::Rate, :dependent => :destroy			  
-			has_many :rates_without_dimension, :conditions => { dimension: nil }, :as => :rateable, :class_name => SeemsRateable::Rate, :dependent => :destroy			  
-			has_many :raters_without_dimension, :through => :rates_without_dimension, :source => :rater 
-			has_one :rate_average_without_dimension, :conditions => { dimension: nil }, :as => :cacheable, :class_name => SeemsRateable::CachedRating, :dependent => :destroy
-			  
-			@permission = opts[:allow_update] ? true : false		 
-			 
-			def self.can_update?	 		 
-			 @permission
-			end
+  module ClassMethods
+   def seems_rateable(opts={})               
+	 #has_many :rates_without_dimension, -> { where(dimension: nil) }, :as => :rateable, :class_name => SeemsRateable::Rate, :dependent => :destroy			  
+	 has_many :rates_without_dimension, :conditions => { dimension: nil }, :as => :rateable, :class_name => SeemsRateable::Rate, :dependent => :destroy			  
+	 has_many :raters_without_dimension, :through => :rates_without_dimension, :source => :rater 
+	 has_one :rate_average_without_dimension, :conditions => { dimension: nil }, :as => :cacheable, :class_name => SeemsRateable::CachedRating, :dependent => :destroy
+	  	  
+	 @permission = opts[:allow_update] ? true : false		 
+	  	 
+	 def self.can_update?	 		 
+	  @permission
+	 end
 			  
-			def self.rateable?
-			 true
-			end
-			  
-				if opts[:dimensions].is_a?(Array)
-					opts[:dimensions].each do |dimension|        
-						has_many :"#{dimension}_rates", :conditions => { dimension: dimension.to_s }, :dependent => :destroy, :class_name => SeemsRateable::Rate, :as => :rateable
-						has_many :"#{dimension}_raters", :through => :"#{dimension}_rates", :source => :rater         
-						has_one :"#{dimension}_average", :conditions => { dimension: dimension.to_s }, :as => :cacheable, :class_name => SeemsRateable::CachedRating, :dependent => :destroy
-					end
-				end	 	 					
-			end
+	 def self.rateable?
+	  true
+	 end
+	  	  
+	 if opts[:dimensions].is_a?(Array)
+	  opts[:dimensions].each do |dimension|        
+	   has_many :"#{dimension}_rates", :conditions => { dimension: dimension.to_s }, :dependent => :destroy, :class_name => SeemsRateable::Rate, :as => :rateable
+	   has_many :"#{dimension}_raters", :through => :"#{dimension}_rates", :source => :rater         
+	   has_one :"#{dimension}_average", :conditions => { dimension: dimension.to_s }, :as => :cacheable, :class_name => SeemsRateable::CachedRating, :dependent => :destroy
+	  end
+	 end	 	 					
+   end
 		  
-			def seems_rateable_rater
-			 has_many :ratings_given, :class_name => SeemsRateable::Rate, :foreign_key => :rater_id
-			end	
-		end
-	end
+	def seems_rateable_rater
+	 has_many :ratings_given, :class_name => SeemsRateable::Rate, :foreign_key => :rater_id
+	end	
+  end
+ end
 end

data/lib/seems_rateable/routes.rb

@@ -1,7 +1,7 @@
 module SeemsRateable
-  module Routes
-    def seems_rateable
-      mount SeemsRateable::Engine => '/rateable', :as => :rateable
-    end
+ module Routes
+  def seems_rateable
+   mount SeemsRateable::Engine => '/rateable', :as => :rateable
   end
+ end
 end

data/lib/seems_rateable/version.rb

@@ -1,3 +1,3 @@
 module SeemsRateable
-  VERSION = "1.0.9"
+ VERSION = "1.0.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seems_rateable
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Peter Toth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-21 00:00:00.000000000 Z
+date: 2013-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails