inquery 1.0.3 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39e19e13ad88defbc2be460c18bff9101cabd8ec157783b737da5ec6dd051f03
-  data.tar.gz: 7b69058c75be27e17c8204f2e7bafef7161db6412c4a24c420799bae8b81344e
+  metadata.gz: 4abe234fd1834486f21f10e93e1be20335be0a6f32b0f861b414b5cbc08f70e6
+  data.tar.gz: 40db2f88941705a41d32438d436e00aa58b471537728bacf42a0310386c25767
 SHA512:
-  metadata.gz: 0ced2783b3590ae0eb76272f70a1ef387519fe773cb6d7a660136e11cb59a3a054287667e42f3dd5186ccc3d673bf3ebc1e9cc19c118abf6c44465e869ca8fd4
-  data.tar.gz: d485bfa3b54ebfb9042fc2d3678b538f9e3b1e8cc535b9f41363bb967c68516bc260a3d9a8db50e40e0f4e87a1d13d689da1d14a053c720f22bacc3b287d9934
+  metadata.gz: 51c77a3008be12214250e18445fd4f0fa73f2d988e469ef42379b57e0b890efeff174cff9b0845a446ccc9d56c78eade987f98fb4f27c25c4cde5087f418a34e
+  data.tar.gz: a0b63cea88fb0df74f0d4cb2dbf97ad728816a8c3eeb6631655e23eebb2142d8cd69ecb17c0518bc99afc209666dbcc0735e619a6f4e35f034a6c9251011895d

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Change log
 
+## 1.0.8 (2020-11-24)
+
+- Improve support for schemacop 3.x
+
+## 1.0.7 (2020-11-24)
+
+- Improve support for schemacop 3.x
+
+## 1.0.6 (2020-11-24)
+
+- Improve support for schemacop 3.x
+
+## 1.0.5 (2020-11-24)
+
+- Improve support for schemacop 3.x and document it
+
+## 1.0.4 (2020-11-24)
+
+- Add support for schemacop 3.x (but still using 2.x schema version)
+
 ## 1.0.3 (2020-05-12)
 
 - Overwrite parameter hash with the casted version if using 

data/README.md

@@ -284,6 +284,9 @@ class SomeQueryClass < Inquery::Query
 end
 ```
 
+Inquery supports both schemacop specification versions 2 and 3 using the methods
+`schema` / `schema2` for version 2 and method `schema3` for version 3.
+
 ## Rails integration
 
 While it is optional, Inquery has been written from the ground up to be

data/Rakefile

@@ -21,7 +21,7 @@ task :gemspec do
     spec.add_dependency 'minitest'
     spec.add_dependency 'activesupport'
     spec.add_dependency 'activerecord'
-    spec.add_dependency 'schemacop', '~> 2.0'
+    spec.add_dependency 'schemacop', '>= 2.0'
   end
 
   File.open('inquery.gemspec', 'w') { |f| f.write(gemspec.to_ruby.strip) }

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.8

data/doc/Inquery.html

@@ -109,7 +109,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue May 12 13:33:18 2020 by
+  Generated on Wed Nov 25 14:07:10 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.25 (ruby-2.6.2).
 </div>

data/doc/Inquery/Exceptions.html

@@ -105,7 +105,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue May 12 13:33:18 2020 by
+  Generated on Wed Nov 25 14:07:10 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.25 (ruby-2.6.2).
 </div>

data/doc/Inquery/Exceptions/Base.html

@@ -118,7 +118,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue May 12 13:33:18 2020 by
+  Generated on Wed Nov 25 14:07:10 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.25 (ruby-2.6.2).
 </div>

data/doc/Inquery/Exceptions/InvalidRelation.html

@@ -122,7 +122,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue May 12 13:33:18 2020 by
+  Generated on Wed Nov 25 14:07:10 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.25 (ruby-2.6.2).
 </div>

data/doc/Inquery/Exceptions/UnknownCallSignature.html

@@ -122,7 +122,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue May 12 13:33:18 2020 by
+  Generated on Wed Nov 25 14:07:10 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.25 (ruby-2.6.2).
 </div>

data/doc/Inquery/Mixins.html

@@ -107,7 +107,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue May 12 13:33:18 2020 by
+  Generated on Wed Nov 25 14:07:10 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.25 (ruby-2.6.2).
 </div>

data/doc/Inquery/Mixins/RawSqlUtils.html

@@ -106,7 +106,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue May 12 13:33:18 2020 by
+  Generated on Wed Nov 25 14:07:10 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.25 (ruby-2.6.2).
 </div>

data/doc/Inquery/Mixins/RelationValidation.html

@@ -227,15 +227,6 @@ options specified at class level using the <code>relation</code> method.</p>
       <pre class="lines">
 
 
-54
-55
-56
-57
-58
-59
-60
-61
-62
 63
 64
 65
@@ -268,10 +259,19 @@ options specified at class level using the <code>relation</code> method.</p>
 92
 93
 94
-95</pre>
+95
+96
+97
+98
+99
+100
+101
+102
+103
+104</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/inquery/mixins/relation_validation.rb', line 54</span>
+      <pre class="code"><span class="info file"># File 'lib/inquery/mixins/relation_validation.rb', line 63</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_validate_relation!'>validate_relation!</span><span class='lparen'>(</span><span class='id identifier rubyid_relation'>relation</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_options'>options</span> <span class='op'>=</span> <span class='const'><span class='object_link'><a href="#DEFAULT_OPTIONS-constant" title="Inquery::Mixins::RelationValidation::DEFAULT_OPTIONS (constant)">DEFAULT_OPTIONS</a></span></span><span class='period'>.</span><span class='id identifier rubyid_dup'>dup</span>
@@ -325,7 +325,7 @@ options specified at class level using the <code>relation</code> method.</p>
 </div>
 
       <div id="footer">
-  Generated on Tue May 12 13:33:18 2020 by
+  Generated on Wed Nov 25 14:07:10 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.25 (ruby-2.6.2).
 </div>

data/doc/Inquery/Mixins/RelationValidation/ClassMethods.html

@@ -156,13 +156,13 @@ on. See <span class='object_link'><a href="../RelationValidation.html#OPTIONS_SC
       <pre class="lines">
 
 
-46
-47
-48
-49</pre>
+55
+56
+57
+58</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/inquery/mixins/relation_validation.rb', line 46</span>
+      <pre class="code"><span class="info file"># File 'lib/inquery/mixins/relation_validation.rb', line 55</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_relation'>relation</span><span class='lparen'>(</span><span class='id identifier rubyid_options'>options</span> <span class='op'>=</span> <span class='lbrace'>{</span><span class='rbrace'>}</span><span class='rparen'>)</span>
   <span class='const'><span class='object_link'><a href="../RelationValidation.html#OPTIONS_SCHEMA-constant" title="Inquery::Mixins::RelationValidation::OPTIONS_SCHEMA (constant)">OPTIONS_SCHEMA</a></span></span><span class='period'>.</span><span class='id identifier rubyid_validate!'>validate!</span><span class='lparen'>(</span><span class='id identifier rubyid_options'>options</span><span class='rparen'>)</span>
@@ -178,7 +178,7 @@ on. See <span class='object_link'><a href="../RelationValidation.html#OPTIONS_SC
 </div>
 
       <div id="footer">
-  Generated on Tue May 12 13:33:18 2020 by
+  Generated on Wed Nov 25 14:07:10 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.25 (ruby-2.6.2).
 </div>

data/doc/Inquery/Mixins/SchemaValidation.html

@@ -116,7 +116,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue May 12 13:33:18 2020 by
+  Generated on Wed Nov 25 14:07:10 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.25 (ruby-2.6.2).
 </div>

data/doc/Inquery/Mixins/SchemaValidation/ClassMethods.html

@@ -115,6 +115,50 @@
   
 
   
+    <span class="summary_desc"><div class='inline'></div></span>
+  
+</li>
+
+      
+        <li class="public ">
+  <span class="summary_signature">
+    
+      <a href="#schema2-instance_method" title="#schema2 (instance method)">#<strong>schema2</strong>(*args, &amp;block)  &#x21d2; Object </a>
+    
+
+    
+  </span>
+  
+  
+  
+  
+  
+  
+  
+
+  
+    <span class="summary_desc"><div class='inline'></div></span>
+  
+</li>
+
+      
+        <li class="public ">
+  <span class="summary_signature">
+    
+      <a href="#schema3-instance_method" title="#schema3 (instance method)">#<strong>schema3</strong>(reference = nil, **options, &amp;block)  &#x21d2; Object </a>
+    
+
+    
+  </span>
+  
+  
+  
+  
+  
+  
+  
+
+  
     <span class="summary_desc"><div class='inline'></div></span>
   
 </li>
@@ -138,6 +182,52 @@
   
 
   
+</h3><div class="docstring">
+  <div class="discussion">
+    
+
+  </div>
+</div>
+<div class="tags">
+  
+
+  <p class="tag_title">See Also:</p>
+  <ul class="see">
+    
+      <li><span class='object_link'><a href="#schema2-instance_method" title="Inquery::Mixins::SchemaValidation::ClassMethods#schema2 (method)">#schema2</a></span></li>
+    
+  </ul>
+
+</div><table class="source_code">
+  <tr>
+    <td>
+      <pre class="lines">
+
+
+25
+26
+27</pre>
+    </td>
+    <td>
+      <pre class="code"><span class="info file"># File 'lib/inquery/mixins/schema_validation.rb', line 25</span>
+
+<span class='kw'>def</span> <span class='id identifier rubyid_schema'>schema</span><span class='lparen'>(</span><span class='op'>*</span><span class='id identifier rubyid_args'>args</span><span class='comma'>,</span> <span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span><span class='rparen'>)</span>
+  <span class='id identifier rubyid_schema2'>schema2</span><span class='lparen'>(</span><span class='op'>*</span><span class='id identifier rubyid_args'>args</span><span class='comma'>,</span> <span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span><span class='rparen'>)</span>
+<span class='kw'>end</span></pre>
+    </td>
+  </tr>
+</table>
+</div>
+    
+      <div class="method_details ">
+  <h3 class="signature " id="schema2-instance_method">
+  
+    #<strong>schema2</strong>(*args, &amp;block)  &#x21d2; <tt>Object</tt> 
+  
+
+  
+
+  
 </h3><table class="source_code">
   <tr>
     <td>
@@ -146,17 +236,51 @@
 
 12
 13
-14
-15
-16</pre>
+14</pre>
     </td>
     <td>
       <pre class="code"><span class="info file"># File 'lib/inquery/mixins/schema_validation.rb', line 12</span>
 
-<span class='kw'>def</span> <span class='id identifier rubyid_schema'>schema</span><span class='lparen'>(</span><span class='op'>*</span><span class='id identifier rubyid_args'>args</span><span class='comma'>,</span> <span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span><span class='rparen'>)</span>
-  <span class='id identifier rubyid_schema'>schema</span> <span class='op'>=</span> <span class='const'>Schemacop</span><span class='op'>::</span><span class='const'>Schema</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='op'>*</span><span class='id identifier rubyid_args'>args</span><span class='comma'>,</span> <span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span><span class='rparen'>)</span>
+<span class='kw'>def</span> <span class='id identifier rubyid_schema2'>schema2</span><span class='lparen'>(</span><span class='op'>*</span><span class='id identifier rubyid_args'>args</span><span class='comma'>,</span> <span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span><span class='rparen'>)</span>
+  <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid__schema'>_schema</span> <span class='op'>=</span> <span class='const'>Schemacop</span><span class='op'>::</span><span class='const'>Schema</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='op'>*</span><span class='id identifier rubyid_args'>args</span><span class='comma'>,</span> <span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span><span class='rparen'>)</span>
+<span class='kw'>end</span></pre>
+    </td>
+  </tr>
+</table>
+</div>
+    
+      <div class="method_details ">
+  <h3 class="signature " id="schema3-instance_method">
+  
+    #<strong>schema3</strong>(reference = nil, **options, &amp;block)  &#x21d2; <tt>Object</tt> 
+  
 
-  <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid__schema'>_schema</span> <span class='op'>=</span> <span class='id identifier rubyid_schema'>schema</span>
+  
+
+  
+</h3><table class="source_code">
+  <tr>
+    <td>
+      <pre class="lines">
+
+
+16
+17
+18
+19
+20
+21
+22</pre>
+    </td>
+    <td>
+      <pre class="code"><span class="info file"># File 'lib/inquery/mixins/schema_validation.rb', line 16</span>
+
+<span class='kw'>def</span> <span class='id identifier rubyid_schema3'>schema3</span><span class='lparen'>(</span><span class='id identifier rubyid_reference'>reference</span> <span class='op'>=</span> <span class='kw'>nil</span><span class='comma'>,</span> <span class='op'>**</span><span class='id identifier rubyid_options'>options</span><span class='comma'>,</span> <span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span><span class='rparen'>)</span>
+  <span class='kw'>if</span> <span class='id identifier rubyid_reference'>reference</span>
+    <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid__schema'>_schema</span> <span class='op'>=</span> <span class='const'>Schemacop</span><span class='op'>::</span><span class='const'>Schema3</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='symbol'>:reference</span><span class='comma'>,</span> <span class='id identifier rubyid_options'>options</span><span class='period'>.</span><span class='id identifier rubyid_merge'>merge</span><span class='lparen'>(</span><span class='label'>path:</span> <span class='id identifier rubyid_reference'>reference</span><span class='rparen'>)</span><span class='rparen'>)</span>
+  <span class='kw'>else</span>
+    <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid__schema'>_schema</span> <span class='op'>=</span> <span class='const'>Schemacop</span><span class='op'>::</span><span class='const'>Schema3</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='symbol'>:hash</span><span class='comma'>,</span> <span class='op'>**</span><span class='id identifier rubyid_options'>options</span><span class='comma'>,</span> <span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span><span class='rparen'>)</span>
+  <span class='kw'>end</span>
 <span class='kw'>end</span></pre>
     </td>
   </tr>
@@ -168,7 +292,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue May 12 13:33:18 2020 by
+  Generated on Wed Nov 25 14:07:10 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.25 (ruby-2.6.2).
 </div>

data/doc/Inquery/Query.html

@@ -779,7 +779,7 @@ easyer access.</p>
 </div>
 
       <div id="footer">
-  Generated on Tue May 12 13:33:18 2020 by
+  Generated on Wed Nov 25 14:07:10 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.25 (ruby-2.6.2).
 </div>

data/doc/Inquery/Query/Chainable.html

@@ -529,7 +529,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue May 12 13:33:19 2020 by
+  Generated on Wed Nov 25 14:07:10 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.25 (ruby-2.6.2).
 </div>

data/doc/_index.html

@@ -248,7 +248,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue May 12 13:33:18 2020 by
+  Generated on Wed Nov 25 14:07:10 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.25 (ruby-2.6.2).
 </div>

data/doc/file.README.html

@@ -328,6 +328,9 @@ access.</p>
 <span class='kw'>end</span>
 </code></pre>
 
+<p>Inquery supports both schemacop specification versions 2 and 3 using the methods
+<code>schema</code> / <code>schema2</code> for version 2 and method <code>schema3</code> for version 3.</p>
+
 <h2 id="rails-integration">Rails integration</h2>
 
 <p>While it is optional, Inquery has been written from the ground up to be
@@ -374,7 +377,7 @@ in his <a href="http://craftingruby.com/posts/2015/06/29/query-objects-through-s
 </div></div>
 
       <div id="footer">
-  Generated on Tue May 12 13:33:18 2020 by
+  Generated on Wed Nov 25 14:07:10 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.25 (ruby-2.6.2).
 </div>

data/doc/index.html

@@ -328,6 +328,9 @@ access.</p>
 <span class='kw'>end</span>
 </code></pre>
 
+<p>Inquery supports both schemacop specification versions 2 and 3 using the methods
+<code>schema</code> / <code>schema2</code> for version 2 and method <code>schema3</code> for version 3.</p>
+
 <h2 id="rails-integration">Rails integration</h2>
 
 <p>While it is optional, Inquery has been written from the ground up to be
@@ -374,7 +377,7 @@ in his <a href="http://craftingruby.com/posts/2015/06/29/query-objects-through-s
 </div></div>
 
       <div id="footer">
-  Generated on Tue May 12 13:33:18 2020 by
+  Generated on Wed Nov 25 14:07:10 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.25 (ruby-2.6.2).
 </div>

data/doc/method_list.html

@@ -172,6 +172,22 @@
   </li>
   
 
+  <li class="odd ">
+    <div class="item">
+      <span class='object_link'><a href="Inquery/Mixins/SchemaValidation/ClassMethods.html#schema2-instance_method" title="Inquery::Mixins::SchemaValidation::ClassMethods#schema2 (method)">#schema2</a></span>
+      <small>Inquery::Mixins::SchemaValidation::ClassMethods</small>
+    </div>
+  </li>
+  
+
+  <li class="even ">
+    <div class="item">
+      <span class='object_link'><a href="Inquery/Mixins/SchemaValidation/ClassMethods.html#schema3-instance_method" title="Inquery::Mixins::SchemaValidation::ClassMethods#schema3 (method)">#schema3</a></span>
+      <small>Inquery::Mixins::SchemaValidation::ClassMethods</small>
+    </div>
+  </li>
+  
+
   <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="Inquery/Mixins/RelationValidation.html#validate_relation!-instance_method" title="Inquery::Mixins::RelationValidation#validate_relation! (method)">#validate_relation!</a></span>

data/doc/top-level-namespace.html

@@ -100,7 +100,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue May 12 13:33:18 2020 by
+  Generated on Wed Nov 25 14:07:10 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.25 (ruby-2.6.2).
 </div>

data/inquery.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: inquery 1.0.3 ruby lib
+# stub: inquery 1.0.8 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "inquery".freeze
-  s.version = "1.0.3"
+  s.version = "1.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Sitrox".freeze]
-  s.date = "2020-05-12"
+  s.date = "2020-11-25"
   s.files = [".gitignore".freeze, ".releaser_config".freeze, ".rubocop.yml".freeze, ".travis.yml".freeze, ".yardopts".freeze, "CHANGELOG.md".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "RUBY_VERSION".freeze, "Rakefile".freeze, "VERSION".freeze, "doc/Inquery.html".freeze, "doc/Inquery/Exceptions.html".freeze, "doc/Inquery/Exceptions/Base.html".freeze, "doc/Inquery/Exceptions/InvalidRelation.html".freeze, "doc/Inquery/Exceptions/UnknownCallSignature.html".freeze, "doc/Inquery/Mixins.html".freeze, "doc/Inquery/Mixins/RawSqlUtils.html".freeze, "doc/Inquery/Mixins/RelationValidation.html".freeze, "doc/Inquery/Mixins/RelationValidation/ClassMethods.html".freeze, "doc/Inquery/Mixins/SchemaValidation.html".freeze, "doc/Inquery/Mixins/SchemaValidation/ClassMethods.html".freeze, "doc/Inquery/Query.html".freeze, "doc/Inquery/Query/Chainable.html".freeze, "doc/_index.html".freeze, "doc/class_list.html".freeze, "doc/css/common.css".freeze, "doc/css/full_list.css".freeze, "doc/css/style.css".freeze, "doc/file.README.html".freeze, "doc/file_list.html".freeze, "doc/frames.html".freeze, "doc/index.html".freeze, "doc/js/app.js".freeze, "doc/js/full_list.js".freeze, "doc/js/jquery.js".freeze, "doc/method_list.html".freeze, "doc/top-level-namespace.html".freeze, "inquery.gemspec".freeze, "lib/inquery.rb".freeze, "lib/inquery/exceptions.rb".freeze, "lib/inquery/mixins/raw_sql_utils.rb".freeze, "lib/inquery/mixins/relation_validation.rb".freeze, "lib/inquery/mixins/schema_validation.rb".freeze, "lib/inquery/query.rb".freeze, "lib/inquery/query/chainable.rb".freeze, "test/db/models.rb".freeze, "test/db/schema.rb".freeze, "test/inquery/query/chainable_test.rb".freeze, "test/inquery/query_test.rb".freeze, "test/queries/group/fetch_as_json.rb".freeze, "test/queries/group/fetch_green.rb".freeze, "test/queries/group/fetch_red.rb".freeze, "test/queries/group/filter_with_color.rb".freeze, "test/queries/user/fetch_all.rb".freeze, "test/queries/user/fetch_in_group.rb".freeze, "test/queries/user/fetch_in_group_rel.rb".freeze, "test/test_helper.rb".freeze]
   s.rubygems_version = "3.0.3".freeze
   s.summary = "A skeleton that allows extracting queries into atomic, reusable classes.".freeze
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<minitest>.freeze, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>.freeze, [">= 0"])
       s.add_runtime_dependency(%q<activerecord>.freeze, [">= 0"])
-      s.add_runtime_dependency(%q<schemacop>.freeze, ["~> 2.0"])
+      s.add_runtime_dependency(%q<schemacop>.freeze, [">= 2.0"])
     else
       s.add_dependency(%q<bundler>.freeze, [">= 0"])
       s.add_dependency(%q<rake>.freeze, [">= 0"])
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<minitest>.freeze, [">= 0"])
       s.add_dependency(%q<activesupport>.freeze, [">= 0"])
       s.add_dependency(%q<activerecord>.freeze, [">= 0"])
-      s.add_dependency(%q<schemacop>.freeze, ["~> 2.0"])
+      s.add_dependency(%q<schemacop>.freeze, [">= 2.0"])
     end
   else
     s.add_dependency(%q<bundler>.freeze, [">= 0"])
@@ -53,6 +53,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<minitest>.freeze, [">= 0"])
     s.add_dependency(%q<activesupport>.freeze, [">= 0"])
     s.add_dependency(%q<activerecord>.freeze, [">= 0"])
-    s.add_dependency(%q<schemacop>.freeze, ["~> 2.0"])
+    s.add_dependency(%q<schemacop>.freeze, [">= 2.0"])
   end
 end

data/lib/inquery/mixins/relation_validation.rb

@@ -3,11 +3,20 @@ module Inquery
     module RelationValidation
       extend ActiveSupport::Concern
 
-      OPTIONS_SCHEMA = Schemacop::Schema.new do
-        opt :class, :string
-        opt :fields, :integer
-        opt :default_select, :symbol
-        opt :default, :object, classes: [Proc, FalseClass]
+      if defined?(Schemacop::Schema3)
+        OPTIONS_SCHEMA = Schemacop::Schema3.new(:hash) do
+          str? :class
+          int? :fields
+          sym? :default_select
+          obj? :default, [Proc, FalseClass]
+        end
+      else
+        OPTIONS_SCHEMA = Schemacop::Schema.new do
+          opt :class, :string
+          opt :fields, :integer
+          opt :default_select, :symbol
+          opt :default, :object, classes: [Proc, FalseClass]
+        end
       end
 
       DEFAULT_OPTIONS = {

data/lib/inquery/mixins/schema_validation.rb

@@ -9,10 +9,21 @@ module Inquery
       end
 
       module ClassMethods
-        def schema(*args, &block)
-          schema = Schemacop::Schema.new(*args, &block)
+        def schema2(*args, &block)
+          self._schema = Schemacop::Schema.new(*args, &block)
+        end
 
-          self._schema = schema
+        def schema3(reference = nil, **options, &block)
+          if reference
+            self._schema = Schemacop::Schema3.new(:reference, options.merge(path: reference))
+          else
+            self._schema = Schemacop::Schema3.new(:hash, **options, &block)
+          end
+        end
+
+        # @see schema2
+        def schema(*args, &block)
+          schema2(*args, &block)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inquery
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.8
 platform: ruby
 authors:
 - Sitrox
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-12 00:00:00.000000000 Z
+date: 2020-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -154,18 +154,18 @@ dependencies:
   name: schemacop
   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'
-description: 
-email: 
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -229,10 +229,10 @@ files:
 - test/queries/user/fetch_in_group.rb
 - test/queries/user/fetch_in_group_rel.rb
 - test/test_helper.rb
-homepage: 
+homepage:
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -247,8 +247,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: A skeleton that allows extracting queries into atomic, reusable classes.
 test_files: