slaver 0.0.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc706e46c4f308443d1b9849251f2a8ecd6f4e71
-  data.tar.gz: edbdb3b2715e66375e92c6667f412dbd08c026de
+  metadata.gz: 07b3a425333d25e38ddcda97e26510e28f6b07f1
+  data.tar.gz: 1747b2ad2b61f494b3a4867f314b204163f52146
 SHA512:
-  metadata.gz: 523191d32e75fc20b2b3fe17ecc6f4efbb5161aff754a3e4fa622795b97f93237b077242907757dbccf6b391c2888a2a234e60fd861536b3abe625f3a428da1e
-  data.tar.gz: 0845dcdd9a65265866b507bc2543ebb87b14994e3fc17344102d94ede72e4632562f5df1505b2e6a30e77fd1fed0fb8e87b6367c3ed5dbd8b3c1f08e87a7e143
+  metadata.gz: 8969f3a897ce1ca35bec2b7e40a7c15de6b098d6e88b4b7acaca89acd1cf84a05d66fae8416dfd4aafe82691371779e0cc6891db6b99517d820392f4fb15f14a
+  data.tar.gz: 5026e2481a4645659623572654c5f4b76a65bff2f3d8a32ef0cb74cc3662a5ee01ff9abb3eb64747436cecf329406d05ea7c8c75999e564ef65a85c1941d55dc

data/.drone.yml

@@ -0,0 +1,73 @@
+name: build
+
+kind: pipeline
+type: docker
+
+volumes:
+  - name: rubygems
+    host:
+      path: /home/data/drone/rubygems
+  - name: images
+    host:
+      path: /home/data/drone/images
+  - name: bundle
+    host:
+      path: /home/data/drone/gems
+  - name: rubygems
+    host:
+      path: /home/data/drone/rubygems
+
+spec_step_common: &spec_step_common
+  image: abakpress/dind-testing:1.0.3
+  pull: if-not-exists
+  privileged: true
+  volumes:
+    - name: images
+      path: /images
+    - name: bundle
+      path: /bundle
+  commands:
+    - prepare-build
+
+    - fetch-images
+      --image abakpress/ruby-app:$RUBY_IMAGE_TAG
+    - dip provision
+    - dip rspec
+
+steps:
+  - name: Tests Ruby 2.2
+    environment:
+      COMPOSE_FILE_EXT: drone
+      DOCKER_RUBY_VERSION: 2.2
+      RUBY_IMAGE_TAG: 2.2-latest
+      RAILS_ENV: test
+    <<: *spec_step_common
+
+  - name: Tests Ruby 2.3
+    environment:
+      COMPOSE_FILE_EXT: drone
+      DOCKER_RUBY_VERSION: 2.3
+      RUBY_IMAGE_TAG: 2.3-latest
+      RAILS_ENV: test
+    <<: *spec_step_common
+
+  - name: Tests Ruby 2.4
+    environment:
+      COMPOSE_FILE_EXT: drone
+      DOCKER_RUBY_VERSION: 2.4
+      RUBY_IMAGE_TAG: 2.4-latest
+      RAILS_ENV: test
+    <<: *spec_step_common
+
+  - name: release
+    image: abakpress/gem-publication:latest
+    pull: if-not-exists
+    when:
+      event: push
+      branch: master
+      status: success
+    volumes:
+      - name: rubygems
+        path: /root/.gem
+    commands:
+      - release-gem --public

data/.gitignore

@@ -1,5 +1,6 @@
 /.bundle/
 /.yardoc
+/.idea/
 /Gemfile.lock
 /_yardoc/
 /coverage/
@@ -8,6 +9,5 @@
 /spec/reports/
 /tmp/
 gemfiles/
-spec/internal/config/database.yml
 spec/internal/test_other
 spec/internal/test

data/Appraisals

