ajaxful_rating 2.2.9.1 → 3.0.0.beta1

data/.gitignore

@@ -0,0 +1,4 @@
+pkg
+doc
+.DS_Store
+*.gem

data/CHANGELOG

@@ -1,21 +1,3 @@
-== 2.2.8.1 Jul 02, 2010
-* Call html_safe only when it's available.
-
-== 2.2.8 Jun 14, 2010
-* Fix html for <li> marking it as html_safe when using rails_xss plugin
-
-== 2.2.7 Jun 12, 2010
-* Fix generated html marking it as html_safe when using rails_xss plugin
-
-== 2.2.6 May 27, 2010
-* Fix wrapper_dom_id with false values for keys
-
-== 2.2.5 May 21, 2010
-* Fix wrapper_dom_id with empty values
-
-== 2.2.4 April 15, 2010
-* Fix wrapper_dom_id join options
-
 == 2.2.3 March 10, 2010
 * Fix validation of current_user to show linked stars
 

data/ChangeLog

@@ -0,0 +1,33 @@
+== 2.2.3 March 10, 2010
+* Fix validation of current_user to show linked stars
+
+== 2.2.2 March 9, 2010
+* Fix bug for jRuby
+* Fixed user self relational model to be rater and rateable.
+
+== 2.2.1 March 8, 2010
+* Changed :force_dynamic for its opposite :force_static.
+* Fixed I18n texts.
+* Fixed missed quotes for Rate belongs_to association with User class
+* Detailed wrapper DOM id with passed hash.
+
+== 2.2.0 March 7, 2010
+* Improved model methods and options.
+* Works now with inherited models.
+* Removed HTML and CSS options for helper for sake of simpleness.
+* Renamed helper option :small_stars to :small.
+* Changed whole helper approach. It should work the same as before.
+  (Except for the renamed and removed options)
+* Removed :force_dynamic, you should exclude the helper from cache since it uses
+  authorization.
+* Fixed opened bugs so far.
+
+== 2.1.5 January 28, 2010
+* Renamed options method name to avoid collapse.
+* Removed CSS duplication.
+
+== 2.1.4 January 25, 2010
+* Added option for showing current_user's rate instead of global average
+
+== 2.1.0 July 25, 2009
+* AjaxfulRating is now available as a gem

data/Manifest

@@ -2,7 +2,6 @@ CHANGELOG
 Manifest
 README.textile
 Rakefile
-ajaxful_rating.gemspec
 generators/ajaxful_rating/USAGE
 generators/ajaxful_rating/ajaxful_rating_generator.rb
 generators/ajaxful_rating/templates/images/star.png

data/README.textile

@@ -64,7 +64,8 @@ class Car < ActiveRecord::Base
 end
 </pre>
 
-Then you need to add a call @ajaxful_rater@ in the user model to make your @User@ model able to rate objects.
+Then you need to add a call @ajaxful_rater@ in the user model. This includes a simple line so
+you can add it _by your own_ as well (@has_many :rates@).
 
 <pre>
 class User < ActiveRecord::Base
@@ -121,13 +122,9 @@ correct action in your controller:
 <%= ratings_for @article, :remote_options => {:url => your_rate_path(@article)} %>
 </pre>
 
-h3. Important!
-
 *To display the stars properly you need to add a call in the head of your layout, which will generate the
 required CSS style for the list. Also don't forget to include the javascripts.*
 
-It's also important to note that this call MUST be within your head tags in your layout, as for now it seems to doesn't work with the @content_for@ tag.
-
 <pre>
   #within the head tags of your layout...
   <%= javascript_include_tag :defaults %>

data/Rakefile

@@ -1,14 +1,21 @@
 require 'rubygems'
 require 'rake'
-require 'echoe'
 
-Echoe.new('ajaxful_rating', '2.2.9.1') do |p|
-  p.description    = "Provides a simple way to add rating functionality to your application."
-  p.url            = "http://github.com/edgarjs/ajaxful-rating"
-  p.author         = "Edgar J. Suarez"
-  p.email          = "edgar.js@gmail.com"
-  p.ignore_pattern = ["tmp/*", "script/*"]
-  p.development_dependencies = []
+begin
+  require 'jeweler'
+  
+  Jeweler::Tasks.new do |spec|
+    spec.name                   = "ajaxful_rating"
+    spec.version                = "3.0.0.beta1"
+    spec.summary                = "Provides a simple way to add rating functionality to your application."
+    spec.description            = "Provides a simple way to add rating functionality to your application."
+    spec.homepage               = "http://github.com/edgarjs/ajaxful-rating"
+    spec.authors                = ["Edgar J. Suarez", "Denis Odorcic"]
+    spec.email                  = ["edgar.js@gmail.com", "denis.odorcic@gmail.com"]
+    spec.has_rdoc               = true
+    spec.files.exclude          'init.rb'
+  end
+  
+rescue LoadError
+  puts "Jeweler not available. Install it with: gem install jeweler"
 end
-
-Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }

data/ajaxful_rating.gemspec

@@ -1,29 +1,74 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "ajaxful_rating"
-  s.version = "2.2.9.1"
+  s.name = %q{ajaxful_rating}
+  s.version = "3.0.0.beta1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Edgar J. Suarez"]
-  s.date = "2012-06-29"
-  s.description = "Provides a simple way to add rating functionality to your application."
-  s.email = "edgar.js@gmail.com"
-  s.extra_rdoc_files = ["CHANGELOG", "README.textile", "lib/ajaxful_rating.rb", "lib/axr/css_builder.rb", "lib/axr/errors.rb", "lib/axr/helpers.rb", "lib/axr/locale.rb", "lib/axr/model.rb", "lib/axr/stars_builder.rb"]
-  s.files = ["CHANGELOG", "Manifest", "README.textile", "Rakefile", "ajaxful_rating.gemspec", "generators/ajaxful_rating/USAGE", "generators/ajaxful_rating/ajaxful_rating_generator.rb", "generators/ajaxful_rating/templates/images/star.png", "generators/ajaxful_rating/templates/images/star_small.png", "generators/ajaxful_rating/templates/migration.rb", "generators/ajaxful_rating/templates/model.rb", "generators/ajaxful_rating/templates/style.css", "init.rb", "lib/ajaxful_rating.rb", "lib/axr/css_builder.rb", "lib/axr/errors.rb", "lib/axr/helpers.rb", "lib/axr/locale.rb", "lib/axr/model.rb", "lib/axr/stars_builder.rb"]
-  s.homepage = "http://github.com/edgarjs/ajaxful-rating"
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Ajaxful_rating", "--main", "README.textile"]
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Edgar J. Suarez", "Denis Odorcic"]
+  s.date = %q{2010-05-03}
+  s.description = %q{Provides a simple way to add rating functionality to your application.}
+  s.email = ["edgar.js@gmail.com", "denis.odorcic@gmail.com"]
+  s.extra_rdoc_files = [
+    "ChangeLog",
+     "README.textile"
+  ]
+  s.files = [
+    ".gitignore",
+     "CHANGELOG",
+     "Manifest",
+     "README.textile",
+     "Rakefile",
+     "ajaxful_rating.gemspec",
+     "lib/ajaxful_rating.rb",
+     "lib/axr/css_builder.rb",
+     "lib/axr/errors.rb",
+     "lib/axr/helpers.rb",
+     "lib/axr/locale.rb",
+     "lib/axr/model.rb",
+     "lib/axr/stars_builder.rb",
+     "lib/generators/ajaxful_rating/USAGE",
+     "lib/generators/ajaxful_rating/ajaxful_rating_generator.rb",
+     "lib/generators/ajaxful_rating/templates/images/star.png",
+     "lib/generators/ajaxful_rating/templates/images/star_small.png",
+     "lib/generators/ajaxful_rating/templates/migration.rb",
+     "lib/generators/ajaxful_rating/templates/model.rb",
+     "lib/generators/ajaxful_rating/templates/style.css",
+     "test/fixtures/car.rb",
+     "test/fixtures/cars.yml",
+     "test/fixtures/rate.rb",
+     "test/fixtures/rates.yml",
+     "test/fixtures/schema.rb",
+     "test/fixtures/user.rb",
+     "test/fixtures/users.yml",
+     "test/lib/model_test.rb",
+     "test/test_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/edgarjs/ajaxful-rating}
+  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = "ajaxful_rating"
-  s.rubygems_version = "1.8.21"
-  s.summary = "Provides a simple way to add rating functionality to your application."
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Provides a simple way to add rating functionality to your application.}
+  s.test_files = [
+    "test/fixtures/car.rb",
+     "test/fixtures/rate.rb",
+     "test/fixtures/schema.rb",
+     "test/fixtures/user.rb",
+     "test/lib/model_test.rb",
+     "test/test_helper.rb"
+  ]
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
     else
     end
   else
   end
 end
+

data/lib/axr/helpers.rb

@@ -20,7 +20,6 @@ module AjaxfulRating # :nodoc:
     # * <tt>:show_user_rating</tt> Set to true if you want to display only the current user's rating, instead of the global average.
     # * <tt>:dimension</tt> The dimension to show the ratings for.
     # * <tt>:force_static</tt> Force static stars even when you're passing a user instance.
-    # * <tt>:to_nearest</tt> Allow stars to be set and averaged to nearest whatever. eg. 0.5 for the nearest half-star
     # 
     # Example:
     #   <%= ratings_for @article, :wrap => false %> # => Will produce something like:
@@ -70,16 +69,17 @@ module AjaxfulRating # :nodoc:
     # 
     #   ajaxful_rating:
     #     helper:
-    #       global_average: "Global rating average: %{value} out of %{max}"
-    #       user_rating: "Your rating: %{value} out of %{max}"
-    #       hover: "Rate %{value} out of %{max}"    def ratings_for(*args)
+    #       global_average: "Global rating average: {{value}} out of {{max}}"
+    #       user_rating: "Your rating: {{value}} out of {{max}}"
+    #       hover: "Rate {{value}} out of {{max}}"    def ratings_for(*args)
     def ratings_for(*args)
       @axr_css ||= CSSBuilder.new
-      options = args.extract_options!.symbolize_keys.slice(:small, :remote_options,
-        :wrap, :show_user_rating, :dimension, :force_static, :current_user, :disable_remote, :to_nearest)
+      options = args.extract_options!.to_hash.symbolize_keys.slice(:small, :remote_options,
+        :wrap, :show_user_rating, :dimension, :force_static, :current_user)
+
       remote_options = options.delete(:remote_options) || {}
       rateable = args.shift
-      user = args.shift || (respond_to?(:current_user) ? current_user : raise(NoUserSpecified))
+      user = args.shift || (respond_to?(:current_user) ? current_user : raise(Errors::NoUserSpecified))
       StarsBuilder.new(rateable, user, self, @axr_css, options, remote_options).render
     end
   end

data/lib/axr/locale.rb

@@ -4,16 +4,15 @@ module AjaxfulRating # :nodoc:
   #
   #   ajaxful_rating:
   #     helper:
-  #       global_average: "Global rating average: %{value} out of %{max}"
-  #       user_rating: "Your rating: %{value} out of %{max}"
-  #       hover: "Rate %{value} out of %{max}"
+  #       global_average: "Global rating average: {{value}} out of {{max}}"
+  #       user_rating: "Your rating: {{value}} out of {{max}}"
+  #       hover: "Rate {{value}} out of {{max}}"
   module Locale
     
     DEFAULTS = {
-      :user_rating => "Your rating: %{value} out of %{max}",
-      :global_average => "Global rating average: %{value} out of %{max}",
-      :hover => "Rate %{value} out of %{max}",
-      :no_ratings => "Not yet rated"
+      :user_rating => "Your rating: {{value}} out of {{max}}",
+      :global_average => "Global rating average: {{value}} out of {{max}}",
+      :hover => "Rate {{value}} out of {{max}}"
     }
     
     def i18n(key, value = nil)
@@ -22,7 +21,6 @@ module AjaxfulRating # :nodoc:
       else
         key.to_sym
       end
-      key = :no_ratings if key == :user_rating && options[:show_user_rating] && ((value || show_value) == 0)
       default = DEFAULTS[key]
       key = "ajaxful_rating.helper.#{key}"
       I18n.t(key, :value => (value || show_value),

data/lib/axr/model.rb

@@ -12,18 +12,16 @@ module AjaxfulRating # :nodoc:
     # * <tt>:stars</tt> Max number of stars that can be submitted.
     # * <tt>:allow_update</tt> Set to true if you want users to be able to update their votes.
     # * <tt>:cache_column</tt> Name of the column for storing the cached rating average.
-    # * <tt>:cache_column</tt> Name of the column for storing the cached rating average.
-    # * <tt>:to_nearest</tt> Allow stars to be set and averaged to nearest whatever . eg. 0.5 for the nearest half-star. May be overridden in the ratings_for
     #
     # Example:
     #   class Article < ActiveRecord::Base
     #     ajaxful_rateable :stars => 10, :cache_column => :custom_column
     #   end
     def ajaxful_rateable(options = {})
-      has_many :rates_without_dimension, :as => :rateable, options.merge(:class_name => 'Rate'),
+      has_many :rates_without_dimension, :as => :rateable, :class_name => 'Rate',
         :dependent => :destroy, :conditions => {:dimension => nil}
       has_many :raters_without_dimension, :through => :rates_without_dimension, :source => :rater
-
+      
       options[:dimensions].each do |dimension|
         has_many "#{dimension}_rates", :dependent => :destroy,
           :conditions => {:dimension => dimension.to_s}, :class_name => 'Rate', :as => :rateable
@@ -38,12 +36,12 @@ module AjaxfulRating # :nodoc:
             :cache_column => :rating_average
           }
         end
-
+        
         alias_method :ajaxful_rating_options, :axr_config
       end
-
+      
       axr_config.update(options)
-
+      
       include AjaxfulRating::InstanceMethods
       extend AjaxfulRating::SingletonMethods
     end
@@ -56,7 +54,7 @@ module AjaxfulRating # :nodoc:
 
   # Instance methods for the rateable object.
   module InstanceMethods
-
+    
     # Proxy for axr_config singleton method.
     def axr_config
       self.class.axr_config
@@ -73,7 +71,7 @@ module AjaxfulRating # :nodoc:
     #   end
     def rate(stars, user, dimension = nil)
       return false if (stars.to_i > self.class.max_stars)
-      raise AlreadyRatedError if (!self.class.axr_config[:allow_update] && rated_by?(user, dimension))
+      raise Errors::AlreadyRatedError if (!self.class.axr_config[:allow_update] && rated_by?(user, dimension))
 
       rate = if self.class.axr_config[:allow_update] && rated_by?(user, dimension)
         rate_by(user, dimension)
@@ -86,19 +84,21 @@ module AjaxfulRating # :nodoc:
       rate.save!
       self.update_cached_average(dimension)
     end
-
+    
     # Builds the DOM id attribute for the wrapper in view.
     def wrapper_dom_id(options = {})
-      options = options.symbolize_keys.slice(:small, :dimension)
-      options = options.select { |k, v| v.present? or (v == false) }.map do |k, v|
+      options = options.to_hash.symbolize_keys.slice(:small, :dimension)
+      options = options.map do |k, v|
         if k == :dimension
           v.to_s
         else
           v.to_s == 'true' ? k.to_s : "no-#{k}"
         end
       end
-      options.unshift("ajaxful_rating")
-      ApplicationController.helpers.dom_id(self, options.sort.join('_'))
+      options = options.delete_if { |x| x.empty? }
+      prefix = "ajaxful_rating"
+      prefix << "_#{options.sort.join('_')}" unless options.empty?
+      ApplicationController.helpers.dom_id(self, prefix)
     end
 
     # Returns an array with the users that have rated this object for the
@@ -108,13 +108,13 @@ module AjaxfulRating # :nodoc:
     def raters(dimension = nil)
       sql = "SELECT DISTINCT u.* FROM #{self.class.user_class.table_name} u "\
         "INNER JOIN rates r ON u.id = r.rater_id WHERE "
-
+      
       sql << self.class.send(:sanitize_sql_for_conditions, {
         :rateable_id => id,
         :rateable_type => self.class.base_class.name,
         :dimension => (dimension.to_s if dimension)
       }, 'r')
-
+      
       self.class.user_class.find_by_sql(sql)
     end
 
@@ -127,7 +127,7 @@ module AjaxfulRating # :nodoc:
     def rated_by?(user, dimension = nil)
       !rate_by(user, dimension).nil?
     end
-
+    
     # Returns whether or not the user can rate this object.
     # Based on if the user has already rated the object or the
     # :allow_update option is enabled.
@@ -148,20 +148,11 @@ module AjaxfulRating # :nodoc:
     # Rating average for the object.
     #
     # Pass false as param to force the calculation if you are caching it.
-    def rate_average(cached = true, dimension = nil, to_nearest = nil)
-      avg = if cached && self.class.caching_average?(dimension, to_nearest)
-        send(caching_column_name(dimension, to_nearest)).to_f
+    def rate_average(cached = true, dimension = nil)
+      avg = if cached && self.class.caching_average?(dimension)
+        send(caching_column_name(dimension)).to_f
       else
-        avg = self.rates_sum(dimension).to_f / self.total_rates(dimension).to_f
-        avg.nan? ? 0.0 : avg
-        if avg > 0
-          to_nearest ||=  axr_config[:to_nearest]
-          if to_nearest
-            notches = 1/to_nearest.to_f
-            avg = ((avg * notches).round)/notches
-          end
-        end
-        avg
+        self.rates_sum(dimension).to_f / self.total_rates(dimension).to_f
       end
       avg.nan? ? 0.0 : avg
     end
@@ -179,20 +170,20 @@ module AjaxfulRating # :nodoc:
     end
 
     # Returns the name of the cache column for the passed dimension.
-    def caching_column_name(dimension = nil, to_nearest = nil)
-      self.class.caching_column_name(dimension, to_nearest)
+    def caching_column_name(dimension = nil)
+      self.class.caching_column_name(dimension)
     end
 
     # Updates the cached average column in the rateable model.
-    def update_cached_average(dimension = nil, to_nearest = nil)
-      if self.class.caching_average?(dimension, to_nearest)
-        update_attribute caching_column_name(dimension, to_nearest), self.rate_average(false, dimension, to_nearest)
+    def update_cached_average(dimension = nil)
+      if self.class.caching_average?(dimension)
+        update_attribute caching_column_name(dimension), self.rate_average(false, dimension)
       end
     end
   end
 
   module SingletonMethods
-
+    
     # Maximum value accepted when rating the model. Default is 5.
     #
     # Change it by passing the :stars option to +ajaxful_rateable+
@@ -202,16 +193,11 @@ module AjaxfulRating # :nodoc:
       axr_config[:stars]
     end
 
-    # Allow stars to be set and averaged to nearest whatever. eg. 0.5 for the nearest half-star
-    def to_nearest
-      axr_config[:to_nearest] || 1
-    end
-
     # Name of the class for the user model.
     def user_class_name
       Rate.reflect_on_association(:rater).options[:class_name]
     end
-
+    
     # Gets the user's class
     def user_class
       user_class_name.constantize
@@ -241,13 +227,13 @@ module AjaxfulRating # :nodoc:
     def find_statement(attr_name, attr_value, dimension = nil)
       sql = "SELECT DISTINCT r2.* FROM rates r1 INNER JOIN "\
         "#{self.base_class.table_name} r2 ON r1.rateable_id = r2.id WHERE "
-
+      
       sql << sanitize_sql_for_conditions({
         :rateable_type => self.base_class.name,
         attr_name => attr_value,
         :dimension => (dimension.to_s if dimension)
       }, 'r1')
-
+      
       find_by_sql(sql)
     end
 
@@ -262,15 +248,14 @@ module AjaxfulRating # :nodoc:
     #
     #   ajaxful_rateable :cache_column => :my_custom_column
     #
-    def caching_average?(dimension = nil, to_nearest = nil)
-      column_names.include?(caching_column_name(dimension, to_nearest))
+    def caching_average?(dimension = nil)
+      column_names.include?(caching_column_name(dimension))
     end
 
     # Returns the name of the cache column for the passed dimension.
-    def caching_column_name(dimension = nil, to_nearest = nil)
+    def caching_column_name(dimension = nil)
       name = axr_config[:cache_column].to_s
       name += "_#{dimension.to_s.underscore}" unless dimension.blank?
-      name += "_#{to_nearest.to_s.gsub('.', '_').underscore}" unless to_nearest.blank?
       name
     end
   end

data/lib/axr/stars_builder.rb

@@ -30,7 +30,6 @@ module AjaxfulRating # :nodoc:
         :wrap => true,
         :small => false,
         :show_user_rating => false,
-        :disable_remote => false,
         :force_static => false,
         :current_user => (@template.current_user if @template.respond_to?(:current_user))
       }.merge(options)
@@ -38,7 +37,7 @@ module AjaxfulRating # :nodoc:
       @options[:small] = @options[:small].to_s == 'true'
       @options[:show_user_rating] = @options[:show_user_rating].to_s == 'true'
       @options[:wrap] = @options[:wrap].to_s == 'true'
