yesql 0.2.1 → 0.2.2

data/lib/yesql/errors/no_bindings_provided_error.rb

@@ -4,25 +4,17 @@ require "yesql/utils/read"
 
 module ::YeSQL
   module Errors
-    class NoBindingsProvidedError
-      include ::YeSQL::Utils::Read
+    module NoBindingsProvidedError
+      def validate_statement_bindings(binds, file_path)
+        return unless statement_binds(file_path).size.positive?
 
-      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, format(MESSAGE, renderable_statement_binds)
+        format(MESSAGE, renderable_statement_binds(file_path)).tap do |message|
+          raise ::ArgumentError, message unless binds.is_a?(::Hash) && !binds.empty?
+        end
       end
 
       private
 
-      attr_reader :binds, :file_path
-
       MESSAGE = <<~MSG
 
         YeSQL invoked without bindings.
@@ -33,9 +25,18 @@ module ::YeSQL
       MSG
       private_constant :MESSAGE
 
-      def statement_binds = statement.scan(::YeSQL::BIND_REGEX).tap { break (_1 || []).sort }
-      def renderable_statement_binds = statement_binds.flatten.map { "- `#{_1}`\n" }.join
-      def expected_binds? = binds.is_a?(::Hash) && !binds.empty?
+      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?
+
+          break scanned_binds.sort
+        end
+      end
+
+      def renderable_statement_binds(file_path)
+        statement_binds(file_path).flatten.map { |bind| "- `#{bind}`\n" }.join
+      end
     end
   end
 end

data/lib/yesql/errors/output_argument_error.rb

@@ -1,23 +1,14 @@
 # frozen_string_literal: true
 
-module ::YeSQL
+module YeSQL
   module Errors
-    class OutputArgumentError
-      def initialize(output)
-        @output = output
-      end
-
-      def validate_output_options
+    module OutputArgumentError
+      def validate_output_options(output)
         return if output.nil?
-        return if OPTIONS.include?(output.to_sym)
 
-        raise ArgumentError, format(MESSAGE, output)
+        raise ArgumentError, format(MESSAGE, output) unless OPTIONS.include?(output.to_sym)
       end
 
-      private
-
-      attr_reader :output
-
       MESSAGE = <<~MSG
         Unsupported `output` option given `%s`. Possible values are:
           - `columns`: returns an array with the columns from the result.

data/lib/yesql/params/output.rb

@@ -6,15 +6,23 @@ require "forwardable"
 module ::YeSQL
   module Params
     class Output
-      extend ::Forwardable
+      extend Forwardable
 
       def initialize(output)
         @output = output.to_s
       end
 
-      def columns? = output == "columns"
-      def rows? = output == "rows"
-      def hash? = output == "hash"
+      def columns?
+        output == "columns"
+      end
+
+      def rows?
+        output == "rows"
+      end
+
+      def hash?
+        output == "hash"
+      end
 
       def_delegator(:output, :to_sym)
 

data/lib/yesql/query/performer.rb

@@ -8,7 +8,7 @@ require "yesql/query/result"
 require "yesql/query/transform_result"
 require "yesql/params/output"
 
-module ::YeSQL
+module YeSQL
   module Query
     class Performer
       include ::YeSQL::Bindings::Utils
@@ -21,11 +21,13 @@ module ::YeSQL
         @prepare = prepare
       end
 
-      def call = ::YeSQL::Query::TransformResult.new(output: output, result: query_result).call
+      def call
+        ::YeSQL::Query::TransformResult.new(output: output, result: query_result).call
+      end
 
       private
 
