ajaxful_rating 3.0.0.beta3 → 3.0.0.beta4

data/Rakefile

@@ -6,7 +6,7 @@ begin
   
   Jeweler::Tasks.new do |spec|
     spec.name                   = "ajaxful_rating"
-    spec.version                = "3.0.0.beta3"
+    spec.version                = "3.0.0.beta4"
     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"

data/ajaxful_rating.gemspec

@@ -1,67 +1,56 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{ajaxful_rating}
-  s.version = "3.0.0.beta3"
+  s.version = "3.0.0.beta4"
 
   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-10-14}
+  s.date = %q{2011-08-16}
   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 = [
     "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"
+    "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.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   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

data/lib/axr/model.rb

@@ -21,16 +21,13 @@ module AjaxfulRating # :nodoc:
       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
-        has_many "#{dimension}_raters", :through => "#{dimension}_rates", :source => :rater
-      end if options[:dimensions].is_a?(Array)
 
       class << self
-        def axr_config
-          @axr_config ||= {
+        def axr_config(dimension = nil)
+          dimension ||= :default
+          @axr_config ||= {}
+          dimension = dimension.to_sym
+          @axr_config[dimension] ||= {
             :stars => 5,
             :allow_update => true,
             :cache_column => :rating_average
@@ -39,8 +36,19 @@ module AjaxfulRating # :nodoc:
         
         alias_method :ajaxful_rating_options, :axr_config
       end
+
+      if options[:dimensions].is_a?(Array)
+        options[:dimensions].each do |dimension|
+          has_many "#{dimension}_rates", :dependent => :destroy,
+            :conditions => {:dimension => dimension.to_s}, :class_name => 'Rate', :as => :rateable
+          has_many "#{dimension}_raters", :through => "#{dimension}_rates", :source => :rater
+
+          axr_config(dimension).update(options)
+        end 
+      else
+          axr_config.update(options)
+      end
       
-      axr_config.update(options)
       
       include AjaxfulRating::InstanceMethods
       extend AjaxfulRating::SingletonMethods
@@ -56,8 +64,8 @@ module AjaxfulRating # :nodoc:
   module InstanceMethods
     
     # Proxy for axr_config singleton method.
-    def axr_config
-      self.class.axr_config
+    def axr_config(dimension = nil)
+      self.class.axr_config(dimension)
     end
 
     # Submits a new rate. Accepts a hash of tipical Ajax request.
@@ -71,9 +79,9 @@ module AjaxfulRating # :nodoc:
     #   end
     def rate(stars, user, dimension = nil)
       return false if (stars.to_i > self.class.max_stars)
-      raise Errors::AlreadyRatedError if (!self.class.axr_config[:allow_update] && rated_by?(user, dimension))
+      raise Errors::AlreadyRatedError if (!self.class.axr_config(dimension)[:allow_update] && rated_by?(user, dimension))
 
-      rate = if self.class.axr_config[:allow_update] && rated_by?(user, dimension)
+      rate = if self.class.axr_config(dimension)[:allow_update] && rated_by?(user, dimension)
         rate_by(user, dimension)
       else
         rates(dimension).build.tap do |r|
@@ -132,7 +140,7 @@ module AjaxfulRating # :nodoc:
     # Based on if the user has already rated the object or the
     # :allow_update option is enabled.
     def can_rate_by?(user, dimension = nil)
-      !rated_by?(user, dimension) || self.class.axr_config[:allow_update]
+      !rated_by?(user, dimension) || self.class.axr_config(dimension)[:allow_update]
     end
 
     # Instance's total rates.
@@ -189,8 +197,8 @@ module AjaxfulRating # :nodoc:
     # Change it by passing the :stars option to +ajaxful_rateable+
     #
     #   ajaxful_rateable :stars => 10
-    def max_stars
-      axr_config[:stars]
+    def max_stars(dimension = nil)
+      axr_config(dimension)[:stars]
     end
 
     # Name of the class for the user model.
@@ -254,7 +262,7 @@ module AjaxfulRating # :nodoc:
 
     # Returns the name of the cache column for the passed dimension.
     def caching_column_name(dimension = nil)
-      name = axr_config[:cache_column].to_s
+      name = axr_config(dimension)[:cache_column].to_s
       name += "_#{dimension.to_s.underscore}" unless dimension.blank?
       name
     end

data/lib/axr/stars_builder.rb

@@ -79,7 +79,7 @@ module AjaxfulRating # :nodoc:
       })
 
       @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(options[:dimension])[:allow_update]))
           link_star_tag(value, css_class)
         else
           @template.content_tag(:span, show_value, :class => css_class, :title => i18n(:current))

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ajaxful_rating
 version: !ruby/object:Gem::Version 
-  hash: -1848230021
-  prerelease: true
+  hash: 62196427
+  prerelease: 6
   segments: 
   - 3
   - 0
   - 0
-  - beta3
-  version: 3.0.0.beta3
+  - beta
+  - 4
+  version: 3.0.0.beta4
 platform: ruby
 authors: 
 - Edgar J. Suarez
@@ -17,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-14 00:00:00 -05:00
+date: 2011-08-16 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -32,7 +33,6 @@ extensions: []
 extra_rdoc_files: 
 - README.textile
 files: 
-- .gitignore
 - CHANGELOG
 - Manifest
 - README.textile
@@ -66,8 +66,8 @@ homepage: http://github.com/edgarjs/ajaxful-rating
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -93,14 +93,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Provides a simple way to add rating functionality to your application.
-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
+test_files: []
+

data/.gitignore

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