rasti-db 2.3.2 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 335b135a71edd9bbb047407d8a288094a19f58b6c2e481837bf4406c06605350
-  data.tar.gz: 89c5da3b13e1a1f9a82faaa2eb414bc063d72c8588b35c4871deb44d189c3d5b
+  metadata.gz: c26c0f818529ec0d1a752cf310c1d23cf235d2c8c83e13a62d8d61bc90b3b400
+  data.tar.gz: 57022ffbb145a76ad9532d16a1ed890f31862f7fc6ad4cea6d40aae0490908ca
 SHA512:
-  metadata.gz: b27407dcb968c5dc6056a50160cc06b6e89f7008623f0ea2234294195080ebc153da762a79a32618740c79915ff7a5424368f58ed5ee64ff951cd1c4e6f9dc32
-  data.tar.gz: 77203709a9d842b819aaca51b789a8ac4c27fcd269f617f680530da18ce96607f610c13c4b78b72a91b75a1be4487efcb66e7daaeb7025a89888397799f2b128
+  metadata.gz: 94746821604273fdf6483d5410f8c73f4793901116478a17d3ecba6e7039705ecf8cf5b8ad0ccb30adb294d052ff144c6d0fe5ca042ca1fd558e3caf5c45de62
+  data.tar.gz: '0684ae374582f8cd633d44aacd720e80b3575e3ef8186de2252d9f73e17f03fe438a54a407127bb320f9ec8996f3f5dc71c99294b503c28797e34faf4c886f22'

data/.travis.yml

@@ -8,6 +8,7 @@ rvm:
   - 2.5
   - 2.6
   - 2.7
+  - 3.0
   - jruby-9.2.9.0
   - ruby-head
   - jruby-head

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rasti-db.gemspec
-gemspec
+gemspec

data/lib/rasti/db.rb

@@ -1,4 +1,5 @@
 require 'sequel'
+require 'rasti-model'
 require 'consty'
 require 'time'
 require 'timing'
@@ -15,13 +16,13 @@ module Rasti
     extend MultiRequire
     extend ClassConfig
 
-    require_relative 'db/query'
-    require_relative_pattern  'db/relations/*'
-    require_relative_pattern  'db/type_converters/postgres_types/*'
-    require_relative_pattern  'db/type_converters/sqlite_types/*'
-    require_relative 'db/nql/nodes/constants/base'
-    require_relative_pattern  'db/nql/filter_condition_strategies/types/*'
-    require_relative_pattern  'db/**/*'
+    require_relative         'db/query'
+    require_relative_pattern 'db/relations/*'
+    require_relative_pattern 'db/type_converters/postgres_types/*'
+    require_relative_pattern 'db/type_converters/sqlite_types/*'
+    require_relative         'db/nql/nodes/constants/base'
+    require_relative_pattern 'db/nql/filter_condition_strategies/types/*'
+    require_relative_pattern 'db/**/*'
 
     attr_config :type_converters, []
     attr_config :nql_filter_condition_strategy, nil

data/lib/rasti/db/collection.rb

@@ -14,7 +14,7 @@ module Rasti
         end
 
         def collection_attributes
-          @collection_attributes ||= model.attributes - relations.keys - computed_attributes.keys
+          @collection_attributes ||= model.attribute_names - relations.keys - computed_attributes.keys
         end
 
         def primary_key
@@ -89,7 +89,7 @@ module Rasti
           raise "Query #{name} already exists" if queries.key? name
 
           queries[name] = lambda || block
-          
+
           define_method name do |*args|
             default_query.instance_exec(*args, &self.class.queries.fetch(name))
           end
@@ -210,21 +210,21 @@ module Rasti
       def qualified_collection_name
         data_source.qualify self.class.collection_name
       end
-      
+
       def qualify(collection_name, data_source_name: nil)
         data_source_name ||= self.class.data_source_name
         environment.qualify data_source_name, collection_name
       end
 
       def default_query
-        Query.new collection_class: self.class, 
-                  dataset: dataset.select_all(self.class.collection_name), 
+        Query.new collection_class: self.class,
+                  dataset: dataset.select_all(self.class.collection_name),
                   environment: environment
       end
 
       def build_query(filter=nil, &block)
         raise ArgumentError, 'must specify filter hash or block' if filter.nil? && block.nil?
-        
+
         if filter
           default_query.where(filter)
         else
@@ -233,7 +233,7 @@ module Rasti
       end
 
       def transform_attributes_to_db(attributes)
-        attributes.each_with_object({}) do |(attribute_name, value), result| 
+        attributes.each_with_object({}) do |(attribute_name, value), result|
           transformed_value = Rasti::DB.to_db data_source.db, qualified_collection_name, attribute_name, value
           result[attribute_name] = transformed_value
         end
@@ -247,7 +247,7 @@ module Rasti
 
         [collection_attributes, relations_ids]
       end
-      
+
       def save_relations(primary_key, relations_primary_keys)
         relations_primary_keys.each do |relation_name, relation_primary_keys|
           relation = self.class.relations[relation_name]
@@ -281,9 +281,9 @@ module Rasti
         relation_data_source = environment.data_source relation.relation_data_source_name
         relation_collection_name = relation_data_source.qualify relation.relation_collection_name
 
-        values = relation_primary_keys.map do |relation_pk| 
+        values = relation_primary_keys.map do |relation_pk|
           {
-            relation.source_foreign_key => primary_key, 
+            relation.source_foreign_key => primary_key,
             relation.target_foreign_key => relation_pk
           }
         end

data/lib/rasti/db/computed_attribute.rb

@@ -9,8 +9,8 @@ module Rasti
         @join = join
       end
 
-      def apply_join(dataset)
-        join ? join.call(dataset) : dataset
+      def apply_join(dataset, environment)
+        join ? join.call(dataset, environment) : dataset
       end
 
       private

data/lib/rasti/db/data_source.rb

@@ -12,7 +12,7 @@ module Rasti
       def qualify(collection_name)
         schema ? Sequel[schema][collection_name] : Sequel[collection_name]
       end
-      
+
     end
   end
 end

data/lib/rasti/db/model.rb

@@ -1,112 +1,11 @@
 module Rasti
   module DB
-    class Model
+    class Model < Rasti::Model
 
-      class UninitializedAttributeError < StandardError
-
-        attr_reader :attribute
-
-        def initialize(attribute)
-          @attribute = attribute
-          super "Uninitialized attribute #{attribute}"
-        end
-
-      end
-
-
-      class << self
-
-        def [](*attribute_names)
-          Class.new(self) do
-            attribute(*attribute_names)
-
-            def self.inherited(subclass)
-              subclass.instance_variable_set :@attributes, attributes.dup
-            end
-          end
-        end
-
-        def attributes
-          @attributes ||= []
-        end
-
-        def model_name
-          name || self.superclass.name
-        end
-
-        def to_s
-          "#{model_name}[#{attributes.join(', ')}]"
-        end
-        alias_method :inspect, :to_s
-
-        private
-
-        def attribute(*names)
-          names.each do |name|
-            raise ArgumentError, "Attribute #{name} already exists" if attributes.include?(name)
-            
-            attributes << name
-
-            define_method name do
-              fetch_attribute name
-            end
-          end
-        end
-
-      end
-
-
-      def initialize(attributes)
-        invalid_attributes = attributes.keys - self.class.attributes
-        raise "#{self.class.model_name} invalid attributes: #{invalid_attributes.join(', ')}" unless invalid_attributes.empty?
-        @attributes = attributes
-      end
-
-      def merge(new_attributes)
-        self.class.new attributes.merge(new_attributes)
-      end
-
-      def eql?(other)
-        instance_of?(other.class) && to_h.eql?(other.to_h)
-      end
-
-      def ==(other)
-        other.kind_of?(self.class) && to_h == other.to_h
-      end
-
-      def hash
-        attributes.map(&:hash).hash
-      end
-
-      def to_s
-        "#<#{self.class.model_name}[#{attributes.map { |n,v| "#{n}: #{v.inspect}" }.join(', ')}]>"
-      end
-      alias_method :inspect, :to_s
-
-      def to_h
-        self.class.attributes.each_with_object({}) do |name, hash|
-          if attributes.key? name
-            value = fetch_attribute name
-            case value
-            when Model
-              hash[name] = value.to_h
-            when Array
-              hash[name] = value.map do |e|
-                e.is_a?(Model) ? e.to_h : e
-              end
-            else
-              hash[name] = value
-            end
-          end
-        end
-      end
-      
       private
 
-      attr_reader :attributes
-
-      def fetch_attribute(name)
-        attributes.key?(name) ? Rasti::DB.from_db(attributes[name]) : raise(UninitializedAttributeError, name)
+      def cast_attribute(type, value)
+        super type, Rasti::DB.from_db(value)
       end
 
     end

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

@@ -3,7 +3,7 @@ module Rasti
     module NQL
       module Nodes
         class BinaryNode < Treetop::Runtime::SyntaxNode
-          
+
           def dependency_tables
             values.flat_map(&:dependency_tables)
           end

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

@@ -3,7 +3,7 @@ module Rasti
     module NQL
       module Nodes
         class ParenthesisSentence < Treetop::Runtime::SyntaxNode
-        
+
           def dependency_tables
             sentence.dependency_tables
           end

data/lib/rasti/db/query.rb

@@ -60,7 +60,7 @@ module Rasti
       def select_computed_attributes(*computed_attributes)
         ds = computed_attributes.inject(dataset) do |ds, name|
           computed_attribute = collection_class.computed_attributes[name]
-          computed_attribute.apply_join(ds).select_append(computed_attribute.identifier.as(name))
+          computed_attribute.apply_join(ds, environment).select_append(computed_attribute.identifier.as(name))
         end
         build_query dataset: ds
       end
@@ -138,7 +138,7 @@ module Rasti
         raise NQL::InvalidExpressionError.new(filter_expression) if sentence.nil?
 
         ds = sentence.computed_attributes(collection_class).inject(dataset) do |ds, name|
-          collection_class.computed_attributes[name].apply_join ds
+          collection_class.computed_attributes[name].apply_join ds, environment
         end
         query = build_query dataset: ds
 

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

@@ -2,7 +2,7 @@ module Rasti
   module DB
     module Relations
       class Base
-        
+
         include Sequel::Inflections
 
         attr_reader :name, :source_collection_class
@@ -63,10 +63,10 @@ module Rasti
 
         def validate_join!
           if source_collection_class.data_source_name != target_collection_class.data_source_name
-            raise "Invalid join of multiple data sources: #{source_collection_class.data_source_name}.#{source_collection_class.collection_name} > #{target_collection_class.data_source_name}.#{target_collection_class.collection_name}" 
+            raise "Invalid join of multiple data sources: #{source_collection_class.data_source_name}.#{source_collection_class.collection_name} > #{target_collection_class.data_source_name}.#{target_collection_class.collection_name}"
           end
         end
-        
+
       end
     end
   end

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

@@ -6,15 +6,15 @@ module Rasti
         def initialize(environment, collection_class, relations=[], selected_attributes={}, excluded_attributes={})
           @environment = environment
           @collection_class = collection_class
-          @graph = build_graph relations, 
-                               Hash::Indifferent.new(selected_attributes), 
+          @graph = build_graph relations,
+                               Hash::Indifferent.new(selected_attributes),
                                Hash::Indifferent.new(excluded_attributes)
         end
 
         def merge(relations:[], selected_attributes:{}, excluded_attributes:{})
-          Graph.new environment, 
-                    collection_class, 
-                    (flat_relations | relations), 
+          Graph.new environment,
+                    collection_class,
+                    (flat_relations | relations),
                     flat_selected_attributes.merge(selected_attributes),
                     flat_excluded_attributes.merge(excluded_attributes)
         end
@@ -22,7 +22,7 @@ module Rasti
         def with_all_attributes_for(relations)
           relations_with_all_attributes = relations.map { |r| [r, nil] }.to_h
 
-          merge selected_attributes: relations_with_all_attributes, 
+          merge selected_attributes: relations_with_all_attributes,
                 excluded_attributes: relations_with_all_attributes
         end
 
@@ -37,7 +37,7 @@ module Rasti
 
           graph.roots.each do |node|
             relation_of(node).fetch_graph environment,
-                                          rows, 
+                                          rows,
                                           node[:selected_attributes],
                                           node[:excluded_attributes] ,
                                           subgraph_of(node)
@@ -88,25 +88,25 @@ module Rasti
             excluded[id] = descendant[:excluded_attributes]
           end
 
-          Graph.new environment, 
-                    relation_of(node).target_collection_class, 
-                    relations, 
-                    selected, 
+          Graph.new environment,
+                    relation_of(node).target_collection_class,
+                    relations,
+                    selected,
                     excluded
         end
 
         def build_graph(relations, selected_attributes, excluded_attributes)
           HierarchicalGraph.new.tap do |graph|
-            flatten(relations).each do |relation| 
+            flatten(relations).each do |relation|
               sections = relation.split('.')
-              
+
               graph.add_node relation, name: sections.last.to_sym,
                                        selected_attributes: selected_attributes[relation],
                                        excluded_attributes: excluded_attributes[relation]
