rasti-db 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b41f6198798c9bee6da1f94742378639bb3b900f3bda6471f791b42a71a24c7
-  data.tar.gz: f470e1f1ef5673546e54e6c144e16ebba577b0f848b8fd59c8822489808a7cbf
+  metadata.gz: 3166fff22e51aca6cd07d0994d1bf6170438e0bc9aed41e90370a83920a0d9ff
+  data.tar.gz: 73e64013ec42740653058f0d9ff6c37ee45de41be0312f2296e4926fb7bff5b4
 SHA512:
-  metadata.gz: f5e836d580a42656efe1d78ee2e193449edd1adf45dbccd0a4b4c9c4d6f263a0d92e844a142abb908a683a8dcad4865d5926aec10b5a0260c0240425dcd063dd
-  data.tar.gz: 71148abafe56a6fe60613f2ebfa38138df2aaa656bdbe7116a834d41f3920fb49b97bfffac3235a520a6ffbb293184310d2d7fcefa552178d1cb767b94ce8e4d
+  metadata.gz: 55c6fc7f5b3ef1d904f252e6d54c595b5d4cb72f1fbdf67f3e577c9cc095bd838f0963f34f611f6b7069971f7ead1d96d7dd20864dbcfea8ed542c5a3008dfdc
+  data.tar.gz: 3b6c0136ba9823832cf329b3efe78406e69ea92d6d90f89950652628de740ea675a8b7d7152e530838f269b9b32140fa7f80750bcc2b41af70c9efc2b275cd78

data/README.md

@@ -93,7 +93,7 @@ User     = Rasti::DB::Model[:id, :name, :posts, :comments, :person]
 Post     = Rasti::DB::Model[:id, :title, :body, :user_id, :user, :comments, :categories]
 Comment  = Rasti::DB::Model[:id, :text, :user_id, :user, :post_id, :post]
 Category = Rasti::DB::Model[:id, :name, :posts]
-Person   = Rasti::DB::Model[:document_number, :first_name, :last_name, :birth_date, :user_id, :user]
+Person   = Rasti::DB::Model[:document_number, :first_name, :last_name, :full_name, :birth_date, :user_id, :user]
 Language = Rasti::DB::Model[:id, :name, :people]
 ```
 
@@ -111,10 +111,10 @@ class Posts < Rasti::DB::Collection
   many_to_many :categories
   one_to_many :comments
 
-  query :created_by do |user_id| 
+  query :created_by do |user_id|
     where user_id: user_id
   end
-  
+
   query :entitled, -> (title) { where title: title }
 
   query :commented_by do |user_id|
@@ -144,6 +144,10 @@ class People < Rasti::DB::Collection
 
   many_to_one :user
   many_to_many :languages
+
+  computed_attribute :full_name do
+    Rasti::DB::ComputedAttribute.new Sequel.join([:first_name, ' ', :last_name])
+  end
 end
 
 class Languages < Rasti::DB::Collection
@@ -210,6 +214,10 @@ posts.all_attributes # => [Post, ...]
 posts.graph('user.person').select_graph_attributes(user: [:id], 'user.person': [:last_name, :user_id]) # => [Post, ...]
 posts.graph('user.person').exclude_graph_attributes(user: [:name], 'user.person': [:first_name, :last_name]) # => [Post, ...]
 posts.graph('user.person').all_graph_attributes('user.person') # => [Post, ...]
+
+posts.each { |post| do_something post } # Iterate posts loading all at first
+posts.each(batch_size: 1000) { |post| do_something post } # Iterate posts loading in batches
+posts.each_batch(size: 1000) { |posts| do_something posts } # Iterate batches of posts
 ```
 ### Natural Query Language
 

data/lib/rasti/db/collection.rb

@@ -14,7 +14,7 @@ module Rasti
         end
 
         def collection_attributes
-          @collection_attributes ||= model.attributes - relations.keys
+          @collection_attributes ||= model.attributes - relations.keys - computed_attributes.keys
         end
 
         def primary_key
@@ -47,6 +47,10 @@ module Rasti
           @queries ||= Hash::Indifferent.new
         end
 
+        def computed_attributes
+          @computed_attributes ||= Hash::Indifferent.new
+        end
+
         private
 
         def set_collection_name(collection_name)
@@ -91,6 +95,11 @@ module Rasti
           end
         end
 
