table_sync 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86c13b07f0c63f70ecd2acc80fca50cdd57e0c3682ad5d7bafa56ef69b94185d
-  data.tar.gz: 8e01d572ffa14629317b248e0090bab8bde89e3dee513434b51b0bc897ceb02f
+  metadata.gz: 703130e1a092c3fdff5a5ada5c83d10371a33ee7f4f45c770e9c4dd48fe20c1d
+  data.tar.gz: 1bc7d081106b6aeb2544f504485ec62a6e5eb7a6c6eb6e2d06aa48413d43cdfd
 SHA512:
-  metadata.gz: 741c3d1904400d34d1e3f0fb03eac24d9b954544744dd0736fa672a3a94751b09e0b221867d4e625749a8301f674e527f82cf62d297ccb1e4f4d1c09b6ad45f9
-  data.tar.gz: 62ee1dc7912c8c301105f0134e0a8dbef9f45ba3ca9d82ff321127f9daedd03129f261ee7af8b738da029d3f5d012627c2cbbd0f9e759826218f1b2c70f5c0b2
+  metadata.gz: efb76a18e1c8d417a73114953a08901add1c282876747dd550d4ee3c7705881fa77f9394cb152e3efe9de404090ebf716ddd69f9f73a013615498b0e7bcdef0c
+  data.tar.gz: 98f5481ee75be205f2e27938c46ebf82b54ede70248fd052a4ef5bce3a14bf574171364485d1e1d465b42801b0a820e55b3d1f3ae5f920497f92d4488351c911

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.12.0] - 2019-09-20
+### Changed
+- Payload for existing ActiveSupport adapter contains both `table` and `schema` fields now.
+
 ## [1.11.0] - 2019-09-11
 ### Added
 - Receiving: inconsistent events raises `TableSync::UnprovidedEventTargetKeysError`

data/docs/synopsis.md

@@ -276,13 +276,14 @@ Types of events available:
 `"tablesync.receive.update"`, `"tablesync.receive.destroy"`, `"tablesync.publish.update"`
 and `"tablesync.publish.destroy"`.
 
-You have access to the payload, which contains  `event`, `direction`, `table` and `count`.
+You have access to the payload, which contains  `event`, `direction`, `table`, `schema` and `count`.
 
 ```
 {
   :event => :update,       # one of update / destroy
   :direction => :publish,  # one of publish / receive
   :table => "users",
+  :schema => "public",  
   :count => 1
 }
 ```

data/lib/table_sync/batch_publisher.rb

@@ -19,7 +19,9 @@ class TableSync::BatchPublisher < TableSync::BasePublisher
     return unless need_publish?
     Rabbit.publish(params)
 
-    TableSync::Instrument.notify table: TableSync.orm.table_name(object_class), event: event,
+    model_naming = TableSync.orm.model_naming(object_class)
+    TableSync::Instrument.notify table: model_naming.table, schema: model_naming.schema,
+                                 event: event,
                                  count: publishing_data[:attributes].size, direction: :publish
   end
 

data/lib/table_sync/config.rb

@@ -10,6 +10,7 @@ module TableSync
 
       @callback_registry = CallbackRegistry.new
 
+      # initialize default options
       only(model.columns)
       mapping_overrides({})
       additional_data({})
@@ -21,23 +22,33 @@ module TableSync
       target_keys(model.primary_keys)
     end
 
-    # add_option implements next logic
+    # add_option implements the following logic
     # config.option - get value
     # config.option(args) - set static value
     # config.option { ... } - set proc as value
     def self.add_option(name, &option_block)
       ivar = "@#{name}".to_sym
 
+      # default option handler (empty handler)
+      # handles values when setting options
       option_block ||= proc { |value| value }
 
       define_method(name) do |*args, &block|
-        if args.empty? && block.nil?
+        # logic for each option
+        if args.empty? && block.nil? # case for config.option, just return ivar
           instance_variable_get(ivar)
-        elsif block
+        elsif block # case for config.option { ... }
+          # get named parameters (parameters with :keyreq) from proc-value
           params = block.parameters.map { |param| param[0] == :keyreq ? param[1] : nil }.compact
