inquery 1.0.4 → 1.0.9

data/doc/top-level-namespace.html

@@ -6,7 +6,7 @@
 <title>
   Top Level Namespace
   
-    &mdash; Documentation by YARD 0.9.25
+    &mdash; Documentation by YARD 0.9.26
   
 </title>
 
@@ -100,9 +100,9 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Nov 24 16:32:43 2020 by
+  Generated on Wed Feb 24 10:57:42 2021 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.25 (ruby-2.6.2).
+  0.9.26 (ruby-2.6.2).
 </div>
 
     </div>

data/inquery.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: inquery 1.0.4 ruby lib
+# stub: inquery 1.0.9 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "inquery".freeze
-  s.version = "1.0.4"
+  s.version = "1.0.9"
 
   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-11-24"
+  s.date = "2021-02-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
@@ -23,24 +23,24 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<sqlite3>.freeze, [">= 0"])
       s.add_development_dependency(%q<haml>.freeze, [">= 0"])
       s.add_development_dependency(%q<yard>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rubocop>.freeze, ["= 0.35.1"])
+      s.add_development_dependency(%q<rubocop>.freeze, ["= 0.92.0"])
       s.add_development_dependency(%q<redcarpet>.freeze, [">= 0"])
       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, ["~> 3.0.8"])
     else
       s.add_dependency(%q<bundler>.freeze, [">= 0"])
       s.add_dependency(%q<rake>.freeze, [">= 0"])
       s.add_dependency(%q<sqlite3>.freeze, [">= 0"])
       s.add_dependency(%q<haml>.freeze, [">= 0"])
       s.add_dependency(%q<yard>.freeze, [">= 0"])
-      s.add_dependency(%q<rubocop>.freeze, ["= 0.35.1"])
+      s.add_dependency(%q<rubocop>.freeze, ["= 0.92.0"])
       s.add_dependency(%q<redcarpet>.freeze, [">= 0"])
       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, ["~> 3.0.8"])
     end
   else
     s.add_dependency(%q<bundler>.freeze, [">= 0"])
@@ -48,11 +48,11 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<sqlite3>.freeze, [">= 0"])
     s.add_dependency(%q<haml>.freeze, [">= 0"])
     s.add_dependency(%q<yard>.freeze, [">= 0"])
-    s.add_dependency(%q<rubocop>.freeze, ["= 0.35.1"])
+    s.add_dependency(%q<rubocop>.freeze, ["= 0.92.0"])
     s.add_dependency(%q<redcarpet>.freeze, [">= 0"])
     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, ["~> 3.0.8"])
   end
 end

data/lib/inquery/mixins/relation_validation.rb

@@ -3,12 +3,12 @@ module Inquery
     module RelationValidation
       extend ActiveSupport::Concern
 
-      if defined?(Schemacop::V2)
-        OPTIONS_SCHEMA = Schemacop::Node.create :object do
+      if defined?(Schemacop::Schema3)
+        OPTIONS_SCHEMA = Schemacop::Schema3.new(:hash) do
           str? :class
           int? :fields
           sym? :default_select
-          rby? :default, [Proc, FalseClass]
+          obj? :default, classes: [Proc, FalseClass]
         end
       else
         OPTIONS_SCHEMA = Schemacop::Schema.new do
@@ -24,26 +24,26 @@ module Inquery
         # `nil` to not perform any checks. The `class` attribute will also be
         # taken to infer a default if no relation is given and you didn't
         # specify any `default`.
-        class: nil,
+        class:          nil,
 
         # This allows to specify a default relation that will be taken if no
         # relation is given. This must be specified as a Proc returning the
         # relation. Set this to `false` for no default. If this is set to `nil`,
         # it will try to infer the default from the option `class` (if given).
-        default: nil,
+        default:        nil,
 
         # Allows to restrict the number of fields / values the relation must
         # select. This is particularly useful if you're using the query as a
         # subquery and need it to return exactly one field. Use `nil` to not
         # perform any checks.
-        fields: nil,
+        fields:         nil,
 
         # If this is set to a symbol, the relation does not have any select
         # fields specified (`select_values` is empty) and `fields` is > 0, it
         # will automatically select the given field. Use `nil` to disable this
         # behavior.
         default_select: :id
-      }
+      }.freeze
 
       included do
         class_attribute :_relation_options
@@ -91,7 +91,7 @@ module Inquery
         # ---------------------------------------------------------------
         fields_count = relation.select_values.size
 
-        if fields_count == 0 && options[:default_select] && options[:fields] && options[:fields] > 0
+        if fields_count.zero? && options[:default_select] && options[:fields] && (options[:fields]).positive?
           relation = relation.select(options[:default_select])
           fields_count = 1
         end

data/lib/inquery/mixins/schema_validation.rb

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

data/test/test_helper.rb

@@ -10,7 +10,7 @@ module TestHelper
 
   module ClassMethods
     def setup_db
-      load File.dirname(__FILE__) + '/db/schema.rb'
+      load "#{File.dirname(__FILE__)}/db/schema.rb"
     end
 
     def setup_base_data

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inquery
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.9
 platform: ruby
 authors:
 - Sitrox
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-24 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.92.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.92.0
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -154,18 +154,18 @@ dependencies:
   name: schemacop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 3.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-description:
-email:
+        version: 3.0.8
+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.4
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: A skeleton that allows extracting queries into atomic, reusable classes.
 test_files: