rasti-db 3.0.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e15c6a4b9b21397abc6135f83b6b863a8e8147e9bfea492cf25fd1d54db00cb
-  data.tar.gz: 0cebbbf49d1262804bfa559e6c696763761242b46a877c50c5f7dce528c9f16c
+  metadata.gz: 331138443b43eefbd6f4e9008755646f790a7a12329d5fb342936b97de8d9bfe
+  data.tar.gz: 9723170bbbf65352a112312a6b72953a69055ceca9d115763705d6363b00e669
 SHA512:
-  metadata.gz: 468ca823921d6eaece74f8b0479e25fc767ed4c7e08a63fe24fd633a467ab3469cf199994b8a53e4207505e5090679011a1a5623d52f6322b910d59594a80ce0
-  data.tar.gz: 938c0fea726c3e70c1fe791d3034eae9f11077c2614321eb252556bf7ad5a8a3f8a470bb9dd3b833ad1e84cec57557a703f4f6591ae2e6dc064b163702264bef
+  metadata.gz: '00777167854dfaa0f0e133b157ac97e56a8a94c840b79a024a2f0af507a995a77f72372b263ee4a00770970d0f6646f0c034ee5cee733dae892bb85cae78f756'
+  data.tar.gz: 66f2f804441640d2cfe7ed3694000092e9d8f7541e6478c4be98b475b7e3d70de7d8a7c78c63b19a8542c89cf1ff7311291f6c09f8d339ba8a2d257a2a671efe

data/.github/workflows/ci.yml

@@ -0,0 +1,26 @@
+name: CI
+
+on:
+  push:
+    branches: [ '**' ]
+  pull_request:
+    branches: [ '**' ]
+
+jobs:
+  test:
+
+    name: Tests
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.1', '2.2', '2.3', '2.4', '2.5', '2.6', '2.7', '3.0', 'jruby-9.2.9.0']
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Run tests
+      run: bundle exec rake

data/README.md

