custom_sort 0.4.02 → 0.4.07

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8a936142d2208136ff22002af705d7034650b934058600ea1e544a4cc5d5d0e
-  data.tar.gz: 3a8abf264ee95fe32ab0ef7163c6f7eb522d0f60413ebafa70abfa5795450d28
+  metadata.gz: 722f4ad4bb8ff604ac7b481e2f51153f952235e341ad87975d39ace75653fa5d
+  data.tar.gz: eac40061c9d950bb0a83ea72fe88e474df1b3b919952da6b816402b8214f6db9
 SHA512:
-  metadata.gz: 11076fe8473f6a7df30eae9b690063229a8d961200d3152df8d19537c90b49afede2ec0a9f899b1b61811e5d9025c6f2248062f46718225cdb51bd2739042a54
-  data.tar.gz: 4f687926e1a3aedee2070a873f626f91b1bf458b8ee25bfcc6761cebad28b32e62ec1ea311f7a0e3209f8da6989fc12c7ac7cf251f0d9099fd91e66266a05c1b
+  metadata.gz: 20aa137fc8c67df5cff97ffc469c281d11ab2b5e80cc015dd7cd7cdb444087c4e42ab609d28e336470417830e4c79f513f4558c1daa8498e14b162a8ebe1d1ca
+  data.tar.gz: c4abd3aeb40c5fbd0a2c53fde15491be7c200cfcf5427a0a22fd028017bb56e6e6b755460886157234c85dc5d0de888dbbeb9b0f800528aaac2a158082c3d28d

data/lib/custom_sort.rb

@@ -14,7 +14,11 @@ module CustomSort
   class Error < StandardError; end
   # Your code goes here...
 
-  FIELDS = [:blended,:blended_recent,:quality,:interesting,:learned,:votes,:nofeedback,:nojoin] # [:second, :minute, :hour, :day, :week, :month, :quarter, :year, :day_of_week, :hour_of_day, :minute_of_hour, :day_of_month, :day_of_year, :month_of_year]
+  # currently, :labeled requires a vote_scope/label as well, the other queries ignore vote_scope
+  FIELDS = [:labeled,:blended,:quality,:interesting,:learned,:votes,:nofeedback,:nojoin] # [:second, :minute, :hour, :day, :week, :month, :quarter, :year, :day_of_week, :hour_of_day, :minute_of_hour, :day_of_month, :day_of_year, :month_of_year]
+  
+  LABELS = [:quality,:interesting,:fun,:funny,:learnedfrom,:spam,:ad,:clickbait,:english]
+
   METHODS = FIELDS.map { |v| :"customsort_by_#{v}" } + [:customsort_by_field]
   LAMBDA_VALUES = [-0.02445,-0.0489,-0.0990, nil]
 
@@ -26,8 +30,8 @@ module CustomSort
     def initialize
 
     end
-    def self.time_decay table_name
-      "EXTRACT(EPOCH FROM (NOW()::timestamp - #{table_name}.created_at::timestamp))/(24*60*60)"
+    def self.time_decay table_name, time_column = "created_at"
+      "EXTRACT(EPOCH FROM (NOW()::timestamp - #{table_name}.#{time_column}::timestamp))/(24*60*60)"
     end
     
     def self.time_decay_adjusted table_name, lambda_key

data/lib/custom_sort/magic_new.rb

@@ -2,13 +2,19 @@ require "i18n"
 
 module CustomSort
   class MagicNew
-    attr_accessor :query_name, :recency_key, :options
+    attr_accessor :query_name, :label, :sort_order, :recency_key, :recent, :options
 
     def initialize(query_name:, **options)
         @query_name = query_name
         @options = options
 
+        @recent = options[:recent] == false ? false : true
         @recency_key = options[:recency_key] ? options[:recency_key].to_i : 2
+        @label = options[:label] ? options[:label] : nil
+        @label = @label.nil? ? CustomSort::LABELS[0].to_s : @label
+
+        @sort_order = options[:sort_order] ? (["asc","desc"].include?(options[:sort_order].downcase) ? options[:sort_order] : "desc") : "desc"
+        
     end
 
     def self.validate_period(period, permit)
@@ -46,7 +52,10 @@ module CustomSort
             relation,
             column: field,
             query_name: magic.query_name,
-            recency_key: magic.recency_key
+            recent: magic.recent,
+            recency_key: magic.recency_key,
+            label: magic.label,
+            sort_order: magic.sort_order
           ).generate
 
         relation

data/lib/custom_sort/relation_builder.rb

@@ -1,18 +1,21 @@
 module CustomSort
     class RelationBuilder