-      attr_reader :bind_statement, :file_path, :named_bindings, :output, :prepare
+      attr_reader :bind_statement, :file_path, :named_bindings, :output, :prepare, :rows
 
       def query_result
         @query_result ||= ::YeSQL::Query::Result.new(binds: binds,
@@ -38,7 +40,9 @@ module ::YeSQL
         ::YeSQL::Bindings::Transformed.new(statement_binds: statement_binds(extractor)).call
       end
 
-      def extractor = ::YeSQL::Bindings::Extractor.new(bindings: named_bindings).call
+      def extractor
+        ::YeSQL::Bindings::Extractor.new(bindings: named_bindings).call
+      end
     end
   end
 end

data/lib/yesql/query/result.rb

@@ -7,13 +7,14 @@ require "yesql/common/adapter"
 module ::YeSQL
   module Query
     class Result
-      extend ::Forwardable
+      extend Forwardable
 
       include ::YeSQL::Common::Adapter
 
       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
@@ -27,15 +28,20 @@ module ::YeSQL
 
       private
 
-      attr_reader :binds, :bind_statement, :file_path, :prepare_option
+      attr_reader :binds, :bind_statement, :connection, :file_path, :prepare_option
 
       def_delegators(:bind_statement, :bound, :to_s, :view?)
       def_delegators(:connection, :exec_query, :raw_connection)
       def_delegators(:raw_connection, :prepare)
 
-      def view_result =  exec_query(bound)
-      def rails5_result = prepare(bound).execute(*binds)
-      def connection = @connection ||= ActiveRecord::Base.connection
+      def view_result
+        exec_query(bound)
+      end
+
+      # TODO: recheck this case
+      def rails5_result
+        prepare(bound).execute(*binds)
+      end
     end
   end
 end

data/lib/yesql/query/transform_result.rb

@@ -7,7 +7,7 @@ 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_5? && mysql?
+        if ::ActiveRecord::VERSION::MAJOR == 5 && mysql?
           return columns if columns?
           return rows_values if rows?
           return array_of_symbol_hashes if hash?
@@ -32,17 +32,28 @@ module ::YeSQL
 
       attr_reader :output, :result
 
-      def_delegators(:result, :fields, :rows, :to_a)
+      def_delegators(:result, :rows, :to_a)
       def_delegators(:output, :columns?, :hash?, :rows?)
 
+      def rows_values
+        to_a.map { |e| e.respond_to?(:values) ? e.values : e }
+      end
+
       def array_of_symbol_hashes
-        to_a.tap { break hashed_rows(_1) if rails_5? }.map { _1&.symbolize_keys || _1 }
+        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)
+        rows.map { |row| columns.zip(row).to_h }
       end
 
-      def columns = fields || result.columns
-      def rows_values = to_a.map { _1.respond_to?(:values) ? _1.values : _1 }
-      def hashed_rows(rows) = rows.map { columns.zip(_1).to_h }
-      def rails_5? = ::ActiveRecord::VERSION::MAJOR == 5
+      def columns
+        return result.fields if result.respond_to?(:fields)
+
+        result.columns
+      end
     end
   end
 end

data/lib/yesql/statement.rb

@@ -13,7 +13,6 @@ module ::YeSQL
     extend ::Forwardable
 
     include ::YeSQL::Common::Adapter
-    include ::YeSQL::Utils::Read
     # Give access to the quote method.
     include ::ActiveRecord::ConnectionAdapters::Quoting
 
@@ -23,22 +22,29 @@ module ::YeSQL
     end
 
     def bound
-      to_s.gsub(::YeSQL::BIND_REGEX) { extract_bind_values(extractor[_1[/(\w+)/].to_sym]) }
+      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)
     end
 
-    def to_s = @to_s ||= statement(readable: true)
-    def view? = to_s =~ /^create\s.*view\s/i
+    def view?
+      to_s =~ /^create\s.*view\s/i
+    end
 
     private
 
     attr_reader :bindings, :file_path
 
-    def extract_bind_values(match)
-      return quote(match[:value]) if view?
-
-      match[:bind][:vars]
+    def extractor
+      ::YeSQL::Bindings::Extractor.new(bindings: bindings).call
     end
-
-    def extractor = @extractor ||= ::YeSQL::Bindings::Extractor.new(bindings: bindings).call
   end
 end

data/lib/yesql/utils/read.rb

@@ -1,20 +1,17 @@
 # frozen_string_literal: true
 
-module ::YeSQL
+module YeSQL
   module Utils
     module Read
-      def statement(readable: false) = read_file(found_file, readable)
+      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
 
-      private
-
-      def read_file(file, readable)
-        return File.readlines(file, chomp: true).join(" ") if readable == true
-
-        File.read(file)
+          break File.read(sql_file_path)
+        end
       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.2.1"
+  VERSION = "0.2.2"
 end

data/yesql.gemspec

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require_relative "lib/yesql/version"
+
+Gem::Specification.new do |spec|
+  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.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.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.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yesql
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Sebastián Palma
@@ -24,34 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         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: backports
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.21.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.21.0
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -115,33 +87,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".rubocop.yml"
+- Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
-- 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
+- Rakefile
+- bin/console
+- bin/setup
 - lib/yesql.rb
 - lib/yesql/bindings/extract.rb
 - lib/yesql/bindings/extractor.rb
@@ -159,6 +113,7 @@ 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