yesql 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8b1e4a24637a3f453ed612d37238b171e9bfc2cbbfd779a0675f06c049a61a2
-  data.tar.gz: 5b0ec67d1aab2d2b73bfe27559853f9267388fa39160bcdd318920bbade17d2e
+  metadata.gz: d4cad8cd91b4afba6c7a8722f9f0dfd6092552d2f4ce735c6880425241122b43
+  data.tar.gz: b8be652b46ee03e081ec2d8bc3bcc2321e26e2b7fcd55dcbf2a2bb288ddac139
 SHA512:
-  metadata.gz: 78a50bcda5bb70dc61f3604e2071b97a06f09866eca3d701dad42be054ead0d2db18a2fe103f33b87f9954c143d5f2a501d10329703de82d6369739fb0e830c3
-  data.tar.gz: 0c7b14bfe915227caa8b6c518b99a12f0cd3a45ababc41fe07515460fd70473687183bfb9a85ba1250f2fcde2db0380dd2815ee6d6ce2f318a721dd248d59c8b
+  metadata.gz: 4dc794c44484b4fcc8815fa866023c6cf5d2f4b82d4f2c45c6de7e86082eaa3ba838c55e750e3f2fd53b0312b4be699c7ddc900400c8445c377fd7c6d1139190
+  data.tar.gz: 88b860a5ce91655366f9d73336b522678a8f709938881e1ff150a13565b57cd12b65c753531ecfb886528d162405c36ca9036c1c3cba52a62aa2e3e3993e76fb

data/.gitignore

