inquery 0.1.0 → 1.0.4

data/inquery.gemspec

@@ -1,16 +1,16 @@
 # -*- encoding: utf-8 -*-
-# stub: inquery 0.1.0 ruby lib
+# stub: inquery 1.0.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "inquery".freeze
-  s.version = "0.1.0"
+  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 = "2017-05-16"
-  s.files = [".gitignore".freeze, ".releaser_config".freeze, ".rubocop.yml".freeze, ".travis.yml".freeze, ".yardopts".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/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/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 = "2.6.6".freeze
+  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
   s.test_files = ["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]
 
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<bundler>.freeze, ["~> 1.3"])
+      s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
       s.add_development_dependency(%q<rake>.freeze, [">= 0"])
       s.add_development_dependency(%q<sqlite3>.freeze, [">= 0"])
       s.add_development_dependency(%q<haml>.freeze, [">= 0"])
@@ -28,9 +28,9 @@ 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, ["~> 1"])
+      s.add_runtime_dependency(%q<schemacop>.freeze, [">= 2.0"])
     else
-      s.add_dependency(%q<bundler>.freeze, ["~> 1.3"])
+      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"])
@@ -40,10 +40,10 @@ 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, ["~> 1"])
+      s.add_dependency(%q<schemacop>.freeze, [">= 2.0"])
     end
   else
-    s.add_dependency(%q<bundler>.freeze, ["~> 1.3"])
+    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"])
@@ -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, ["~> 1"])
+    s.add_dependency(%q<schemacop>.freeze, [">= 2.0"])
   end
 end

data/lib/inquery.rb

@@ -6,5 +6,6 @@ require 'schemacop'
 require 'inquery/exceptions'
 require 'inquery/mixins/schema_validation'
 require 'inquery/mixins/relation_validation'
+require 'inquery/mixins/raw_sql_utils'
 require 'inquery/query'
 require 'inquery/query/chainable'

data/lib/inquery/mixins/raw_sql_utils.rb

@@ -0,0 +1,23 @@
+module Inquery
+  module Mixins
+    module RawSqlUtils
+      extend ActiveSupport::Concern
+
+      included do
+        # Sanitizes the SQL and substitutes in the supplied variables. Relies on
+        # `sanitize_sql_array` from ActiveRecord.
+        def san(sql, *variables)
+          ActiveRecord::Base.send(:sanitize_sql_array, [sql, *variables])
+        end
+
+        # Executes the sql on the connection provided by calling `connection`,
+        # which means that the method needs to be defined where this mixin is
+        # included. The sql passed in should be sanitized.
+        # Returns an instance of `ActiveRecord::Result`.
+        def exec_query(sql)
+          connection.exec_query(sql, self.class.to_s)
+        end
+      end
+    end
+  end
+end

data/lib/inquery/mixins/relation_validation.rb

@@ -3,14 +3,21 @@ module Inquery
     module RelationValidation
       extend ActiveSupport::Concern
 
-      OPTIONS_SCHEMA = {
-        hash: {
-          class: { type: String, null: true, required: false },
-          fields: { type: :integer, null: true, required: false },
-          default_select: { type: :symbol, null: true, required: false },
-          default: { type: [Proc, FalseClass], null: true, required: false }
-        }
-      }
+      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 = {
         # Allows to restrict the class (attribute `klass`) of the relation. Use
@@ -46,7 +53,7 @@ module Inquery
         # Allows to configure the parameters of the relation this query operates
         # on. See {OPTIONS_SCHEMA} for documentation of the options hash.
         def relation(options = {})
-          Schemacop.validate!(OPTIONS_SCHEMA, options)
+          OPTIONS_SCHEMA.validate!(options)
           self._relation_options = options
         end
       end

data/lib/inquery/mixins/schema_validation.rb

@@ -9,14 +9,11 @@ module Inquery
       end
 
       module ClassMethods
-        def schema(schema)
-          fail 'Schema must be a hash.' unless schema.is_a?(Hash)
-
-          unless schema[:type]
-            schema = {
-              type: :hash,
-              hash: schema
-            }
+        def schema(*args, &block)
+          if defined?(Schemacop::V2)
+            schema = Schemacop::V2::Schema.new(*args, &block)
+          else
+            schema = Schemacop::Schema.new(*args, &block)
           end
 
           self._schema = schema

data/lib/inquery/query.rb

@@ -1,6 +1,7 @@
 module Inquery
   class Query
     include Mixins::SchemaValidation
+    include Mixins::RawSqlUtils
 
     attr_reader :params
 
@@ -21,8 +22,8 @@ module Inquery
     def initialize(params = {})
       @params = params
 
-      if self.class._schema
-        Schemacop.validate!(self.class._schema, @params)
+      if _schema
+        @params = _schema.validate!(@params)
       end
     end
 
@@ -46,5 +47,11 @@ module Inquery
     def osparams
       @osparams ||= OpenStruct.new(params)
     end
+
+    # Provides a connection to the database. May be overridden if a different
+    # connection is desired. Defaults to `ActiveRecord::Base.connection`.
+    def connection
+      ActiveRecord::Base.connection
+    end
   end
 end

data/lib/inquery/query/chainable.rb

@@ -19,6 +19,11 @@ module Inquery
       super(params)
     end
 
+    # Override the connection method to (re-)use the connection of the relation
+    def connection
+      @relation.connection
+    end
+
     private
 
     def parse_init_args(*args)

data/test/inquery/query/chainable_test.rb

@@ -5,7 +5,7 @@ require 'queries/group/filter_with_color'
 
 module Inquery
   class Query
-    class ChainableTest < Minitest::Unit::TestCase
+    class ChainableTest < Minitest::Test
       include TestHelper
 
       def setup

data/test/inquery/query_test.rb

@@ -4,7 +4,7 @@ require 'queries/user/fetch_in_group'
 require 'queries/group/fetch_as_json'
 
 module Inquery
-  class QueryTest < Minitest::Unit::TestCase
+  class QueryTest < Minitest::Test
     include TestHelper
 
     def setup
@@ -29,7 +29,7 @@ module Inquery
     end
 
     def test_fetch_users_in_group_with_invalid_schema
-      assert_raises Schemacop::Exceptions::Validation do
+      assert_raises Schemacop::Exceptions::ValidationError do
         Queries::User::FetchInGroup.run
       end
     end

data/test/queries/group/filter_with_color.rb

@@ -2,7 +2,9 @@ module Queries
   module Group
     class FilterWithColor < Inquery::Query::Chainable
       relation class: 'Group'
-      schema color: :string
+      schema do
+        req :color, :string
+      end
 
       def call
         relation.where(color: osparams.color)

data/test/queries/user/fetch_in_group.rb

@@ -1,9 +1,9 @@
 module Queries
   module User
     class FetchInGroup < Inquery::Query
-      schema(
-        group_id: :integer
-      )
+      schema do
+        req :group_id, :integer
+      end
 
       def call
         ::Group.find(osparams.group_id).users

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: inquery
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.4
 platform: ruby
 authors:
 - Sitrox
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2020-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -154,18 +154,18 @@ dependencies:
   name: schemacop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
-description: 
-email: 
+        version: '2.0'
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -175,6 +175,7 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - ".yardopts"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -187,6 +188,7 @@ files:
 - doc/Inquery/Exceptions/InvalidRelation.html
 - doc/Inquery/Exceptions/UnknownCallSignature.html
 - doc/Inquery/Mixins.html
+- doc/Inquery/Mixins/RawSqlUtils.html
 - doc/Inquery/Mixins/RelationValidation.html
 - doc/Inquery/Mixins/RelationValidation/ClassMethods.html
 - doc/Inquery/Mixins/SchemaValidation.html
@@ -210,6 +212,7 @@ files:
 - inquery.gemspec
 - lib/inquery.rb
 - lib/inquery/exceptions.rb
+- lib/inquery/mixins/raw_sql_utils.rb
 - lib/inquery/mixins/relation_validation.rb
 - lib/inquery/mixins/schema_validation.rb
 - lib/inquery/query.rb
@@ -226,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
@@ -244,9 +247,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-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: