sql_query 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8996df6ea13c7ce6e1b4ffb04d2137d537852326
-  data.tar.gz: 776b12b91ab006e9ec2170268cfe2cb258f56603
+  metadata.gz: 578c4baee7c9f46b29390e5673a3964ea2355df5
+  data.tar.gz: 9a5ebd7357ab88afbe51e722450ce7be3cb50358
 SHA512:
-  metadata.gz: 0d535b70950bfd98f169873ff9471453296e7eb4fb045dc0cf525d9563153022fa8e743aed56a00533ae67d62fc4ceeda4089d4483638b988a7922077c9dfd29
-  data.tar.gz: 8615b61a80e9d78e6492404437bf0c6195ab241ec44be1e50f4544b2994c224c9c16982860886157e7659d3e25142a27b15bb3e9a361ea198f51f7b2200d22a3
+  metadata.gz: 7dc270655c8c0e38679b97cf60dac8923ca4f91e183d61320978594af24f252cb5c62e2daf533b85b5024c9e74a832d28b8c777106e0b65b8f241d47e381c78c
+  data.tar.gz: b97a98c442b2b80fbfec76193690924cefa157ef18e5144c69e19097931163b150351454648d8042402a5e4d467de024fd805a66b391416942b054b403bd3fe2

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 # SqlQuery change log
 
-## 0.4.1 / Unreleased
+## 0.5.1 / Unreleased
 
 * [Added]
 
@@ -10,6 +10,10 @@
 
 * [Fixed]
 
+## 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.

data/README.md

@@ -79,9 +79,13 @@ 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.
+
 ### Methods
 
-- **execute** - executes query and returns result data. It accepts boolean argument. When argument is false it will raw sql query instead of prepared_for_logs.
+- **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.
 - **explain** - runs explain for SQL from template
 - **sql** - returns SQL string
 - **pretty_sql** - returns SQL string prettier to read in console
@@ -89,14 +93,19 @@ 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.

data/lib/sql_query.rb

@@ -9,8 +9,8 @@ class SqlQuery
     end
     @sql_filename = file_name
     @options = options
+    @connection =  options.try(:delete, :db_connection) || self.class.config.adapter.connection
     prepare_variables
-    @connection = ActiveRecord::Base.connection
   end
 
   def explain
@@ -47,10 +47,8 @@ class SqlQuery
                   ).sql
   end
 
-  def self.config=(value)
-    @config = value
-  end
 
+  attr_writer :config
   def self.config
     @config ||= Config.new
   end
@@ -60,10 +58,11 @@ class SqlQuery
   end
 
   class Config
-    attr_accessor :path
+    attr_accessor :path, :adapter
 
     def initialize
       @path = '/app/sql_queries'
+      @adapter = ActiveRecord::Base
     end
   end
 
@@ -87,6 +86,7 @@ class SqlQuery
   end
 
   def prepare_variables
+    return unless @options.present?
     @options.each do |k, v|
       instance_variable_set("@#{k}", v)
     end

data/spec/config_spec.rb

@@ -0,0 +1,13 @@
+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/sql_query_spec.rb

@@ -6,6 +6,10 @@ describe SqlQuery do
   let(:file_name) { :get_player_by_email }
   let(:query) { described_class.new(file_name, options) }
 
+  class Model < ActiveRecord::Base
+    self.abstract_class = true
+  end
+
   describe '#initialize' do
 
     it 'sets instance variables for all options' do
@@ -20,13 +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')
       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
 
   describe '#file_path' do
@@ -121,6 +133,17 @@ describe SqlQuery do
     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
@@ -129,4 +152,10 @@ describe SqlQuery do
         .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

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "sql_query"
-  spec.version       = "0.4.0"
+  spec.version       = "0.5.0"
   spec.authors       = ["sufleR"]
   spec.email         = ["szymon.fracczak@gmail.com"]
   spec.summary       = %q{Ruby gem to load and execute SQL queries from `.sql.erb` templates}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sql_query
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - sufleR
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -159,6 +159,7 @@ files:
 - gemfiles/4.1.gemfile
 - gemfiles/4.2.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
@@ -193,6 +194,7 @@ 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