rasti-db 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e586b1a5bcf834e6a79251e952217118cf6c6f53
-  data.tar.gz: b856445b50aa29d89cac9ed1249b214b652709b3
+  metadata.gz: 898bf83981559ff4a054d73ad018a7f07e65d1a3
+  data.tar.gz: dda154478784631a4683281364c43d249db3356c
 SHA512:
-  metadata.gz: 6accf5482a38984a81ce068a90c1d1dbf959573b04b6e197d9e444f25d3bf0bff48a2365114352dc26d9e27656a7aed4702142977d97237026609f1dc16268da
-  data.tar.gz: 0a2ccdbfa430014b52a4af8fa7cf1abd8a56b07dc3ed2fa4611c280247d118bd1c6ac5f63380e34d245f977343799ed316989498b6f940cc51b437b010853027
+  metadata.gz: cf9dacf0e63b028ad3ac4a32fcaff83dbb3b355ee02f60782d85203c2d931015e5ec1aa7cbcbc35b54ab943a3fb78f62970ebde2680d603d5998547ba3c347a4
+  data.tar.gz: ad67c48927b98ae619bd7c80fd044f518d26d906ff238972ab07871d987f2ccd616230b34c6816c0e5f49a928ba6bc77436c1834a71a21675cb8f546299d72a4

data/README.md

@@ -130,6 +130,9 @@ DB.transaction do
   users.bulk_insert [{name: 'User 1'}, {name: 'User 2'}]
   users.bulk_update(name: 'User updated') { where id: [1,2] }
   users.bulk_delete { where id: [1,2] }
+
+  posts.insert_relations 1, categories: [2,3]
+  posts.delete_relations 1, categories: [2,3]
 end
 ```
 
@@ -144,6 +147,7 @@ posts.where{id > 1}.limit(10).offset(20) } # => [Post, ...]
 posts.graph(:user, :categories, 'comments.user') # => [Post(User, [Categories, ...], [Comments(User)]), ...]
 posts.created_by(1) # => [Post, ...]
 posts.created_by(1).entitled('...').commented_by(2) # => [Post, ...]
+posts.with_categories([1,2]) # => [Post, ...]
 posts.where(id: [1,2]).raw # => [{id:1, ...}, {id:2, ...}]
 posts.where(id: [1,2]).primary_keys # => [1,2]
 posts.where(id: [1,2]).pluck(:id) # => [1,2]

data/lib/rasti/db/collection.rb

@@ -8,6 +8,7 @@ module Rasti
 
       class << self
 
+        extend Sequel::Inflections
         include Sequel::Inflections
 
         def collection_name
@@ -58,19 +59,19 @@ module Rasti
           @model = model
         end
 
-        def one_to_many(name, options={})
-          relations[name] = Relations::OneToMany.new name, self, options
-        end
-
-        def many_to_one(name, options={})
-          relations[name] = Relations::ManyToOne.new name, self, options
-        end
+        [Relations::OneToMany, Relations::ManyToOne, Relations::ManyToMany].each do |relation_class|
+          define_method underscore(demodulize(relation_class.name)) do |name, options={}|
+            relations[name] = relation_class.new name, self, options
 
-        def many_to_many(name, options={})
-          relations[name] = Relations::ManyToMany.new name, self, options
+            query "with_#{pluralize(name)}".to_sym do |primary_keys|
+              with_related name, primary_keys
+            end
+          end
         end
 
         def query(name, lambda=nil, &block)
+          raise "Query #{name} already exists" if queries.key? name
+
           queries[name] = lambda || block
           
           define_method name do |*args|
@@ -166,10 +167,6 @@ module Rasti
         where(self.class.primary_key => primary_key).graph(*relations).first
       end
 
-      def query
-        Query.new self.class, dataset, [], schema
-      end
-
       QUERY_METHODS.each do |method|
         define_method method do |*args, &block|
           query.public_send method, *args, &block
@@ -194,6 +191,10 @@ module Rasti
         schema.nil? ? self.class.collection_name : Sequel.qualify(schema, self.class.collection_name)
       end
       
+      def query
+        Query.new self.class, dataset, [], schema
+      end
+
       def build_query(filter=nil, &block)
         raise ArgumentError, 'must specify filter hash or block' if filter.nil? && block.nil?
         if filter

data/lib/rasti/db/query.rb

@@ -28,7 +28,7 @@ module Rasti
       end
 
       def all
-        with_relations(dataset.all).map do |row| 
+        with_graph(dataset.all).map do |row| 
           collection_class.model.new row
         end
       end
@@ -41,7 +41,7 @@ module Rasti
       DATASET_CHAINED_METHODS.each do |method|
         define_method method do |*args, &block|
           Query.new collection_class, 
-                    dataset.send(method, *args, &block), 
+                    dataset.public_send(method, *args, &block), 
                     relations, 
                     schema
         end
@@ -68,12 +68,12 @@ module Rasti
 
       def first
         row = dataset.first
-        row ? collection_class.model.new(with_relations(row)) : nil
+        row ? collection_class.model.new(with_graph(row)) : nil
       end
 
       def last
         row = dataset.last
-        row ? collection_class.model.new(with_relations(row)) : nil
+        row ? collection_class.model.new(with_graph(row)) : nil
       end
 
       def detect(*args, &block)
@@ -92,7 +92,12 @@ module Rasti
         Query.new collection_class, ds, relations, schema
       end
 
-      def with_relations(data)
+      def with_related(relation_name, primary_keys)
+        ds = collection_class.relations[relation_name].apply_filter dataset, schema, primary_keys
+        Query.new collection_class, ds, relations, schema
+      end
+
+      def with_graph(data)
         rows = data.is_a?(Array) ? data : [data]
         Relations.graph_to rows, relations, collection_class, dataset.db, schema
         data

data/lib/rasti/db/relations.rb

@@ -43,6 +43,14 @@ module Rasti
           @target_collection_class ||= @options[:collection].is_a?(Class) ? @options[:collection] : Consty.get(@options[:collection] || camelize(pluralize(name)), source_collection_class)
         end
 
+        def qualified_source_collection_name(schema=nil)
+          schema.nil? ? source_collection_class.collection_name : Sequel.qualify(schema, source_collection_class.collection_name)
+        end
+
+        def qualified_target_collection_name(schema=nil)
+          schema.nil? ? target_collection_class.collection_name : Sequel.qualify(schema, target_collection_class.collection_name)
+        end
+
         def one_to_many?
           is_a? OneToMany
         end
@@ -82,6 +90,15 @@ module Rasti
           end
         end
 
+        def apply_filter(dataset, schema=nil, primary_keys=[])
+          target_name = qualified_target_collection_name schema
+
+          dataset.join(target_name, foreign_key => source_collection_class.primary_key)
+                 .where(Sequel.qualify(target_name, target_collection_class.primary_key) => primary_keys)
+                 .select_all(qualified_source_collection_name(schema))
+                 .distinct
+        end
+
       end
 
 
@@ -107,6 +124,10 @@ module Rasti
           end
         end
 
+        def apply_filter(dataset, schema=nil, primary_keys=[])
+          dataset.where(foreign_key => primary_keys)
+        end
+
       end
 
 
@@ -124,10 +145,6 @@ module Rasti
           @relation_collection_name ||= @options[:relation_collection_name] || [source_collection_class.collection_name, target_collection_class.collection_name].sort.join('_').to_sym
         end
 
-        def qualified_target_collection_name(schema=nil)
-          schema.nil? ? target_collection_class.collection_name : Sequel.qualify(schema, target_collection_class.collection_name)
-        end
-
         def qualified_relation_collection_name(schema=nil)
           schema.nil? ? relation_collection_name : Sequel.qualify(schema, relation_collection_name)
         end
@@ -158,6 +175,15 @@ module Rasti
           end
         end
 
+        def apply_filter(dataset, schema=nil, primary_keys=[])
+          relation_name = qualified_relation_collection_name schema
+
+          dataset.join(relation_name, source_foreign_key => target_collection_class.primary_key)
+                 .where(Sequel.qualify(relation_name, target_foreign_key) => primary_keys)
+                 .select_all(qualified_source_collection_name(schema))
+                 .distinct
+        end
+
       end
 
     end

data/lib/rasti/db/version.rb

@@ -1,5 +1,5 @@
 module Rasti
   module DB
-    VERSION = '0.2.9'
+    VERSION = '0.3.0'
   end
 end

data/lib/rasti/db.rb

@@ -4,7 +4,7 @@ require 'consty'
 require_relative 'db/version'
 require_relative 'db/helpers'
 require_relative 'db/query'
+require_relative 'db/relations'
 require_relative 'db/collection'
 require_relative 'db/model'
-require_relative 'db/relations'
 require_relative 'db/type_converter'

data/spec/collection_spec.rb

@@ -312,22 +312,45 @@ describe 'Collection' do
     describe 'Named queries' do
 
       before do
+        1.upto(2) { |i| db[:categories].insert name: "Category #{i}" }
         1.upto(2) { |i| db[:users].insert name: "User #{i}" }
-        1.upto(3) { |i| db[:posts].insert user_id: 1, title: "Post #{i}", body: '...' }
-        4.upto(5) { |i| db[:posts].insert user_id: 2, title: "Post #{i}", body: '...' }
+        1.upto(3) do |i| 
+          db[:posts].insert user_id: 1, title: "Post #{i}", body: '...'
+          db[:categories_posts].insert category_id: 1, post_id: i
+        end
+        4.upto(5) do |i| 
+          db[:posts].insert user_id: 2, title: "Post #{i}", body: '...'
+          db[:categories_posts].insert category_id: 2, post_id: i
+        end
+      end
+
+      describe 'Relations' do
+
+        it 'Many to Many' do
+          posts.order(:id).with_categories(1).primary_keys.must_equal [1,2,3]
+        end
+
+        it 'One to Many' do
+          users.with_posts([1,4]).primary_keys.must_equal [1,2]
+        end
+
+        it 'Many to One' do
+          posts.with_users(2).primary_keys.must_equal [4,5]
+        end
+
       end
 
       it 'Global' do
         result_1 = posts.created_by(1)
-        result_1.map(&:id).must_equal [1,2,3]
+        result_1.primary_keys.must_equal [1,2,3]
         
         result_2 = posts.created_by(2)
-        result_2.map(&:id).must_equal [4,5]
+        result_2.primary_keys.must_equal [4,5]
       end
 
       it 'Chained' do
         result = posts.created_by(2).entitled('Post 4')
-        result.map(&:id).must_equal [4]
+        result.primary_keys.must_equal [4]
       end
 
     end

data/spec/query_spec.rb

@@ -37,7 +37,7 @@ describe 'Query' do
   end
 
   it 'Map' do
-    users_query.map { |u| u.name }.must_equal db[:users].map(:name)
+    users_query.map(&:name).must_equal db[:users].map(:name)
   end
 
   it 'Detect' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasti-db
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-01 00:00:00.000000000 Z
+date: 2017-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel