seems_rateable 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75166b76cc03e894fbb7d2d63cd807acdafc4816
-  data.tar.gz: d8353a22a2e5cfa5ddba077445e4900d3dd4afe3
+  metadata.gz: 5da25869fc6cb9fd1c221b6f6e4a91863e05b199
+  data.tar.gz: e6a95e44392d188f812290df55b638441b4b094e
 SHA512:
-  metadata.gz: f6c2b82a4cee9ac55e02150db1142bc49d4f0c1cf00d7fa06e5c4f8e389b21cc090b5f5289d11ae240038cb140ccae116a6e4b1e82e468775fe0d55e9380b0f2
-  data.tar.gz: 9a250d496faf719be8e82823536e4ea25774f5ba8c688274e3640261d864f30d1384c9b0310d6453a4c088f8ad742a0ef1a5ba864e8543808efc90632f79ddbb
+  metadata.gz: a77a2cf678894a71dc0c5f0fa985be61d5f4d506d7fec15afec417a1409cf1fc1de4b31dce4e96ab161f84ef1d34a69b12e642af2fbbd907eca542af72ec5930
+  data.tar.gz: bd098828cb0a4900c887f9fbe5c6f79c4939501f87b3ce1ee35e3ec3af12ef57c32c136bb4a760749f7f05cc8678c2082f1bab0cdc2c14ce43304e5d2bf4239a

data/Rakefile

@@ -10,23 +10,8 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'SeemsRateable'
   rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('README.md')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
 Bundler::GemHelper.install_tasks
-
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
-
-Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each {|f| load f }
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-task :default => :spec
-
-
-
-

data/lib/seems_rateable/model.rb

@@ -3,7 +3,7 @@ require 'active_support/concern'
 module SeemsRateable
   module Model
     extend ActiveSupport::Concern
-      
+
     def rate(stars, user_id, dimension=nil)
       if !has_rated?(user_id, dimension)
         self.rates.create do |r|
@@ -16,26 +16,25 @@ module SeemsRateable
         update_users_rating(stars, user_id, dimension)
       else
         raise Errors::AlreadyRatedError
-      end   
+      end
     end
-      
+
     def update_overall_average_rating(stars, dimension=nil)
-      if average(dimension).nil?
-        CachedRating.create do |r|
+      r = average(dimension)
+      if r.nil?
+        self.rate_averages.create do |r|
           r.avg = stars
           r.dimension = dimension
-          r.cacheable_id = self.id
-          r.cacheable_type = self.class.name
           r.cnt = 1
-        end           
+        end
       else
-       r = average(dimension)
-       r.avg = (r.avg * r.cnt + stars) / (r.cnt+1)
-       r.cnt += 1
-       r.save!
+        r.avg = (r.avg * r.cnt + stars) / (r.cnt+1)
+        r.cnt += 1
+        r.save!
+        r
       end
     end
-      
+
     def update_users_rating(stars, user_id, dimension=nil)
       obj = rates(dimension).where(:rater_id => user_id).first
       current_record = average(dimension)
@@ -44,69 +43,49 @@ module SeemsRateable
       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
+      rate_averages.where(dimension: dimension).first
     end
-      
+
     def rates(dimension=nil)
-      if dimension.nil?
-        self.send "rates_without_dimension"
-      else
-        self.send "#{dimension}_rates"
-      end
+      rates_all.where(dimension: dimension)
     end
-    
+
     def raters(dimension=nil)
-      if dimension.nil?
-        self.send "raters_without_dimension"
-      else
-        self.send "#{dimension}_raters"
-      end
+      raters_all.where('seems_rateable_rates.dimension = ?', dimension)
     end
-      
+
     def has_rated?(user_id, dimension=nil)
       record = self.rates(dimension).where(:rater_id => user_id)
-      record.empty? ? false : true        
-    end   
-      
+      record.empty? ? false : true
+    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 :raters_without_dimension, :through => :rates_without_dimension, :source => :rater
-        has_one :rate_average_without_dimension, -> { where(dimension: nil) }, :as => :cacheable, :class_name => SeemsRateable::CachedRating, :dependent => :destroy
-        
-        @permission = opts[:allow_update] ? true : false    
-        
-        def self.can_update?      
-          @permission
+        has_many :rates_all, :as => :rateable, :class_name => SeemsRateable::Rate, :dependent => :destroy
+        has_many :raters_all, :through => :rates_all, :class_name => SeemsRateable::Engine.config.owner_class, :source => :rater
+        has_many :rate_averages, :as => :cacheable, :class_name => SeemsRateable::CachedRating, :dependent => :destroy
+
+        self.class_variable_set(:@@permission, opts[:allow_update] ? true : false)
+
+        def self.can_update?
+          self.class_variable_get(:@@permission)
         end
-        
+
         def self.rateable?
           true
         end
-        
-        if opts[:dimensions].is_a?(Array)
-          opts[:dimensions].each do |dimension|
-            has_many :"#{dimension}_rates", -> { where(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", -> { where(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
   end
 end

data/lib/seems_rateable/version.rb

@@ -1,3 +1,3 @@
 module SeemsRateable
-  VERSION = "1.0.12"
+  VERSION = "1.0.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seems_rateable
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Peter Toth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-20 00:00:00.000000000 Z
+date: 2014-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -151,3 +151,4 @@ signing_key:
 specification_version: 4
 summary: Star Rating Engine
 test_files: []
+has_rdoc: