popularable 1.2.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7e979b1fa4cea6c06ffe15b203b29a79457c68f2
-  data.tar.gz: 240ec42fce12117ddaa1d22d42958013b735a336
+SHA256:
+  metadata.gz: '064497b0e513cb12f5576493808768c138dc33ad745b23c5b7091c45ac078987'
+  data.tar.gz: ea65be967f9c675cdff2bea3f0ecbf6364e9642cc0311728d87c56a0ec1e41f6
 SHA512:
-  metadata.gz: 271bb74de44fb2bd37196347347aae4a6fb13e7d3697ff0fb433488a5b424f61e70ee4004fbb0885d3fa8888eaff7119a838e591b464993587ac76e7c9b2104c
-  data.tar.gz: 713c2e4266b42a12133d87ad966f90b4a430e1abff297172e94826711740e5b6eed6361eb71297e522617582e48addb71b0e3570a6bd8d4dcfb7e6f68ecdca8a
+  metadata.gz: 2c911cac3ce70dea9760a520296c2c538655371047028dff2094cb4710eb0362790366549f419633a57b33fe89d4737a577b43911882cb9c802956ba032dca5b
+  data.tar.gz: 043eb3b48552d0e2d70fc4af001e3570e002419158915a2bfe9a87f94a6ae0d427238bb0f0edcec7acc8df22ceea834f026c5e6519b1e98fa207325b111180ea

data/lib/concerns/popularable.rb

@@ -5,28 +5,29 @@ module Popularable
     included do
       # scope :order_by_recent_popularity, -> { .joins( "LEFT OUTER JOIN popularable_popularity_events ON (" + self.to_s.pluralize.underscore + ".id = popularable_popularity_events.popularable_id AND popularable_popularity_events.popularable_type = '" + self.to_s + "')").where( ["popularable_popularity_events.popularity_event_date >= ?", 1.month.ago] ).group( self.to_s.pluralize.underscore + ".id" ).order( "popularity DESC" ) }
 
-      scope :popular_today,      -> { 
+      scope :popular_today,      -> {
         popular_since( Time.now.beginning_of_day )
       }
 
-      scope :popular_this_week,  -> { 
+      scope :popular_this_week,  -> {
         popular_since( Time.now.beginning_of_week )
       }
-      
-      scope :popular_this_month, -> { 
+
+      scope :popular_this_month, -> {
         popular_since( Time.now.beginning_of_month )
       }
-      
-      scope :popular_this_year,  -> { 
+
+      scope :popular_this_year,  -> {
         popular_since( Time.now.beginning_of_year )
       }
 
-      scope :popular_all_time,   -> { 
-        popular_since( Time.now - 100.years )
+      scope :popular_all_time,   -> {
+        # This uses an inner join and ditches the unnecessary where clause for performance.
+        select( "#{self.table_name}.*, 0 + SUM(popularable_popularity_events.popularity) AS popularity").joins( "INNER JOIN popularable_popularity_events ON (#{self.table_name}.id = popularable_popularity_events.popularable_id AND popularable_popularity_events.popularable_type = '#{self.name}')").group( "#{self.table_name}.id" ).order( "popularity DESC" )
       }
-      
+
       scope :popular_since, -> (since){
-        select( "#{self.table_name}.*, 0 + SUM(popularable_popularity_events.popularity) AS popularity").joins( "LEFT OUTER JOIN popularable_popularity_events ON (#{self.table_name}.id = popularable_popularity_events.popularable_id AND popularable_popularity_events.popularable_type = '#{self.to_s}')").where( "popularable_popularity_events.popularity_event_date >= ?", since.to_date ).group( "#{MediaItem.table_name}.id" ).order( "popularity DESC" )
+        select( "#{self.table_name}.*, 0 + SUM(popularable_popularity_events.popularity) AS popularity").joins( "LEFT OUTER JOIN popularable_popularity_events ON (#{self.table_name}.id = popularable_popularity_events.popularable_id AND popularable_popularity_events.popularable_type = '#{self.name}')").where( "popularable_popularity_events.popularity_event_date >= ?", since.to_date ).group( "#{self.table_name}.id" ).order( "popularity DESC" )
       }
 
       has_many :popularable_popularity_events, as: :popularable
@@ -35,12 +36,37 @@ module Popularable
         true
       end
 
+      # Count methods
+      def popular_count_today
+        popular_count_since(Time.now.beginning_of_day)
+      end
+
+      def popular_count_this_week
+        popular_count_since(Time.now.beginning_of_week)
+      end
+
+      def popular_count_this_month
+        popular_count_since(Time.now.beginning_of_month)
+      end
+
+      def popular_count_this_year
+        popular_count_since(Time.now.beginning_of_year)
+      end
+
+      def popular_count_all_time
+        popular_count_since(Time.now - 100.years)
+      end
+
+      def popular_count_since(since = Time.now)
+        popularable_popularity_events.where( "popularable_popularity_events.popularity_event_date >= ?", since.to_date ).sum( :popularity )
+      end
+
     end
 
     def bump_popularity!( popularity_add_value = 1, popularity_event_time = Time.now )
       popularable_popularity_event = self.popularable_popularity_events.find_or_create_by( popularity_event_date: popularity_event_time.to_date )
 
-      popularable_popularity_event.update_attributes( popularity: popularable_popularity_event.popularity.to_i + popularity_add_value )
+      popularable_popularity_event.update( popularity: popularable_popularity_event.popularity.to_i + popularity_add_value )
     end
   end
-end
+end

data/lib/popularable/version.rb

@@ -1,5 +1,5 @@
 module Popularable
   module Rails
-    VERSION = "1.2.0"
+    VERSION = "1.4.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: popularable
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Jeff McFadden
@@ -76,8 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Organize your models by a historical popularity value