@@ -0,0 +1,7 @@
+spec/minimalpg/log/*
+spec/minimalmysql/log/*
+spec/minimalpg/db/*
+spec/minimalmysql/db/*
+
+*.un~
+*.swp

data/.rubocop.yml

@@ -0,0 +1,20 @@
+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

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

data/Gemfile.lock

@@ -0,0 +1,63 @@
+PATH
+  remote: .
+  specs:
+    yesql (0.2.2)
+      activerecord (>= 4.0.0.beta1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    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 (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.8)
+    diff-lcs (1.4.4)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    method_source (1.0.0)
+    minitest (5.14.4)
+    mysql2 (0.5.3)
+    pg (1.2.3)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.3)
+      rspec-support (~> 3.9.3)
+    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.4)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    yard (0.9.26)
+    zeitwerk (2.4.2)
+
+PLATFORMS
+  x86_64-linux
+
+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

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

data/bin/console

@@ -0,0 +1,14 @@
+#!/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__)

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/yesql.rb

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require "backports/2.0"
-require "ruby-next/language/setup"
-
-RubyNext::Language.setup_gem_load_path
-
 require "yesql/statement"
 require "yesql/version"
 require "yesql/config/configuration"
@@ -13,33 +8,36 @@ require "yesql/errors/file_path_does_not_exist_error"
 require "yesql/errors/no_bindings_provided_error"
 require "yesql/errors/output_argument_error"
 
-module ::YeSQL
+module YeSQL
   include ::YeSQL::Config
+  include ::YeSQL::Errors::FilePathDoesNotExistError
+  include ::YeSQL::Errors::NoBindingsProvidedError
+  include ::YeSQL::Errors::OutputArgumentError
 
   BIND_REGEX = /(?<!:):(\w+)(?=\b)/
 
-  def YeSQL(file_path, binds = {}, options = {})
+  def YeSQL(file_path, bindings = {}, options = {})
     output = options[:output] || :rows
 
-    validate(binds, file_path, output)
-    execute(binds, file_path, output, options[:prepare])
+    validate(bindings, file_path, output)
+    execute(bindings, file_path, output, options)
   end
 
   private
 
-  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
+  def validate(bindings, file_path, output)
+    validate_file_path_existence(file_path)
+    validate_statement_bindings(bindings, file_path)
+    validate_output_options(output)
   end
 
-  def execute(binds, file_path, output, prepare)
+  def execute(bindings, file_path, output, options)
     ::YeSQL::Query::Performer.new(
-      bindings: binds,
-      bind_statement: ::YeSQL::Statement.new(binds, file_path),
+      bindings: bindings,
+      bind_statement: ::YeSQL::Statement.new(bindings, file_path),
       file_path: file_path,
       output: output,
-      prepare: prepare
+      prepare: options[:prepare]
     ).call
   end
 end

data/lib/yesql/bindings/extract.rb

@@ -8,7 +8,7 @@ module ::YeSQL
     class Extract
       include ::YeSQL::Common::Adapter
 
-      def initialize(hash, indexed_bindings, index, value)
+      def initialize(indexed_bindings, hash, index, value)
         @hash = hash
         @index = index
         @indexed_bindings = indexed_bindings
@@ -18,35 +18,37 @@ module ::YeSQL
       def bind_vals
         return [nil, value] unless array?
 
-        value.map { [nil, _1] }
+        value.map { |bind| [nil, bind] }
       end
 
       def bind_vars
         if mysql?
           return "?" unless array?
 
-          Array.new(size, "?").join(", ")
+          Array.new(value.size, "?").join(", ")
         elsif pg?
           return "$#{last_val}" unless array?
 
-          value.map.with_index(bind_index) { "$#{_2}" }.join(", ")
+          value.map.with_index(bind_index) { |_, i| "$#{i}" }.join(", ")
         end
       end
 
+      def last_val
+        prev_last_val + current_val_size
+      end
+
       def prev
         return if first?
 
         indexed_bindings[index - 2].first
       end
 
-      def last_val = prev_last_val + current_val_size
-
       private
 
       attr_reader :hash, :index, :indexed_bindings, :value
 
       def current_val_size
-        return size if array?
+        return value.size if array?
 
         1
       end
@@ -57,15 +59,19 @@ module ::YeSQL
         hash[prev][:last_val]
       end
 
+      def first?
+        index == 1
+      end
+
+      def array?
+        value.is_a?(Array)
+      end
+
       def bind_index
         return 1 if first?
 
         prev_last_val + 1
       end
-
-      def size = value.size
-      def first? = index == 1
-      def array? = value.is_a?(Array)
     end
   end
 end

data/lib/yesql/bindings/extractor.rb

@@ -2,37 +2,35 @@
 
 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
 
       def call
-        bindings
-          .each_with_object({})
-          .with_index(1) do |((key, value), hash), index|
-            hash[key] = binding_extracts(hash, indexed_bindings, index, key, value)
-          end
+        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
       end
 
       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
-          break {
-            bind: { vals: _1.bind_vals, vars: _1.bind_vars },
-            last_val: _1.last_val,
-            match: key,
-            prev: _1.prev,
-            value: value
-          }
-        end
-      end
     end
   end
 end

data/lib/yesql/bindings/transformed.rb

@@ -23,16 +23,18 @@ module ::YeSQL
 
       attr_reader :statement_binds
 
-      def rails5? = ::ActiveRecord::VERSION::MAJOR == 5
+      def rails5?
+        ::ActiveRecord::VERSION::MAJOR == 5
+      end
 
       def mysql_rails5_binds
         statement_binds
           .flat_map(&:first)
           .each_slice(2)
-          .flat_map do
-            next [_1, _2].compact.map(&:last) if _1.is_a?(Array)
+          .flat_map do |first, last|
+            next [first, last].compact.map(&:last) if first.is_a?(Array)
 
-            _2
+            last
           end
       end
 
@@ -46,7 +48,7 @@ module ::YeSQL
 
       def pg_binds
         statement_binds
-          .sort_by { _2.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,15 +1,14 @@
 # frozen_string_literal: true
 
-module ::YeSQL
+module YeSQL
   module Bindings
     module Utils
-      include ::YeSQL::Utils::Read
-
       def statement_binds(extractor)
-        statement(readable: true)
-          .scan(::YeSQL::BIND_REGEX)
-          .map(&:first)
-          .map { extractor[_1.to_sym][:bind].values_at(:vals, :vars) }
+        ::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
       end
     end
   end

data/lib/yesql/common/adapter.rb

@@ -7,12 +7,19 @@ module ::YeSQL
     module Adapter
       extend ::Forwardable
 
-      def mysql? = adapter == "Mysql2"
-      def pg? = adapter == "PostgreSQL"
+      # `adapter` might be a complex object, but
+      # for the sake of brevity it's just a string
+      def adapter
+        ::ActiveRecord::Base.connection.adapter_name
+      end
 
-      private
+      def mysql?
+        adapter == "Mysql2"
+      end
 
-      def adapter = ::ActiveRecord::Base.connection.adapter_name
+      def pg?
+        adapter == "PostgreSQL"
+      end
     end
   end
 end

data/lib/yesql/config/configuration.rb

@@ -15,7 +15,9 @@ module ::YeSQL
   end
 
   class << self
-    def config = @config ||= ::YeSQL::Configuration.new
+    def config
+      @config ||= ::YeSQL::Configuration.new
+    end
 
     def configure
       yield config if block_given?

data/lib/yesql/errors/file_path_does_not_exist_error.rb

@@ -1,30 +1,17 @@
 # frozen_string_literal: true
 
-module ::YeSQL
+module YeSQL
   module Errors
-    class FilePathDoesNotExistError
-      def initialize(file_path)
-        @file_path = file_path
-      end
+    module FilePathDoesNotExistError
+      def validate_file_path_existence(file_path)
+        return if file_exists?(file_path)
 
-      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, format(MESSAGE, available_files: available_files,
+                                                   file_path: file_path, path: ::YeSQL.config.path)
       end
 
       private
 
-      attr_reader :file_path
-
       MESSAGE = <<~MSG
 
         SQL file "%<file_path>s" does not exist in %<path>s.
@@ -35,9 +22,17 @@ module ::YeSQL
       MSG
       private_constant :MESSAGE
 
-      def file_exists? = path_files.any? { _1.include?("#{file_path}.sql") }
-      def path_files = @path_files ||= Dir["#{::YeSQL.config.path}/**/*.sql"]
-      def available_files = path_files.map { "- #{_1}\n" }.join
+      def file_exists?(file_path)
+        path_files.any? { |filename| filename.include?("#{file_path}.sql") }
+      end
+
+      def available_files
+        path_files.map { |file| "- #{file}\n" }.join
+      end
+
+      def path_files
+        @path_files ||= Dir["#{::YeSQL.config.path}/**/*.sql"]
+      end
     end
   end
 end