-      attr_reader :query_name, :column, :recency_key #, :period
+      attr_reader :query_name, :column, :recency_key, :label #, :period
       #, :period, :day_start, :week_start, :n_seconds
       
       #def initialize(relation, column:, period:, time_zone:, time_range:, week_start:, day_start:, n_seconds:)
-      def initialize(relation, column:, query_name:, recency_key:)
+      def initialize(relation, column:, query_name:, recency_key:, label: nil, sort_order: "DESC", recent: true)
         @relation = relation
         @column = resolve_column(relation, column) unless column.nil?
         @query_name = query_name
         @table_name = resolve_table(relation) #"items"
         @class_name = resolve_class(relation)
         
-        @recency = true
+        @recent = recent == false ? recent : true
         @lambda_key = recency_key #2
+        @sort_order = sort_order
+
+        @label = label #label.nil? ? CustomSort::LABELS[0].to_s : label
 
         #if relation.default_timezone == :local
         #  raise CustomSort::Error, "ActiveRecord::Base.default_timezone must be :utc to use Groupdate"
@@ -24,17 +27,38 @@ module CustomSort
 
         case query_name
         when "nojoin"
-            @relation.where(*where_clause).order(order_clause)
+            @relation.select(net_score_col).select(time_decay_col).where(*where_clause).order(order_clause)
         else
-            @relation.joins(join_clause).where(*where_clause).order(order_clause)
+            @relation.select(net_score_col).select(time_decay_col).joins(join_clause).where(*where_clause).order(order_clause)
         end
       end
   
       private
+        def default_sort_col
+            "created_at"
+        end
+        def sort_order
+            ["asc","desc"].include?(@sort_order.downcase) ? @sort_order : "desc"
+        end
+        
+        def net_score_col
+            "#{net_score} as net_score"
+        end
+        def net_score
+            case query_name
+            when "nofeedback","nojoin"
+                time_decay
+            else
+                sort_col
+            end
+        end
 
+        def time_decay_col
+            "#{time_decay} as time_decay" 
+        end
         
         def time_decay
-            CustomSort::SortFields.time_decay_adjusted(@table_name,@lambda_key)
+            @recent ? CustomSort::SortFields.time_decay_adjusted(@table_name,@lambda_key) : 1
         end
 
         def quality_min
@@ -67,6 +91,10 @@ module CustomSort
             end
             "(#{cols.join(" + ")})"
         end
+        def labeled_col
+            "(cached_weighted_#{@label}_average * cached_weighted_#{@label}_total)"
+        end
+
         def blended_where vote_filter_col
             cols = []
             CustomSort.blended_columns.each do |col|
@@ -77,28 +105,29 @@ module CustomSort
             ["#{vote_filter_col} = ? AND #{cols.join(" AND ")}",@class_name]
         end
 
+        def labeled_where vote_filter_col
+            ["#{vote_filter_col} = ?",@class_name]
+        end
+
         def data_table
             CustomSort.data_table
         end
   
-        def order_clause
+        def sort_col
             case query_name
-            when "quality"
-                sort_col = quality_col
-            when "interesting"
-                sort_col = interesting_col
-            when "learned"
-                sort_col = learned_col
-            when "blended"
-                sort_col = blended_col
+            when "quality", "interesting","learned","blended","labeled"
+                "(#{time_decay}*#{send(query_name+"_col")})"
             when "blended_recent"
-                sort_col = "(#{time_decay}*#{blended_col})"
+                "(#{time_decay}*#{blended_col})"
             when "nofeedback","nojoin"
-                sort_col = "created_at"
+                default_sort_col
             else
-                sort_col = votes_col
+                votes_col
             end
-            sort_col + " DESC"
+        end
+        
+        def order_clause
+            sort_col + " " + sort_order
         end
 
         def join_clause
@@ -117,8 +146,10 @@ module CustomSort
             vote_filter_col = "#{data_table}.resource_type"
             #base_query = ["vote_caches.resource_type = ?",@class_name]
             case query_name
-            when "blended", "blended_recent"
+            when "blended"
                 query = blended_where vote_filter_col
+            when "weighted"
+                query = weighted_where vote_filter_col
             when "interesting"
                 query = ["#{vote_filter_col} = ? AND #{interesting_col} > ?",@class_name, interesting_min]
             when "learned"

data/lib/custom_sort/version.rb

@@ -1,3 +1,3 @@
 module CustomSort
-  VERSION = "0.4.02"
-end
+  VERSION = "0.4.07"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: custom_sort
 version: !ruby/object:Gem::Version
-  version: 0.4.02
+  version: 0.4.07
 platform: ruby
 authors:
 - Scott Merritt