querrel 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac00fa1731878f9644eeef4cba1df54454b70d3c
-  data.tar.gz: 3333ac82975cc0ab9a9359ea254db41c97330ded
+  metadata.gz: d04075453f43a4ab89ca79243a30a178f4aff083
+  data.tar.gz: 78b50fabae36322f9081f11af4d48f7958a4b7c8
 SHA512:
-  metadata.gz: fa8d8b12c96c966a0b5e755749a175902f4ba5b1808f94d3cdb70179250d6f624eba73d69f754a9e0e642bc10c02960455ac1bafb25fccb69dd44e8980daaef3
-  data.tar.gz: a65135e0097d7ccdad1d7f276ab77adc0cc48f1787db0a413c12afa93920795558157ccda86737eb51a85e589ab86c6f2ed7910b771cb0155a89063e567f41e6
+  metadata.gz: 2fcdfb519bb2715c5e025cbca6487d323be1bb9aa1dade7677f39fad3c6b77b9501f73b7c8d48be8ed7c3e49a96de4ed2230be6385e21e015c9171c07bb269f7
+  data.tar.gz: 4934643a60e57b9dde67119c236922a81e102d0722b43af0610e1d305f1a0bcccc20bca4d0109a8c74b42134777e44e2a87b061d2c6b87c51fb49fe4eeda1311

data/README.md

@@ -40,23 +40,21 @@ all_brand_names = q.query(Brand.all) do |s|
 end
 ```
 
-There is also a `run` method which instead of running a preprescribed scope and merging, will yield the `ConnectedModelFactory` class which allows you to wrap any ActiveRecord class so that you can query it in the thread, for instance:
+There is also a `run` method which instead of running a preprescribed scope and merging, will take a block which allows you do anything you want with the specified database connection, for instance:
 
 ```ruby
 require 'thread'
-all_brands = Brand.all
+all_brands = []
 b_s = Mutex.new
-all_products = Product.all
+all_products = []
 p_s = Mutex.new
 
-Querrel.run(on: dbs) do |q|
-  b_s.synchronize { all_brands += q[Brand].all.to_a }
-  p_s.synchronize { all_products += q[Product].all.to_a }
+Querrel.run(on: dbs) do |db|
+  b_s.synchronize { all_brands += Brand.all.to_a }
+  p_s.synchronize { all_products += Product.all.to_a }
 end
 ```
 
-At the moment, any queries using `run` and the ConnectedModelFactory won't return objects of the class passed in, but an anonymous class instead. However, `query` can marshall the results back into the original class.
-
 ### Databases
 
 There are three ways in which you can instruct Querrel which databases to use:

data/lib/querrel/connection_resolver.rb

@@ -23,7 +23,7 @@ module Querrel
       @resolver = ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new(specs)
     end
 
-    [:configurations, :spec].each do |m|
+    [:configurations, :spec, :resolve].each do |m|
       define_method(m) do |*args, &block|
         @resolver.send(m, *args, &block)
       end

data/lib/querrel/map_reduce.rb

@@ -15,36 +15,23 @@ module Querrel
         dbs = @connection_resolver.configurations.keys
       end
 
-      query_model = scope.model
       results = {}
       results_semaphore = Mutex.new
 
       pool = StaticPool.new(options[:threads] || 20)
       dbs.each do |db|
         pool.enqueue do
-          Thread.current[:querrel_connected_models] = []
-          con_spec = retrieve_connection_spec(db, resolver)
-          Thread.current[:querrel_con_spec] = con_spec
-          dynamic_class = ConnectedModelFactory[query_model, con_spec]
+          ActiveRecord::Base.connection_handler = ActiveRecord::ConnectionAdapters::ConnectionHandler.new
+          con_config = retrieve_connection_config(db, resolver)
+          ActiveRecord::Base.establish_connection(con_config)
 
           begin
-            local_scope = dynamic_class.all.merge(scope)
-            local_results = if block_given?
-              res = yield(local_scope, ConnectedModelFactory)
-              res.to_a.each(&:readonly!) if res.is_a?(ActiveRecord::Relation)
-              res
-            else
-              local_scope.to_a.map do |r|
-                query_model.instantiate(r.attributes, {}).tap(&:readonly!)
-              end
-            end
+            local_results = block_given? ? yield(scope, db) : scope
+            local_results.to_a.each(&:readonly!) if local_results.is_a?(ActiveRecord::Relation)
 
             results_semaphore.synchronize { results[db] = local_results }
           ensure
-            Thread.current[:querrel_connected_models].each do |m|
-              m.connection_pool.release_connection
-            end
-            Thread.current[:querrel_connected_models] = nil
+            ActiveRecord::Base.connection_handler.clear_all_connections!
           end
         end
       end

data/lib/querrel/querreller.rb

@@ -1,4 +1,3 @@
-require 'querrel/connected_model_factory'
 require 'querrel/connection_resolver'
 require 'querrel/static_pool'
 require 'querrel/map_reduce'
@@ -27,15 +26,12 @@ module Querrel
       dbs.each do |db|
         pool.enqueue do
           begin
-            Thread.current[:querrel_connected_models] = []
-            con_spec = retrieve_connection_spec(db, resolver)
-            Thread.current[:querrel_con_spec] = con_spec
-            yield(ConnectedModelFactory)
+            ActiveRecord::Base.connection_handler = ActiveRecord::ConnectionAdapters::ConnectionHandler.new
+            con_config = retrieve_connection_config(db, resolver)
+            ActiveRecord::Base.establish_connection(con_config)
+            yield(db)
           ensure
-            Thread.current[:querrel_connected_models].each do |m|
-              m.connection_pool.release_connection
-            end
-            Thread.current[:querrel_connected_models] = nil
+            ActiveRecord::Base.connection_handler.clear_all_connections!
           end
         end
       end
@@ -46,6 +42,10 @@ module Querrel
       resolver.spec(db.to_sym)
     end
 
+    def retrieve_connection_config(db, resolver)
+      resolver.resolve(db.to_sym)
+    end
+
     def while_connected_to(db, resolver, &b)
       conf = resolver.spec(db.to_sym)
       pool = ActiveRecord::ConnectionAdapters::ConnectionPool.new(conf)

data/lib/querrel/version.rb

@@ -1,3 +1,3 @@
 module Querrel
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/querrel.gemspec

@@ -17,10 +17,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "activerecord", "~> 4.1"
+  spec.add_runtime_dependency "activerecord", ">= 4.0"
 
   spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake", "~> 0"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "sqlite3", "~> 1.3.5"
   spec.add_development_dependency "database_rewinder", "~> 0"
 end

data/test/instance_test.rb

@@ -46,9 +46,9 @@ class InstanceTest < Querrel::Test
     s = Mutex.new
     configs_actual = []
 
-    @q.run do |q|
+    @q.run do
       s.synchronize do
-        configs_actual << q[Product].connection_config
+        configs_actual << Product.connection_config
       end
     end
 

data/test/non_instance_test.rb

@@ -46,9 +46,9 @@ class NonInstanceTest < Querrel::Test
   def test_runner
     s = Mutex.new
     configs_actual = []
-    Querrel.run(on: @dbs) do |q|
+    Querrel.run(on: @dbs) do
       s.synchronize do
-        configs_actual << q[Product].connection_config
+        configs_actual << Product.connection_config
       end
     end
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: querrel
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Mike Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -42,14 +42,14 @@ dependencies:
   name: rake
   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'
 - !ruby/object:Gem::Dependency
@@ -93,7 +93,6 @@ files:
 - README.md
 - Rakefile
 - lib/querrel.rb
-- lib/querrel/connected_model_factory.rb
 - lib/querrel/connection_resolver.rb
 - lib/querrel/map_reduce.rb
 - lib/querrel/querreller.rb

data/lib/querrel/connected_model_factory.rb

@@ -1,14 +0,0 @@
-module Querrel
-  class ConnectedModelFactory
-    def self.[](model, con_spec = nil)
-      con_spec ||= Thread.current[:querrel_con_spec]
-      dynamic_class_name = "#{model.name}#{Thread.current.object_id}"
-      Class.new(model).tap do |m|
-        m.send(:define_singleton_method, :name) { dynamic_class_name }
-        m.establish_connection(con_spec.config)
-
-        Thread.current[:querrel_connected_models] << m
-      end
-    end
-  end
-end