sql_query 0.2.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 748c4c52de904df3008bce29a438a87fb35999a7
-  data.tar.gz: d6f2f18bd2182837f558290c57119fe33137272d
+  metadata.gz: 5f152c55f4f62dabfbd3e85d01341cdb6191f6c7
+  data.tar.gz: 5dfa356ad15704877a746d26943580c04abd92c6
 SHA512:
-  metadata.gz: c72a0c1ddbe997fa7508b03abe76724ba9cb2c0beaf193668c2dbbca397c1e925810cc267be4b410610ea64b1d018111fac214499dc17caf869e1070b7dddcf2
-  data.tar.gz: c25bc31e5266d0ae7ec96b559e42a08ccc604aeb996852fc575d36591fe04ed7d318b12778c66f0f4d2f812020cb60e639086666a7250d0987ac74af6684c910
+  metadata.gz: 4fac1c583e039c30dc2c2b7a72fdd5014dc4744185cbbc73bb8868d368b2c09606a7c6913db392799c65a435566c10c94f137b2b38e4a8f83caedc56a94a7601
+  data.tar.gz: 2d8488e10a49b8ee0b71325d6dea182e31eca25b058e26916cd53a6bc868f122e9e874a3510c2cc6cbe5fd854960e220ba23a27da82fe34406e5c40b66757772

data/.ruby-gemset

@@ -0,0 +1 @@
+sql_query

data/.ruby-version

@@ -0,0 +1 @@
+2.3.3

data/.travis.yml

@@ -1,24 +1,28 @@
 language: ruby
+cache: bundler
+before_install:
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v '< 2'
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
 
 gemfile:
   - gemfiles/3.2.gemfile
   - gemfiles/4.0.gemfile
   - gemfiles/4.1.gemfile
   - gemfiles/4.2.gemfile
+  - gemfiles/5.0.gemfile
 
 rvm:
-  - '1.9.3'
-  - '2.0.0'
-  - '2.1.5'
-  - '2.2.1'
+  - '2.3.3'
 
 addons:
-  postgresql: '9.3'
-  code_climate:
-    repo_token: 743bf63d7a422064551b35931628682c6cad81a30743edee7ff9ea8af061397d
+  postgresql: '9.4'
 
 env:
   - BUILDER=travis
-
 before_script:
   - psql -c 'create database travis_ci_test;' -U postgres
+  - ./cc-test-reporter before-build
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT -r 743bf63d7a422064551b35931628682c6cad81a30743edee7ff9ea8af061397d

data/Appraisals

@@ -1,15 +1,21 @@
-appraise "3.2" do
-  gem "activerecord", "~> 3.2.21"
+# frozen_string_literal: true
+
+appraise '3.2' do
+  gem 'activerecord', '~> 3.2.21'
+end
+
+appraise '4.0' do
+  gem 'activerecord', '~> 4.0.0'
 end
 
-appraise "4.0" do
-  gem "activerecord", "~> 4.0.0"
+appraise '4.1' do
+  gem 'activerecord', '~> 4.1.0'
 end
 
-appraise "4.1" do
-  gem "activerecord", "~> 4.1.0"
+appraise '4.2' do
+  gem 'activerecord', '~> 4.2.0'
 end
 
-appraise "4.2" do
-  gem "activerecord", "~> 4.2.0"
+appraise '5.0' do
+  gem 'activerecord', '~> 5.0.0'
 end

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 # SqlQuery change log
 
-## 0.2.2 / Unreleased
+## 0.7.1 / Unreleased
 
 * [Added]
 
@@ -10,6 +10,29 @@
 
 * [Fixed]
 
+## 0.7.0 / 2020-08-04
+
+* [Added] support for exec_query from ActiveRecord https://github.com/sufleR/sql_query/pull/7
+
+
+## 0.6.0 / 2017-03-30
+
+* [Added] possibility to override path where gem will look for sql file.
+
+## 0.5.0 / 2016-04-26
+
+* [Added] possibility to overwrite default connection class and connection directly using db_connection option.
+
+## 0.4.0 / 2016-01-20
+
+* [Added] execute will accept boolean attribute.
+When set to false it will use raw query instead of prepared for logs.
+By default it will be set to true.
+
+## 0.3.0 / 2015-12-10
+
+* [Added] support for partials
+
 ## 0.2.1 / 2015-05-01
 
 * [Added] support for activerecord >= 3.2

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in sql_query.gemspec

data/README.md

@@ -1,5 +1,4 @@
 [![Gem Version](https://badge.fury.io/rb/sql_query.svg)](http://badge.fury.io/rb/sql_query)
-[![Dependency Status](https://gemnasium.com/sufleR/sql_query.svg)](https://gemnasium.com/sufleR/sql_query)
 [![Code Climate](https://codeclimate.com/github/sufleR/sql_query/badges/gpa.svg)](https://codeclimate.com/github/sufleR/sql_query)
 [![Test Coverage](https://codeclimate.com/github/sufleR/sql_query/badges/coverage.svg)](https://codeclimate.com/github/sufleR/sql_query)
 [![Build Status](https://travis-ci.org/sufleR/sql_query.svg?branch=master)](https://travis-ci.org/sufleR/sql_query)
@@ -79,9 +78,15 @@ Example:
 SqlQuery.new('player/get_by_email', email: 'e@mail.dev')
 ```
 
+#### Special options
+
+* db_connection - If you want to change default connection to database you may do it for every query execution using this option.
+* sql_file_path - it will override default path where gem will look for sql file.
+
 ### Methods
 
-- **execute** - executes query and returns result data.
+- **execute** - executes query and returns result data. It accepts boolean argument. When argument is false it will run raw sql query instead of prepared_for_logs.
+- **exec_query** - similar to `#execute` but with data returned via `ActiveRecord::Result`.
 - **explain** - runs explain for SQL from template
 - **sql** - returns SQL string
 - **pretty_sql** - returns SQL string prettier to read in console
@@ -89,15 +94,46 @@ SqlQuery.new('player/get_by_email', email: 'e@mail.dev')
 
 ### Configuration
 
-If you don't like default path to your queries you can configure it in initializer.
-
 ```ruby
 # config/initializers/sql_query.rb
 SqlQuery.configure do |config|
   config.path = '/app/sql_templates'
+  config.adapter = ActiveRecord::Base
 end
 ```
 
+#### Configuration options
+* path - If you don't like default path to your queries you can change it here.
+
+* adapter - class which implements connection method.
+
+### Partials
+
+You can prepare part of sql query in partial file and reuse it in multiple queries.
+
+Partial file should start with '_'. 
+
+Example:
+
+```sql
+# app/sql_queries/_email_partial.sql.erb
+players.email = <%= quote @email %>
+```
+
+and use this partial like this:
+
+```sql
+SELECT *
+FROM players
+WHERE <%= partial :email_partial %>
+```
+
+## Examples
+
+Check examples folder for some usefull queries.
+
+If you have some examples to share please make pull request.
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/sql_query/fork )
@@ -105,3 +141,10 @@ end
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request
+
+To run specs, setup Postgres with the following:
+
+```sql
+CREATE DATABASE sqlquery;
+CREATE ROLE sqlquery WITH LOGIN;
+```

data/Rakefile

@@ -1,6 +1,8 @@
-require "bundler/gem_tasks"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
-task :default => :spec
+task default: :spec
 
 RSpec::Core::RakeTask.new

data/examples/README.md

@@ -0,0 +1,10 @@
+### File list:
+
+* __distinct_values.sql.erb__ - implements "loose indexscan" in postgresql. More info [https://wiki.postgresql.org/wiki/Loose_indexscan](https://wiki.postgresql.org/wiki/Loose_indexscan)
+
+```
+SqlQuery.new(:distinct_values, table_name: :players, column_name: :player_type).execute
+
+```
+### 
+

data/examples/distinct_values.sql.erb

@@ -0,0 +1,14 @@
+WITH RECURSIVE t AS (
+  SELECT MIN(<%= @column_name %>) AS <%= @column_name %>
+  FROM <%= @table_name %>
+  UNION ALL
+  SELECT (
+    SELECT MIN(<%= @column_name %>) FROM <%= @table_name %>
+    WHERE <%= @column_name %> > t.<%= @column_name %>)
+  FROM t WHERE t.<%= @column_name %> IS NOT NULL
+)
+SELECT <%= @column_name %> FROM t WHERE <%= @column_name %> IS NOT NULL
+<% if @with_nulls %>
+  UNION ALL
+  SELECT NULL WHERE EXISTS(SELECT 1 FROM <%= @table_name %> WHERE <%= @column_name %> IS NULL)
+<% end %>

data/gemfiles/3.2.gemfile

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 # This file was generated by Appraisal
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "activerecord", "~> 3.2.21"
+gem 'activerecord', '~> 3.2.21'
 
-gemspec :path => "../"
+gemspec path: '../'

data/gemfiles/4.0.gemfile

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 # This file was generated by Appraisal
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "activerecord", "~> 4.0.0"
+gem 'activerecord', '~> 4.0.0'
 
-gemspec :path => "../"
+gemspec path: '../'

data/gemfiles/4.1.gemfile

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 # This file was generated by Appraisal
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "activerecord", "~> 4.1.0"
+gem 'activerecord', '~> 4.1.0'
 
-gemspec :path => "../"
+gemspec path: '../'

data/gemfiles/4.2.gemfile

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 # This file was generated by Appraisal
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "activerecord", "~> 4.2.0"
+gem 'activerecord', '~> 4.2.0'
 
-gemspec :path => "../"
+gemspec path: '../'

data/gemfiles/5.0.gemfile

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 5.0.0'
+
+gemspec path: '../'

data/lib/sql_query.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'erb'
 
 class SqlQuery
@@ -5,21 +7,30 @@ class SqlQuery
 
   def initialize(file_name, options = {})
     unless file_name.is_a?(String) || file_name.is_a?(Symbol)
-      fail ArgumentError, 'SQL file name should be String or Symbol'
+      raise ArgumentError, 'SQL file name should be String or Symbol'
     end
+
     @sql_filename = file_name
-    prepare_variables(options)
-    @connection = ActiveRecord::Base.connection
+    @options = options
+    @connection = options.try(:delete, :db_connection) ||
+                  self.class.config.adapter.connection
+    prepare_variables
   end
 
   def explain
-    msg = "EXPLAIN for: \n#{ sql }\n"
+    msg = "EXPLAIN for: \n#{sql}\n"
     msg += connection.explain(sql)
     pretty(msg)
   end
 
-  def execute
-    connection.execute(prepared_for_logs).entries
+  def execute(prepare = true)
+    to_execute = prepare ? prepared_for_logs : sql
+    connection.execute(to_execute).entries
+  end
+
+  def exec_query(prepare = true)
+    to_execute = prepare ? prepared_for_logs : sql
+    connection.exec_query(to_execute).to_a
   end
 
   def sql
@@ -35,13 +46,16 @@ class SqlQuery
   end
 
   def prepared_for_logs
-    sql.gsub(/(\n|\s)+/,' ')
+    sql.gsub(/(\n|\s)+/, ' ')
   end
 
-  def self.config=(value)
-    @config = value
+  def partial(partial_name, partial_options = {})
+    path, file_name = split_to_path_and_name(partial_name)
+    self.class.new("#{path}/_#{file_name}",
+                   @options.merge(partial_options)).sql
   end
 
+  attr_writer :config
   def self.config
     @config ||= Config.new
   end
@@ -51,44 +65,62 @@ class SqlQuery
   end
 
   class Config
-    attr_accessor :path
+    attr_accessor :path, :adapter
 
     def initialize
       @path = '/app/sql_queries'
+      @adapter = ActiveRecord::Base
     end
   end
 
   private
 
+  def split_to_path_and_name(file)
+    if file.is_a?(Symbol)
+      ['', file.to_s]
+    else
+      parts = file.rpartition('/')
+      [parts.first, parts.last]
+    end
+  end
+
   def pretty(value)
     # override inspect to be more human readable from console
     # code copy from ActiveRecord
     # https://github.com/rails/rails/blob/master/activerecord/lib/active_record/explain.rb#L30
-    def value.inspect; self; end
+    def value.inspect
+      self
+    end
     value
   end
 
-  def prepare_variables(options)
-    options.each do |k, v|
+  def prepare_variables
+    return if @options.blank?
+
+    @options.each do |k, v|
       instance_variable_set("@#{k}", v)
     end
   end
 
   def file_path
     files = Dir.glob(path)
-    if files.size == 0
-      raise "File not found: #{ @sql_filename }"
+    if files.empty?
+      raise "File not found: #{@sql_filename}"
     elsif files.size > 1
-      raise "More than one file found: #{ files.join(', ')}"
+      raise "More than one file found: #{files.join(', ')}"
     else
       files.first
     end
   end
 
   def path
-    root = defined?(Rails) ? Rails.root.to_s : Dir.pwd
-    tmp_path = "#{ root }#{self.class.config.path}"
-    tmp_path += "/#{ @sql_filename }.{sql.erb,erb.sql}"
+    if @sql_file_path.present?
+      tmp_path = @sql_file_path
+    else
+      root = defined?(Rails) ? Rails.root.to_s : Dir.pwd
+      tmp_path = "#{root}#{self.class.config.path}"
+    end
+    tmp_path += "/#{@sql_filename}.{sql.erb,erb.sql}"
     tmp_path
   end
 end

data/spec/config_spec.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe SqlQuery::Config do
+  describe 'initialize' do
+    it 'sets path to default' do
+      expect(described_class.new.path).to eq('/app/sql_queries')
+    end
+
+    it 'sets adapter to ActiveRecord::Base' do
+      expect(described_class.new.adapter).to eq(ActiveRecord::Base)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,16 +1,13 @@
-if ENV['BUILDER'] == 'travis'
-  require "codeclimate-test-reporter"
-  CodeClimate::TestReporter.start
-else
-  require 'simplecov'
-  SimpleCov.start do
-    add_filter '/spec/'
-  end
+# frozen_string_literal: true
+
+require 'simplecov'
+SimpleCov.start do
+  add_filter '/spec/'
 end
 
 require 'active_record'
 require 'sql_query'
-require 'pry'
+#require 'pry'
 
 SqlQuery.configure do |config|
   config.path = '/spec/sql_queries'
@@ -26,15 +23,15 @@ RSpec.configure do |config|
   end
 
   connection = if ENV['BUILDER'] == 'travis'
-                 "postgres://postgres@localhost/travis_ci_test"
+                 'postgres://postgres@localhost/travis_ci_test'
                else
-                 "postgres://sqlquery:sqlquery@localhost/sqlquery"
+                 'postgres://sqlquery:sqlquery@localhost/sqlquery'
                end
 
   ActiveRecord::Base.establish_connection(connection)
 
   ActiveRecord::Base.connection.execute(
-    "CREATE TABLE IF NOT EXISTS players (email text);"
+    'CREATE TABLE IF NOT EXISTS players (email text);'
   )
 
   config.order = :random

data/spec/sql_queries/_email_partial.sql.erb

@@ -0,0 +1 @@
+players.email = <%= quote @email %>

data/spec/sql_queries/get_player_by_email_with_template.sql.erb

@@ -0,0 +1,3 @@
+SELECT *
+FROM players
+WHERE <%= partial :email_partial %>

data/spec/sql_query_spec.rb

@@ -1,13 +1,17 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe SqlQuery do
-
   let(:options) { { email: 'e@mail.dev' } }
   let(:file_name) { :get_player_by_email }
   let(:query) { described_class.new(file_name, options) }
 
-  describe '#initialize' do
+  class Model < ActiveRecord::Base
+    self.abstract_class = true
+  end
 
+  describe '#initialize' do
     it 'sets instance variables for all options' do
       expect(query.instance_variable_get(:@email)).to eq 'e@mail.dev'
     end
@@ -20,11 +24,21 @@ describe SqlQuery do
       end
     end
 
-    context 'file_name argument is not Symbol or String' do
+    context 'when file_name argument is not Symbol or String' do
       let(:file_name) { { do: 'something' } }
 
       it 'raises ArgumentError' do
-        expect{ query }.to raise_error(ArgumentError, 'SQL file name should be String or Symbol')
+        expect { query }
+          .to raise_error(ArgumentError,
+                          'SQL file name should be String or Symbol')
+      end
+    end
+
+    context 'with db_connection option' do
+      let(:options) { { db_connection: Model.connection } }
+
+      it 'sets connection to requested' do
+        expect(query.connection).to eq(Model.connection)
       end
     end
   end
@@ -39,7 +53,8 @@ describe SqlQuery do
       let(:file_name) { :not_exists }
 
       it 'raises error' do
-        expect{ query.send(:file_path) }.to raise_error('File not found: not_exists')
+        expect { query.send(:file_path) }
+          .to raise_error('File not found: not_exists')
       end
     end
 
@@ -47,14 +62,27 @@ describe SqlQuery do
       let(:file_name) { :duplicated }
 
       it 'raises error' do
-        expect{ query.send(:file_path) }.to raise_error.with_message(/More than one file found:/)
+        expect { query.send(:file_path) }
+          .to raise_error.with_message(/More than one file found:/)
+      end
+    end
+  end
+
+  describe '#path' do
+    context 'when there is sql_file_path option' do
+      let(:options) { { sql_file_path: '/path_to_file' } }
+      let(:file_name) { 'fname' }
+
+      it 'sets it as dir for file' do
+        expect(query.send(:path)).to eq('/path_to_file/fname.{sql.erb,erb.sql}')
       end
     end
   end
 
   describe '#sql' do
     it 'returns query string' do
-      expect(query.sql).to eq "SELECT *\nFROM players\nWHERE email = 'e@mail.dev'\n"
+      expect(query.sql)
+        .to eq("SELECT *\nFROM players\nWHERE email = 'e@mail.dev'\n")
     end
 
     context 'when file is .erb.sql' do
@@ -69,7 +97,8 @@ describe SqlQuery do
 
   describe '#pretty_sql' do
     it 'returns query string' do
-      expect(query.pretty_sql).to eq "SELECT *\nFROM players\nWHERE email = 'e@mail.dev'\n"
+      expect(query.pretty_sql)
+        .to eq("SELECT *\nFROM players\nWHERE email = 'e@mail.dev'\n")
     end
   end
 
@@ -77,7 +106,7 @@ describe SqlQuery do
     let(:explain) { query.explain }
     it 'returns explain string' do
       expect(explain).to include 'EXPLAIN for:'
-      expect(explain).to include "FROM players"
+      expect(explain).to include 'FROM players'
       expect(explain).to include "WHERE email = 'e@mail.dev'"
       expect(explain).to include 'QUERY PLAN'
       expect(explain).to include 'Seq Scan on players'
@@ -93,12 +122,90 @@ describe SqlQuery do
 
     after do
       ActiveRecord::Base.connection.execute(
-        "DELETE FROM players"
+        'DELETE FROM players'
+      )
+    end
+
+    it 'returns data from database' do
+      expect(query.execute).to eq [{ 'email' => 'e@mail.dev' }]
+    end
+
+    context 'when prepare argument is true' do
+      it 'executes prepared query for logs' do
+        expect(query).to receive(:prepared_for_logs) { '' }
+        query.execute
+      end
+    end
+
+    context 'when prepare argument is false' do
+      it 'executes unchanged sql query' do
+        expect(query).not_to receive(:prepared_for_logs)
+        query.execute(false)
+      end
+    end
+  end
+
+  describe '#exec_query' do
+    before do
+      ActiveRecord::Base.connection.execute(
+        "INSERT INTO players (email) VALUES ('e@mail.dev')"
+      )
+    end
+
+    after do
+      ActiveRecord::Base.connection.execute(
+        'DELETE FROM players'
       )
     end
 
     it 'returns data from database' do
-      expect(query.execute).to eq [{ 'email' => 'e@mail.dev'}]
+      expect(query.exec_query).to eq [{ 'email' => 'e@mail.dev' }]
+    end
+
+    context 'when prepare argument is true' do
+      it 'executes prepared query for logs' do
+        expect(query).to receive(:prepared_for_logs) { '' }
+        query.exec_query
+      end
+    end
+
+    context 'when prepare argument is false' do
+      it 'executes unchanged sql query' do
+        expect(query).not_to receive(:prepared_for_logs)
+        query.exec_query(false)
+      end
+    end
+  end
+
+  describe '#partial' do
+    let(:file_name) { :get_player_by_email_with_template }
+    it 'resolves partials as parts of sql queries' do
+      expect(query.sql)
+        .to eq("SELECT *\nFROM players\nWHERE players.email = 'e@mail.dev'\n\n")
+    end
+
+    context 'when partial name is string with file path' do
+      let(:file_name) { :get_player_by_email }
+
+      it 'should find file by whole path and _name' do
+        query
+        expect(described_class)
+          .to receive(:new).with('some/path/to/_file.sql', options) { query }
+        query.partial('some/path/to/file.sql', {})
+      end
+    end
+  end
+
+  describe '#prepared_for_logs' do
+    it 'returns string without new lines' do
+      expect(query.prepared_for_logs)
+        .to eq("SELECT * FROM players WHERE email = 'e@mail.dev' ")
+    end
+  end
+
+  describe '.config' do
+    it 'returns configuration instance' do
+      expect(described_class.config).to be_kind_of(SqlQuery::Config)
     end
   end
 end

data/sql_query.gemspec

@@ -1,34 +1,35 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
-  spec.name          = "sql_query"
-  spec.version       = "0.2.1"
-  spec.authors       = ["sufleR"]
-  spec.email         = ["szymon.fracczak@netguru.co"]
-  spec.summary       = %q{Ruby gem to load and execute SQL queries from `.sql.erb` templates}
-  spec.description   = %q{
+  spec.name          = 'sql_query'
+  spec.version       = '0.7.0'
+  spec.authors       = ['sufleR']
+  spec.email         = ['szymon.fracczak@gmail.com']
+  spec.summary       = 'Ruby gem to load and execute SQL queries from `.sql.erb` templates'
+  spec.description   = "
     It makes working with pure SQL easier with syntax highlighting.
     Let's you clean your Ruby code from SQL strings.
-  }
-  spec.homepage      = "https://github.com/sufleR/sql_query"
-  spec.license       = "MIT"
+  "
+  spec.homepage      = 'https://github.com/sufleR/sql_query'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.required_ruby_version = ">= 1.9.3"
+  spec.required_ruby_version = '>= 1.9.3'
 
-  spec.add_dependency "activerecord", ">= 3.2"
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10"
-  spec.add_development_dependency "rspec", "~> 3.2"
-  spec.add_development_dependency "pg", "~> 0.18"
-  spec.add_development_dependency "pry", "~> 0.10"
-  spec.add_development_dependency "with_model", "~> 1.2"
-  spec.add_development_dependency "codeclimate-test-reporter", "~> 0.4"
-  spec.add_development_dependency "appraisal"
+  spec.add_dependency 'activerecord', '>= 3.2', '< 6.0'
+  spec.add_development_dependency 'appraisal'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'pg', '~> 0.18'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.4'
+  spec.add_development_dependency 'rubocop', '<= 0.81'
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'with_model', '~> 1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sql_query
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.7.0
 platform: ruby
 authors:
 - sufleR
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-01 00:00:00.000000000 Z
+date: 2020-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,127 +27,132 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: with_model
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0.81'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0.81'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: with_model
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 description: "\n    It makes working with pure SQL easier with syntax highlighting.\n
   \   Let's you clean your Ruby code from SQL strings.\n  "
 email:
-- szymon.fracczak@netguru.co
+- szymon.fracczak@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - ".travis.yml"
 - Appraisals
 - CHANGELOG.md
@@ -152,16 +160,22 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- examples/README.md
+- examples/distinct_values.sql.erb
 - gemfiles/3.2.gemfile
 - gemfiles/4.0.gemfile
 - gemfiles/4.1.gemfile
 - gemfiles/4.2.gemfile
+- gemfiles/5.0.gemfile
 - lib/sql_query.rb
+- spec/config_spec.rb
 - spec/spec_helper.rb
+- spec/sql_queries/_email_partial.sql.erb
 - spec/sql_queries/duplicated.erb.sql
 - spec/sql_queries/duplicated.sql.erb
 - spec/sql_queries/erb_sql.erb.sql
 - spec/sql_queries/get_player_by_email.sql.erb
+- spec/sql_queries/get_player_by_email_with_template.sql.erb
 - spec/sql_query_spec.rb
 - sql_query.gemspec
 homepage: https://github.com/sufleR/sql_query
@@ -184,14 +198,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby gem to load and execute SQL queries from `.sql.erb` templates
 test_files:
+- spec/config_spec.rb
 - spec/spec_helper.rb
+- spec/sql_queries/_email_partial.sql.erb
 - spec/sql_queries/duplicated.erb.sql
 - spec/sql_queries/duplicated.sql.erb
 - spec/sql_queries/erb_sql.erb.sql
 - spec/sql_queries/get_player_by_email.sql.erb
+- spec/sql_queries/get_player_by_email_with_template.sql.erb
 - spec/sql_query_spec.rb