-              
+
               if sections.count > 1
                 parent_id = sections[0..-2].join('.')
-                graph.add_relation parent_id: parent_id, 
+                graph.add_relation parent_id: parent_id,
                                    child_id: relation
               end
             end

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

@@ -54,19 +54,19 @@ module Rasti
 
           relations_graph.fetch_graph join_rows if relations_graph
 
-          relation_rows = join_rows.each_with_object(Hash.new { |h,k| h[k] = [] }) do |row, hash| 
-            attributes = row.select { |attr,_| target_collection_class.model.attributes.include? attr }
+          relation_rows = join_rows.each_with_object(Hash.new { |h,k| h[k] = [] }) do |row, hash|
+            attributes = row.select { |attr,_| target_collection_class.model.attribute_names.include? attr }
             hash[row[:source_foreign_key]] << target_collection_class.model.new(attributes)
           end
 
-          rows.each do |row| 
+          rows.each do |row|
             row[name] = relation_rows.fetch row[source_collection_class.primary_key], []
           end
         end
 
         def add_join(environment, dataset, prefix=nil)
           validate_join!
-          
+
           many_to_many_relation_alias = with_prefix prefix, "#{relation_collection_name}_#{SecureRandom.base64}"
 
           relation_name = prefix ? Sequel[prefix] : Sequel[source_collection_class.collection_name]

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

@@ -17,18 +17,18 @@ module Rasti
           query = query.select_attributes(*selected_attributes) if selected_attributes
           query = relations_graph.apply_to query if relations_graph
 
-          relation_rows = query.each_with_object({}) do |row, hash| 
+          relation_rows = query.each_with_object({}) do |row, hash|
             hash[row.public_send(source_collection_class.primary_key)] = row
           end
-          
-          rows.each do |row| 
+
+          rows.each do |row|
             row[name] = relation_rows[row[foreign_key]]
           end
         end
 
         def add_join(environment, dataset, prefix=nil)
           validate_join!
-          
+
           relation_alias = join_relation_name prefix
 
           relation_name = prefix ? Sequel[prefix] : Sequel[source_collection_class.collection_name]

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

@@ -19,14 +19,14 @@ module Rasti
 
           relation_rows = query.group_by(&foreign_key)
 
-          rows.each do |row| 
+          rows.each do |row|
             row[name] = build_graph_result relation_rows.fetch(row[source_collection_class.primary_key], [])
           end
         end
 
         def add_join(environment, dataset, prefix=nil)
           validate_join!
-          
+
           relation_alias = join_relation_name prefix
 
           relation_name = prefix ? Sequel[prefix] : Sequel[source_collection_class.collection_name]

data/lib/rasti/db/type_converters/time_in_zone.rb

@@ -6,7 +6,7 @@ module Rasti
         class << self
 
           def to_db(db, collection_name, attribute_name, value)
-            value
+            value.is_a?(Timing::TimeInZone) ? value.to_time : value
           end
 
           def from_db(value)

data/lib/rasti/db/version.rb

@@ -1,5 +1,5 @@
 module Rasti
   module DB
-    VERSION = '2.3.2'
+    VERSION = '4.1.0'
   end
 end

data/rasti-db.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'sequel', '~> 5.0'
+  spec.add_runtime_dependency 'rasti-model', '~> 2.0'
   spec.add_runtime_dependency 'treetop', '~> 1.4.8'
   spec.add_runtime_dependency 'consty', '~> 1.0', '>= 1.0.3'
   spec.add_runtime_dependency 'timing', '~> 0.1', '>= 0.1.3'

data/spec/collection_spec.rb

@@ -52,7 +52,7 @@ describe 'Collection' do
     it 'Insert with many to many' do
       user_id = db[:users].insert name: 'User 1'
 
-      1.upto(2) do |i| 
+      1.upto(2) do |i|
         db[:posts].insert user_id: user_id, title: "Post #{i}", body: '...', language_id: 1
         db[:categories].insert name: "Category #{i}"
       end
@@ -65,7 +65,7 @@ describe 'Collection' do
     end
 
     it 'Insert only many to many' do
-      1.upto(3) do |i| 
+      1.upto(3) do |i|
         db[:categories].insert name: "Category #{i}"
       end
 
@@ -101,7 +101,7 @@ describe 'Collection' do
     it 'Update with many to many' do
       user_id = db[:users].insert name: 'User 1'
 
-      1.upto(3) do |i| 
+      1.upto(3) do |i|
         db[:posts].insert user_id: user_id, title: "Post #{i}", body: '...', language_id: 1
         db[:categories].insert name: "Category #{i}"
       end
@@ -115,11 +115,11 @@ describe 'Collection' do
       posts.update 1, categories: [2,3]
 
       db[:categories_posts].where(post_id: 1).map(:category_id).must_equal [2,3]
-      
+
       db[:categories_posts].where(category_id: 2).map(:post_id).must_equal [1,2]
 
       categories.update 2, posts: [2,3]
-      
+
       db[:categories_posts].where(category_id: 2).map(:post_id).must_equal [2,3]
     end
 
@@ -145,7 +145,7 @@ describe 'Collection' do
     end
 
     it 'Delete only many to many' do
-      1.upto(3) do |i| 
+      1.upto(3) do |i|
         db[:categories].insert name: "Category #{i}"
       end
 
@@ -172,14 +172,14 @@ describe 'Collection' do
         1.upto(3) do |i|
           user_id = db[:users].insert name: "User #{i}"
 
-          db[:people].insert document_number: "document_#{i}", 
+          db[:people].insert document_number: "document_#{i}",
                              first_name: "John #{i}",
                              last_name: "Doe #{i}",
                              birth_date: Time.now - i,
                              user_id: user_id
 
-          category_id = db[:categories].insert name: "Category #{i}" 
-          
+          category_id = db[:categories].insert name: "Category #{i}"
+
           1.upto(3) do |n|
             post_id = db[:posts].insert user_id: user_id, title: "Post #{i}.#{n}", body: '...', language_id: 1
             db[:categories_posts].insert post_id: post_id, category_id: category_id
@@ -227,7 +227,7 @@ describe 'Collection' do
         db[:posts].where(user_id: 1).count.must_equal 0
         db[:comments].join(:posts, id: :post_id).where(Sequel[:posts][:user_id] => 1).count.must_equal 0
         db[:categories_posts].join(:posts, id: :post_id).where(Sequel[:posts][:user_id] => 1).count.must_equal 0
-        
+
         db[:users].count.must_equal 2
         db[:people].count.must_equal 2
         db[:categories].count.must_equal 3
@@ -241,9 +241,9 @@ describe 'Collection' do
     describe 'Multiple data sources' do
 
       before do
-        1.upto(3) do |i| 
+        1.upto(3) do |i|
           db[:users].insert name: "User #{i}"
-          db[:people].insert document_number: "document_#{i}", 
+          db[:people].insert document_number: "document_#{i}",
                              first_name: "John #{i}",
                              last_name: "Doe #{i}",
                              birth_date: Time.now - i,
@@ -303,7 +303,7 @@ describe 'Collection' do
 
     it 'Find' do
       id = db[:users].insert name: 'User 1'
-      
+
       users.find(id).must_equal User.new(id: id, name: 'User 1')
     end
 
@@ -410,26 +410,26 @@ describe 'Collection' do
 
         1.upto(2) do |i|
           db[:categories].insert name: "Category #{i}"
-          
+
           db[:users].insert name: "User #{i}"
-          
-          db[:people].insert document_number: "document_#{i}", 
+
+          db[:people].insert document_number: "document_#{i}",
                              first_name: "John #{i}",
                              last_name: "Doe #{i}",
                              birth_date: Time.now - i,
                              user_id: i
-          
+
         end
 
         db[:languages_people].insert language_id: 1, document_number: 'document_1'
         db[:languages_people].insert language_id: 2, document_number: 'document_2'
 
-        1.upto(3) do |i| 
+        1.upto(3) do |i|
           db[:posts].insert user_id: 1, title: "Post #{i}", body: '...', language_id: 1
           db[:categories_posts].insert category_id: 1, post_id: i
         end
-        
-        4.upto(5) do |i| 
+
+        4.upto(5) do |i|
           db[:posts].insert user_id: 2, title: "Post #{i}", body: '...', language_id: 2
           db[:categories_posts].insert category_id: 2, post_id: i
         end
@@ -475,7 +475,7 @@ describe 'Collection' do
       it 'Global' do
         result_1 = posts.created_by(1)
         result_1.primary_keys.must_equal [1,2,3]
-        
+
         result_2 = posts.created_by(2)
         result_2.primary_keys.must_equal [4,5]
       end