@@ -1,7 +1,7 @@
 # Rasti::DB
 
 [![Gem Version](https://badge.fury.io/rb/rasti-db.svg)](https://rubygems.org/gems/rasti-db)
-[![Build Status](https://travis-ci.org/gabynaiman/rasti-db.svg?branch=master)](https://travis-ci.org/gabynaiman/rasti-db)
+[![CI](https://github.com/gabynaiman/rasti-db/actions/workflows/ci.yml/badge.svg)](https://github.com/gabynaiman/rasti-db/actions/workflows/ci.yml)
 [![Coverage Status](https://coveralls.io/repos/github/gabynaiman/rasti-db/badge.svg?branch=master)](https://coveralls.io/github/gabynaiman/rasti-db?branch=master)
 [![Code Climate](https://codeclimate.com/github/gabynaiman/rasti-db.svg)](https://codeclimate.com/github/gabynaiman/rasti-db)
 

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/query.rb

@@ -58,17 +58,15 @@ module Rasti
       end
 
       def select_computed_attributes(*computed_attributes)
-        ds = computed_attributes.inject(dataset) do |ds, name|
+        ds = computed_attributes.inject(dataset) do |inner_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(inner_ds, environment).select_append(computed_attribute.identifier.as(name))
         end
         build_query dataset: ds
       end
 
       def all
-        with_graph(dataset.all).map do |row|
-          collection_class.model.new row
-        end
+        build_models dataset.all
       end
       alias_method :to_a, :all
 
@@ -114,13 +112,11 @@ module Rasti
       end
 
       def first
-        row = dataset.first
-        row ? build_model(row) : nil
+        build_model dataset.first
       end
 
       def last
-        row = dataset.last
-        row ? build_model(row) : nil
+        build_model dataset.last
       end
 
       def detect(*args, &block)
@@ -137,8 +133,8 @@ 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
+        ds = sentence.computed_attributes(collection_class).inject(dataset) do |inner_ds, name|
+          collection_class.computed_attributes[name].apply_join inner_ds, environment
         end
         query = build_query dataset: ds
 
@@ -164,7 +160,21 @@ module Rasti
       end
 
       def build_model(row)
-        collection_class.model.new with_graph(row)
+        row ? build_models([row]).first : nil
+      end
+
+      def build_models(rows)
+        with_graph(rows).map do |row|
+          collection_class.model.new slice_defined_attributes(row)
+        end
+      end
+
+      def slice_defined_attributes(row)
+        row.select { |k,_| defined_attributes.include? k }
+      end
+
+      def defined_attributes
+        @defined_attributes ||= collection_class.model.attribute_names.to_set
       end
 
       def chainable(&block)

data/lib/rasti/db/version.rb

@@ -1,5 +1,5 @@
 module Rasti
   module DB
-    VERSION = '3.0.0'
+    VERSION = '4.1.1'
   end
 end

data/rasti-db.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'sequel', '~> 5.0'
-  spec.add_runtime_dependency 'rasti-model', '~> 1.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/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/minitest_helper.rb

@@ -19,7 +19,8 @@ Post     = Rasti::DB::Model[:id, :title, :body, :user_id, :user, :comments, :cat
 Comment  = Rasti::DB::Model[:id, :text, :user_id, :user, :post_id, :post, :tags]
 Category = Rasti::DB::Model[:id, :name, :posts]
 Person   = Rasti::DB::Model[:document_number, :first_name, :last_name, :birth_date, :user_id, :user, :languages, :full_name]
-Language = Rasti::DB::Model[:id, :name, :people]
+Language = Rasti::DB::Model[:id, :name, :people, :countries]
+Country  = Rasti::DB::Model[:id, :name, :language_id]
 
 
 class Users < Rasti::DB::Collection
@@ -47,8 +48,8 @@ class Posts < Rasti::DB::Collection
   one_to_many :comments
 
   query :created_by, ->(user_id) { where user_id: user_id }
-  
-  query :entitled do |title| 
+
+  query :entitled do |title|
     where title: title
   end
 
@@ -106,6 +107,11 @@ class Languages < Rasti::DB::Collection
 
   many_to_many :people, collection: People, relation_data_source_name: :default
   one_to_many :posts
+  one_to_many :countries
+end
+
+class Countries < Rasti::DB::Collection
+  many_to_one :language
 end
 
 
@@ -114,7 +120,7 @@ class Minitest::Spec
   let(:users) { Users.new environment }
 
   let(:posts) { Posts.new environment }
-  
+
   let(:comments) { Comments.new environment }
 
   let(:categories) { Categories.new environment }
@@ -123,9 +129,11 @@ class Minitest::Spec
 
   let(:languages) { Languages.new environment }
 
+  let(:countries) { Countries.new environment }
+
   let(:driver) { (RUBY_ENGINE == 'jruby') ? 'jdbc:sqlite::memory:' : {adapter: :sqlite} }
 
-  let :environment do 
+  let :environment do
     Rasti::DB::Environment.new default: Rasti::DB::DataSource.new(db),
                                custom: Rasti::DB::DataSource.new(custom_db)
   end
@@ -179,6 +187,13 @@ class Minitest::Spec
         primary_key [:language_id, :document_number]
       end
 
+      db.create_table :countries do
+        primary_key :id
+        String :name, null: false, unique: true
+        Integer :population, null: false
+        Integer :language_id, null: false, index: true
+      end
+
     end
   end
 

data/spec/query_spec.rb

@@ -32,6 +32,8 @@ describe 'Query' do
     db[:categories_posts].insert post_id: 2, category_id: 2
     db[:categories_posts].insert post_id: 2, category_id: 3
     db[:categories_posts].insert post_id: 3, category_id: 3
+
+    db[:countries].insert name: 'Argentina', population: 40000000, language_id: 1
   end
 
   let(:users_query) { Rasti::DB::Query.new collection_class: Users, dataset: db[:users], environment: environment }
@@ -44,6 +46,8 @@ describe 'Query' do
 
   let(:languages_query) { Rasti::DB::Query.new collection_class: Languages, dataset: custom_db[:languages], environment: environment }
 
+  let(:countries_query) { Rasti::DB::Query.new collection_class: Countries, dataset: db[:countries], environment: environment }
+
   it 'Count' do
     users_query.count.must_equal 10
   end
@@ -166,6 +170,25 @@ describe 'Query' do
     end
   end
 
+  describe 'Ignore undefined attributes' do
+
+    it 'First level' do
+      countries_query.raw.first.must_equal id: 1,
+                                     name: 'Argentina',
+                                     population: 40000000,
+                                     language_id: 1
+
+      [countries_query.detect(id: 1), countries_query.where(id: 1).order(:name).last, countries_query.all.first].each do |country|
+        country.must_equal Country.new(language_id: 1, id: 1, name: 'Argentina')
+      end
+    end
+
+    it 'Graph nested' do
+      languages_query.graph(:countries).first.countries.must_equal [Country.new(language_id: 1, id: 1, name: 'Argentina')]
+    end
+
+  end
+
   it 'Map' do
     users_query.map(&:name).must_equal db[:users].map(:name)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasti-db
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2022-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
@@ -294,10 +294,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".coveralls.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -395,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

data/.travis.yml

@@ -1,22 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.1
-  - 2.2
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-  - jruby-9.2.9.0
-  - ruby-head
-  - jruby-head
-
-matrix:
-  fast_finish: true
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
-
-jdk:
-  - openjdk8