master_slave 4.0.0 → 4.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ac72a0a0724da38a016bbdd1583db8401e426431
+  data.tar.gz: e784023a02f7adc988aaadedda4e32dd1b285e12
+SHA512:
+  metadata.gz: 184399a622403048090201c11e469d337bc7da6ef4c7ea6d7f455c8b9ce71fde631d8b0d50aa3c97a17870d2e69572c7b8f76c1e309ca37d60abae3c561cda4f
+  data.tar.gz: 0666f7fbb6a7e85d1b8856642a57731ca06b2583da7fc1bff55f5f74d15406f151df1247acd537889430b299b2c1bde2aff0135562c49f88a3c5ebbf95cc1af9

data/lib/master_slave/{config.rb → configuration.rb}

@@ -1,9 +1,4 @@
 module MasterSlave
-
-  def self.config
-    @config ||= MasterSlave::Configuration.new
-  end
-
   class Configuration
     cattr_accessor :config_file
 
@@ -12,7 +7,7 @@ module MasterSlave
     end
 
     def slave_names
-      raise "#{Rails.env}'s slave config not exist" if @content.blank?
+      raise "#{Rails.env}'s slave config is not exist" if @content.blank?
       @shard_names ||= @content.keys.sort
     end
 
@@ -28,7 +23,7 @@ module MasterSlave
 
     def load_config
       if File.exist?(self.class.config_file)
-        hash_config = YAML.load(ERB.new(File.open(self.class.config_file).read).result)
+        hash_config = YAML.load(ERB.new(File.read(self.class.config_file)).result)
         HashWithIndifferentAccess.new(hash_config)[Rails.env]
       else
         {}

data/lib/master_slave/connection_handler.rb

@@ -10,25 +10,21 @@ module MasterSlave
     end
 
     class << self
-
-      def setup
-        setup_connection
-      end
-
       def connection_pool_name(slave_name)
         "master_slave_#{slave_name.to_s.strip}"
       end
 
-      protected
-
       def setup_connection
         ActiveRecord::Base.slave_connection_names ||= []
         MasterSlave.config.slave_names.each do |slave_name|
-          ActiveRecord::Base.slave_connection_names << slave_name.to_s.strip
-          spec = MasterSlave.config.slave_config(slave_name).symbolize_keys
+          slave_name = slave_name.to_s.strip
+          if !ActiveRecord::Base.slave_connection_names.include? slave_name
+            ActiveRecord::Base.slave_connection_names << slave_name
+          end
 
-          resolver = ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new spec, spec
-          spec = resolver.spec
+          spec = { Rails.env => MasterSlave.config.slave_config(slave_name) }
+          resolver = ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new spec
+          spec = resolver.spec(Rails.env.to_sym)
 
           unless ActiveRecord::Base.respond_to?(spec.adapter_method)
             raise AdapterNotFound, "database configuration specifies nonexistent #{spec.config[:adapter]} adapter"

data/lib/master_slave/{base.rb → core.rb}

@@ -1,5 +1,5 @@
 module MasterSlave
-  module Base
+  module Core
     extend ActiveSupport::Concern
 
     included do
@@ -47,7 +47,7 @@ module MasterSlave
 
       def with_slave(slave_name)
         slave_name = slave_name.to_s.strip
-        raise "#{slave_name} not exist" unless ActiveRecord::Base.slave_connection_names.include?(slave_name)
+        raise "The slave name is not exist.(#{slave_name})" unless ActiveRecord::Base.slave_connection_names.include?(slave_name)
         MasterSlave::RuntimeRegistry.current_slave_name = slave_name
         MasterSlave::RuntimeRegistry.slave_block        = true
         yield

data/lib/master_slave/railtie.rb

@@ -3,10 +3,10 @@ module MasterSlave
 
     config.after_initialize do
       if File.exist?(MasterSlave::Configuration.config_file)
-        puts "\033[32mmaster_slave is on!\033[0m"
-        ActiveRecord::Base.send :include, MasterSlave::Base
-        MasterSlave::ConnectionHandler.setup
-      else
+        puts "\033[32mmaster_slave is on!\033[0m" unless MasterSlave.quiet
+        ActiveRecord::Base.send :include, MasterSlave::Core
+        MasterSlave.setup!
+      elsif !MasterSlave.quiet
         puts "\033[31mNo such file #{MasterSlave::Configuration.config_file}\033[0m"
         puts "\033[31mPlease execute `rails g master_slave:config`\033[0m"
         puts "\033[31mmaster_slave is off!\033[0m"

data/lib/master_slave/version.rb

@@ -1,3 +1,3 @@
 module MasterSlave
-  VERSION = '4.0.0'
+  VERSION = '4.1.0'
 end

data/lib/master_slave.rb

@@ -1,6 +1,31 @@
-require 'master_slave/base'
-require 'master_slave/config'
+require 'rails'
+require 'active_support'
+require 'active_record'
+require 'master_slave/core'
+require 'master_slave/configuration'
 require 'master_slave/connection_handler'
 require 'master_slave/runtime_registry'
 require 'master_slave/version'
 require 'master_slave/railtie'
+
+module MasterSlave
+
+  class << self
+    def config
+      @config ||= MasterSlave::Configuration.new
+    end
+
+    def quiet
+      return @quiet if defined?(@quiet)
+      @quiet = false
+    end
+
+    def quiet=(value)
+      @quiet = !!value
+    end
+
+    def setup!
+      MasterSlave::ConnectionHandler.setup_connection
+    end
+  end
+end

metadata

@@ -1,69 +1,51 @@
 --- !ruby/object:Gem::Specification
 name: master_slave
 version: !ruby/object:Gem::Version
-  version: 4.0.0
-  prerelease: 
+  version: 4.1.0
 platform: ruby
 authors:
 - Tumayun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-22 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-description: mysql separate read and write.
+date: 2015-01-06 00:00:00.000000000 Z
+dependencies: []
+description: Rails separate read and write.
 email: tumayun.2010@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/master_slave.rb
-- lib/rails/generators/templates/shards.yml
-- lib/rails/generators/config_generator.rb
-- lib/master_slave/version.rb
-- lib/master_slave/railtie.rb
-- lib/master_slave/config.rb
+- lib/master_slave/configuration.rb
 - lib/master_slave/connection_handler.rb
+- lib/master_slave/core.rb
+- lib/master_slave/railtie.rb
 - lib/master_slave/runtime_registry.rb
-- lib/master_slave/base.rb
+- lib/master_slave/version.rb
+- lib/rails/generators/config_generator.rb
+- lib/rails/generators/templates/shards.yml
 homepage: https://github.com/tumayun/master_slave
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: master_slave.
 test_files: []