yesql 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f432f23ac16148c7439ec096a55c142c9985c537d06ef5ded891fb3178d3bbf
-  data.tar.gz: b5d82c03933a0401d4b24a3fd48f00ea3864adfb8566db7f73c518714784cc54
+  metadata.gz: 180f75c325ecfc85f0d95e0d0a9422fcde92db273487bd19a7f03318c3206f16
+  data.tar.gz: '00429a2c7880d6546e82b5c530d097be14e524ed161a81d7c75b55c61f86f2b7'
 SHA512:
-  metadata.gz: '084397cf83aa10faf2d724a0be1c11548e36dd515932c4552498c130a96efb044ca5f498aa30d4ec9c002ea1f36c4ec3699bcd4e6e2db2313b0b56fab9da2ae5'
-  data.tar.gz: 70a91ebc63c23cd5c653351e728fc9c93207fd2583b1b72629d63717ba8e105c86318b016110f3040fd681b176da4d80db2807c40b4859ac3192c1a160901572
+  metadata.gz: 6a13774afd3b568927652026d00ac25d1b521c4eebcdcf4d2f4bc9d3de86652613322d449e30f276eabfebcb2aaa044bdc66abc3757f0f759533b0fcf5c53868
+  data.tar.gz: 3017fb1e072485f1c3d469517c1e326d74c32f2d14873a8801c78da8d0bb1f49459a81f6abc64b9c0fa1680dd8799cd12328496ec0077fa2823e24e204f80c1a

data/.rubocop.yml

@@ -1,8 +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.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yesql (0.1.5)
+    yesql (0.1.6)
       rails (>= 5.0)
 
 GEM

data/lib/yesql.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'yesql/statement'
 require 'yesql/version'
 require 'yesql/config/configuration'
 require 'yesql/query/performer'
@@ -7,7 +8,6 @@ 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'
-require 'yesql/bindings/binder'
 
 module YeSQL
   include ::YeSQL::Config
@@ -40,7 +40,7 @@ module YeSQL
   def execute(bindings, cache, file_path, output, options)
     ::YeSQL::Query::Performer.new(
       bindings: bindings,
-      bind_statement: ::YeSQL::Bindings::Binder.bind_statement(file_path, bindings),
+      bind_statement: ::YeSQL::Statement.new(bindings, file_path),
       cache: cache,
       file_path: file_path,
       output: output,

data/lib/yesql/bindings/extract.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'yesql'
+require 'yesql/common/adapter'
 
 module ::YeSQL
   module Bindings

data/lib/yesql/errors/no_bindings_provided_error.rb

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
-module YeSQL
+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?
 
         format(MESSAGE, renderable_statement_binds(file_path)).tap do |message|
-          raise ArgumentError, message unless binds.is_a?(Hash) && !binds.empty?
+          raise ::ArgumentError, message unless binds.is_a?(::Hash) && !binds.empty?
         end
       end
 

data/lib/yesql/query/performer.rb

@@ -32,9 +32,9 @@ module YeSQL
       # rubocop:enable Metrics/ParameterLists
 
       def call
-        return modified_output if cache.empty?
+        return transformed_result if cache.empty?
 
-        Rails.cache.fetch(cache_key, expires_in: expires_in) { modified_output }
+        Rails.cache.fetch(cache_key, expires_in: expires_in) { transformed_result }
       end
 
       private
@@ -49,8 +49,8 @@ module YeSQL
                   :prepare,
                   :rows
 
-      def modified_output
-        @modified_output ||=
+      def transformed_result
+        @transformed_result ||=
           ::YeSQL::Query::TransformResult.new(output: output, result: query_result).call
       end
 
@@ -61,13 +61,13 @@ module YeSQL
                                                      prepare: prepare).call
       end
 
-      def extractor
-        ::YeSQL::Bindings::Extractor.new(bindings: named_bindings).call
-      end
-
       def binds
         ::YeSQL::Bindings::Transformed.new(statement_binds: statement_binds(extractor)).call
       end
+
+      def extractor
+        ::YeSQL::Bindings::Extractor.new(bindings: named_bindings).call
+      end
     end
   end
 end

data/lib/yesql/query/result.rb

@@ -11,32 +11,35 @@ module ::YeSQL
 
       include ::YeSQL::Common::Adapter
 
-      def initialize(binds:, bind_statement:, file_path:, prepare:)
+      def initialize(binds: [], bind_statement:, file_path:, prepare:)
         @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?
 
-        exec_query(bind_statement, file_path, binds, prepare: prepare_option)
+        exec_query(bound, file_path, binds, prepare: prepare_option)
       end
 
       private
 
-      attr_reader :binds, :bind_statement, :file_path, :prepare_option
+      attr_reader :binds, :bind_statement, :connection, :file_path, :prepare_option
 
-      def_delegators(:connection, :exec_query, :raw_connection)
+      def_delegators(:bind_statement, :bound, :to_s, :view?)
+      def_delegators(:connection,     :exec_query, :raw_connection)
       def_delegators(:raw_connection, :prepare)
 
-      def connection
-        ActiveRecord::Base.connection
+      def view_result
+        exec_query(bound)
       end
 
       def rails5_result
-        prepare(bind_statement).execute(*binds)
+        prepare(bound).execute(*binds)
       end
     end
   end

data/lib/yesql/query/transform_result.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'yesql'
+require 'yesql/common/adapter'
 require 'forwardable'
 
 module ::YeSQL
@@ -8,20 +9,23 @@ module ::YeSQL
     class TransformResult
       extend Forwardable
 
+      include ::YeSQL::Common::Adapter
+
       def initialize(output:, result:)
         @output = output
         @result = result
       end
 
       def call
-        if ::Rails::VERSION::MAJOR == 5
+        if ::Rails::VERSION::MAJOR == 5 && mysql?
           return columns if columns?
           return rows_values if rows?
+          return array_of_symbol_hashes if hash?
         end
 
         return result.public_send(output.to_sym) if columns? || rows?
 
-        array_of_symbol_hashes
+        to_a.map(&:symbolize_keys)
       end
 
       private

data/lib/yesql/statement.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'forwardable'
+
+require 'yesql/utils/read'
+require 'yesql/bindings/extractor'
+require 'yesql/common/adapter'
+
+module ::YeSQL
+  class Statement
+    extend Forwardable
+
+    include ::YeSQL::Common::Adapter
+
+    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)
+    end
+
+    def view?
+      to_s =~ /^create\s.*view\s/i
+    end
+
+    private
+
+    def_delegator(:connection, :quote)
+
+    attr_reader :bindings, :connection, :file_path
+
+    def extractor
+      ::YeSQL::Bindings::Extractor.new(bindings: bindings).call
+    end
+  end
+end

data/lib/yesql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yesql
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Sebastián Palma
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-26 00:00:00.000000000 Z
+date: 2020-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -97,7 +97,6 @@ files:
 - bin/console
 - bin/setup
 - lib/yesql.rb
-- lib/yesql/bindings/binder.rb
 - lib/yesql/bindings/extract.rb
 - lib/yesql/bindings/extractor.rb
 - lib/yesql/bindings/transformed.rb
@@ -112,6 +111,7 @@ files:
 - lib/yesql/query/performer.rb
 - lib/yesql/query/result.rb
 - lib/yesql/query/transform_result.rb
+- lib/yesql/statement.rb
 - lib/yesql/utils/read.rb
 - lib/yesql/version.rb
 - yesql.gemspec

data/lib/yesql/bindings/binder.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-require 'yesql/utils/read'
-require 'yesql/bindings/extractor'
-
-module YeSQL
-  module Bindings
-    class Binder
-      def self.bind_statement(file_path, bindings)
-        ::YeSQL::Bindings::Extractor.new(bindings: bindings).call.tap do |extractor|
-          break ::YeSQL::Utils::Read.statement(file_path, readable: true)
-                                    .gsub(::YeSQL::BIND_REGEX) do |match|
-                                      extractor[match[/(\w+)/].to_sym][:bind][:vars]
-                                    end
-        end
-      end
-    end
-  end
-end