sql_query 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 578c4baee7c9f46b29390e5673a3964ea2355df5
-  data.tar.gz: 9a5ebd7357ab88afbe51e722450ce7be3cb50358
+  metadata.gz: 0452542a904eddb855ce109208eed5a89feceab6
+  data.tar.gz: cc8e5ac17cdda1cac20ab9cd06b134a5d3b7afc8
 SHA512:
-  metadata.gz: 7dc270655c8c0e38679b97cf60dac8923ca4f91e183d61320978594af24f252cb5c62e2daf533b85b5024c9e74a832d28b8c777106e0b65b8f241d47e381c78c
-  data.tar.gz: b97a98c442b2b80fbfec76193690924cefa157ef18e5144c69e19097931163b150351454648d8042402a5e4d467de024fd805a66b391416942b054b403bd3fe2
+  metadata.gz: c1df1313fde7374076bb952dc48fdb677aa3559160f313478c6f6d88bc5ce9dcc0f36fe27386bade19dd30638df5731e9584412006c995da0d1e7711c89779eb
+  data.tar.gz: f9a398f523abaec9ed20fcfe5326c9b8ddd97a2a1fffad73ae7a959ee94ee5965423012fb685781b0edcd5ff15286845fe912a28e1c6f4460c14b91320fcc552

data/.travis.yml

@@ -1,24 +1,23 @@
 language: ruby
+cache: bundler
+before_install: gem update bundler
 
 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.3'
+  - '2.3.1'
 
 addons:
-  postgresql: '9.3'
+  postgresql: '9.4'
   code_climate:
     repo_token: 743bf63d7a422064551b35931628682c6cad81a30743edee7ff9ea8af061397d
 
 env:
   - BUILDER=travis
-
 before_script:
   - psql -c 'create database travis_ci_test;' -U postgres

data/Appraisals

@@ -13,3 +13,7 @@ end
 appraise "4.2" do
   gem "activerecord", "~> 4.2.0"
 end
+
+appraise "5.0" do
+ gem "activerecord", "~> 5.0.0"
+end

data/CHANGELOG.md

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

data/README.md

@@ -82,6 +82,7 @@ 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
 

data/gemfiles/5.0.gemfile

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

data/lib/sql_query.rb

@@ -104,8 +104,12 @@ class SqlQuery
   end
 
   def path
-    root = defined?(Rails) ? Rails.root.to_s : Dir.pwd
-    tmp_path = "#{root}#{self.class.config.path}"
+    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

data/spec/sql_query_spec.rb

@@ -51,7 +51,7 @@ 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
 
@@ -64,6 +64,17 @@ describe SqlQuery do
     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"

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.5.0"
+  spec.version       = "0.6.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}
@@ -23,9 +23,9 @@ Gem::Specification.new do |spec|
   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 "bundler", "~> 1.13"
+  spec.add_development_dependency "rake", "~> 11.3"
+  spec.add_development_dependency "rspec", "~> 3.4"
   spec.add_development_dependency "pg", "~> 0.18"
   spec.add_development_dependency "pry", "~> 0.10"
   spec.add_development_dependency "with_model", "~> 1.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sql_query
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - sufleR
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '11.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '11.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -158,6 +158,7 @@ files:
 - 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
@@ -189,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby gem to load and execute SQL queries from `.sql.erb` templates