quo 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f8a79b64bd0db1439df6ffcfb820786ed082405bb24d56ac2ac08cb47c052b7
-  data.tar.gz: 0b46427745aa9433130c4ec495cf2c9d79bff517b00ea99f17029b3a2714b604
+  metadata.gz: 3278d72f55569eb93fb569185467cd4b327ffd157e249c8538d4a643c652443c
+  data.tar.gz: e936c5fd0de429b941e110c273cb12ff302079095ab0f3d7d38023718b80b5e3
 SHA512:
-  metadata.gz: 514f649e606616d7a46de0c409b4c3f635c11fe900f179e0f94952a594adb49877e82ced68e9541e2dd398e2b0e35e9ea8ff1c4995701ed8f30361de48f8ae78
-  data.tar.gz: 7562f9cfc712ac473e6a32bb1c9f5b9e88123fb0abaa696f29dbf24e90dcedaaf716d42e0cd8bf6b8a5594a6f888fbf20f3e2b665ff9dda108ddc7ededfbe9a9
+  metadata.gz: 4adcb23af540cf2db462bd21640aef4497c1f2509a1ac6968a5a15b1cd2004d7db9935638ba5496eb57ffc655ad515688fc9468a191d17b32735da1a7c652705
+  data.tar.gz: f99119cdf52a97e956317a530e9074e12b07816405f6dd5fd80f74665dd34c0294368ed6d6a7d88f8147484486f52606462864663357e430ca2eebc36b7372d7

data/lib/quo/query.rb

@@ -41,7 +41,7 @@ module Quo
 
     # Combine (compose) this query object with another composeable entity, see notes for `.compose` above.
     # Compose is aliased as `+`. Can optionally take `joins()` parameters to perform a joins before the merge
-    def compose(right, joins = nil)
+    def compose(right, joins: nil)
       Quo::QueryComposer.new(self, right, joins).compose
     end
 
@@ -252,7 +252,6 @@ module Quo
             rel = rel.limit(@options[:limit]) if @options[:limit].present?
             rel = rel.preload(@options[:preload]) if @options[:preload].present?
             rel = rel.includes(@options[:includes]) if @options[:includes].present?
-            rel = rel.joins(@options[:joins]) if @options[:joins].present?
             rel = rel.select(@options[:select]) if @options[:select].present?
           end
           rel

data/lib/quo/query_composer.rb

@@ -58,7 +58,7 @@ module Quo
     end
 
     def apply_joins(left_rel, joins)
-      joins.present? ? left_rel.joins(joins.to_sym) : left_rel
+      joins.present? ? left_rel.joins(joins) : left_rel
     end
 
     def both_relations?(left_rel_type, right_rel_type)

data/lib/quo/utilities/compose.rb

@@ -6,7 +6,7 @@ module Quo
     # These can be Quo::Query, Quo::MergedQuery, Quo::EagerQuery and ActiveRecord::Relations.
     # See the `README.md` docs for more details.
     module Compose
-      def compose(query1, query2, joins = nil)
+      def compose(query1, query2, joins: nil)
         Quo::QueryComposer.new(query1, query2, joins).compose
       end
 

data/lib/quo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Quo
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/sig/quo.rbs

@@ -27,7 +27,7 @@ module Quo
       # Combine two query-like or composeable entities:
       # These can be Quo::Query, Quo::MergedQuery, Quo::EagerQuery and ActiveRecord::Relations.
       # See the `README.md` docs for more details.
-      def compose: (composable query1, composable query2, ?untyped? joins) -> Quo::MergedQuery
+      def compose: (composable query1, composable query2, ?joins: untyped?) -> Quo::MergedQuery
 
       # Determines if the object `query` is something which can be composed with query objects
       def composable_with?: (merge_composable query) -> bool
@@ -90,7 +90,7 @@ module Quo
 
     def initialize: (**untyped options) -> void
     def query: () -> composable
-    def compose: (composable right, ?untyped? joins) -> Quo::MergedQuery
+    def compose: (composable right, ?joins: untyped?) -> Quo::MergedQuery
     alias + compose
 
     def copy: (**untyped options) -> query

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quo
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Stephen Ierodiaconou