popularable 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87cb950ce8fbcb244d3331dcf656e052dceeaaea
-  data.tar.gz: 26d563f2c0906f4972abd6b47d2e50f3474ed701
+  metadata.gz: 7e979b1fa4cea6c06ffe15b203b29a79457c68f2
+  data.tar.gz: 240ec42fce12117ddaa1d22d42958013b735a336
 SHA512:
-  metadata.gz: 777d98c936990f73114222162de22048daa5525c18171cbfe2aae061d4191d03077308078e4be1312058d150b2d228bdfd6fbb8aef2a8ee8207fe4c57827fd68
-  data.tar.gz: 94997b2e73c3cee9c47981d448f1484f124ea5bc97544475939a8acd34182f44b03e071f884c3ca418b3dcf02ef5df27ba696d852a7c0bcd763486196bf5ede3
+  metadata.gz: 271bb74de44fb2bd37196347347aae4a6fb13e7d3697ff0fb433488a5b424f61e70ee4004fbb0885d3fa8888eaff7119a838e591b464993587ac76e7c9b2104c
+  data.tar.gz: 713c2e4266b42a12133d87ad966f90b4a430e1abff297172e94826711740e5b6eed6361eb71297e522617582e48addb71b0e3570a6bd8d4dcfb7e6f68ecdca8a

data/.gitignore

@@ -36,6 +36,7 @@ rerun.txt
 pickle-email-*.html
 .DS_Store
 *.swp
+*.gem
 
 # Ignore application configuration
 /config/application.yml

data/lib/concerns/popularable.rb

@@ -5,15 +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,      -> { find_by_sql( ["SELECT " + self.table_name + ".*, 0 + SUM(popularable_popularity_events.popularity) AS popularity FROM " + self.table_name + " 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 >= ? GROUP BY " + self.table_name + ".id ORDER BY popularity DESC", Time.now.to_date] ) }
-
-      scope :popular_this_week,  -> { find_by_sql( ["SELECT " + self.table_name + ".*, 0 + SUM(popularable_popularity_events.popularity) AS popularity FROM " + self.table_name + " 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 >= ? GROUP BY " + self.table_name + ".id ORDER BY popularity DESC", Time.now.beginning_of_week.to_date] ) }
-
-      scope :popular_this_month, -> { find_by_sql( ["SELECT " + self.table_name + ".*, 0 + SUM(popularable_popularity_events.popularity) AS popularity FROM " + self.table_name + " 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 >= ? GROUP BY " + self.table_name + ".id ORDER BY popularity DESC", Time.now.beginning_of_month.to_date] ) }
-
-      scope :popular_this_year,  -> { find_by_sql( ["SELECT " + self.table_name + ".*, 0 + SUM(popularable_popularity_events.popularity) AS popularity FROM " + self.table_name + " 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 >= ? GROUP BY " + self.table_name + ".id ORDER BY popularity DESC", Time.now.beginning_of_year.to_date] ) }
-
-      scope :popular_all_time,   -> { find_by_sql( ["SELECT " + self.table_name + ".*, 0 + SUM(popularable_popularity_events.popularity) AS popularity FROM " + self.table_name + " 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 + "') GROUP BY " + self.table_name + ".id ORDER BY popularity DESC"] ) }
+      scope :popular_today,      -> { 
+        popular_since( Time.now.beginning_of_day )
+      }
+
+      scope :popular_this_week,  -> { 
+        popular_since( Time.now.beginning_of_week )
+      }
+      
+      scope :popular_this_month, -> { 
+        popular_since( Time.now.beginning_of_month )
+      }
+      
+      scope :popular_this_year,  -> { 
+        popular_since( Time.now.beginning_of_year )
+      }
+
+      scope :popular_all_time,   -> { 
+        popular_since( Time.now - 100.years )
+      }
+      
+      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" )
+      }
 
       has_many :popularable_popularity_events, as: :popularable
 

data/lib/popularable/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: popularable
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Jeff McFadden