custom_sort 0.4.04 → 0.4.05

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b1388dee282745a5a3b3dd0057b3cd353438c04960628d51bb7d815551776be
-  data.tar.gz: 3e827f529101221c05d5155484b5e439a5c7bc38cea7756ffbd3683821340515
+  metadata.gz: 4ec3e7a04be42e6df24706c1a72c0b91df7f6f97028c16d89b3db7c69b5d5ab6
+  data.tar.gz: 711ce9ea889046979a3f6134c5058fccf479c2a28e6ec3dac7d681370e5395ba
 SHA512:
-  metadata.gz: 3c599fda9a65f20b1e2d2117c2a0502f77beea22eb31baf2d45a006af5a53c4bbf1fcf11274af9b8553b0fa92976f8a97133fefda0756dbe64ee736f29b161d0
-  data.tar.gz: 2c96f8f718ce75756e441305cd69ba0db57abe5e93aab38af9ba9bdee9b90928502f9bfe209e7c687fbeca6504b872b100d4b2d22ee998d516e15269e4951cc2
+  metadata.gz: 83346e7300f3538aa3bae03a6f2b79f99b294938afd261359da7699b3ca2f2aee03b6bd6a70c9e16c422e217c070def494764aa6c5f3f0efa01eceeaa2cf43ec
+  data.tar.gz: b6a26765ebf86373c5cf597e4875cca0f14c93a2e00f9f133ffddf3cb607b7e00e971e693b72accdda83f2072e57eae99f32b728d258baa9e89496745b55d3dc

data/lib/custom_sort.rb

@@ -15,7 +15,7 @@ module CustomSort
   # Your code goes here...
 
   # 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]
+  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]
 
@@ -30,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,15 +2,18 @@ require "i18n"
 
 module CustomSort
   class MagicNew
-    attr_accessor :query_name, :recency_key, :label, :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
 
@@ -49,8 +52,10 @@ module CustomSort
             relation,
             column: field,
             query_name: magic.query_name,
+            recent: magic.recent,
             recency_key: magic.recency_key,
-            label: magic.label
+            label: magic.label,
+            sort_order: magic.sort_order
           ).generate
 
         relation

data/lib/custom_sort/relation_builder.rb

@@ -4,15 +4,16 @@ module CustomSort
       #, :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:, label: nil)
+      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
 
@@ -36,6 +37,9 @@ module CustomSort
         def default_sort_col
             "created_at"
         end
+        def sort_order
+            ["asc","desc"].include?(@sort_order.downcase) ? @sort_order : "desc"
+        end
         
         def net_score_col
             "#{sort_col} as net_score"
@@ -46,7 +50,7 @@ module CustomSort
         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
@@ -97,9 +101,6 @@ module CustomSort
             ["#{vote_filter_col} = ?",@class_name]
         end
 
-
-       
-
         def data_table
             CustomSort.data_table
         end
@@ -107,7 +108,7 @@ module CustomSort
         def sort_col
             case query_name
             when "quality", "interesting","learned","blended","labeled"
-                send(query_name+"_col")
+                "(#{time_decay}*#{send(query_name+"_col")})"
             when "blended_recent"
                 "(#{time_decay}*#{blended_col})"
             when "nofeedback","nojoin"
@@ -118,7 +119,7 @@ module CustomSort
         end
         
         def order_clause
-            sort_col + " DESC"
+            sort_col + sort_order
         end
 
         def join_clause
@@ -137,7 +138,7 @@ 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

data/lib/custom_sort/version.rb

@@ -1,3 +1,3 @@
 module CustomSort
-  VERSION = "0.4.04"
+  VERSION = "0.4.05"
 end

metadata

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