yesql 0.1.7 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 180f75c325ecfc85f0d95e0d0a9422fcde92db273487bd19a7f03318c3206f16
-  data.tar.gz: '00429a2c7880d6546e82b5c530d097be14e524ed161a81d7c75b55c61f86f2b7'
+  metadata.gz: f38a878a124272c8ed8f51d723cba49704d2e7b60b28920c562fdbc8e1d68836
+  data.tar.gz: dbfa7776c1eb0eeae767023504cb741dd05052fd992b3b01a218f849917d7696
 SHA512:
-  metadata.gz: 6a13774afd3b568927652026d00ac25d1b521c4eebcdcf4d2f4bc9d3de86652613322d449e30f276eabfebcb2aaa044bdc66abc3757f0f759533b0fcf5c53868
-  data.tar.gz: 3017fb1e072485f1c3d469517c1e326d74c32f2d14873a8801c78da8d0bb1f49459a81f6abc64b9c0fa1680dd8799cd12328496ec0077fa2823e24e204f80c1a
+  metadata.gz: b781599e0e8d5f6a84bec509737595269f28e6347284046f2a7d767ff14256b79a8658643b0e077a453ce08bf4d23766e2eebbd1bcc19b952b43f3eeda94b87b
+  data.tar.gz: 6ac1827d64222972e9fd70bbdb216576581c86dd54a93824d20236e451720ae035ee54ad47912270faa823d8ff30d471353e9a69d123fa1d2544315067683481

data/.gitignore

@@ -2,3 +2,6 @@ spec/minimalpg/log/*
 spec/minimalmysql/log/*
 spec/minimalpg/db/*
 spec/minimalmysql/db/*
+
+*.un~
+*.swp

data/Gemfile

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
 
 group :docs do
-  gem 'yard'
+  gem "yard"
 end

data/Gemfile.lock

@@ -1,159 +1,55 @@
 PATH
   remote: .
   specs:
-    yesql (0.1.6)
-      rails (>= 5.0)
+    yesql (0.1.8)
+      activerecord (>= 4.0.0.beta1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      activejob (= 6.0.3.4)
-      activerecord (= 6.0.3.4)
-      activestorage (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
-      mail (>= 2.7.1)
-    actionmailer (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      actionview (= 6.0.3.4)
-      activejob (= 6.0.3.4)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.4)
-      actionview (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
-      rack (~> 2.0, >= 2.0.8)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      activerecord (= 6.0.3.4)
-      activestorage (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
-      nokogiri (>= 1.8.5)
-    actionview (6.0.3.4)
-      activesupport (= 6.0.3.4)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.3.4)
-      activesupport (= 6.0.3.4)
-      globalid (>= 0.3.6)
-    activemodel (6.0.3.4)
-      activesupport (= 6.0.3.4)
-    activerecord (6.0.3.4)
-      activemodel (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
-    activestorage (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      activejob (= 6.0.3.4)
-      activerecord (= 6.0.3.4)
-      marcel (~> 0.3.1)
-    activesupport (6.0.3.4)
+    activemodel (6.1.3.1)
+      activesupport (= 6.1.3.1)
+    activerecord (6.1.3.1)
+      activemodel (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
+    activesupport (6.1.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    builder (3.2.4)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
-    crass (1.0.6)
+    concurrent-ruby (1.1.8)
     diff-lcs (1.4.4)
-    erubi (1.9.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (1.8.5)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    loofah (2.7.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
     method_source (1.0.0)
-    mimemagic (0.3.5)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.2)
+    minitest (5.14.4)
     mysql2 (0.5.3)
-    nio4r (2.5.4)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
     pg (1.2.3)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (6.0.3.4)
-      actioncable (= 6.0.3.4)
-      actionmailbox (= 6.0.3.4)
-      actionmailer (= 6.0.3.4)
-      actionpack (= 6.0.3.4)
-      actiontext (= 6.0.3.4)
-      actionview (= 6.0.3.4)
-      activejob (= 6.0.3.4)
-      activemodel (= 6.0.3.4)
-      activerecord (= 6.0.3.4)
-      activestorage (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
-      bundler (>= 1.3.0)
-      railties (= 6.0.3.4)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    railties (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
-    rake (13.0.1)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
+    rspec-core (3.9.3)
       rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec-expectations (3.9.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    sprockets (4.0.2)
+    rspec-support (3.9.4)
+    tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    websocket-driver (0.7.3)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    yard (0.9.25)
-    zeitwerk (2.4.0)
+    yard (0.9.26)
+    zeitwerk (2.4.2)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
   mysql2 (~> 0.5.3)
@@ -164,4 +60,4 @@ DEPENDENCIES
   yesql!
 
 BUNDLED WITH
-   2.1.4
+   2.2.3

data/README.md

@@ -120,28 +120,6 @@ ActiveRecord::Base.connection.execute('SELECT * FROM pg_prepared_statements').to
 ```
 
 
-#### `cache`
-
-If you need to cache your query, you can use the `cache` option. `cache` must be a Hash containing __at least__ the `expires_in` key with an `ActiveSupport::Duration` object, e.g:
-
-```ruby
-YeSQL('users', cache: { key: 'users', expires_in: 1.hour })
-```
-
-That's enough to cache the result of the query for 1 hour with the cache key "users".
-
-If no `key` key/value is used, then the cache key is the name of the file containing the SQL code, and
-
-```ruby
-YeSQL('users', cache: { key: 'users', expires_in: 1.hour })
-```
-
-is the same as
-
-```ruby
-YeSQL('users', cache: { expires_in: 1.hour })
-```
-
 ## Configuration
 
 For default `YeSQL` looks for the _.sql_ files defined under the `app/yesql/` folder but you can update it to use any folder you need. For that you can create a Ruby file under the `config/initializers/` with the following content:
@@ -173,6 +151,12 @@ You can check at anytime what's the configuration path by inspecting the ::YeSQL
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/sebastian-palma/yesql. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/sebastian-palma/yesql/blob/master/CODE_OF_CONDUCT.md).
 
+## TODO
+
+- [ ] Allow comments in .sql files.
+- [ ] Improve errors.
+- [ ] Auto convert `x IN (xs)` queries to `(x = x' OR x = x'')`.
+
 
 ## License
 

data/Rakefile

@@ -1 +1,3 @@
 # frozen_string_literal: true
+
+require "standard/rake"

data/lib/yesql.rb

@@ -1,50 +1,40 @@
 # frozen_string_literal: true
 
-require 'yesql/statement'
-require 'yesql/version'
-require 'yesql/config/configuration'
-require 'yesql/query/performer'
-require 'yesql/errors/cache_expiration_error'
-require 'yesql/errors/file_path_does_not_exist_error'
-require 'yesql/errors/no_bindings_provided_error'
-require 'yesql/errors/output_argument_error'
-
-module YeSQL
+require "yesql/statement"
+require "yesql/version"
+require "yesql/config/configuration"
+require "yesql/query/performer"
+require "yesql/errors/file_path_does_not_exist_error"
+require "yesql/errors/no_bindings_provided_error"
+require "yesql/errors/output_argument_error"
+
+module ::YeSQL
   include ::YeSQL::Config
-  include ::YeSQL::Errors::CacheExpirationError
-  include ::YeSQL::Errors::FilePathDoesNotExistError
-  include ::YeSQL::Errors::NoBindingsProvidedError
-  include ::YeSQL::Errors::OutputArgumentError
 
-  BIND_REGEX = /(?<!:):(\w+)(?=\b)/.freeze
+  BIND_REGEX = /(?<!:):(\w+)(?=\b)/
 
-  # rubocop:disable Naming/MethodName
-  def YeSQL(file_path, bindings = {}, options = {})
+  def YeSQL(file_path, binds = {}, options = {})
     output = options[:output] || :rows
-    cache = options[:cache] || {}
 
-    validate(bindings, cache, file_path, output)
-    execute(bindings, cache, file_path, output, options)
+    validate(binds, file_path, output)
+    execute(binds, file_path, output, options[:prepare])
   end
-  # rubocop:enable Naming/MethodName
 
   private
 
-  def validate(bindings, cache, file_path, output)
-    validate_file_path_existence(file_path)
-    validate_statement_bindings(bindings, file_path)
-    validate_output_options(output)
-    validate_cache_expiration(cache[:expires_in]) unless cache.empty?
+  def validate(binds, file_path, output)
+    ::YeSQL::Errors::FilePathDoesNotExistError.new(file_path).validate_file_path_existence
+    ::YeSQL::Errors::NoBindingsProvidedError.new(binds, file_path).validate_statement_bindings
+    ::YeSQL::Errors::OutputArgumentError.new(output).validate_output_options
   end
 
-  def execute(bindings, cache, file_path, output, options)
+  def execute(binds, file_path, output, prepare)
     ::YeSQL::Query::Performer.new(
-      bindings: bindings,
-      bind_statement: ::YeSQL::Statement.new(bindings, file_path),
-      cache: cache,
+      bindings: binds,
+      bind_statement: ::YeSQL::Statement.new(binds, file_path),
       file_path: file_path,
       output: output,
-      prepare: options[:prepare]
+      prepare: prepare
     ).call
   end
 end

data/lib/yesql/bindings/extract.rb

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
-require 'yesql'
-require 'yesql/common/adapter'
+require "yesql"
+require "yesql/common/adapter"
 
 module ::YeSQL
   module Bindings
     class Extract
       include ::YeSQL::Common::Adapter
 
-      def initialize(indexed_bindings, hash, index, value)
-        @indexed_bindings = indexed_bindings
+      def initialize(hash, indexed_bindings, index, value)
         @hash = hash
         @index = index
+        @indexed_bindings = indexed_bindings
         @value = value
       end
 
@@ -23,13 +23,13 @@ module ::YeSQL
 
       def bind_vars
         if mysql?
-          return '?' unless array?
+          return "?" unless array?
 
-          Array.new(value.size, '?').join(', ')
+          Array.new(size, "?").join(", ")
         elsif pg?
           return "$#{last_val}" unless array?
 
-          value.map.with_index(bind_index) { |_, i| "$#{i}" }.join(', ')
+          value.map.with_index(bind_index) { |_, i| "$#{i}" }.join(", ")
         end
       end
 
@@ -48,7 +48,7 @@ module ::YeSQL
       attr_reader :hash, :index, :indexed_bindings, :value
 
       def current_val_size
-        return value.size if array?
+        return size if array?
 
         1
       end
@@ -72,6 +72,10 @@ module ::YeSQL
 
         prev_last_val + 1
       end
+
+      def size
+        value.size
+      end
     end
   end
 end

data/lib/yesql/bindings/extractor.rb

@@ -1,38 +1,41 @@
 # frozen_string_literal: true
 
-require 'yesql/bindings/extract'
+require "yesql/bindings/extract"
 
-module YeSQL
+module ::YeSQL
   module Bindings
     class Extractor
-      def initialize(bindings:)
+      def initialize(bindings: {})
         @bindings = bindings
-        @indexed_bindings = (bindings || {}).to_a
+        @indexed_bindings = bindings.to_a
       end
 
-      # rubocop:disable Metrics/MethodLength
       def call
-        bindings.each_with_object({}).with_index(1) do |((key, value), hash), index|
-          hash[key] =
-            ::YeSQL::Bindings::Extract.new(indexed_bindings, hash, index, value).tap do |extract|
-              break {
-                bind: {
-                  vals: extract.bind_vals,
-                  vars: extract.bind_vars
-                },
-                last_val: extract.last_val,
-                match: key,
-                prev: extract.prev,
-                value: value
-              }
-            end
-        end
+        bindings
+          .each_with_object({})
+          .with_index(1) do |((key, value), hash), index|
+            hash[key] = binding_extracts(hash, indexed_bindings, index, key, value)
+          end
       end
-      # rubocop:enable Metrics/MethodLength
 
       private
 
       attr_reader :bindings, :indexed_bindings
+
+      def binding_extracts(hash, indexed_bindings, index, key, value)
+        ::YeSQL::Bindings::Extract.new(hash, indexed_bindings, index, value).tap do |extract|
+          break {
+            bind: {
+              vals: extract.bind_vals,
+              vars: extract.bind_vars
+            },
+            last_val: extract.last_val,
+            match: key,
+            prev: extract.prev,
+            value: value
+          }
+        end
+      end
     end
   end
 end

data/lib/yesql/bindings/transformed.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'yesql'
-require 'yesql/common/adapter'
+require "yesql"
+require "yesql/common/adapter"
 
 module ::YeSQL
   module Bindings
@@ -24,16 +24,15 @@ module ::YeSQL
       attr_reader :statement_binds
 
       def rails5?
-        ::Rails::VERSION::MAJOR == 5
+        ::ActiveRecord::VERSION::MAJOR == 5
       end
 
       def mysql_rails5_binds
         statement_binds
-          .map(&:first)
-          .flatten(1)
+          .flat_map(&:first)
           .each_slice(2)
           .flat_map do |first, last|
-            next [first, last].map(&:last) if first.is_a?(Array)
+            next [first, last].compact.map(&:last) if first.is_a?(Array)
 
             last
           end
@@ -49,7 +48,7 @@ module ::YeSQL
 
       def pg_binds
         statement_binds
-          .sort_by { |_, position| position.to_s.tr('$', '').to_i }
+          .sort_by { |_, position| position.to_s.tr("$", "").to_i }
           .uniq
           .map(&:first)
           .flatten

data/lib/yesql/bindings/utils.rb

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
-module YeSQL
+module ::YeSQL
   module Bindings
     module Utils
+      include ::YeSQL::Utils::Read
+
       def statement_binds(extractor)
-        ::YeSQL::Utils::Read.statement(file_path, readable: true)
-                            .scan(::YeSQL::BIND_REGEX).map do |(bind)|
-          extractor[bind.to_sym][:bind].values_at(:vals, :vars)
-        end
+        statement(readable: true)
+          .scan(::YeSQL::BIND_REGEX)
+          .map(&:first)
+          .map { extractor[_1.to_sym][:bind].values_at(:vals, :vars) }
       end
     end
   end

data/lib/yesql/common/adapter.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'forwardable'
+require "forwardable"
 
 module ::YeSQL
   module Common
     module Adapter
-      extend Forwardable
+      extend ::Forwardable
 
       # `adapter` might be a complex object, but
       # for the sake of brevity it's just a string
@@ -14,11 +14,11 @@ module ::YeSQL
       end
 
       def mysql?
-        adapter == 'Mysql2'
+        adapter == "Mysql2"
       end
 
       def pg?
-        adapter == 'PostgreSQL'
+        adapter == "PostgreSQL"
       end
     end
   end

data/lib/yesql/config/configuration.rb

@@ -3,11 +3,12 @@
 module ::YeSQL
   module Config
     class Configuration
-      attr_accessor :path
+      attr_accessor :connection, :path
 
-      DEFAULT_PATH = 'app/yesql'
+      DEFAULT_PATH = "app/yesql"
 
       def initialize
+        @connection = ""
         @path = DEFAULT_PATH
       end
     end

data/lib/yesql/errors/file_path_does_not_exist_error.rb

@@ -1,28 +1,31 @@
 # frozen_string_literal: true
 
-module YeSQL
+module ::YeSQL
   module Errors
-    module FilePathDoesNotExistError
-      def validate_file_path_existence(file_path)
-        return if file_exists?(file_path)
+    class FilePathDoesNotExistError
+      def initialize(file_path)
+        @file_path = file_path
+      end
+
+      def validate_file_path_existence
+        return if file_exists?
 
-        raise NotImplementedError, format(MESSAGE, available_files: available_files,
-                                                   file_path: file_path, path: ::YeSQL.config.path)
+        raise ::NotImplementedError, message
       end
 
       private
 
-      MESSAGE = <<~MSG
+      attr_reader :file_path
 
-        SQL file "%<file_path>s" does not exist in %<path>s.
+      def message
+"\nSQL file \"#{file_path}\" does not exist in #{::YeSQL.config.path}.
 
-        Available SQL files are:
+Available SQL files are:
 
-        %<available_files>s
-      MSG
-      private_constant :MESSAGE
+#{available_files}\n"
+      end
 
-      def file_exists?(file_path)
+      def file_exists?
         path_files.any? { |filename| filename.include?("#{file_path}.sql") }
       end
 

data/lib/yesql/errors/no_bindings_provided_error.rb

@@ -1,41 +1,48 @@
 # frozen_string_literal: true
 
-require 'yesql/utils/read'
+require "yesql/utils/read"
 
 module ::YeSQL
   module Errors
-    module NoBindingsProvidedError
-      def validate_statement_bindings(binds, file_path)
-        return unless statement_binds(file_path).size.positive?
+    class NoBindingsProvidedError
+      include ::YeSQL::Utils::Read
 
-        format(MESSAGE, renderable_statement_binds(file_path)).tap do |message|
-          raise ::ArgumentError, message unless binds.is_a?(::Hash) && !binds.empty?
-        end
+      def initialize(binds, file_path)
+        @binds = binds
+        @file_path = file_path
+      end
+
+      def validate_statement_bindings
+        return unless statement_binds.size.positive?
+        return if expected_binds?
+
+        raise ::ArgumentError, message
       end
 
       private
 
-      MESSAGE = <<~MSG
+      attr_reader :binds, :file_path
 
-        YeSQL invoked without bindings.
+      def message
+"\nYeSQL invoked without bindings.
 
-        Expected bindings are:
+Expected bindings are:
 
-        %s
-      MSG
-      private_constant :MESSAGE
+#{renderable_statement_binds}\n"
+      end
 
-      def statement_binds(file_path)
-        ::YeSQL::Utils::Read.statement(file_path)
-                            .scan(::YeSQL::BIND_REGEX).tap do |scanned_binds|
-          break [] if scanned_binds.size.zero?
+      def statement_binds
+        statement
+          .scan(::YeSQL::BIND_REGEX)
+          .tap { |scanned_binds| break (scanned_binds || []).sort }
+      end
 
-          break scanned_binds.sort
-        end
+      def renderable_statement_binds
+        statement_binds.flatten.map { |bind| "- `#{bind}`\n" }.join
       end
 
-      def renderable_statement_binds(file_path)
-        statement_binds(file_path).flatten.map { |bind| "- `#{bind}`\n" }.join
+      def expected_binds?
+        binds.is_a?(::Hash) && !binds.empty?
       end
     end
   end

data/lib/yesql/errors/output_argument_error.rb

@@ -1,22 +1,32 @@
 # frozen_string_literal: true
 
-module YeSQL
+module ::YeSQL
   module Errors
-    module OutputArgumentError
-      def validate_output_options(output)
+    class OutputArgumentError
+      def initialize(output)
+        @output = output
+      end
+
+      def validate_output_options
         return if output.nil?
+        return if OPTIONS.include?(output.to_sym)
 
-        raise ArgumentError, format(MESSAGE, output) unless OPTIONS.include?(output.to_sym)
+        raise ArgumentError, message
       end
 
-      MESSAGE = <<~MSG
-        Unsupported `output` option given `%s`. Possible values are:
-          - `columns`: returns an array with the columns from the result.
-          - `hash`: returns an array of hashes combining both, the columns and rows from the statement result.
-          - `rows`: returns an array of arrays for each row from the given SQL statement.
-      MSG
+      private
+
+      attr_reader :output
+
       OPTIONS = %i[columns hash rows].freeze
-      private_constant :MESSAGE, :OPTIONS
+      private_constant :OPTIONS
+
+      def message
+"Unsupported `output` option given `#{output}`. Possible values are:
+  - `columns`: returns an array with the columns from the result.
+  - `hash`: returns an array of hashes combining both, the columns and rows from the statement result.
+  - `rows`: returns an array of arrays for each row from the given SQL statement.\n"
+      end
     end
   end
 end

data/lib/yesql/params/output.rb

@@ -1,27 +1,27 @@
 # frozen_string_literal: true
 
-require 'yesql'
-require 'forwardable'
+require "yesql"
+require "forwardable"
 
 module ::YeSQL
   module Params
     class Output
-      extend Forwardable
+      extend ::Forwardable
 
       def initialize(output)
         @output = output.to_s
       end
 
       def columns?
-        output == 'columns'
+        output == "columns"
       end
 
       def rows?
-        output == 'rows'
+        output == "rows"
       end
 
       def hash?
-        output == 'hash'
+        output == "hash"
       end
 
       def_delegator(:output, :to_sym)

data/lib/yesql/query/performer.rb

@@ -1,58 +1,33 @@
 # frozen_string_literal: true
 
-require 'yesql'
-require 'yesql/bindings/utils'
-require 'yesql/common/adapter'
-require 'yesql/bindings/transformed'
-require 'yesql/query/result'
-require 'yesql/query/transform_result'
-require 'yesql/params/output'
-
-module YeSQL
+require "yesql"
+require "yesql/bindings/utils"
+require "yesql/common/adapter"
+require "yesql/bindings/transformed"
+require "yesql/query/result"
+require "yesql/query/transform_result"
+require "yesql/params/output"
+
+module ::YeSQL
   module Query
     class Performer
       include ::YeSQL::Bindings::Utils
 
-      # rubocop:disable Metrics/ParameterLists
-      def initialize(bind_statement:,
-                     bindings: {},
-                     cache: {},
-                     file_path:,
-                     output: :rows,
-                     prepare: false)
+      def initialize(bind_statement:, file_path:, bindings: {}, output: :rows, prepare: false)
         @bind_statement = bind_statement
-        @cache = cache
-        @cache_key = cache[:key] || file_path
-        @expires_in = cache[:expires_in]
         @file_path = file_path
         @named_bindings = bindings.transform_keys(&:to_sym)
         @output = ::YeSQL::Params::Output.new(output)
         @prepare = prepare
       end
-      # rubocop:enable Metrics/ParameterLists
 
       def call
-        return transformed_result if cache.empty?
-
-        Rails.cache.fetch(cache_key, expires_in: expires_in) { transformed_result }
+        ::YeSQL::Query::TransformResult.new(output: output, result: query_result).call
       end
 
       private
 
-      attr_reader :bind_statement,
-                  :cache,
-                  :cache_key,
-                  :expires_in,
-                  :file_path,
-                  :named_bindings,
-                  :output,
-                  :prepare,
-                  :rows
-
-      def transformed_result
-        @transformed_result ||=
-          ::YeSQL::Query::TransformResult.new(output: output, result: query_result).call
-      end
+      attr_reader :bind_statement, :file_path, :named_bindings, :output, :prepare
 
       def query_result
         @query_result ||= ::YeSQL::Query::Result.new(binds: binds,

data/lib/yesql/query/result.rb

@@ -1,37 +1,36 @@
 # frozen_string_literal: true
 
-require 'yesql'
-require 'forwardable'
-require 'yesql/common/adapter'
+require "yesql"
+require "forwardable"
+require "yesql/common/adapter"
 
 module ::YeSQL
   module Query
     class Result
-      extend Forwardable
+      extend ::Forwardable
 
       include ::YeSQL::Common::Adapter
 
-      def initialize(binds: [], bind_statement:, file_path:, prepare:)
+      def initialize(bind_statement:, file_path:, prepare:, binds: [])
         @binds = binds
         @bind_statement = bind_statement
-        @connection = ActiveRecord::Base.connection
         @file_path = file_path
         @prepare_option = prepare
       end
 
       def call
-        return view_result   if view?
-        return rails5_result if ::Rails::VERSION::MAJOR == 5 && mysql?
+        return view_result if view?
+        return rails5_result if ::ActiveRecord::VERSION::MAJOR == 5 && mysql?
 
         exec_query(bound, file_path, binds, prepare: prepare_option)
       end
 
       private
 
-      attr_reader :binds, :bind_statement, :connection, :file_path, :prepare_option
+      attr_reader :binds, :bind_statement, :file_path, :prepare_option
 
       def_delegators(:bind_statement, :bound, :to_s, :view?)
-      def_delegators(:connection,     :exec_query, :raw_connection)
+      def_delegators(:connection, :exec_query, :raw_connection)
       def_delegators(:raw_connection, :prepare)
 
       def view_result
@@ -41,6 +40,10 @@ module ::YeSQL
       def rails5_result
         prepare(bound).execute(*binds)
       end
+
+      def connection
+        @connection ||= ActiveRecord::Base.connection
+      end
     end
   end
 end

data/lib/yesql/query/transform_result.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'yesql'
-require 'yesql/common/adapter'
-require 'forwardable'
+require "yesql"
+require "yesql/common/adapter"
+require "forwardable"
 
 module ::YeSQL
   module Query
     class TransformResult
-      extend Forwardable
+      extend ::Forwardable
 
       include ::YeSQL::Common::Adapter
 
@@ -17,7 +17,7 @@ module ::YeSQL
       end
 
       def call
-        if ::Rails::VERSION::MAJOR == 5 && mysql?
+        if rails_5? && mysql?
           return columns if columns?
           return rows_values if rows?
           return array_of_symbol_hashes if hash?
@@ -32,7 +32,7 @@ module ::YeSQL
 
       attr_reader :output, :result
 
-      def_delegators(:result, :rows, :to_a)
+      def_delegators(:result, :fields, :rows, :to_a)
       def_delegators(:output, :columns?, :hash?, :rows?)
 
       def rows_values
@@ -40,8 +40,9 @@ module ::YeSQL
       end
 
       def array_of_symbol_hashes
-        to_a.tap { |rows| break hashed_rows(rows) if ::Rails::VERSION::MAJOR == 5 }
-            .map { |e| e.respond_to?(:symbolize_keys) ? e.symbolize_keys : e }
+        to_a
+          .tap { |rows| break hashed_rows(rows) if ::ActiveRecord::VERSION::MAJOR == 5 }
+          .map { |e| e.respond_to?(:symbolize_keys) ? e.symbolize_keys : e }
       end
 
       def hashed_rows(rows)
@@ -49,9 +50,11 @@ module ::YeSQL
       end
 
       def columns
-        return result.fields if result.respond_to?(:fields)
+        fields || result.columns
+      end
 
-        result.columns
+      def rails_5?
+        ::ActiveRecord::VERSION::MAJOR == 5
       end
     end
   end

data/lib/yesql/statement.rb

@@ -1,35 +1,35 @@
 # frozen_string_literal: true
 
-require 'forwardable'
+require "active_record"
 
-require 'yesql/utils/read'
-require 'yesql/bindings/extractor'
-require 'yesql/common/adapter'
+require "forwardable"
+
+require "yesql/utils/read"
+require "yesql/bindings/extractor"
+require "yesql/common/adapter"
 
 module ::YeSQL
   class Statement
-    extend Forwardable
+    extend ::Forwardable
 
     include ::YeSQL::Common::Adapter
+    include ::YeSQL::Utils::Read
+    # Give access to the quote method.
+    include ::ActiveRecord::ConnectionAdapters::Quoting
 
     def initialize(bindings = {}, file_path)
       @bindings = bindings
-      @connection = ::ActiveRecord::Base.connection
       @file_path = file_path
     end
 
     def bound
       to_s.gsub(::YeSQL::BIND_REGEX) do |match|
-        extractor[match[/(\w+)/].to_sym].tap do |extract|
-          break quote(extract[:value]) if view?
-
-          break extract[:bind][:vars]
-        end
+        extract_bind_values(extractor[match[/(\w+)/].to_sym])
       end
     end
 
     def to_s
-      @to_s ||= ::YeSQL::Utils::Read.statement(file_path, readable: true)
+      @to_s ||= statement(readable: true)
     end
 
     def view?
@@ -38,9 +38,13 @@ module ::YeSQL
 
     private
 
-    def_delegator(:connection, :quote)
+    attr_reader :bindings, :file_path
 
-    attr_reader :bindings, :connection, :file_path
+    def extract_bind_values(match)
+      return quote(match[:value]) if view?
+
+      match[:bind][:vars]
+    end
 
     def extractor
       ::YeSQL::Bindings::Extractor.new(bindings: bindings).call

data/lib/yesql/utils/read.rb

@@ -1,16 +1,26 @@
 # frozen_string_literal: true
 
-module YeSQL
+module ::YeSQL
   module Utils
     module Read
-      def self.statement(file_path, readable: false)
-        Dir["./#{::YeSQL.config.path}/**/*.sql"]
-          .find { |dir_file_path| dir_file_path.include?("#{file_path}.sql") }
-          .tap do |sql_file_path|
-          break File.readlines(sql_file_path, chomp: true).join(' ') if readable == true
+      def statement(readable: false)
+        read_file(found_file, readable)
+      end
+
+      private
 
