custom_sort 0.4.03 → 0.4.04

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0c16cb0f36675e44f51915fbe66ae39256481edb407a1d366e3b3ca735942ed
-  data.tar.gz: 8414db0f014acccd5d7e5b736728ffdda788b9fc7d4625dece0acfe916d8845a
+  metadata.gz: 9b1388dee282745a5a3b3dd0057b3cd353438c04960628d51bb7d815551776be
+  data.tar.gz: 3e827f529101221c05d5155484b5e439a5c7bc38cea7756ffbd3683821340515
 SHA512:
-  metadata.gz: fef53e1038cae0510db6fedf7f8a911aba496a0e21abee47fdf45b40b30ef57751335faaa96bceb7617065d8c89fee23eb3a6e255fc25b600d471e91e205b33e
-  data.tar.gz: 6ade261b33d3c754c6518912075377a230710c0ec56b58aeadb9f3d01648df09e08de3b2f562a018d49e0b0950037373b352715bf2d1998d8ccb539a24fe9695
+  metadata.gz: 3c599fda9a65f20b1e2d2117c2a0502f77beea22eb31baf2d45a006af5a53c4bbf1fcf11274af9b8553b0fa92976f8a97133fefda0756dbe64ee736f29b161d0
+  data.tar.gz: 2c96f8f718ce75756e441305cd69ba0db57abe5e93aab38af9ba9bdee9b90928502f9bfe209e7c687fbeca6504b872b100d4b2d22ee998d516e15269e4951cc2

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,: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]
+  
+  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]
 

data/lib/custom_sort/magic_new.rb

@@ -2,13 +2,16 @@ require "i18n"
 
 module CustomSort
   class MagicNew
-    attr_accessor :query_name, :recency_key, :options
+    attr_accessor :query_name, :recency_key, :label, :options
 
     def initialize(query_name:, **options)
         @query_name = query_name
         @options = options
 
         @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
+        
     end
 
     def self.validate_period(period, permit)
@@ -46,7 +49,8 @@ module CustomSort
             relation,
             column: field,
             query_name: magic.query_name,
-            recency_key: magic.recency_key
+            recency_key: magic.recency_key,
+            label: magic.label
           ).generate
 
         relation

data/lib/custom_sort/relation_builder.rb

@@ -1,10 +1,10 @@
 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)
         @relation = relation
         @column = resolve_column(relation, column) unless column.nil?
         @query_name = query_name
@@ -14,6 +14,8 @@ module CustomSort
         @recency = true
         @lambda_key = recency_key #2
 
+        @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"
         #end
@@ -77,6 +79,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|
@@ -87,20 +93,21 @@ 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 sort_col
             case query_name
-            when "quality"
-                quality_col
-            when "interesting"
-                interesting_col
-            when "learned"
-                learned_col
-            when "blended"
-                blended_col
+            when "quality", "interesting","learned","blended","labeled"
+                send(query_name+"_col")
             when "blended_recent"
                 "(#{time_decay}*#{blended_col})"
             when "nofeedback","nojoin"
@@ -132,6 +139,8 @@ module CustomSort
             case query_name
             when "blended", "blended_recent"
                 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.03"
-end
+  VERSION = "0.4.04"
+end

metadata

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