rasti-db 1.4.0 → 2.2.0

data/spec/relations_spec.rb

@@ -30,14 +30,19 @@ describe 'Relations' do
       relation.many_to_one?.must_equal false
       relation.many_to_many?.must_equal false
       relation.one_to_one?.must_equal false
+
+      relation.from_one?.must_equal true
+      relation.from_many?.must_equal false
+      relation.to_one?.must_equal false
+      relation.to_many?.must_equal true
     end
 
     it 'Graph' do
       user_id = db[:users].insert name: 'User 1'
-      1.upto(2) { |i| db[:posts].insert user_id: user_id, title: "Post #{i}", body: '...' }
+      1.upto(2) { |i| db[:posts].insert user_id: user_id, title: "Post #{i}", body: '...', language_id: 1 }
       rows = db[:users].all
       
-      Users.relations[:posts].graph_to rows, db
+      Users.relations[:posts].fetch_graph environment, rows
       
       rows[0][:posts].must_equal posts.where(user_id: user_id).all
     end
@@ -72,14 +77,19 @@ describe 'Relations' do
       relation.many_to_one?.must_equal true
       relation.many_to_many?.must_equal false
       relation.one_to_one?.must_equal false
+
+      relation.from_one?.must_equal false
+      relation.from_many?.must_equal true
+      relation.to_one?.must_equal true
+      relation.to_many?.must_equal false
     end
 
     it 'Graph' do
       user_id = db[:users].insert name: 'User 1'
-      db[:posts].insert user_id: user_id, title: 'Post 1', body: '...'
+      db[:posts].insert user_id: user_id, title: 'Post 1', body: '...', language_id: 1
       rows = db[:posts].all
 
-      Posts.relations[:user].graph_to rows, db
+      Posts.relations[:user].fetch_graph environment, rows
 
       rows[0][:user].must_equal users.first
     end
@@ -120,12 +130,17 @@ describe 'Relations' do
       relation.many_to_one?.must_equal false
       relation.many_to_many?.must_equal true
       relation.one_to_one?.must_equal false
+
+      relation.from_one?.must_equal false
+      relation.from_many?.must_equal true
+      relation.to_one?.must_equal false
+      relation.to_many?.must_equal true
     end
 
     it 'Graph' do
       user_id = db[:users].insert name: 'User 1'
 
-      1.upto(2) { |i| db[:posts].insert user_id: user_id, title: "Post #{i}", body: '...' }
+      1.upto(2) { |i| db[:posts].insert user_id: user_id, title: "Post #{i}", body: '...', language_id: 1 }
 
       1.upto(4) { |i| db[:categories].insert name: "Category #{i}" }
 
@@ -136,7 +151,7 @@ describe 'Relations' do
 
       rows = db[:posts].all
 
-      Posts.relations[:categories].graph_to rows, db
+      Posts.relations[:categories].fetch_graph environment, rows
 
       rows[0][:categories].must_equal categories.where(id: [1,2]).all
       rows[1][:categories].must_equal categories.where(id: [3,4]).all
@@ -172,6 +187,11 @@ describe 'Relations' do
       relation.many_to_one?.must_equal false
       relation.many_to_many?.must_equal false
       relation.one_to_one?.must_equal true
+
+      relation.from_one?.must_equal true
+      relation.from_many?.must_equal false
+      relation.to_one?.must_equal true
+      relation.to_many?.must_equal false
     end
 
     it 'Graph' do
@@ -186,7 +206,7 @@ describe 'Relations' do
 
       rows = db[:users].all
 
-      Users.relations[:person].graph_to rows, db
+      Users.relations[:person].fetch_graph environment, rows
 
       2.times do |i|
         rows[i][:person].must_equal people.find("document_#{i}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasti-db
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-08 00:00:00.000000000 Z
+date: 2020-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -112,20 +112,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: hierarchical_graph
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: hash_ext
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -249,9 +277,12 @@ files:
 - lib/rasti-db.rb
 - lib/rasti/db.rb
 - lib/rasti/db/collection.rb
-- lib/rasti/db/helpers.rb
+- lib/rasti/db/computed_attribute.rb
+- lib/rasti/db/data_source.rb
+- lib/rasti/db/environment.rb
 - lib/rasti/db/model.rb
 - lib/rasti/db/nql/invalid_expression_error.rb
+- lib/rasti/db/nql/nodes/attribute.rb
 - lib/rasti/db/nql/nodes/binary_node.rb
 - lib/rasti/db/nql/nodes/comparisons/base.rb
 - lib/rasti/db/nql/nodes/comparisons/equal.rb
@@ -272,14 +303,13 @@ files:
 - lib/rasti/db/nql/nodes/constants/time.rb
 - lib/rasti/db/nql/nodes/constants/true.rb
 - lib/rasti/db/nql/nodes/disjunction.rb
-- lib/rasti/db/nql/nodes/field.rb
 - lib/rasti/db/nql/nodes/parenthesis_sentence.rb
 - lib/rasti/db/nql/nodes/sentence.rb
 - lib/rasti/db/nql/syntax.rb
 - lib/rasti/db/nql/syntax.treetop
 - lib/rasti/db/query.rb
 - lib/rasti/db/relations/base.rb
-- lib/rasti/db/relations/graph_builder.rb
+- lib/rasti/db/relations/graph.rb
 - lib/rasti/db/relations/many_to_many.rb
 - lib/rasti/db/relations/many_to_one.rb
 - lib/rasti/db/relations/one_to_many.rb
@@ -293,9 +323,11 @@ files:
 - lib/rasti/db/version.rb
 - rasti-db.gemspec
 - spec/collection_spec.rb
+- spec/computed_attribute_spec.rb
 - spec/coverage_helper.rb
 - spec/minitest_helper.rb
 - spec/model_spec.rb
+- spec/nql/computed_attributes_spec.rb
 - spec/nql/dependency_tables_spec.rb
 - spec/nql/filter_condition_spec.rb
 - spec/nql/syntax_parser_spec.rb
@@ -328,9 +360,11 @@ specification_version: 4
 summary: Database collections and relations
 test_files:
 - spec/collection_spec.rb
+- spec/computed_attribute_spec.rb
 - spec/coverage_helper.rb
 - spec/minitest_helper.rb
 - spec/model_spec.rb
+- spec/nql/computed_attributes_spec.rb
 - spec/nql/dependency_tables_spec.rb
 - spec/nql/filter_condition_spec.rb
 - spec/nql/syntax_parser_spec.rb

data/lib/rasti/db/helpers.rb

@@ -1,16 +0,0 @@
-module Rasti
-  module DB
-    module Helpers
-      module WithSchema
-
-        private
-
-        def with_schema(table, field=nil)
-          qualified_table = schema ? Sequel[schema][table] : Sequel[table]
-          field ? Sequel[qualified_table][field] : qualified_table
-        end
-
-      end
-    end
-  end
-end

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

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

data/lib/rasti/db/relations/graph_builder.rb

@@ -1,60 +0,0 @@
-module Rasti
-  module DB
-    module Relations
-      class GraphBuilder
-        class << self
-
-          def graph_to(rows, relations, collection_class, db, schema=nil)
-            return if rows.empty?
-
-            parse(relations).each do |relation_name, nested_relations|
-              relation = get_relation collection_class, relation_name
-              relation.graph_to rows, db, schema, nested_relations
-            end
-          end
-
-          def joins_to(dataset, relations, collection_class, schema=nil)
-            ds = recursive_joins dataset, recursive_parse(relations), collection_class, schema
-            qualified_collection_name = schema ? Sequel[schema][collection_class.collection_name] : Sequel[collection_class.collection_name]
-            ds.distinct.select_all(qualified_collection_name)
-          end
-
-          private
-
-          def get_relation(collection_class, relation_name)
-            raise "Undefined relation #{relation_name} for #{collection_class}" unless collection_class.relations.key? relation_name
-            collection_class.relations[relation_name]
-          end
-
-          def parse(relations)
-            relations.each_with_object({}) do |relation, hash|
-              tail = relation.to_s.split '.'
-              head = tail.shift.to_sym
-              hash[head] ||= []
-              hash[head] << tail.join('.') unless tail.empty?
-            end
-          end
-
-          def recursive_parse(relations)
-            parse(relations).each_with_object({}) do |(key, value), hash|
-              hash[key] = recursive_parse value
-            end
-          end
-
-          def recursive_joins(dataset, joins, collection_class, schema, prefix=nil)
-            joins.each do |relation_name, nested_joins|
-              relation = get_relation collection_class, relation_name
-
-              dataset = relation.join_to dataset, schema, prefix
-
-              dataset = recursive_joins dataset, nested_joins, relation.target_collection_class, schema, relation.join_relation_name(prefix) unless nested_joins.empty?
-            end
-
-            dataset
-          end
-
-        end
-      end
-    end
-  end
-end