filecluster 0.4.18 → 0.4.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fef3c7d2db488cd43e844f7e237e8696f4715ff
-  data.tar.gz: 88696b276b74b2aec6595798ddfaf3f1909ec2e6
+  metadata.gz: aac24b717934dcbd725628834a6b0636b860c019
+  data.tar.gz: 790af9f42d49808420ffa79808ad116781b7c175
 SHA512:
-  metadata.gz: df5d53cdee92041d9fb71c753d4255edccd2f6a4e5475785063adda9161867b537627e333a41256ea6386be118677ccfdbbe5f3ca2c64d24c594f2db588698b8
-  data.tar.gz: 1e11a7586394c716a9f42d09063c7716b70d2b173f0a667f6fbec09405479a4b1d7c4ff90bbdbcc21fe3ff70e0a730c1ad89f5cdbf5aa216d723d143ed6d5353
+  metadata.gz: 591aec59e41a052db68bc8750d4b30de34ad8b0fbd1e4c9fdf83fdbcd01453629c918af717bf8e5fc0cf6b560031f47a882d746e0221e050ab33c1ea9364fcee
+  data.tar.gz: 95c6e59b1fd6de27abcb500bfc9009160f983c26a2cfcaea9f727b74949a9f11e65766e41d6e21124e48a1272d838279c93ea2cc24367a41b8757040bc480541

data/lib/fc/db.rb

@@ -14,7 +14,10 @@ module FC
     
     def self.connect(options = {})
       if !@options
-        if defined?(ActiveRecord::Base) && ActiveRecord::Base.connection
+        if options[:host] || options[:database] || options[:username] || options[:password] || 
+          !defined?(ActiveRecord::Base) && ActiveRecord::Base.connection
+          self.connect_by_config(options)
+        else
           if defined?(Octopus::Proxy) && ActiveRecord::Base.connection.is_a?(Octopus::Proxy)
             connection = ActiveRecord::Base.connection.select_connection.instance_variable_get(:@connection)
           else
@@ -25,8 +28,6 @@ module FC
           @prefix = @options[:prefix].to_s if @options[:prefix]
           @connects = {} unless @connects
           @connects[Thread.current.object_id] = connection
-        else
-          self.connect_by_config(options)
         end
       else
         @options.merge!(options)

data/lib/fc/version.rb

@@ -1,3 +1,3 @@
 module FC
-  VERSION = "0.4.18"
+  VERSION = "0.4.19"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filecluster
 version: !ruby/object:Gem::Version
-  version: 0.4.18
+  version: 0.4.19
 platform: ruby
 authors:
 - sh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-18 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2