+        def computed_attribute(name, &block)
+          raise "Computed Attribute #{name} already exists" if computed_attributes.key? name
+          computed_attributes[name] = block.call
+        end
+
       end
 
       def initialize(environment)

data/lib/rasti/db/computed_attribute.rb

@@ -0,0 +1,22 @@
+module Rasti
+  module DB
+    class ComputedAttribute
+
+      attr_reader :identifier
+
+      def initialize(identifier, &join)
+        @identifier = identifier
+        @join = join
+      end
+
+      def apply_join(dataset)
+        join ? join.call(dataset) : dataset
+      end
+
+      private
+
+      attr_reader :join
+
+    end
+  end
+end

data/lib/rasti/db/nql/nodes/attribute.rb

@@ -0,0 +1,37 @@
+module Rasti
+  module DB
+    module NQL
+      module Nodes
+        class Attribute < Treetop::Runtime::SyntaxNode
+
+          def identifier(collection_class)
+            if computed? collection_class
+              collection_class.computed_attributes[column].identifier
+            else
+              tables.empty? ? Sequel[column] : Sequel[tables.join('__').to_sym][column]
+            end
+          end
+
+          def tables
+            _tables.elements.map{ |e| e.table.text_value }
+          end
+
+          def column
+            _column.text_value.to_sym
+          end
+
+          def computed_attributes(collection_class)
+            computed?(collection_class) ? [column] : []
+          end
+
+          private
+
+          def computed?(collection_class)
+            collection_class.computed_attributes.key? column
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/rasti/db/nql/nodes/binary_node.rb

@@ -8,6 +8,10 @@ module Rasti
             values.flat_map(&:dependency_tables)
           end
 
+          def computed_attributes(collection_class)
+            left.computed_attributes(collection_class) | right.computed_attributes(collection_class)
+          end
+
           def values
             @values ||= values_for(left) + values_for(right)
           end

data/lib/rasti/db/nql/nodes/comparisons/base.rb

@@ -6,7 +6,11 @@ module Rasti
           class Base < Treetop::Runtime::SyntaxNode
 
             def dependency_tables
-              field.tables.empty? ? [] : [field.tables.join('.')]
+              attribute.tables.empty? ? [] : [attribute.tables.join('.')]
+            end
+
+            def computed_attributes(collection_class)
+              attribute.computed_attributes(collection_class)
             end
 
           end

data/lib/rasti/db/nql/nodes/comparisons/equal.rb

@@ -5,8 +5,8 @@ module Rasti
         module Comparisons
           class Equal < Base
 
-            def filter_condition
-              { field.identifier => argument.value }
+            def filter_condition(collection_class)
+              { attribute.identifier(collection_class) => argument.value }
             end
 
           end

data/lib/rasti/db/nql/nodes/comparisons/greater_than.rb

@@ -5,8 +5,8 @@ module Rasti
         module Comparisons
           class GreaterThan < Base
 
-            def filter_condition
-              field.identifier > argument.value
+            def filter_condition(collection_class)
+              attribute.identifier(collection_class) > argument.value
             end
 
           end

data/lib/rasti/db/nql/nodes/comparisons/greater_than_or_equal.rb

@@ -5,8 +5,8 @@ module Rasti
         module Comparisons
           class GreaterThanOrEqual < Base
 
-            def filter_condition
-              field.identifier >= argument.value
+            def filter_condition(collection_class)
+              attribute.identifier(collection_class) >= argument.value
             end
 
           end

data/lib/rasti/db/nql/nodes/comparisons/include.rb

@@ -5,8 +5,8 @@ module Rasti
         module Comparisons
           class Include < Base
 
-            def filter_condition
-              Sequel.ilike(field.identifier, "%#{argument.value}%")
+            def filter_condition(collection_class)
+              Sequel.ilike(attribute.identifier(collection_class), "%#{argument.value}%")
             end
 
           end

data/lib/rasti/db/nql/nodes/comparisons/less_than.rb

@@ -5,8 +5,8 @@ module Rasti
         module Comparisons
           class LessThan < Base
 
-            def filter_condition
-              field.identifier < argument.value
+            def filter_condition(collection_class)
+              attribute.identifier(collection_class) < argument.value
             end
 
           end

data/lib/rasti/db/nql/nodes/comparisons/less_than_or_equal.rb

@@ -5,8 +5,8 @@ module Rasti
         module Comparisons
           class LessThanOrEqual < Base
 
-            def filter_condition
-              field.identifier <= argument.value
+            def filter_condition(collection_class)
+              attribute.identifier(collection_class) <= argument.value
             end
             
           end