@@ -1,7 +1,11 @@
-appraise 'rails3.1' do
-  gem 'rails', '~> 3.1.0'
+if RUBY_VERSION < '2.4'
+  appraise 'rails4.0' do
+    gem 'rails', '~> 4.0.0'
+    gem 'sqlite3', '~> 1.3.6'
+  end
 end
 
-appraise 'rails3.2' do
-  gem 'rails', '~> 3.2.0'
+appraise 'rails4.2' do
+  gem 'rails', '~> 4.2.0'
+  gem 'sqlite3', '~> 1.3.6'
 end

data/CHANGELOG.md

@@ -1,11 +1,39 @@
+# v0.2.3
 
-#### [Current]
+* 2021-08-05 [aff2000](../../commit/aff2000) - __(TamarinEA)__ Release 0.2.3 
+* 2021-08-05 [e6b74b6](../../commit/e6b74b6) - __(TamarinEA)__ chore: add ruby 2.4 support 
 
+# v0.2.2
 
-#### v0.0.1
- * 2015-11-03 [172eda3](../../commit/172eda3) - __(Denis Korobitcin)__ fix(slavable): add block support
- * 2015-10-22 [b67f807](../../commit/b67f807) - __(Denis Korobitcin)__ feature: added slavable extension
- * 2015-10-23 [9dc8cf0](../../commit/9dc8cf0) - __(Denis Korobitcin)__ chore(readme): fixed within section [skip ci]
- * 2015-10-22 [bbb2535](../../commit/bbb2535) - __(Denis Korobitcin)__ chore: Big refactoring
- * 2015-10-19 [b64de51](../../commit/b64de51) - __(Denis Korobitcin)__ feature: added main slaver logic
- * 2015-10-19 [4441efa](../../commit/4441efa) - __(Artem Napolskih)__ Initial commit
+* 2019-12-16 [d25637b](../../commit/d25637b) - __(ZhidkovDenis)__ fix: separate test and release sections in drone config 
+* 2019-12-02 [94932dc](../../commit/94932dc) - __(ZhidkovDenis)__ Release 0.2.1 
+* 2019-12-02 [e842c9f](../../commit/e842c9f) - __(ZhidkovDenis)__ fix: add missed definition for Slaver::Proxy#respond_to_missing? 
+Slaver::Proxy#respond_to? now will check if Slaver::Proxy#safe_connection
+could respond to specified method.
+
+* 2019-12-02 [29081ac](../../commit/29081ac) - __(ZhidkovDenis)__ chore: remove old rails and ruby support, actualize .drone.yml 
+* 2016-12-27 [7cb588c](../../commit/7cb588c) - __(Denis Korobicyn)__ chore: add dip & drone 
+
+# v0.2.0
+
+* 2016-12-14 [019562a](../../commit/019562a) - __(TamarinEA)__ feat: support rails 4 
+* 2015-11-24 [12c8036](../../commit/12c8036) - __(Denis Korobitcin)__ Release 0.0.2 
+* 2015-11-23 [a93dd20](../../commit/a93dd20) - __(Denis Korobitcin)__ chore(readme): within method and some spelling [skip ci] 
+* 2015-11-23 [f186f6c](../../commit/f186f6c) - __(Denis Korobitcin)__ fix(slavable): special methods capability 
+
+# v0.0.1
+
+* 2015-11-03 [172eda3](../../commit/172eda3) - __(Denis Korobitcin)__ fix(slavable): add block support 
+* 2015-10-22 [b67f807](../../commit/b67f807) - __(Denis Korobitcin)__ feature: added slavable extension 
+* 2015-10-23 [9dc8cf0](../../commit/9dc8cf0) - __(Denis Korobitcin)__ chore(readme): fixed within section [skip ci] 
+* 2015-10-22 [bbb2535](../../commit/bbb2535) - __(Denis Korobitcin)__ chore: Big refactoring 
+Changes:
+1. `on` now working throught `within`
+2. For `within` config independent of class on which it used
+3. Moved all logic to different classes
+  3.1. pools -> PoolsHandler
+  3.2. config -> ConfigHandler
+  3.3. `on` now creaating ScopeProxy which send all missing_methods to base class with within block
+
+* 2015-10-19 [b64de51](../../commit/b64de51) - __(Denis Korobitcin)__ feature: added main slaver logic 
+* 2015-10-19 [4441efa](../../commit/4441efa) - __(Artem Napolskih)__ Initial commit 

data/Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'pry', '< 0.13.0', require: false

data/README.md

@@ -68,7 +68,7 @@ Only works with class/scope methods. Connection changed until query is perfomed.
 
 ### Execute block on other connection
 
-Connection will be switched only for required class.
+Connection will be switched for any query in block.
 
 ```ruby
   # simple usage
@@ -130,7 +130,7 @@ Some.class_method
 Some.new.some_method
 ```
 
-### ACTUNG!!!!
+### ACHTUNG!!!!
 
 If you connection does not exists, behavior may change dependent of you current Rails environment:
  - `Rails.env == production`: It'll raise `ArgumentError`

data/dip.yml

@@ -0,0 +1,46 @@
+version: '1'
+
+environment:
+  DOCKER_RUBY_VERSION: 2.4
+  RUBY_IMAGE_TAG: 2.4-latest
+  COMPOSE_FILE_EXT: development
+  RAILS_ENV: test
+
+compose:
+  files:
+    - docker-compose.yml
+    - docker-compose.${COMPOSE_FILE_EXT}.yml
+
+interaction:
+  sh:
+    service: app
+
+  irb:
+    service: app
+    command: irb
+
+  bundle:
+    service: app
+    command: bundle
+
+  rake:
+    service: app
+    command: bundle exec rake
+
+  appraisal:
+    service: app
+    command: bundle exec appraisal
+
+  rspec:
+    service: app
+    command: bundle exec appraisal bundle exec rspec
+
+  clean:
+    service: app
+    command: rm -f Gemfile.lock gemfiles/*.gemfile.*
+
+provision:
+  - docker volume create --name bundler_data
+  - dip clean
+  - dip bundle install
+  - dip appraisal install

data/docker-compose.development.yml

@@ -0,0 +1,14 @@
+version: '2'
+
+services:
+  app:
+    volumes:
+      - .:/app
+      - ../:/localgems
+      - bundler-data:/bundle
+
+volumes:
+  bundler-data:
+    external:
+      name: bundler_data
+

data/docker-compose.drone.yml

@@ -0,0 +1,7 @@
+version: '2'
+
+services:
+  app:
+    volumes:
+      - .:/app
+      - /bundle:/bundle

data/docker-compose.yml

@@ -0,0 +1,9 @@
+version: '2'
+
+services:
+  app:
+    image: abakpress/ruby-app:$RUBY_IMAGE_TAG
+    environment:
+      - BUNDLE_PATH=/bundle/$DOCKER_RUBY_VERSION
+      - BUNDLE_CONFIG=/app/.bundle/config
+    command: bash

data/lib/slavable.rb

@@ -13,9 +13,8 @@ module Slavable
       connection = options.with_indifferent_access.fetch(:to)
 
       class_eval <<-eoruby, __FILE__, __LINE__ + 1
-
         def #{with_name}(*args, &block)
-          ::ActiveRecord::Base.within(:#{connection}) { #{without_name}(*args, &block) }
+          ::ActiveRecord::Base.within(:#{connection}) { send(:#{without_name}, *args, &block) }
         end
       eoruby
 

data/lib/slaver/pools_handler.rb

@@ -27,7 +27,11 @@ module Slaver
     def create_connection_pool(config_name)
       config = ::ActiveRecord::Base.configurations[config_name]
       config.symbolize_keys!
-      spec = ActiveRecord::Base::ConnectionSpecification.new(config, "#{config[:adapter]}_connection")
+      if ActiveRecord::VERSION::MAJOR < 4
+        spec = ActiveRecord::Base::ConnectionSpecification.new(config, "#{config[:adapter]}_connection")
+      else
+        spec = ActiveRecord::ConnectionAdapters::ConnectionSpecification.new(config, "#{config[:adapter]}_connection")
+      end
 
       ActiveRecord::ConnectionAdapters::ConnectionPool.new(spec)
     end

data/lib/slaver/proxy.rb

@@ -34,5 +34,9 @@ module Slaver
     def method_missing(method, *args, &block)
       safe_connection.send(method, *args, &block)
     end
+
+    def respond_to_missing?(method, include_private = false)
+      safe_connection.respond_to?(method, include_private) || super
+    end
   end
 end

data/lib/slaver/version.rb

@@ -1,3 +1,3 @@
 module Slaver
-  VERSION = '0.0.1'
+  VERSION = '0.2.3'.freeze
 end

data/slaver.gemspec

@@ -18,18 +18,18 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'activerecord', '~> 3.1'
-  spec.add_runtime_dependency 'activesupport', '~> 3.1'
+  spec.add_runtime_dependency 'activerecord', '>= 4.0', '< 5.0'
+  spec.add_runtime_dependency 'activesupport', '>= 4.0', '< 5.0'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.3'
-  spec.add_development_dependency 'rspec-rails'
-  spec.add_development_dependency 'combustion', '~> 0.5'
+  spec.add_development_dependency 'rspec-rails', '~> 3.9.1'
+  spec.add_development_dependency 'combustion', '>= 0.5.0', '< 0.5.5'
   spec.add_development_dependency 'appraisal'
-  spec.add_development_dependency 'pry-debugger'
   spec.add_development_dependency 'shoulda-matchers', '< 3.0.0'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'database_cleaner'
   spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'pry-byebug'
 end

metadata

@@ -1,197 +1,215 @@
 --- !ruby/object:Gem::Specification
 name: slaver
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Denis Korobitcin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2021-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.1'
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '5.0'
   type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '5.0'
+- !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
+- !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.9.1
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 3.9.1
+- !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.5.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.5.5
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.5.5
+- !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: pry-debugger
+- !ruby/object:Gem::Dependency
+  name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
-  name: shoulda-matchers
+- !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: simplecov
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: database_cleaner
+- !ruby/object:Gem::Dependency
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: sqlite3
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - deniskorobitcin@gmail.com
@@ -199,16 +217,20 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".drone.yml"
+- ".gitignore"
+- ".rspec"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
-- Makefile
 - README.md
 - Rakefile
 - config.ru
+- dip.yml
+- docker-compose.development.yml
+- docker-compose.drone.yml
+- docker-compose.yml
 - lib/slavable.rb
 - lib/slaver.rb
 - lib/slaver/config_handler.rb
@@ -230,17 +252,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.1
 signing_key: 
 specification_version: 4
 summary: Instant change of connection in rails application.

data/Makefile

@@ -1,31 +0,0 @@
-BUNDLE = bundle
-BUNDLE_OPTIONS = -j 3
-RSPEC = ${APPRAISAL} rspec
-APPRAISAL = ${BUNDLE} exec appraisal
-
-all: test
-
-test: configs bundler appraisal
-	${RSPEC} 2>&1
-
-define DATABASE_YML
-test:
-  adapter: sqlite3
-  database: test
-test_other:
-  adapter: sqlite3
-  database: test_other
-endef
-export DATABASE_YML
-
-configs:
-	echo "$${DATABASE_YML}" > spec/internal/config/database.yml
-
-bundler:
-	if ! gem list bundler -i > /dev/null; then \
-	  gem install bundler; \
-	fi
-	${BUNDLE} install ${BUNDLE_OPTIONS}
-
-appraisal:
-	${APPRAISAL} install