activecube 0.1.41 → 0.1.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 566db205500299f766f3971b9692e876926ca5ff1f65fbfea78a8c19ed4c501d
-  data.tar.gz: 33c2890756ea8fba2d4dc28a877fcf21891a56783d63a996d5bf3c5cfde14033
+  metadata.gz: 7074b394ca4949bf0bedae97ac91b59ef8d742cb7c6ab77e5409345d77caa7bd
+  data.tar.gz: e7872e83b417e7e9d34acd329627e68d8d1424771e507fd345bd4edac0bc04e9
 SHA512:
-  metadata.gz: 54316348e68e897854789e8a7dd3ac628fbab5b1c1b4e4fa877faff72ecbe42ebe2a589c77f31b2287af0c40dc03efd8da9467bba6eaa59466c4951cb9c6d638
-  data.tar.gz: aed6fcd142c56ef9f56a84b9efb00bab50a7b96090d9d4379653991dc387b6ae1d7249da5170389422d57ca683b4e9f853eb3549559d1e160db5583be8dcc2bc
+  metadata.gz: 693c8954a658b15c5f6f314b189fbff0a13777a8a84fbf1354d70610dabc903ef7be60475a4253e5bdd72e067a4a31aaaddb0821fa4949a4347be0abd5d28c02
+  data.tar.gz: 2a04854410822d43e2b4e29b53c062cdf59b971137978081147133956fd1108e2bd1b633782347075e7aa81cc9d237d8da92d148f5064d4697ee20d3be56944c

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    activecube (0.1.40)
+    activecube (0.1.41)
       activerecord (>= 5.2)
 
 GEM

data/lib/activecube/query/cube_query.rb

@@ -61,6 +61,14 @@ module Activecube::Query
       self
     end
 
+    def desc_by_integer *args
+      clear_sql
+      args.each{|arg|
+        options << Ordering.new(arg, :desc, options = {with_length: true})
+      }
+      self
+    end
+
     def asc *args
       clear_sql
       args.each{|arg|
@@ -69,6 +77,14 @@ module Activecube::Query
       self
     end
 
+    def asc_by_integer *args
+      clear_sql
+      args.each{|arg|
+        options << Ordering.new(arg, :asc, options = {with_length: true})
+      }
+      self
+    end
+
     def offset *args
       clear_sql
       args.each{|arg|
@@ -138,4 +154,4 @@ module Activecube::Query
       @composed = nil
     end
   end
-end
+end

data/lib/activecube/query/ordering.rb

@@ -2,15 +2,21 @@ module Activecube
   module Query
     class Ordering
 
-      attr_reader :argument, :direction
-      def initialize argument, direction
+      attr_reader :argument, :direction, :options
+      def initialize argument, direction, options = {}
         @argument = argument
         @direction = direction
+        @options = options
       end
 
       def append_query _model, _cube_query, _table, query
-        text = argument.to_s.split(',').map{|s| quote s}.join(',')
-        query.order(::Arel.sql(text).send(direction))
+        @text = argument.to_s.split(',').map{|s| quote s}.join(',')
+
+        if options[:with_length]
+          return by_length_order(query)
+        end
+
+        simple_order(query)
       end
 
       def quote s
@@ -21,6 +27,21 @@ module Activecube
         end
       end
 
+      private
+
+      attr_reader :text
+
+      def simple_order(query)
+        query.order(::Arel.sql(text).send(direction))
+      end
+
+      def by_length_order(query)
+        query.order(
+          ::Arel.sql("LENGTH(#{text})").send(direction),
+          ::Arel.sql(text).send(direction)
+        )
+      end
+
     end
   end
-end
+end

data/lib/activecube/query_methods.rb

@@ -5,7 +5,7 @@ module Activecube
 
     attr_reader :database, :role
 
-    [:slice, :measure, :when, :desc, :asc, :limit, :offset].each do |method|
+    [:slice, :measure, :when, :desc, :desc_by_integer, :asc, :asc_by_integer, :limit, :offset].each do |method|
       define_method(method) do |*args|
         Query::CubeQuery.new(self).send method, *args
       end

data/lib/activecube/version.rb

@@ -1,3 +1,3 @@
 module Activecube
-  VERSION = "0.1.41"
+  VERSION = "0.1.42"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activecube
 version: !ruby/object:Gem::Version
-  version: 0.1.41
+  version: 0.1.42
 platform: ruby
 authors:
 - Aleksey Studnev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-03 00:00:00.000000000 Z
+date: 2022-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord