yesql 0.1.8 → 0.2.0

data/lib/yesql/statement.rb

@@ -1,49 +1,44 @@
 # 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
-      end
-    end
-
-    def to_s
-      @to_s ||= ::YeSQL::Utils::Read.statement(file_path, readable: true)
+      to_s.gsub(::YeSQL::BIND_REGEX) { extract_bind_values(extractor[_1[/(\w+)/].to_sym]) }
     end
 
-    def view?
-      to_s =~ /^create\s.*view\s/i
-    end
+    def to_s = @to_s ||= statement(readable: true)
+    def view? = to_s =~ /^create\s.*view\s/i
 
     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?
 
-    def extractor
-      ::YeSQL::Bindings::Extractor.new(bindings: bindings).call
+      match[:bind][:vars]
     end
+
+    def extractor = @extractor ||= ::YeSQL::Bindings::Extractor.new(bindings: bindings).call
   end
 end

data/lib/yesql/utils/read.rb

@@ -1,17 +1,20 @@
 # 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)
 
-          break File.read(sql_file_path)
-        end
+      private
+
+      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 { _1.include?("#{file_path}.sql") }
+      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.8'
+  VERSION = "0.2.0"
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: yesql
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - Sebastián Palma
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-16 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: ruby-next-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -87,15 +101,33 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rubocop.yml"
-- Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
-- Rakefile
-- bin/console
-- bin/setup
+- lib/.rbnext/2.3/yesql/errors/file_path_does_not_exist_error.rb
+- lib/.rbnext/2.3/yesql/errors/no_bindings_provided_error.rb
+- lib/.rbnext/2.3/yesql/errors/output_argument_error.rb
+- lib/.rbnext/2.3/yesql/query/transform_result.rb
+- lib/.rbnext/2.7/yesql/bindings/extract.rb
+- lib/.rbnext/2.7/yesql/bindings/extractor.rb
+- lib/.rbnext/2.7/yesql/bindings/transformed.rb
+- lib/.rbnext/2.7/yesql/bindings/utils.rb
+- lib/.rbnext/2.7/yesql/errors/file_path_does_not_exist_error.rb
+- lib/.rbnext/2.7/yesql/errors/no_bindings_provided_error.rb
+- lib/.rbnext/2.7/yesql/query/transform_result.rb
+- lib/.rbnext/2.7/yesql/statement.rb
+- lib/.rbnext/2.7/yesql/utils/read.rb
+- lib/.rbnext/3.0/yesql/bindings/extract.rb
+- lib/.rbnext/3.0/yesql/bindings/transformed.rb
+- lib/.rbnext/3.0/yesql/common/adapter.rb
+- lib/.rbnext/3.0/yesql/config/configuration.rb
+- lib/.rbnext/3.0/yesql/errors/file_path_does_not_exist_error.rb
+- lib/.rbnext/3.0/yesql/errors/no_bindings_provided_error.rb
+- lib/.rbnext/3.0/yesql/params/output.rb
+- lib/.rbnext/3.0/yesql/query/performer.rb
+- lib/.rbnext/3.0/yesql/query/result.rb
+- lib/.rbnext/3.0/yesql/query/transform_result.rb
+- lib/.rbnext/3.0/yesql/statement.rb
+- lib/.rbnext/3.0/yesql/utils/read.rb
 - lib/yesql.rb
 - lib/yesql/bindings/extract.rb
 - lib/yesql/bindings/extractor.rb
@@ -103,7 +135,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
@@ -114,7 +145,6 @@ files:
 - lib/yesql/statement.rb
 - lib/yesql/utils/read.rb
 - lib/yesql/version.rb
-- yesql.gemspec
 homepage: https://github.com/sebastian-palma/yesql
 licenses:
 - MIT
@@ -122,7 +152,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
@@ -138,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.3
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Ruby library to use SQL
 test_files: []

data/.gitignore

@@ -1,4 +0,0 @@
-spec/minimalpg/log/*
-spec/minimalmysql/log/*
-spec/minimalpg/db/*
-spec/minimalmysql/db/*

data/.rubocop.yml

@@ -1,20 +0,0 @@
-require: rubocop-rspec
-
-Metrics/BlockLength:
-  Exclude:
-    - spec/**/*_spec.rb
-    - spec/spec_helper.rb
-    - spec/yesql/shared/*
-
-RSpec/FilePath:
-  Exclude:
-    - spec/**/*_spec.rb
-
-RSpec/NestedGroups:
-  Enabled: False
-
-RSpec/ExampleLength:
-  Enabled: False
-
-RSpec/BeforeAfterAll:
-  Enabled: False

data/Gemfile

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

data/Gemfile.lock

@@ -1,167 +0,0 @@
-PATH
-  remote: .
-  specs:
-    yesql (0.1.7)
-      rails (>= 5.0)
-
-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)
-      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)
-    coderay (1.1.3)
-    concurrent-ruby (1.1.8)
-    crass (1.0.6)
-    diff-lcs (1.4.4)
-    erubi (1.10.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (1.8.9)
-      concurrent-ruby (~> 1.0)
-    loofah (2.9.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)
-    minitest (5.14.4)
-    mysql2 (0.5.3)
-    nio4r (2.5.7)
-    nokogiri (1.11.2-x86_64-darwin)
-      racc (~> 1.4)
-    pg (1.2.3)
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    racc (1.5.2)
-    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.3)
-    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-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
-      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)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    thor (1.1.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.9)
-      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.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  mysql2 (~> 0.5.3)
-  pg (>= 0.18)
-  pry (~> 0.13.1)
-  rspec (~> 3.9.0)
-  yard
-  yesql!
-
-BUNDLED WITH
-   2.2.3

data/Rakefile

@@ -1 +0,0 @@
-# frozen_string_literal: true

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "yesql"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)