data/lib/rasti/db/nql/nodes/comparisons/like.rb

@@ -5,8 +5,8 @@ module Rasti
         module Comparisons
           class Like < Base
 
-            def filter_condition
-              Sequel.ilike(field.identifier, argument.value)
+            def filter_condition(collection_class)
+              Sequel.ilike(attribute.identifier(collection_class), argument.value)
             end
 
           end

data/lib/rasti/db/nql/nodes/comparisons/not_equal.rb

@@ -5,8 +5,8 @@ module Rasti
         module Comparisons
           class NotEqual < Base
 
-            def filter_condition
-              Sequel.negate(field.identifier => argument.value)
+            def filter_condition(collection_class)
+              Sequel.negate(attribute.identifier(collection_class) => argument.value)
             end
 
           end

data/lib/rasti/db/nql/nodes/comparisons/not_include.rb

@@ -5,8 +5,8 @@ module Rasti
         module Comparisons
           class NotInclude < Base
 
-            def filter_condition
-              ~ Sequel.ilike(field.identifier, "%#{argument.value}%")
+            def filter_condition(collection_class)
+              ~ Sequel.ilike(attribute.identifier(collection_class), "%#{argument.value}%")
             end
 
           end

data/lib/rasti/db/nql/nodes/conjunction.rb

@@ -4,8 +4,8 @@ module Rasti
       module Nodes
         class Conjunction < BinaryNode
 
-          def filter_condition
-            Sequel.&(*values.map(&:filter_condition))
+          def filter_condition(collection_class)
+            Sequel.&(*values.map { |value| value.filter_condition(collection_class) } )
           end
 
         end

data/lib/rasti/db/nql/nodes/disjunction.rb

@@ -4,8 +4,8 @@ module Rasti
       module Nodes
         class Disjunction < BinaryNode
 
-          def filter_condition
-            Sequel.|(*values.map(&:filter_condition))
+          def filter_condition(collection_class)
+            Sequel.|(*values.map { |value| value.filter_condition(collection_class) } )
           end
 
         end

data/lib/rasti/db/nql/nodes/parenthesis_sentence.rb

@@ -8,8 +8,12 @@ module Rasti
             sentence.dependency_tables
           end
 
-          def filter_condition
-            sentence.filter_condition
+          def computed_attributes(collection_class)
+            sentence.computed_attributes(collection_class)
+          end
+
+          def filter_condition(collection_class)
+            sentence.filter_condition collection_class
           end
 
         end

data/lib/rasti/db/nql/nodes/sentence.rb

@@ -8,8 +8,12 @@ module Rasti
             proposition.dependency_tables
           end
 
-          def filter_condition
-            proposition.filter_condition
+          def computed_attributes(collection_class)
+            proposition.computed_attributes collection_class
+          end
+
+          def filter_condition(collection_class)
+            proposition.filter_condition collection_class
           end
 
         end

data/lib/rasti/db/nql/syntax.rb

@@ -433,14 +433,14 @@ module Rasti
           r0
         end
 
-        module Field0
+        module Attribute0
           def table
             elements[0]
           end
 
         end
 
-        module Field1
+        module Attribute1
           def _tables
             elements[0]
           end
@@ -450,10 +450,10 @@ module Rasti
           end
         end
 
-        def _nt_field
+        def _nt_attribute
           start_index = index
-          if node_cache[:field].has_key?(index)
-            cached = node_cache[:field][index]
+          if node_cache[:attribute].has_key?(index)
+            cached = node_cache[:attribute][index]
             if cached
               cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
               @index = cached.interval.end
@@ -465,7 +465,7 @@ module Rasti
           s1, i1 = [], index
           loop do
             i2, s2 = index, []
-            r3 = _nt_field_name
+            r3 = _nt_attribute_name
             s2 << r3
             if r3
               if has_terminal?('.', false, index)
@@ -479,7 +479,7 @@ module Rasti
             end
             if s2.last
               r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
-              r2.extend(Field0)
+              r2.extend(Attribute0)
             else
               @index = i2
               r2 = nil
@@ -493,24 +493,24 @@ module Rasti
           r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
           s0 << r1
           if r1
-            r5 = _nt_field_name
+            r5 = _nt_attribute_name
             s0 << r5
           end
           if s0.last
-            r0 = instantiate_node(Nodes::Field,input, i0...index, s0)
-            r0.extend(Field1)
+            r0 = instantiate_node(Nodes::Attribute,input, i0...index, s0)
+            r0.extend(Attribute1)
           else
             @index = i0
             r0 = nil
           end
 
-          node_cache[:field][start_index] = r0
+          node_cache[:attribute][start_index] = r0
 
           r0
         end
 
         module ComparisonInclude0
-          def field
+          def attribute
             elements[0]
           end
 
@@ -535,7 +535,7 @@ module Rasti
           end
 
           i0, s0 = index, []
-          r1 = _nt_field
+          r1 = _nt_attribute
           s0 << r1
           if r1
             s2, i2 = [], index
@@ -591,7 +591,7 @@ module Rasti
         end
 
         module ComparisonNotInclude0
-          def field
+          def attribute
             elements[0]
           end
 
@@ -616,7 +616,7 @@ module Rasti
           end
 
           i0, s0 = index, []
-          r1 = _nt_field
+          r1 = _nt_attribute
           s0 << r1
           if r1
             s2, i2 = [], index
@@ -672,7 +672,7 @@ module Rasti
         end
 
         module ComparisonLike0
-          def field
+          def attribute
             elements[0]
           end
 
@@ -697,7 +697,7 @@ module Rasti
           end
 
           i0, s0 = index, []
-          r1 = _nt_field
+          r1 = _nt_attribute
           s0 << r1
           if r1
             s2, i2 = [], index
@@ -753,7 +753,7 @@ module Rasti
         end
 
         module ComparisonGreaterThan0
-          def field
+          def attribute
             elements[0]
           end
 
@@ -778,7 +778,7 @@ module Rasti
           end
 
           i0, s0 = index, []
-          r1 = _nt_field
+          r1 = _nt_attribute
           s0 << r1
           if r1
             s2, i2 = [], index
@@ -834,7 +834,7 @@ module Rasti
         end
 
         module ComparisonGreaterThanOrEqual0
-          def field
+          def attribute
             elements[0]
           end
 
@@ -859,7 +859,7 @@ module Rasti
           end
 
           i0, s0 = index, []
-          r1 = _nt_field
+          r1 = _nt_attribute
           s0 << r1
           if r1
             s2, i2 = [], index
@@ -915,7 +915,7 @@ module Rasti
         end
 
         module ComparisonLessThan0
-          def field
+          def attribute
             elements[0]
           end
 
@@ -940,7 +940,7 @@ module Rasti
           end
 
           i0, s0 = index, []
-          r1 = _nt_field
+          r1 = _nt_attribute
           s0 << r1
           if r1
             s2, i2 = [], index
@@ -996,7 +996,7 @@ module Rasti
         end
 
         module ComparisonLessThanOrEqual0
-          def field
+          def attribute
             elements[0]
           end
 
@@ -1021,7 +1021,7 @@ module Rasti
           end
 
           i0, s0 = index, []
-          r1 = _nt_field
+          r1 = _nt_attribute
           s0 << r1
           if r1
             s2, i2 = [], index
@@ -1077,7 +1077,7 @@ module Rasti
         end
 
         module ComparisonNotEqual0
-          def field
+          def attribute
             elements[0]
           end
 
@@ -1102,7 +1102,7 @@ module Rasti
           end
 
           i0, s0 = index, []
-          r1 = _nt_field
+          r1 = _nt_attribute
           s0 << r1
           if r1
             s2, i2 = [], index
@@ -1158,7 +1158,7 @@ module Rasti
         end
 
         module ComparisonEqual0
-          def field
+          def attribute
             elements[0]
           end
 
@@ -1183,7 +1183,7 @@ module Rasti
           end
 
           i0, s0 = index, []
-          r1 = _nt_field
+          r1 = _nt_attribute
           s0 << r1
           if r1
             s2, i2 = [], index
@@ -1311,10 +1311,10 @@ module Rasti
           r0
         end
 
-        def _nt_field_name
+        def _nt_attribute_name
           start_index = index
-          if node_cache[:field_name].has_key?(index)
-            cached = node_cache[:field_name][index]
+          if node_cache[:attribute_name].has_key?(index)
+            cached = node_cache[:attribute_name][index]
             if cached
               cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
               @index = cached.interval.end
@@ -1343,7 +1343,7 @@ module Rasti
             r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
           end
 
-          node_cache[:field_name][start_index] = r0
+          node_cache[:attribute_name][start_index] = r0
 
           r0
         end