postamt 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29bb5ed214ac16f7db72ba4972b5c2fa38e5424d
-  data.tar.gz: b886f40c3d7857a171dc0f1a3dba0cfdf1001223
+  metadata.gz: 30bfd14a7213ace24dba5220f3ac626b81bcb589
+  data.tar.gz: 9e5637ef937415773d48e88a1e4088bd7958ae11
 SHA512:
-  metadata.gz: 630a589f47d5ac39739845fbcbbe0cbb0a82af9c35f32a0c4f06bef41db90f621b87e9fbac8e77dc154f4b42a6f33f9a275bd68538c9930f8ee2eb951437bbcb
-  data.tar.gz: 5942ae970cf31e4852697af34f100d017f139352a2559fb7fbd2a84896ed005b514306b98e346d9b842f5c0a4dad8fd8bcb3e51407999da69955804483388336
+  metadata.gz: 7e6152b1f295e59fdf89d200e7f7fe84c9760b34791e4c70add44172de9e59aabdc0c1ca9a6cdd29427fa08e8d2614fccd061c63accb17d47ea98c9cc829941d
+  data.tar.gz: 606887095458d5da31d842063a1d047bad181b7f1225940a8f1bc071febcbb372abe22bd3017bad32a4025a1ef3a475c5a5e746e951d216abce8c288ca44728b

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.9.3
+
+Require Ruby 2 and Rails 4.1.
+
+Fix duplicate log messages in Rails 4.1. 
+
 ## 0.9.2
 
 Fix ActiveRecord::Relation#update_all signature change in Rails 4.1.

data/README.md

@@ -2,8 +2,9 @@
 
 [![Gem Version](https://badge.fury.io/rb/postamt.png)](http://rubygems.org/gems/postamt)
 
-Postamt is a sane, Rails-4-ready solution for performing database
-reads against a hot standby server.
+Postamt is a sane, solution for performing database reads against a hot standby server with Rails 4.1.
+
+If you use Rails 3.2 or 4.0, use Postamt version 0.9.2.
 
 Choose per model and/or controller&action whether a read-only query
 should be sent to master or a hot standby.<br />
@@ -114,16 +115,8 @@ $ createuser -s slave # better to restrict slave to be read-only
 Migrate the DB in the Rails 4 app:
 
 ```
-$ cd testapp # Rails 4
+$ cd testapp41 # Rails 4.1
 $ RAILS_ENV=test bundle exec rake db:migrate
-```
-
-Run the tests on Rails 3.2 and Rails 4:
-
-```
-$ cd testapp # Rails 4
-$ bundle exec ruby -Itest test/integration/postamt_test.rb
-$ cd testapp32 # Rails 3.2
 $ bundle exec ruby -Itest test/integration/postamt_test.rb
 ```
 

data/lib/postamt.rb

@@ -42,14 +42,6 @@ module Postamt
     Thread.current[:postamt_overwritten_default_connections] ||= {}
   end
 
-  if Rails::VERSION::MAJOR == 4 and Rails::VERSION::MINOR <= 1
-    Postamt::ConnectionSpecificationResolver = ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver
-  elsif Rails::VERSION::MAJOR == 3 and Rails::VERSION::MINOR == 2
-    Postamt::ConnectionSpecificationResolver = ActiveRecord::Base::ConnectionSpecification::Resolver
-  else
-    abort "Postamt doesn't support Rails version #{Rails.version}"
-  end
-
   # Called by Postamt::Railtie
   def self.hook!
     if Rails::VERSION::MAJOR == 4 and Rails::VERSION::MINOR <= 1
@@ -77,49 +69,6 @@ module Postamt
       end
     end
 
-    ActiveRecord::Relation.class_eval do
-      # Also make sure that actions that don't instantiate the model and
-      # therefore don't call #save or #destroy run on master.
-      # update_column calls update_all, delete calls delete_all, so we don't
-      # have to monkey patch them.
-
-      def delete_all_with_postamt(conditions = nil)
-        Postamt.on(:master) { delete_all_without_postamt(conditions) }
-      end
-
-      if Rails::VERSION::MAJOR >= 4 and Rails::VERSION::MINOR >= 1
-        def update_all_with_postamt(updates)
-          Postamt.on(:master) { update_all_without_postamt(updates) }
-        end
-      else
-        def update_all_with_postamt(updates, conditions = nil, options = {})
-          Postamt.on(:master) { update_all_without_postamt(updates, conditions, options) }
-        end
-      end
-
-      # TODO: Switch to Module#prepend once we are Ruby-2.0.0-only
-      alias_method_chain :delete_all, :postamt
-      alias_method_chain :update_all, :postamt
-    end
-
-    ActiveRecord::LogSubscriber.class_eval do
-      attr_accessor :connection_name
-
-      def sql_with_connection_name(event)
-        self.connection_name = ObjectSpace._id2ref(event.payload[:connection_id]).instance_variable_get(:@config)[:username]
-        sql_without_connection_name(event)
-      end
-
-      def debug_with_connection_name(msg)
-        conn = connection_name ? color("  [#{connection_name}]", ActiveSupport::LogSubscriber::BLUE, true) : ''
-        debug_without_connection_name(conn + msg)
-      end
-
-      # TODO: Switch to Module#prepend once we are Ruby-2.0.0-onlhy
-      alias_method_chain :sql, :connection_name
-      alias_method_chain :debug, :connection_name
-    end
-
     ActionController::Base.instance_eval do
       def use_db_connection(connection, args)
         klass_names = args.delete(:for)
@@ -143,6 +92,38 @@ module Postamt
         Postamt.overwritten_default_connections.clear
       end
     end
+
+    ActiveRecord::LogSubscriber.prepend Postamt::LogSubscriber
+    ActiveRecord::Relation.prepend Postamt::Relation
+  end
+
+  module LogSubscriber
+    extend ActiveSupport::Concern
+
+    def sql(event)
+      @postamt_connection_name = ObjectSpace._id2ref(event.payload[:connection_id]).instance_variable_get(:@config)[:username]
+      super
+    end
+
+    def debug(msg)
+      conn = @postamt_connection_name ? color("  [#{@postamt_connection_name}]", ActiveSupport::LogSubscriber::BLUE, true) : ''
+      super(conn + msg)
+    end
+  end
+
+  module Relation
+    # Also make sure that actions that don't instantiate the model and
+    # therefore don't call #save or #destroy run on master.
+    # update_column calls update_all, delete calls delete_all, so we don't
+    # have to monkey patch them.
+
+    def delete_all(conditions = nil)
+      Postamt.on(:master) { super }
+    end
+
+    def update(updates)
+      Postamt.on(:master) { super }
+    end
   end
 end
 

data/lib/postamt/connection_handler.rb

@@ -1,10 +1,9 @@
-require 'atomic'
 require 'thread_safe'
 
 module Postamt
   class ConnectionHandler
     def initialize
-      @process_pid = Atomic.new(nil)
+      @process_pid = ThreadSafe::Util::AtomicReference.new(nil)
     end
 
     def connection_pools
@@ -110,8 +109,19 @@ module Postamt
       # to optimise for.
       @pools[connection] ||= begin
         Postamt.configurations[connection.to_s] ||= Postamt.configurations['master']
-        resolver = Postamt::ConnectionSpecificationResolver.new connection, Postamt.configurations
-        spec = resolver.spec
+
+        spec = if Rails::VERSION::MAJOR == 4 and Rails::VERSION::MINOR == 1
+          resolver = ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new Postamt.configurations
+          resolver.spec(connection)
+        elsif Rails::VERSION::MAJOR == 4 and Rails::VERSION::MINOR == 0
+          resolver = ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new connection, Postamt.configurations
+          resolver.spec
+        elsif Rails::VERSION::MAJOR == 3 and Rails::VERSION::MINOR == 2
+          resolver = ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new connection, Postamt.configurations
+          resolver.spec
+        else
+          abort "Postamt doesn't support Rails version #{Rails.version}"
+        end
 
         unless ActiveRecord::Base.respond_to?(spec.adapter_method)
           raise ActiveRecord::AdapterNotFound, "database configuration specifies nonexistent #{spec.config[:adapter]} adapter"

data/lib/postamt/version.rb

@@ -1,3 +1,3 @@
 module Postamt
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

data/postamt.gemspec

@@ -18,8 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "thread_safe", "~> 0.1"
-  spec.add_dependency "railties", [">= 3.2.0", "<= 4.1.0"]
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_dependency "atomic", [">= 1.1.7", "< 2"]
+  spec.add_dependency "railties", ["~> 4.1.0.rc1"]
+  spec.add_dependency "activerecord", ["~> 4.1.0.rc1"]
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postamt
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Martin Schürrer
@@ -9,56 +9,70 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thread_safe
+  name: atomic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 1.1.7
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.7
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.0
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
-    - - "<="
+        version: 4.1.0.rc1
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.1.0.rc1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Performs (some of) your read-only queries on a hot standby