-          break File.read(sql_file_path)
-        end
+      def read_file(file, readable)
+        return File.readlines(file, chomp: true).join(" ") if readable == true
+
+        File.read(file)
+      end
+
+      def found_file
+        dir_sql_files.find { |dir_file_path| dir_file_path.include?("#{file_path}.sql") }
+      end
+
+      def dir_sql_files
+        Dir["./#{::YeSQL.config.path}/**/*.sql"]
       end
     end
   end

data/lib/yesql/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-module YeSQL
-  VERSION = '0.1.7'
+module ::YeSQL
+  VERSION = "0.2.3"
 end

data/yesql.gemspec

@@ -1,28 +1,28 @@
 # frozen_string_literal: true
 
-require_relative 'lib/yesql/version'
+require_relative "lib/yesql/version"
 
 Gem::Specification.new do |spec|
-  spec.name = 'yesql'
+  spec.name = "yesql"
   spec.version = YeSQL::VERSION
-  spec.authors = ['Sebastián Palma']
-  spec.email = ['vnhnhm.github@gmail.com']
-  spec.summary = 'Ruby library to use SQL'
+  spec.authors = ["Sebastián Palma"]
+  spec.email = ["vnhnhm.github@gmail.com"]
+  spec.summary = "Ruby library to use SQL"
   spec.description = 'SQL "raw" for Rails projects'
