database_slave 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjZhMzMxNjJjNmYzZmNmM2VkYTc0OGY1MmJjMjhkNzJhYzVlOTczZA==
+    ZjI2MGU0NGYzZWZmNGE4MGU2MTRmZTJiYWQ4NjMwNWQ0Mzg1OTE4Yg==
   data.tar.gz: !binary |-
-    NzlkOGUyODcwOWVkOTQxNTYyN2VmYjcxMjY3ZTk1ZmE0NjcwN2YwZQ==
+    NmU3NzE0ZjM1ZjVmMTc5N2QwMzg1MGViM2QzNDQzYjFkMmQyMTdlNQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NWNkMzAzNjcwOTI5M2ViZjk0OGEwOWQyODlmMjcyNzg1YmMwZmRjZGZhMWFj
-    MjczMjc5ZWUxNjQzYzUzY2E2MjZjODI2YTQzODkxZmU0Yzg5YWIwYjdjZTc1
-    ZDUzYTMyYmE4MzFlZWQ4MjZiN2VmNmQ3Y2M4MGIzZjZkNDM1MTI=
+    ZDcwNTc3YjFlY2U3NDYyMzU0MjNkZGM1MjNlODgyMTFhMTNkNjAxODQ3ZmQ3
+    NTJjNWZiYzkyYjc1MDVhYTQxOGU3MDg0Mzc5NGQ4ZDFiZDQwZDk2MzEyMWQz
+    ZDVlNmQyNjExMGY4MmIyYWZiMGY4NWJmMDJiZjgzMTU1OTNhMWY=
   data.tar.gz: !binary |-
-    YTgzNWZiMjdmYjFjOTZkYTM0ZmM5YmJjNWI4MDk0NWFmYjE0YTQ5NjY1NDc3
-    M2YzMTQyZTYyZTA1ZjViZDhlMzUyMGQ0NWFkODExOTJkODMwMzllODk1Y2Fm
-    OTc3ZjhiYzNiZjEwNmI1NTQ0ZjA1OTc0MGQxN2I1Nzc5YzRmOWM=
+    OGZiMzhiMzA3OWFhMDBjODFmYTJkZmYwMmE1MzZlMjExNGI1ZGVjNTEwMTEz
+    YThiZjJiZWY4YjA2MjRjOTA1OWY4Zjg1MTYyOTllYTllYTZjNTZkNmVhYWVl
+    ZDRlMWRkMmMyODBjYTVhYWNjMTc5YTNhMjc3ZTU3Yzc0NTViMjc=

data/CHANGELOG

@@ -1,4 +1,10 @@
+0.1.2 - 2015-03-31
+  * support new usage:
+      ActiveRecord::Base.using(:slave_name) do
+      end
+  * prevent usage: ActiveRecord::Base.using(:slave_name).where()
+  * add error classes
 0.1.1 - 2015.03.31
   * alias using using_slave
-  * 解决父查询中包含default_scope等子查询而导致父查询不走从库的bug
-  * supprt pluck/count/sum etc.
+  * bug fixed: 父查询中包含default_scope等子查询时导致父查询不走从库
+  * supprt includes/pluck/count/sum etc.

data/README.md

@@ -87,6 +87,8 @@ There are two ways to use slave database:
   end
   ```
 
+  Because of `alias`, you can use `using` instead of `using_slave`.
+
 # License
 
 See LICENSE file.

data/lib/database_slave/base.rb

@@ -10,6 +10,32 @@ module DatabaseSlave
         delegate :using_slave, :using, to: :scoped
       end
     end
+
+    module ClassMethods
+      # 为了兼容老版本
+      #   ActiveRecord::Base.using(:slave_name) do
+      #   end
+      # 的写法, 这里迫不得已重写了scoped方法, 目的是:
+      #
+      # 当使用如上方式时, 将其using()方法代理到一个继承了ActiveRecord::Base的
+      # 空的具象类DatabaseSlave::NoneActiveRecord, 以便进而能够使用using方法,
+      # 因为ActiveRecord::Base是一个抽象类, 不能使用using方法.
+      #
+      # 且此种方式只能后接block, 不能用于级联式. 使用级联式会抛出异常, 具体见
+      # ActiveRecord::Relation#using_slave中的实现.
+      #
+      def scoped(options = nil)
+        if self.equal? ActiveRecord::Base
+          # Module.const_get(ActiveRecord::Base.subclasses.map(&:name).sort.first) || self
+          DatabaseSlave::NoneActiveRecord
+        else
+          super
+        end
+      end
+    end
+  end
+
+  class NoneActiveRecord < ActiveRecord::Base
   end
 end
 

data/lib/database_slave/connection_handler.rb

@@ -30,7 +30,8 @@ module DatabaseSlave
         klass          = self.const_set(slave_name.to_s.strip.camelize, Class.new)
 
         unless ActiveRecord::Base.respond_to?(spec.adapter_method)
-          raise "AdapterNotFound: database configuration specifies nonexistent #{config['adapter']} adapter"
+          raise DatabaseSlave::AdapterNotFound,
+            "database configuration specifies not include #{config['adapter']} adapter"
         end
 
         ActiveRecord::Base.slave_connections << klass.name

data/lib/database_slave/errors.rb

@@ -0,0 +1,19 @@
+module DatabaseSlave
+
+  # Generic Database Slave exception class.
+  class DatabaseSlaveError < StandardError
+  end
+
+  # Raised when using_slave() method used on a abstract class
+  # without a block given.
+  # For example: ActiveRecord::Base.using_slave().where() is not allowed.
+  class AbstractClassWithoutBlockError < DatabaseSlaveError
+  end
+
+  # Raised when slave connection doesn't exists.
+  class SlaveConnectionNotExists < DatabaseSlaveError
+  end
+
+  class AdapterNotFound < DatabaseSlaveError
+  end
+end

data/lib/database_slave/relation.rb

@@ -33,13 +33,20 @@ module DatabaseSlave
             DatabaseSlave::RuntimeRegistry.current_slave_name = nil
           end
         else
+          # 不能使用抽象类级联式查询, 即不能使用ActiveRecord::Base.using().where()
+          if self.name.eql? DatabaseSlave::NoneActiveRecord.name
+            raise DatabaseSlave::AbstractClassWithoutBlockError,
+              'a block must be given to abstract class, or you can use a specific class.'
+          end
+
           self.slave_name = "DatabaseSlave::ConnectionHandler::#{slave_name.to_s.strip.camelize}"
           relation = clone
 
           if ActiveRecord::Base.slave_connections.include? self.slave_name
             relation
           else
-            raise "#{slave_name} is not exist."
+            raise DatabaseSlave::SlaveConnectionNotExists,
+              "#{slave_name} is not exists."
           end
         end
       else

data/lib/database_slave/version.rb

@@ -1,3 +1,3 @@
 module DatabaseSlave
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/database_slave.rb

@@ -1,4 +1,5 @@
 require 'database_slave/base'
+require 'database_slave/errors'
 require 'database_slave/configuration'
 require 'database_slave/connection_handler'
 require 'database_slave/runtime_registry'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: database_slave
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Hayden Wei
@@ -26,6 +26,7 @@ files:
 - lib/database_slave/base.rb
 - lib/database_slave/configuration.rb
 - lib/database_slave/connection_handler.rb
+- lib/database_slave/errors.rb
 - lib/database_slave/railtie.rb
 - lib/database_slave/relation.rb
 - lib/database_slave/runtime_registry.rb