+
+          # wrapper for proc-value, this wrapper receives all params (model, version, project_id...)
+          # and filters them for proc-value
           unified_block = proc { |hash = {}| block.call(hash.slice(*params)) }
+
+          # set wrapped proc-value as ivar value
           instance_variable_set(ivar, unified_block)
-        else
+        else # case for config.option(args)
+          # call option_block with args as params and set ivar to result
           instance_variable_set(ivar, instance_exec(*args, &option_block))
         end
       end

data/lib/table_sync/instrument_adapter/active_support.rb

@@ -4,10 +4,11 @@ module TableSync::InstrumentAdapter
   module ActiveSupport
     module_function
 
-    def notify(table:, event:, direction:, count: 1)
+    def notify(table:, schema:, event:, direction:, count: 1)
       ::ActiveSupport::Notifications.instrument "tablesync.#{direction}.#{event}",
                                                 count: count,
                                                 table: table.to_s,
+                                                schema: schema.to_s,
                                                 event: event,
                                                 direction: direction
     end

data/lib/table_sync/model/active_record.rb

@@ -45,8 +45,8 @@ module TableSync::Model
           AND kcu.constraint_name = tc.constraint_name
         WHERE
           t.table_schema NOT IN ('pg_catalog', 'information_schema')
-          AND t.table_schema = '#{table_info[:schema]}'
-          AND t.table_name = '#{table_info[:name]}'
+          AND t.table_schema = '#{model_naming.schema}'
+          AND t.table_name = '#{model_naming.table}'
         ORDER BY
           kcu.ordinal_position
       SQL
@@ -74,9 +74,8 @@ module TableSync::Model
         end.compact
       end
 
-      TableSync::Instrument.notify(
-        table: table_name, event: :update, count: result.count, direction: :receive,
-      )
+      TableSync::Instrument.notify(table: model_naming.table, schema: model_naming.schema,
+                                   event: :update, count: result.count, direction: :receive)
 
       result
     end
@@ -88,7 +87,8 @@ module TableSync::Model
       end
 
       TableSync::Instrument.notify(
-        table: table_name, event: :destroy, count: result.count, direction: :receive,
+        table: model_naming.table, schema: model_naming.schema,
+        event: :destroy, count: result.count, direction: :receive
       )
 
       result
@@ -106,21 +106,14 @@ module TableSync::Model
 
     attr_reader :raw_model
 
-    def table_info
-      keys = raw_model.table_name.split(".")
-      name = keys[-1]
-      schema = keys[-2] || "public"
-      { schema: schema, name: name }
-    end
-
-    def table_name
-      table_info[:name]
-    end
-
     def db
       @raw_model.connection
     end
 
+    def model_naming
+      ::TableSync::NamingResolver::ActiveRecord.new(table_name: raw_model.table_name)
+    end
+
     def row_to_hash(row)
       row.attributes.each_with_object({}) { |(k, v), o| o[k.to_sym] = v }
     end

data/lib/table_sync/model/sequel.rb

@@ -36,14 +36,15 @@ module TableSync::Model
                       )
                       .multi_insert(insert_data)
 
-      TableSync::Instrument.notify table: table_name, count: result.count,
-                                   event: :update, direction: :receive
+      TableSync::Instrument.notify table: model_naming.table, schema: model_naming.schema,
+                                   count: result.count, event: :update, direction: :receive
       result
     end
 
     def destroy(data)
       result = dataset.returning.where(data).delete
-      TableSync::Instrument.notify table: table_name, count: result.count,
+      TableSync::Instrument.notify table: model_naming.table, schema: model_naming.schema,
+                                   count: result.count,
                                    event: :destroy, direction: :receive
       result
     end
@@ -64,6 +65,10 @@ module TableSync::Model
       raw_model.table_name
     end
 
+    def model_naming
+      ::TableSync::NamingResolver::Sequel.new(table_name: table_name, db: db)
+    end
+
     def dataset
       raw_model.dataset
     end

