activecube 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 219e2133090d27d2c5af643c31657ea1882d9a6e17c5e93dbe3fa8e9c977ca41
-  data.tar.gz: 184e6baf918fbe1ab6098f5209519cd3d33f1b4eda6c385e36146aebfd4f0936
+  metadata.gz: 07ee0a4ed85e2f44c15312a2fb5db85b51216c762b11841a6bbeccfe0f61feb1
+  data.tar.gz: e8d1e9cafbdbfae253795a7e800c58c5440b58f8cf2114ed22b4c3939d3b84d8
 SHA512:
-  metadata.gz: da5c6da9bbccd5269039be4cd2232eb1e9c5972aeaa3dcdc62a592dc3ba0c769f470a04a91e0ed71044792fb7a65f8c8eef2e5e663b948a572989a544391639a
-  data.tar.gz: 1e7e2802abdc89ef0cf41a06c9f96822a2c48f6dbe2db91c0ab97b198f4de857919d61c3c3ffe2ef5cda8be4942becac6337557fa4fd81514f225bbd79c7f64d
+  metadata.gz: c71efd229e58542bb67a2013f2931977cd32bed9c561d6b2f868ddd84584fd2b0d148d2381cdc456d0cb6e63379387fffffa8ced761125124609689476c0de3a
+  data.tar.gz: 4e9d3e28aabfc5abe471db21018db200da52e16c0ca38327bacde36eec88ca16dc8f0592dddb07bc295b31e7c7a3acb4d45044c6f9785dcd013f1fa820369971

data/Gemfile.lock

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

data/lib/activecube/query/cube_query.rb

@@ -2,7 +2,6 @@ require 'activecube/query/chain_appender'
 require 'activecube/query/item'
 require 'activecube/query/limit'
 require 'activecube/query/measure'
-require 'activecube/query/or_selector'
 require 'activecube/query/ordering'
 require 'activecube/query/selector'
 require 'activecube/query/slice'
@@ -109,7 +108,7 @@ module Activecube::Query
       end
 
       unless reduced_measures.detect{|rm| rm.selectors.empty? }
-        reduced_selectors += [OrSelector.new(reduced_measures.map(&:selectors).flatten.uniq)]
+        reduced_selectors += [Selector.or(reduced_measures.map(&:selectors).flatten.uniq)]
       end
 
       return self if (reduced_measures == self.measures) && (reduced_selectors == self.selectors)

data/lib/activecube/query/selector.rb

@@ -8,6 +8,35 @@ module Activecube::Query
         'not_eq' => 'not_in'
     }
 
+    class CombineSelector < Selector
+
+      def initialize selectors, operator
+        @selectors = selectors
+        @operator = operator
+      end
+
+      def required_column_names
+        @selectors.map(&:required_column_names).uniq
+      end
+
+      def to_s
+        "Selector any(#{@selectors.map(&:to_s).join(',')})"
+      end
+
+      def expression model, arel_table, cube_query
+        expr = nil
+        @selectors.each do |s|
+          expr = expr ? expr.send(@operator, s.expression(model, arel_table, cube_query)) : s.expression(model, arel_table, cube_query)
+        end
+        expr
+      end
+
+      def append_query model, cube_query, arel_table, query
+        query.where expression(model, arel_table, cube_query)
+      end
+
+    end
+
     class Operator
 
       attr_reader :operation, :argument
@@ -107,5 +136,13 @@ module Activecube::Query
       "Selector #{super}"
     end
 
+    def self.or(selectors)
+      CombineSelector.new(selectors, :or)
+    end
+
+    def self.and(selectors)
+      CombineSelector.new(selectors, :and)
+    end
+
   end
 end

data/lib/activecube/version.rb

@@ -1,3 +1,3 @@
 module Activecube
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activecube
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Aleksey Studnev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-14 00:00:00.000000000 Z
+date: 2020-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -111,7 +111,6 @@ files:
 - lib/activecube/query/measure.rb
 - lib/activecube/query/measure_nothing.rb
 - lib/activecube/query/modification.rb
-- lib/activecube/query/or_selector.rb
 - lib/activecube/query/ordering.rb
 - lib/activecube/query/selector.rb
 - lib/activecube/query/slice.rb

data/lib/activecube/query/or_selector.rb

@@ -1,22 +0,0 @@
-require 'activecube/query/selector'
-
-module Activecube
-  module Query
-    class OrSelector < Selector
-
-      attr_reader :selectors
-      def initialize selectors
-        @selectors = selectors
-      end
-
-      def append_query model, cube_query, table, query
-        expr = nil
-        selectors.each do |s|
-          expr = expr ? expr.or(s.expression model, table, cube_query) : s.expression(model, table, cube_query)
-        end
-        query.where(expr)
-      end
-
-    end
-  end
-end