-     
+      
       @remote_options = {
         :url => nil,
         :method => :post
@@ -50,7 +49,7 @@ module AjaxfulRating # :nodoc:
         if @template.respond_to?(url)
           @remote_options[:url] = @template.send(url, rateable)
         else
-          raise(MissingRateRoute)
+          raise(Errors::MissingRateRoute)
         end
       end
     end
@@ -65,31 +64,29 @@ module AjaxfulRating # :nodoc:
       
       stars << @template.content_tag(:li, i18n(:current), :class => "show-value",
         :style => "width: #{width}%")
-      stars += (1..rateable.class.max_stars/rateable.class.to_nearest).map do |i|
-        star_tag(i*rateable.class.to_nearest)
+      stars += (1..rateable.class.max_stars).map do |i|
+        star_tag(i)
       end
-      # When using rails_xss plugin, it needs to render as HTML
-      stars = "".respond_to?(:html_safe) ? stars.join.html_safe : stars.join
-      @template.content_tag(:ul, stars, :class => "ajaxful-rating#{' small' if options[:small]}")
+      @template.content_tag(:ul, stars.join.html_safe, :class => "ajaxful-rating#{' small' if options[:small]}")
     end
     
     def star_tag(value)
       already_rated = rateable.rated_by?(user, options[:dimension]) if user
-      css_class = "stars-%s" % [ value.to_s.gsub('.', '_') ]
+      css_class = "stars-#{value}"
       @css_builder.rule(".ajaxful-rating .#{css_class}", {
         :width => "#{(value / rateable.class.max_stars.to_f) * 100}%",
-        :zIndex => "%.f" % ( (rateable.class.max_stars/rateable.class.to_nearest) + 2 - (value/rateable.class.to_nearest))
+        :zIndex => (rateable.class.max_stars + 2 - value).to_s
       })
+
       @template.content_tag(:li) do
-        if !options[:force_static] && (user && options[:current_user] == user &&
-          (!already_rated || rateable.axr_config[:allow_update]))
+        if !options[:force_static] && (user && options[:current_user] == user && (!already_rated || rateable.axr_config[:allow_update]))
           link_star_tag(value, css_class)
         else
           @template.content_tag(:span, show_value, :class => css_class, :title => i18n(:current))
         end
       end
     end
-    
+
     def link_star_tag(value, css_class)
       query = {
         :stars => value,
@@ -97,24 +94,21 @@ module AjaxfulRating # :nodoc:
         :small => options[:small],
         :show_user_rating => options[:show_user_rating]
       }.to_query
-      config = {
-        :html => {
-          :class => css_class,
-          :title => i18n(:hover, value)
-        },
-        :url => "#{remote_options[:url]}",
-        :with => "'#{query}'"
+      
+      options = {
+        :class => css_class,
+        :title => i18n(:hover, value),
+        :method => remote_options[:method] || :post,
+        :remote => true
       }
-      if options[:disable_remote]
-        config[:url] += "?" + query
-        @template.link_to(value, config[:url], config[:html])
-      else
-        @template.link_to_remote(value, remote_options.merge(config))
-      end
+      
+      href = "#{remote_options[:url]}?#{query}"
+
+      @template.link_to(value, href, options)
     end
-    
+
     def wrapper_tag
-      @template.content_tag(:div, ratings_tag, :class => "ajaxful-rating-wrapper#{' show-user-rating' if @options[:show_user_rating]}",
+      @template.content_tag(:div, ratings_tag, :class => "ajaxful-rating-wrapper",
         :id => rateable.wrapper_dom_id(options))
     end
   end

data/{generators → lib/generators}/ajaxful_rating/USAGE

@@ -2,4 +2,4 @@ Description:
     Generates a model called Rate linked to a user model named as the passed parameter.
 
 Example:
-    ./script/generate ajaxful_rating User
+    rails generate ajaxful_rating User

data/lib/generators/ajaxful_rating/ajaxful_rating_generator.rb

@@ -0,0 +1,38 @@
+require 'rails/generators/migration'
+class AjaxfulRatingGenerator < Rails::Generators::NamedBase
+  include Rails::Generators::Migration
+  
+  def self.source_root
+    @_axr_root ||= File.expand_path("../templates", __FILE__)
+  end
+
+  def create_model_files
+    model_file = File.join('app/models', "#{file_path}.rb")
+    raise "User model (#{model_file}) must exits." unless File.exists?(model_file)
+    class_collisions 'Rate'
+    template 'model.rb', File.join('app/models', class_path, "rate.rb")
+  end
+
+  def create_migration
+    migration_template 'migration.rb', "db/migrate/create_rates.rb"
+  end
+
+  def create_layout
+    copy_file 'images/star.png', 'public/images/ajaxful_rating/star.png'
+    copy_file 'images/star_small.png', 'public/images/ajaxful_rating/star_small.png'
+    copy_file 'style.css', 'public/stylesheets/ajaxful_rating.css'
+  end
+
+  private
+
+  # FIXME: Should be proxied to ActiveRecord::Generators::Base
+  # Implement the required interface for Rails::Generators::Migration.
+  def self.next_migration_number(dirname) #:nodoc:
+    if ActiveRecord::Base.timestamped_migrations
+      Time.now.utc.strftime("%Y%m%d%H%M%S")
+    else
+      "%.3d" % (current_migration_number(dirname) + 1)
+    end
+  end
+
+end

data/{generators → lib/generators}/ajaxful_rating/templates/migration.rb

@@ -3,7 +3,7 @@ class CreateRates < ActiveRecord::Migration
     create_table :rates do |t|
       t.belongs_to :rater
       t.belongs_to :rateable, :polymorphic => true
-      t.float :stars, :null => false
+      t.integer :stars, :null => false
       t.string :dimension
       t.timestamps
     end

data/test/fixtures/car.rb

@@ -0,0 +1,3 @@
+class Car < ActiveRecord::Base
+  ajaxful_rateable :stars => 10, :dimensions => [:speed, :reliability, :price]
+end

data/test/fixtures/cars.yml

@@ -0,0 +1,7 @@
+audi:
+  id: 1
+  name: Audi
+  
+porsche:
+  id: 2
+  name: Infinity

data/test/fixtures/rate.rb

@@ -0,0 +1,6 @@
+class Rate < ActiveRecord::Base
+  belongs_to :rater, :class_name => "User"
+  belongs_to :rateable, :polymorphic => true
+  
+  attr_accessible :rate, :dimension
+end

data/test/fixtures/rates.yml

@@ -0,0 +1,41 @@
+rate_audi_denis:
+  rater_id: 1 # Denis
+  rateable_id: 1 # Audi
+  rateable_type: Car
+  stars: 6
+  dimension: 
+      
+rate_audi_denis_speed:
+  rater_id: 1 # Denis
+  rateable_id: 1 # Audi
+  rateable_type: Car
+  stars: 7
+  dimension: speed
+  
+rate_audi_denis_reliability:
+  rater_id: 1 # Denis
+  rateable_id: 1 # Audi
+  rateable_type: Car
+  stars: 5
+  dimension: reliability
+
+rate_audi_john:
+  rater_id: 2 # John
+  rateable_id: 1 # Audi
+  rateable_type: Car
+  stars: 8
+  dimension: 
+
+rate_audi_john_speed:
+  rater_id: 2 # John
+  rateable_id: 1 # Audi
+  rateable_type: Car
+  stars: 8
+  dimension: speed
+
+rate_audi_john_reliability:
+  rater_id: 2 # John
+  rateable_id: 2 # Audi
+  rateable_type: Car
+  stars: 5
+  dimension: reliability

data/test/fixtures/schema.rb

@@ -0,0 +1,22 @@
+ActiveRecord::Schema.define do
+  create_table "cars", :force => true do |t|
+    t.string   "name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "rates", :force => true do |t|
+    t.integer  "rater_id"
+    t.integer  "rateable_id"
+    t.string   "rateable_type"
+    t.integer  "stars",         :null => false
+    t.string   "dimension"
+  end
+
+  add_index "rates", ["rateable_id", "rateable_type"], :name => "index_rates_on_rateable_id_and_rateable_type"
+  add_index "rates", ["rater_id"], :name => "index_rates_on_rater_id"
+
+  create_table "users", :force => true do |t|
+    t.string   "name"
+  end
+end

data/test/fixtures/user.rb

@@ -0,0 +1,3 @@
+class User < ActiveRecord::Base
+  ajaxful_rater
+end

data/test/fixtures/users.yml

@@ -0,0 +1,7 @@
+denis:
+  id: 1
+  name: Denis Odorcic
+  
+john:
+  id: 2
+  name: John Doe

data/test/lib/model_test.rb

@@ -0,0 +1,58 @@
+require File.dirname(__FILE__) + "/../test_helper"
+
+class ModelTest < ActiveSupport::TestCase
+  include ActiveRecord::TestFixtures
+
+  def setup
+    @audi     = Car.find_by_name("Audi")
+    @infinity = Car.find_by_name("Infinity")
+
+    @denis = User.find_by_name("Denis Odorcic")
+  end
+
+  def test_find_statement
+    assert_equal Car.find_statement(:stars, 7).size, 0
+    assert_equal Car.find_statement(:stars, 8).size, 1
+    assert_equal Car.find_statement(:stars, 8, :speed).size, 1
+    assert_equal Car.find_statement(:stars, 5, :reliability).size, 2
+  end
+
+  def test_rate_higher_than_max_stars
+    assert_equal Car.max_stars, 10
+    assert !@audi.rate(15, User.first)
+  end
+
+  def test_already_rated_error
+    Car.axr_config[:allow_update] = false
+    assert @audi.rated_by?(@denis)
+    assert_raise AjaxfulRating::Errors::AlreadyRatedError do
+      @audi.rate(4, @denis)
+    end
+  end
+
+  def test_already_rated_and_allowed_to_update
+    assert @audi.rated_by?(@denis)
+    stars = @audi.rate_by(@denis).stars
+
+    assert_no_difference 'Rate.count' do
+      @audi.rate(1, @denis)
+    end
+    assert_equal @audi.rate_by(@denis).stars, 1
+    assert_not_equal @audi.rate_by(@denis).stars, stars
+  end
+
+  def test_new_rating
+    assert_difference 'Rate.count', 1 do
+      @audi.rate(5, @denis, :price)
+    end
+  end
+
+  def test_raters
+    assert_equal @audi.raters.size, 2
+    assert_difference 'Rate.count', 1 do
+      @audi.rate(3, User.create(:name => "Bob"))
+    end
+    assert_equal @audi.raters.size, 3
+  end
+
+end

data/test/test_helper.rb

@@ -0,0 +1,25 @@
+$:.unshift File.dirname(__FILE__) + '/../lib'
+
+require 'rubygems'
+require 'test/unit'
+require 'active_record'
+require 'active_record/fixtures'
+require 'action_controller'
+require 'ajaxful_rating'
+
+AXR_FIXTURES_PATH = File.join(File.dirname(__FILE__), 'fixtures')
+
+# For transactional fixtures to work in tests, configurations in AR::Base has to be set to something
+ActiveRecord::Base.configurations = {:epic => 'fail'}
+ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
+
+# Add fixtures to load path
+dep = defined?(ActiveSupport::Dependencies) ? ActiveSupport::Dependencies : ::Dependencies
+dep.load_paths.unshift AXR_FIXTURES_PATH
+
+ActiveRecord::Base.silence do
+  ActiveRecord::Migration.verbose = false
+  load File.join(AXR_FIXTURES_PATH, 'schema.rb')
+end
+
+Fixtures.create_fixtures(AXR_FIXTURES_PATH, ActiveRecord::Base.connection.tables)

metadata

@@ -1,54 +1,43 @@
 --- !ruby/object:Gem::Specification 
 name: ajaxful_rating
 version: !ruby/object:Gem::Version 
-  hash: 89
-  prerelease: 
+  prerelease: true
   segments: 
-  - 2
-  - 2
-  - 9
-  - 1
-  version: 2.2.9.1
+  - 3
+  - 0
+  - 0
+  - beta1
+  version: 3.0.0.beta1
 platform: ruby
 authors: 
 - Edgar J. Suarez
+- Denis Odorcic
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-06-29 00:00:00 Z
+date: 2010-05-03 00:00:00 -05:00
+default_executable: 
 dependencies: []
 
 description: Provides a simple way to add rating functionality to your application.
-email: edgar.js@gmail.com
+email: 
+- edgar.js@gmail.com
+- denis.odorcic@gmail.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- CHANGELOG
+- ChangeLog
 - README.textile
-- lib/ajaxful_rating.rb
-- lib/axr/css_builder.rb
-- lib/axr/errors.rb
-- lib/axr/helpers.rb
-- lib/axr/locale.rb
-- lib/axr/model.rb
-- lib/axr/stars_builder.rb
 files: 
+- .gitignore
 - CHANGELOG
 - Manifest
 - README.textile
 - Rakefile
 - ajaxful_rating.gemspec
-- generators/ajaxful_rating/USAGE
-- generators/ajaxful_rating/ajaxful_rating_generator.rb
-- generators/ajaxful_rating/templates/images/star.png
-- generators/ajaxful_rating/templates/images/star_small.png
-- generators/ajaxful_rating/templates/migration.rb
-- generators/ajaxful_rating/templates/model.rb
-- generators/ajaxful_rating/templates/style.css
-- init.rb
 - lib/ajaxful_rating.rb
 - lib/axr/css_builder.rb
 - lib/axr/errors.rb
@@ -56,44 +45,59 @@ files:
 - lib/axr/locale.rb
 - lib/axr/model.rb
 - lib/axr/stars_builder.rb
+- lib/generators/ajaxful_rating/USAGE
+- lib/generators/ajaxful_rating/ajaxful_rating_generator.rb
+- lib/generators/ajaxful_rating/templates/images/star.png
+- lib/generators/ajaxful_rating/templates/images/star_small.png
+- lib/generators/ajaxful_rating/templates/migration.rb
+- lib/generators/ajaxful_rating/templates/model.rb
+- lib/generators/ajaxful_rating/templates/style.css
+- test/fixtures/car.rb
+- test/fixtures/cars.yml
+- test/fixtures/rate.rb
+- test/fixtures/rates.yml
+- test/fixtures/schema.rb
+- test/fixtures/user.rb
+- test/fixtures/users.yml
+- test/lib/model_test.rb
+- test/test_helper.rb
+- ChangeLog
+has_rdoc: true
 homepage: http://github.com/edgarjs/ajaxful-rating
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Ajaxful_rating
-- --main
-- README.textile
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 11
       segments: 
       - 1
-      - 2
-      version: "1.2"
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
-rubyforge_project: ajaxful_rating
-rubygems_version: 1.8.21
+rubyforge_project: 
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Provides a simple way to add rating functionality to your application.
-test_files: []
-
+test_files: 
+- test/fixtures/car.rb
+- test/fixtures/rate.rb
+- test/fixtures/schema.rb
+- test/fixtures/user.rb
+- test/lib/model_test.rb
+- test/test_helper.rb

data/generators/ajaxful_rating/ajaxful_rating_generator.rb

@@ -1,30 +0,0 @@
-class AjaxfulRatingGenerator < Rails::Generator::NamedBase
-  def initialize(runtime_args, runtime_options = {})
-    super
-      
-    # if there's no user model
-    model_file = File.join('app/models', "#{file_path}.rb")
-    raise "User model (#{model_file}) must exits." unless File.exists?(model_file)
-  end
-  
-  def manifest
-    record do |m|
-      m.class_collisions 'Rate'
-      m.template 'model.rb', File.join('app/models', 'rate.rb')
-      m.migration_template 'migration.rb', 'db/migrate',
-        :migration_file_name => 'create_rates'
-      
-      # style
-      m.directory 'public/images/ajaxful_rating'
-      m.file 'images/star.png', 'public/images/ajaxful_rating/star.png'
-      m.file 'images/star_small.png', 'public/images/ajaxful_rating/star_small.png'
-      m.file 'style.css', 'public/stylesheets/ajaxful_rating.css'
-    end
-  end
-  
-  protected
-  
-  def banner
-    "Usage: #{$0} ajaxful_rating UserModelName"
-  end
-end

data/init.rb

@@ -1,6 +0,0 @@
-puts "------------------------------------------"
-puts "IMPORTANT: AjaxfulRating has been updated to v2.2.x and some options changed."\
-  "Please read the changelog at http://github.com/edgarjs/ajaxful-rating/blob/master/CHANGELOG"
-puts "------------------------------------------"
-
-require 'ajaxful_rating'