saseo 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ace1b2a4acc3bc9335423feaa6ac2683d316c05
-  data.tar.gz: 539126fd909b07cb23d26775b9925892d7b0d078
+  metadata.gz: 870d97ea47c29c3c88bc485148418518159c1223
+  data.tar.gz: b53a277d7db97fec52f4844d298af35bc3b01abf
 SHA512:
-  metadata.gz: 2477b4227cf676ae414d8d42fbc2a306b46aa48ed53d2b14b2d9542db00d6b08093d2f597b5ee71b6fbd080d579060483d4caa4148a06038c007ad25570395bf
-  data.tar.gz: 28a75ce72cffcb90be7b39307b73f8230c4223b53265f64f8a7e84283b968ca02c11b9fe8ce3246c600b5932f1e9faacae1cead6caf1016c919ae2a2a80faae5
+  metadata.gz: dbdef412fd9e9b1d0a539178016a6687efd44293e560fb05fb12955819ffa36e25d91e97617491b382649aa3d05a3b448276f525b4f8e08764200198b3ae1f2f
+  data.tar.gz: 83ee5c66b3a9d72cf594072999efc04de69ebc5434b04a3dcaefac23ecdadc8f844c4098d9f156f0c3c1d0e6621f6db920fc957fa845a19b2f0582755c52ff8f

data/lib/saseo/extensions/active_record/adapter_mixin.rb

@@ -0,0 +1,55 @@
+require 'active_record/base'
+
+module Saseo
+  module Extensions
+    module ActiveRecord
+      module AdapterMixin
+        extend self
+
+        def begin_db_transaction
+          execute 'BEGIN'
+          Saseo::Whodunnit.set_db_whodunnit
+        end
+
+        def notify(channel, payload)
+            conn = instance_variable_get(:@connection)
+            conn.async_exec "SELECT pg_notify('#{channel}', '#{payload.to_s}')"
+        end
+
+        # Heavily cribbed from Sequel:
+        # https://github.com/jeremyevans/sequel/blob/c6678741ce34aac52cff966ff6a6288ccb8d5b75/lib/sequel/adapters/postgres.rb#L440
+        def listen(channels:, after_listen: nil, timeout: nil, loop: false, &block)
+          if loop && !block
+            raise ArgumentError, 'calling #listen with :loop requires a block'
+          end
+          channels = Array(channels)
+
+          timeout_block = timeout.respond_to?(:call) ? timeout : proc { timeout }
+          loop_callable = loop.respond_to?(:call)
+            begin
+              conn = instance_variable_get(:@connection)
+              channels.each do |channel|
+                conn.async_exec "LISTEN \"#{channel}\""
+                ::ActiveRecord::Base.logger.try(:debug) { "listening to #{channel}..." }
+
+              end
+              after_listen.call(conn) if after_listen
+
+              if loop
+                catch(:stop) do
+                  loop do
+                    conn.wait_for_notify(timeout_block.call, &block)
+                    loop.call(conn) if loop_callable
+                  end
+                end
+              else
+                conn.wait_for_notify(timeout_block.call, &block)
+              end
+            ensure
+              conn.async_exec 'UNLISTEN *'
+            end
+          end
+      end
+    end
+  end
+end

data/lib/saseo/extensions/active_record.rb

@@ -1,9 +1,8 @@
 require 'saseo/extensions/active_record/detector'
-require 'saseo/extensions/active_record/patcher'
 
-module Saseo
-  module Extensions
-    module ActiveRecord
-    end
-  end
-end
+if Saseo::Extensions::ActiveRecord::Detector.active_record_detected? && Saseo::Extensions::ActiveRecord::Detector.active_record_version >= 3
+  require 'active_record/connection_adapters/postgresql_adapter'
+  require 'saseo/extensions/active_record/adapter_mixin'
+
+  ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend ::Saseo::Extensions::ActiveRecord::AdapterMixin
+end

data/lib/saseo/publishing/publisher.rb

@@ -1,4 +1,5 @@
 require 'active_record'
+require 'saseo/extensions/active_record'
 require 'saseo/config'
 require 'saseo/publishing/data_change_message'
 require 'saseo/models/source/version'
@@ -36,7 +37,7 @@ module Saseo
 
       def run(channels: :all, loop: true, timeout: nil)
         self.channels = channels
-        listen channels: self.channels, loop: loop, timeout: timeout do |channel, pid, payload|
+        db_connection.listen channels: self.channels, loop: loop, timeout: timeout do |channel, pid, payload|
           uuid = payload
           logger.debug { "received NOTIFY for source version: #{uuid}" }
 
@@ -50,48 +51,6 @@ module Saseo
       def db_connection
         Saseo::Models::Source::Base.connection
       end