@@ -490,7 +490,7 @@ describe 'Collection' do
     it 'Graph' do
       1.upto(3) do |i|
         db[:users].insert name: "User #{i}"
-        db[:people].insert document_number: "document_#{i}", 
+        db[:people].insert document_number: "document_#{i}",
                            first_name: "John #{i}",
                            last_name: "Doe #{i}",
                            birth_date: Time.now - i,
@@ -521,10 +521,10 @@ describe 'Collection' do
 
         comment.post_id.must_equal 1
         comment.user_id.must_equal i
-        
+
         comment.user.id.must_equal i
         comment.user.name.must_equal "User #{i}"
-        
+
         comment.user.posts.count.must_equal 1
         comment.user.posts[0].id.must_equal i
         comment.user.posts[0].title.must_equal "Post #{i}"
@@ -544,7 +544,7 @@ describe 'Collection' do
       stubs = Proc.new do |sql|
         case sql
 
-        when 'SELECT users.* FROM schema_1.users', 
+        when 'SELECT users.* FROM schema_1.users',
              'SELECT users.* FROM schema_1.users WHERE (users.id IN (2, 1))'
           [
             {id: 1},
@@ -588,7 +588,7 @@ describe 'Collection' do
       Sequel.mock fetch: stubs, autoid: autoid
     end
 
-    let :stub_environment do 
+    let :stub_environment do
       Rasti::DB::Environment.new default: Rasti::DB::DataSource.new(stub_db, :schema_1),
                                  custom: Rasti::DB::DataSource.new(stub_db, :schema_2)
     end
@@ -627,7 +627,7 @@ describe 'Collection' do
 
       stub_users.insert name: 'User 1'
 
-      stub_people.insert document_number: 'document_1', 
+      stub_people.insert document_number: 'document_1',
                          first_name: 'John',
                          last_name: 'Doe',
                          birth_date: Time.parse('2020-04-24'),
@@ -680,7 +680,7 @@ describe 'Collection' do
 
       stub_db.sqls.must_equal [
         'SELECT posts.* FROM schema_1.posts',
-        'SELECT categories.*, categories_posts.post_id AS source_foreign_key FROM schema_1.categories INNER JOIN schema_1.categories_posts ON (schema_1.categories_posts.category_id = schema_1.categories.id) WHERE (categories_posts.post_id IN (3, 4))', 
+        'SELECT categories.*, categories_posts.post_id AS source_foreign_key FROM schema_1.categories INNER JOIN schema_1.categories_posts ON (schema_1.categories_posts.category_id = schema_1.categories.id) WHERE (categories_posts.post_id IN (3, 4))',
         'SELECT comments.* FROM schema_1.comments WHERE (comments.post_id IN (3, 4))',
         'SELECT users.* FROM schema_1.users WHERE (users.id IN (2, 1))',
         'SELECT posts.* FROM schema_1.posts WHERE (posts.user_id IN (1, 2))',

data/spec/computed_attribute_spec.rb

@@ -2,7 +2,7 @@ require 'minitest_helper'
 
 describe 'ComputedAttribute' do
 
-  it 'Apply Join wiht join attribute must generate correct query' do
+  it 'Apply Join with join attribute must generate correct query' do
     dataset = db[:users]
     computed_attribute = Rasti::DB::ComputedAttribute.new(Sequel[:comments_count][:value]) do |dataset|
       subquery = dataset.db.from(:comments)
@@ -13,7 +13,7 @@ describe 'ComputedAttribute' do
       dataset.join_table(:inner, subquery, :user_id => :id)
     end
     expected_query = "SELECT *, `comments_count`.`value` AS 'value' FROM `users` INNER JOIN (SELECT `user_id`, count(`id`) AS 'value' FROM `comments` GROUP BY `user_id`) AS 'comments_count' ON (`comments_count`.`user_id` = `users`.`id`)"
-    computed_attribute.apply_join(dataset)
+    computed_attribute.apply_join(dataset, environment)
                       .select_append(computed_attribute.identifier)
                       .sql
                       .must_equal expected_query
@@ -23,10 +23,30 @@ describe 'ComputedAttribute' do
     dataset = db[:people]
     computed_attribute = Rasti::DB::ComputedAttribute.new Sequel.join([:first_name, ' ', :last_name])
     expected_query = "SELECT * FROM `people` WHERE ((`first_name` || ' ' || `last_name`) = 'FULL NAME')"
-    computed_attribute.apply_join(dataset)
+    computed_attribute.apply_join(dataset, environment)
                       .where(computed_attribute.identifier => 'FULL NAME')
                       .sql
                       .must_equal expected_query
   end
 
+  it 'Apply join with join and environment attributes must generate correct query' do
+    dataset = db[:users]
+
+    expected_query = "SELECT *, `comments_count`.`value` AS 'value' FROM `users` INNER JOIN (SELECT `user_id`, count(`id`) AS 'value' FROM `comments` GROUP BY `user_id`) AS 'comments_count' ON (`comments_count`.`user_id` = `users`.`id`)"
+
+    computed_attribute = Rasti::DB::ComputedAttribute.new(Sequel[:comments_count][:value]) do |dataset, environment|
+      subquery = dataset.db.from(environment.data_source(:custom).qualify(:comments))
+                           .select(Sequel[:user_id], Sequel.function('count', :id).as(:value))
+                           .group(:user_id)
+                           .as(:comments_count)
+
+      dataset.join_table(:inner, subquery, :user_id => :id)
+    end
+
+    computed_attribute.apply_join(dataset, environment)
+                      .select_append(computed_attribute.identifier)
+                      .sql
+                      .must_equal expected_query
+  end
+
 end

data/spec/relations_spec.rb

@@ -8,15 +8,15 @@ describe 'Relations' do
 
       it 'Implicit' do
         relation = Rasti::DB::Relations::OneToMany.new :posts, Users
-        
+
         relation.target_collection_class.must_equal Posts
         relation.foreign_key.must_equal :user_id
       end
 
       it 'Explicit' do
-        relation = Rasti::DB::Relations::OneToMany.new :articles, Users, collection: 'Posts', 
+        relation = Rasti::DB::Relations::OneToMany.new :articles, Users, collection: 'Posts',
                                                                          foreign_key: :id_user
-        
+
         relation.target_collection_class.must_equal Posts
         relation.foreign_key.must_equal :id_user
       end
@@ -41,9 +41,9 @@ describe 'Relations' do
       user_id = db[:users].insert name: 'User 1'
       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].fetch_graph environment, rows
-      
+
       rows[0][:posts].must_equal posts.where(user_id: user_id).all
     end
 
@@ -55,15 +55,15 @@ describe 'Relations' do
 
       it 'Implicit' do
         relation = Rasti::DB::Relations::ManyToOne.new :user, Posts
-        
+
         relation.target_collection_class.must_equal Users
         relation.foreign_key.must_equal :user_id
       end
 
       it 'Explicit' do
-        relation = Rasti::DB::Relations::ManyToOne.new :publisher, Posts, collection: 'Users', 
+        relation = Rasti::DB::Relations::ManyToOne.new :publisher, Posts, collection: 'Users',
                                                                           foreign_key: :publisher_id
-        
+
         relation.target_collection_class.must_equal Users
         relation.foreign_key.must_equal :publisher_id
       end
@@ -102,7 +102,7 @@ describe 'Relations' do
 
       it 'Implicit' do
         relation = Rasti::DB::Relations::ManyToMany.new :categories, Posts
-        
+
         relation.target_collection_class.must_equal Categories
         relation.source_foreign_key.must_equal :post_id
         relation.target_foreign_key.must_equal :category_id
@@ -110,11 +110,11 @@ describe 'Relations' do
       end
 
       it 'Explicit' do
-        relation = Rasti::DB::Relations::ManyToMany.new :tags, Posts, collection: 'Categories', 
-                                                                      source_foreign_key: :article_id, 
-                                                                      target_foreign_key: :tag_id, 
+        relation = Rasti::DB::Relations::ManyToMany.new :tags, Posts, collection: 'Categories',
+                                                                      source_foreign_key: :article_id,
+                                                                      target_foreign_key: :tag_id,
                                                                       relation_collection_name: :tags_articles
-        
+
         relation.target_collection_class.must_equal Categories
         relation.source_foreign_key.must_equal :article_id
         relation.target_foreign_key.must_equal :tag_id
@@ -165,15 +165,15 @@ describe 'Relations' do
 
       it 'Implicit' do
         relation = Rasti::DB::Relations::OneToOne.new :person, Users
-        
+
         relation.target_collection_class.must_equal People
         relation.foreign_key.must_equal :user_id
       end
 
       it 'Explicit' do
-        relation = Rasti::DB::Relations::OneToOne.new :person, Users, collection: 'Users', 
+        relation = Rasti::DB::Relations::OneToOne.new :person, Users, collection: 'Users',
                                                                       foreign_key: :id_user
-        
+
         relation.target_collection_class.must_equal Users
         relation.foreign_key.must_equal :id_user
       end
@@ -197,7 +197,7 @@ describe 'Relations' do
     it 'Graph' do
       2.times do |i|
         user_id = db[:users].insert name: "User #{i}"
-        db[:people].insert document_number: "document_#{i}", 
+        db[:people].insert document_number: "document_#{i}",
                            first_name: "John #{i}",
                            last_name: "Doe #{i}",
                            birth_date: Time.now - i,

data/spec/type_converters/time_in_zone_spec.rb

@@ -7,7 +7,7 @@ describe Rasti::DB::TypeConverters::TimeInZone do
   describe 'To DB' do
 
     it 'must not transform Time to TimeInZone' do
-      time = Time.now
+      time = Timing::TimeInZone.now
 
       converted_time = type_converter.to_db db, 'table', :time, time
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasti-db
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 4.1.0
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2021-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: rasti-model
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
@@ -352,7 +366,6 @@ files:
 - 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
@@ -382,7 +395,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.9
 signing_key: 
 specification_version: 4
 summary: Database collections and relations
@@ -391,7 +404,6 @@ test_files:
 - 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

data/spec/model_spec.rb

@@ -1,90 +0,0 @@
-require 'minitest_helper'
-
-describe 'Model' do
-
-  describe 'Attribues' do
-
-    it 'Valid definition' do
-      model = Rasti::DB::Model[:id, :name]
-      model.attributes.must_equal [:id, :name]
-    end
-
-    it 'Invalid definition' do
-      error = proc { Rasti::DB::Model[:id, :name, :name] }.must_raise ArgumentError
-      error.message.must_equal 'Attribute name already exists'
-    end
-
-    it 'Accessors' do
-      post = Post.new id: 1, title: 'Title'
-
-      post.id.must_equal 1
-      post.title.must_equal 'Title'
-
-      [:body, :user, :comments].each do |attribute|
-        error = proc { post.send attribute }.must_raise Rasti::DB::Model::UninitializedAttributeError
-        error.message.must_equal "Uninitialized attribute #{attribute}"
-      end
-
-      proc { post.invalid_method }.must_raise NoMethodError
-    end
-
-  end
-
-
-  it 'Inheritance' do
-    subclass = Class.new(User) do
-      attribute :additional_attribute
-    end
-
-    subclass.attributes.must_equal (User.attributes + [:additional_attribute])
-  end
-
-  describe 'To String' do
-    
-    it 'Class' do
-      User.to_s.must_equal 'User[id, name, posts, comments, person, comments_count]'
-    end
-
-    it 'Instance' do
-      user = User.new id: 1, name: 'User 1'
-      user.to_s.must_equal '#<User[id: 1, name: "User 1"]>'
-    end
-
-  end
-
-  it 'To Hash' do
-    post = Post.new id: 2, 
-                    title: 'Title', 
-                    body: 'body', 
-                    user_id: 1, 
-                    user: User.new(id: 1, name: 'User 1'), 
-                    comments: [Comment.new(id: 4, text: 'comment text', user_id: 5)]
-
-    post.to_h.must_equal id: 2,
-                         title: 'Title', 
-                         body: 'body', 
-                         user_id: 1, 
-                         user: {id: 1, name: 'User 1'}, 
-                         comments: [{id: 4, text: 'comment text', user_id: 5}]
-  end
-
-  it 'Equality' do
-    assert User.new(id: 1, name: 'User 1') == User.new(id: 1, name: 'User 1')
-    refute User.new(id: 1, name: 'User 1') == User.new(id: 2, name: 'User 2')
-
-    assert User.new(id: 1, name: 'User 1').eql? User.new(id: 1, name: 'User 1')
-    refute User.new(id: 1, name: 'User 1').eql? User.new(id: 2, name: 'User 2')
-
-    assert_equal User.new(id: 1, name: 'User 1').hash, User.new(id: 1, name: 'User 1').hash
-    refute_equal User.new(id: 1, name: 'User 1').hash, User.new(id: 2, name: 'User 2').hash
-  end
-
-  it 'Merge' do
-    user = User.new(id: 1, name: 'User 1')
-    changed_user = user.merge(name: 'User 2')
-    
-    user.must_equal User.new(id: 1, name: 'User 1')
-    changed_user.must_equal User.new(id: 1, name: 'User 2')
-  end
-
-end