data/lib/table_sync/naming_resolver/active_record.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module TableSync::NamingResolver
+  class ActiveRecord
+    def initialize(table_name:)
+      @table_name = table_name
+    end
+
+    def table
+      meta_data.last
+    end
+
+    def schema
+      meta_data.size > 1 ? meta_data[-2] : "public"
+    end
+
+    private
+
+    attr_reader :table_name
+
+    def meta_data
+      table_name.to_s.split "."
+    end
+  end
+end

data/lib/table_sync/naming_resolver/sequel.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module TableSync::NamingResolver
+  class Sequel
+    def initialize(table_name:, db:)
+      @table_name = table_name
+      @db = db
+    end
+
+    def table
+      table_name.is_a?(::Sequel::SQL::QualifiedIdentifier) ? table_name.column : table_name
+    end
+
+    def schema
+      return table_name.table if table_name.is_a?(::Sequel::SQL::QualifiedIdentifier)
+      db.get(Sequel.function("current_schema")) rescue "public"
+    end
+
+    private
+
+    attr_reader :table_name, :db
+  end
+end

data/lib/table_sync/orm_adapter/active_record.rb

@@ -8,6 +8,10 @@ module TableSync::ORMAdapter
       ::TableSync::Model::ActiveRecord
     end
 
+    def model_naming(object)
+      ::TableSync::NamingResolver::ActiveRecord.new(table_name: object.table_name)
+    end
+
     def find(dataset, conditions)
       dataset.find_by(conditions)
     end
@@ -16,10 +20,6 @@ module TableSync::ORMAdapter
       object.attributes
     end
 
-    def table_name(object)
-      object.table_name
-    end
-
     def setup_sync(klass, **opts)
       debounce_time = opts.delete(:debounce_time)
 

data/lib/table_sync/orm_adapter/sequel.rb

@@ -8,6 +8,10 @@ module TableSync::ORMAdapter
       ::TableSync::Model::Sequel
     end
 
+    def model_naming(object)
+      ::TableSync::NamingResolver::Sequel.new(table_name: object.table_name, db: object.db)
+    end
+
     def find(dataset, conditions)
       dataset.find(conditions)
     end
@@ -16,10 +20,6 @@ module TableSync::ORMAdapter
       object.values
     end
 
-    def table_name(object)
-      object.table_name
-    end
-
     def setup_sync(klass, **opts)
       if_predicate     = to_predicate(opts.delete(:if), true)
       unless_predicate = to_predicate(opts.delete(:unless), false)

data/lib/table_sync/publisher.rb

@@ -34,7 +34,8 @@ class TableSync::Publisher < TableSync::BasePublisher
     return if !object && !destroyed?
 
     Rabbit.publish(params)
-    TableSync::Instrument.notify table: TableSync.orm.table_name(object_class),
+    model_naming = TableSync.orm.model_naming(object_class)
+    TableSync::Instrument.notify table: model_naming.table, schema: model_naming.schema,
                                  event: event, direction: :publish
   end
 

data/lib/table_sync/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TableSync
-  VERSION = "1.11.0"
+  VERSION = "1.12.0"
 end

data/lib/table_sync.rb

@@ -24,6 +24,8 @@ module TableSync
   require_relative "./table_sync/model/sequel"
   require_relative "./table_sync/instrument"
   require_relative "./table_sync/instrument_adapter/active_support"
+  require_relative "./table_sync/naming_resolver/active_record"
+  require_relative "./table_sync/naming_resolver/sequel"
 
   class << self
     include Memery

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table_sync
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Umbrellio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-11 00:00:00.000000000 Z
+date: 2019-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: memery
@@ -267,6 +267,8 @@ files:
 - lib/table_sync/instrument_adapter/active_support.rb
 - lib/table_sync/model/active_record.rb
 - lib/table_sync/model/sequel.rb
+- lib/table_sync/naming_resolver/active_record.rb
+- lib/table_sync/naming_resolver/sequel.rb
 - lib/table_sync/orm_adapter/active_record.rb
 - lib/table_sync/orm_adapter/sequel.rb
 - lib/table_sync/publisher.rb