-
-      def notify(channel, payload)
-        conn = db_connection.instance_variable_get(:@connection)
-        conn.async_exec "SELECT pg_notify('#{channel}', '#{payload.to_s}')"
-      end
-
-      # Heavily cribbed from Sequel:
-      # https://github.com/jeremyevans/sequel/blob/c6678741ce34aac52cff966ff6a6288ccb8d5b75/lib/sequel/adapters/postgres.rb#L440
-      def listen(channels:, after_listen: nil, timeout: nil, loop: false, &block)
-        if loop && !block
-          raise ArgumentError, 'calling #listen with :loop requires a block'
-        end
-        channels = Array(channels)
-
-        timeout_block = timeout.respond_to?(:call) ? timeout : proc { timeout }
-        loop_callable = loop.respond_to?(:call)
-        Saseo::Models::Source::Base.connection_pool.with_connection do |connection|
-          begin
-            conn = connection.instance_variable_get(:@connection)
-            channels.each do |channel|
-              conn.async_exec "LISTEN \"#{channel}\""
-              logger.debug { "listening to #{channel}..." }
-
-            end
-            after_listen.call(conn) if after_listen
-
-            if loop
-
-              catch(:stop) do
-                loop do
-                  conn.wait_for_notify(timeout_block.call, &block)
-                  loop.call(conn) if loop_callable
-                end
-              end
-            else
-              conn.wait_for_notify(timeout_block.call, &block)
-            end
-          ensure
-            conn.async_exec 'UNLISTEN *'
-          end
-        end
-      end
     end
   end
 end

data/lib/saseo/version.rb

@@ -1,3 +1,3 @@
 module Saseo
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saseo
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Nathan Keyes
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-08 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -218,12 +218,8 @@ files:
 - lib/saseo/config/saseo_source_database.yml
 - lib/saseo/extensions.rb
 - lib/saseo/extensions/active_record.rb
+- lib/saseo/extensions/active_record/adapter_mixin.rb
 - lib/saseo/extensions/active_record/detector.rb
-- lib/saseo/extensions/active_record/patcher.rb
-- lib/saseo/extensions/active_record/v_3.rb
-- lib/saseo/extensions/active_record/v_3/connection_adapters/postgresql_adapter.rb
-- lib/saseo/extensions/active_record/v_4.rb
-- lib/saseo/extensions/active_record/v_4/connection_adapters/postgresql/database_statements.rb
 - lib/saseo/models/base.rb
 - lib/saseo/models/source/base.rb
 - lib/saseo/models/source/version.rb

data/lib/saseo/extensions/active_record/patcher.rb

@@ -1,32 +0,0 @@
-require 'saseo/extensions/active_record/detector'
-
-module Saseo
-  module Extensions
-    module ActiveRecord
-      module Patcher
-        extend self
-
-        UnsupportedActiveRecordVersion = Class.new(RuntimeError)
-
-        EXTENSIONS = {
-          3 => ['saseo/extensions/active_record/v_3'],
-          4 => ['saseo/extensions/active_record/v_4'],
-        }
-
-        def patch_active_record!
-          return false unless Saseo::Extensions::ActiveRecord::Detector.active_record_detected?
-          version = Saseo::Extensions::ActiveRecord::Detector.active_record_version
-
-          raise UnsupportedActiveRecordVersion.new unless EXTENSIONS.keys.include? version
-          EXTENSIONS[version].each do |version_extension|
-            require version_extension
-          end
-          true
-        end
-
-
-        patch_active_record!
-      end
-    end
-  end
-end

data/lib/saseo/extensions/active_record/v_3/connection_adapters/postgresql_adapter.rb

@@ -1,26 +0,0 @@
-require 'saseo/extensions/active_record/detector'
-
-require 'saseo/whodunnit'
-
-module Saseo
-  module Extensions
-    module ActiveRecord
-      module V3
-        module ConnectionAdapters
-          module PostgreSQLAdapter
-            extend self
-            def begin_db_transaction
-              execute "BEGIN"
-              Saseo::Whodunnit.set_db_whodunnit
-            end
-          end
-        end
-      end
-    end
-  end
-end
-
-if Saseo::Extensions::ActiveRecord::Detector.active_record_version == 3
-  require 'active_record/connection_adapters/postgresql_adapter'
-  ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend ::Saseo::Extensions::ActiveRecord::V3::ConnectionAdapters::PostgreSQLAdapter
-end

data/lib/saseo/extensions/active_record/v_3.rb

@@ -1,11 +0,0 @@
-require 'saseo/extensions/active_record/v_3/connection_adapters/postgresql_adapter'
-
-module Saseo
-  module Extensions
-    module ActiveRecord
-      module V3
-
-      end
-    end
-  end
-end

data/lib/saseo/extensions/active_record/v_4/connection_adapters/postgresql/database_statements.rb

@@ -1,29 +0,0 @@
-require 'saseo/extensions/active_record/detector'
-
-require 'saseo/whodunnit'
-
-module Saseo
-  module Extensions
-    module ActiveRecord
-      module V4
-        module ConnectionAdapters
-          module PostgreSQL
-            module DatabaseStatements
-              extend self
-
-              def begin_db_transaction
-                execute "BEGIN"
-                Saseo::Whodunnit.set_db_whodunnit
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
-
-if Saseo::Extensions::ActiveRecord::Detector.active_record_version == 3
-  require 'active_record/connection_adapters/postgresql_adapter'
-  ::ActiveRecord::ConnectionAdapters::PostgreSQL::DatabaseStatements.prepend ::Saseo::Extensions::ActiveRecord::V4::ConnectionAdapters::PostgreSQL::DatabaseStatements
-end

data/lib/saseo/extensions/active_record/v_4.rb

@@ -1,11 +0,0 @@
-require 'saseo/extensions/active_record/v_4/connection_adapters/postgresql/database_statements'
-
-module Saseo
-  module Extensions
-    module ActiveRecord
-      module V4
-
-      end
-    end
-  end
-end