inquery 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39e19e13ad88defbc2be460c18bff9101cabd8ec157783b737da5ec6dd051f03
-  data.tar.gz: 7b69058c75be27e17c8204f2e7bafef7161db6412c4a24c420799bae8b81344e
+  metadata.gz: 705cf4cd798bece378f6bb8f58f6fe8c4cc8e5175519bff8d292bcb1c718ffa9
+  data.tar.gz: 4aad1d32fc5725ad02d1361d351f225304115006fd974f98ea587f2e7e0dcfa7
 SHA512:
-  metadata.gz: 0ced2783b3590ae0eb76272f70a1ef387519fe773cb6d7a660136e11cb59a3a054287667e42f3dd5186ccc3d673bf3ebc1e9cc19c118abf6c44465e869ca8fd4
-  data.tar.gz: d485bfa3b54ebfb9042fc2d3678b538f9e3b1e8cc535b9f41363bb967c68516bc260a3d9a8db50e40e0f4e87a1d13d689da1d14a053c720f22bacc3b287d9934
+  metadata.gz: 54ca20f922c48be73d09f88519323a9133837fb621721b3fc7ad4ba68e612df6f1aabcd2343322440d0a6102691bdd29de704b440007168ff068547f20021c5f
+  data.tar.gz: 46ddba74947a1c088216e3467a20c0ddf4716e471f4b6f3fab1a96e8b0d5e624bc935bfd4cfbbfc44ac6515dac0380aebfcfae80fff77ae2b7ec70fd83599611

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change log
 
+## 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/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.4

data/doc/Inquery.html

@@ -109,7 +109,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue May 12 13:33:18 2020 by
+  Generated on Tue Nov 24 16:32:43 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 Tue Nov 24 16:32:43 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 Tue Nov 24 16:32:43 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 Tue Nov 24 16:32:43 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 Tue Nov 24 16:32:43 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 Tue Nov 24 16:32:43 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 Tue Nov 24 16:32:43 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 Tue Nov 24 16:32:43 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 Tue Nov 24 16:32:43 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 Tue Nov 24 16:32:43 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

@@ -148,13 +148,21 @@
 13
 14
 15
-16</pre>
+16
+17
+18
+19
+20</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'>if</span> <span class='kw'>defined?</span><span class='lparen'>(</span><span class='const'>Schemacop</span><span class='op'>::</span><span class='const'>V2</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'>V2</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'>else</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>
 
   <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>
 <span class='kw'>end</span></pre>
@@ -168,7 +176,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue May 12 13:33:18 2020 by
+  Generated on Tue Nov 24 16:32:43 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 Tue Nov 24 16:32:43 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 Tue Nov 24 16:32:43 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 Tue Nov 24 16:32:43 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

@@ -374,7 +374,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 Tue Nov 24 16:32:43 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

@@ -374,7 +374,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 Tue Nov 24 16:32:43 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/top-level-namespace.html

@@ -100,7 +100,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue May 12 13:33:18 2020 by
+  Generated on Tue Nov 24 16:32:43 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.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "inquery".freeze
-  s.version = "1.0.3"
+  s.version = "1.0.4"
 
   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-24"
   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::V2)
+        OPTIONS_SCHEMA = Schemacop::Node.create :object do
+          str? :class
+          int? :fields
+          sym? :default_select
+          rby? :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

@@ -10,7 +10,11 @@ module Inquery
 
       module ClassMethods
         def schema(*args, &block)
-          schema = Schemacop::Schema.new(*args, &block)
+          if defined?(Schemacop::V2)
+            schema = Schemacop::V2::Schema.new(*args, &block)
+          else
+            schema = Schemacop::Schema.new(*args, &block)
+          end
 
           self._schema = schema
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inquery
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Sitrox
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-12 00:00:00.000000000 Z
+date: 2020-11-24 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: