ensembl 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f42c94ee8d83d257d7a8a14bc93e7575378960c
-  data.tar.gz: bb7fba0cfe944082d157fffb5f572da729593bde
+  metadata.gz: c4ac70520dcc5ef2fe51ecf7225730f85f1ac3fd
+  data.tar.gz: 68bafb5f5b405ab11ce606da2885d27978fa3320
 SHA512:
-  metadata.gz: e445f42acc1f4f1f7cc6e228c98b8854feaf9fb051e40c120f1d15cdf2ad9725b95119af95252f5d83e192e96048951d27d4cfce9a6a393d022b26ef3cad3316
-  data.tar.gz: ad76ac1961ce9a49b224eda9db098b47cbc4ce8c1369f78545358e36d2c9d8447a3679cc165508c84e1438beec2eb6d147bbe96e1002473294a975432411ac74
+  metadata.gz: 8874bde7ed8aed44edec73c73c1dd3f3008b390357cfdd1c3fb414f8e1ff6ab123c934f666f66c74df1063599a1bf1777c6dc349078dc6281b6232edb67d0e49
+  data.tar.gz: d2d2d476b200bbb2e7bbb6961e14d9b9f3f15b4478b3bf7f42757c7f8c9d7fc57dc44e8765d81479d6a8771cc958086346b96f9015444d4be8c1a16669352fb6

data/lib/ensembl/core/activerecord.rb

@@ -7,13 +7,22 @@ module Ensembl
       end
     end
 
-    class Connection < ConnectionPooledBase
+    class Connection < ActiveRecord::Base
       self.extend Ensembl::TableNameOverrides
 
       self.abstract_class = true
 
       self.establish_connection :core
 
+      # ConnectionPool implemented from:
+      # http://www.lucasallan.com/2014/05/26/fixing-concurrency-issues-with-active-record-in-a-rack-application.html
+      singleton_class.send(:alias_method, :original_connection, :connection)
+
+      def self.connection
+        ActiveRecord::Base.connection_pool.with_connection do |conn|
+          conn
+        end
+      end
     end
 
     class ModelBase < Connection

data/lib/ensembl/variation/activerecord.rb

@@ -5,7 +5,7 @@ module Ensembl
 
     # ConnectionPool implemented from:
     # http://www.lucasallan.com/2014/05/26/fixing-concurrency-issues-with-active-record-in-a-rack-application.html
-    class Connection < ConnectionPooledBase
+    class Connection < ActiveRecord::Base
 
       self.extend Ensembl::TableNameOverrides
 
@@ -13,6 +13,15 @@ module Ensembl
 
       self.establish_connection :variation
 
+      # ConnectionPool implemented from:
+      # http://www.lucasallan.com/2014/05/26/fixing-concurrency-issues-with-active-record-in-a-rack-application.html
+      singleton_class.send(:alias_method, :original_connection, :connection)
+
+      def self.connection
+        ActiveRecord::Base.connection_pool.with_connection do |conn|
+          conn
+        end
+      end
     end
 
     class ModelBase < Connection

data/lib/ensembl/version.rb

@@ -1,3 +1,3 @@
 module Ensembl
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ensembl
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Kristjan Metsalu