activecube 0.1.39 → 0.1.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 849b74aa2966edb904085a1ffe0f0ac9b0450dcb6bc21ab81741ab4b246c25a4
-  data.tar.gz: '05138c6ffd9311667dabfe3b98ff2c7e432f77e5a12a89d7675b75284ec3d696'
+  metadata.gz: 7074b394ca4949bf0bedae97ac91b59ef8d742cb7c6ab77e5409345d77caa7bd
+  data.tar.gz: e7872e83b417e7e9d34acd329627e68d8d1424771e507fd345bd4edac0bc04e9
 SHA512:
-  metadata.gz: 77c933cba35f04f5611d94da571db185505d81eda693d89b84ebbd952762095f2a561b2745a387bca9b61ce75ea2103a083975b96d3c8ae0f2707b73295df6be
-  data.tar.gz: 5998bae42643d1a360b354653d894238365d2079c0ee67571c1ef1a7c566432333ef4c39c26045847b98ab91b6cab83286a82a57c9a296133dee28201b1fc59d
+  metadata.gz: 693c8954a658b15c5f6f314b189fbff0a13777a8a84fbf1354d70610dabc903ef7be60475a4253e5bdd72e067a4a31aaaddb0821fa4949a4347be0abd5d28c02
+  data.tar.gz: 2a04854410822d43e2b4e29b53c062cdf59b971137978081147133956fd1108e2bd1b633782347075e7aa81cc9d237d8da92d148f5064d4697ee20d3be56944c

data/Gemfile.lock

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

data/lib/activecube/processor/composer.rb

@@ -75,9 +75,7 @@ module Activecube::Processor
       measures_by_tables = measure_tables.group_by(&:table)
       measures_by_tables.each_pair do |table, list|
         @models << table.model
-        reduce_options = measures_by_tables.count==1 ? cube_query.options : []
-        reduced = cube_query.reduced list.map(&:measure), reduce_options
-        table_query = table.query reduced
+        table_query = table.query cube_query
         composed_query = composed_query ? table.join(cube_query, composed_query, table_query) : table_query
       end
       composed_query

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|
@@ -124,36 +140,6 @@ module Activecube::Query
       (measures.map(&:selectors) + slices.map(&:selectors) + selectors).flatten.map(&:required_column_names).flatten.uniq
     end
 
-    def reduced other_measures, other_options
-
-      common_selectors = []
-      other_measures.each_with_index do |m,i|
-        if i==0
-          common_selectors += m.selectors
-        else
-          common_selectors &= m.selectors
-        end
-      end
-
-      if common_selectors.empty?
-        reduced_measures = other_measures
-        reduced_selectors = self.selectors
-      else
-        reduced_measures = other_measures.collect{|m|
-          Measure.new m.cube, m.key, m.definition, (m.selectors - common_selectors), m.modifications
-        }
-        reduced_selectors = self.selectors + common_selectors
-      end
-
-      unless reduced_measures.detect{|rm| rm.selectors.empty? }
-        reduced_selectors += [Selector.or(reduced_measures.map(&:selectors).flatten.uniq)]
-      end
-
-      return self if (reduced_measures == self.measures) && (reduced_selectors == self.selectors)
-
-      CubeQuery.new cube, slices, reduced_measures, reduced_selectors, other_options, tables
-    end
-
     def join_fields
       slices.map(&:group_by_columns).flatten.uniq
     end
@@ -168,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
@@ -13,7 +13,6 @@ module Activecube
 
     def connected_to database: nil, role: nil, &block
       raise Activecube::InputArgumentError, "Must pass block to method" unless block_given?
-      raise "Database not defined" unless database
       super_model.connected_to(database: database, role: role) do
         @database = database
         @role = role

data/lib/activecube/version.rb

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

metadata

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