-  spec.homepage = 'https://github.com/sebastian-palma/yesql'
-  spec.license = 'MIT'
-  spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = 'https://github.com/sebastian-palma/yesql'
-  spec.metadata['changelog_uri'] = 'https://github.com/sebastian-palma/yesql'
+  spec.homepage = "https://github.com/sebastian-palma/yesql"
+  spec.license = "MIT"
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://github.com/sebastian-palma/yesql"
+  spec.metadata["changelog_uri"] = "https://github.com/sebastian-palma/yesql"
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir = 'exe'
+  spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
-  spec.add_dependency 'rails', '>= 5.0'
-  spec.add_development_dependency 'mysql2', '~> 0.5.3'
-  spec.add_development_dependency 'pg', '>= 0.18'
-  spec.add_development_dependency 'pry', '~> 0.13.1'
-  spec.add_development_dependency 'rspec', '~> 3.9.0'
+  spec.require_paths = ["lib"]
+  spec.add_dependency "activerecord", ">= 4.0.0.beta1"
+  spec.add_development_dependency "mysql2", "~> 0.5.3"
+  spec.add_development_dependency "pg", ">= 0.18"
+  spec.add_development_dependency "pry", "~> 0.13.1"
+  spec.add_development_dependency "rspec", "~> 3.9.0"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: yesql
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.3
 platform: ruby
 authors:
 - Sebastián Palma
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-01 00:00:00.000000000 Z
+date: 2021-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 4.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 4.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -103,7 +103,6 @@ files:
 - lib/yesql/bindings/utils.rb
 - lib/yesql/common/adapter.rb
 - lib/yesql/config/configuration.rb
-- lib/yesql/errors/cache_expiration_error.rb
 - lib/yesql/errors/file_path_does_not_exist_error.rb
 - lib/yesql/errors/no_bindings_provided_error.rb
 - lib/yesql/errors/output_argument_error.rb
@@ -122,7 +121,7 @@ metadata:
   homepage_uri: https://github.com/sebastian-palma/yesql
   source_code_uri: https://github.com/sebastian-palma/yesql
   changelog_uri: https://github.com/sebastian-palma/yesql
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -137,8 +136,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.2.3
+signing_key: 
 specification_version: 4
 summary: Ruby library to use SQL
 test_files: []

data/lib/yesql/errors/cache_expiration_error.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module YeSQL
-  module Errors
-    module CacheExpirationError
-      def validate_cache_expiration(expires_in)
-        raise ArgumentError, MESSAGE unless expires_in.is_a?(ActiveSupport::Duration)
-      end
-
-      MESSAGE = <<~MSG
-        Missing mandatory `expires_in` option for `cache`.
-
-        Can not cache the result of the query without an expiration date.
-      MSG
-      private_constant :MESSAGE
-    end
-  end
-end