table_exists? -> data_source_exists?

bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "delta"
+require 'bundler/setup'
+require 'delta'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "delta"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

delta.gemspec

@@ -4,37 +4,36 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'delta/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "delta"
+  spec.name          = 'delta'
   spec.version       = Delta::VERSION
-  spec.authors       = ["Theodore Konukhov"]
-  spec.email         = ["me@thdr.io"]
+  spec.authors       = ['Theodore Konukhov']
+  spec.email         = ['me@thdr.io']
 
   spec.summary       = %q{Deltas for ActiveRecord models}
   spec.description   = %q{Deltas for ActiveRecord models}
-  spec.homepage      = "https://github.com/konukhov/delta"
-  spec.license       = "MIT"
+  spec.homepage      = 'https://github.com/konukhov/delta'
+  spec.license       = 'MIT'
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
   # delete this section to allow pushing this gem to any host.
   if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = "https://rubygems.org"
+    spec.metadata['allowed_push_host'] = 'https://rubygems.org'
   else
-    raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
+    raise 'RubyGems 2.0 or newer is required to protect against public gem pushes.'
   end
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency     "request_store"
+  spec.add_runtime_dependency 'request_store'
 
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "awesome_print"
-  spec.add_development_dependency "rails", "~> 4.2"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rspec-rails"
-  spec.add_development_dependency "test_after_commit"
-  spec.add_development_dependency "pg"
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'awesome_print'
+  spec.add_development_dependency 'rails', '~> 5.0.2'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rspec-rails'
+  spec.add_development_dependency 'pg'
   #spec.add_development_dependency "rubocop"
 end

lib/delta.rb

@@ -42,22 +42,22 @@ def configure
       yield(config)
     end
 
-    def current_user
-      current_user_proc && current_user_proc.call
+    def current_profile
+      current_profile_proc && current_profile_proc.call
     end
 
     def store
       RequestStore
     end
 
-    def set_current_user_proc(proc)
-      store[:current_user_proc] = proc
+    def set_current_profile_proc(proc)
+      store[:current_profile_proc] = proc
     end
 
     private
 
-    def current_user_proc
-      store[:current_user_proc]
+    def current_profile_proc
+      store[:current_profile_proc]
     end
   end
 

lib/delta/adapters/active_record/model.rb

@@ -3,8 +3,8 @@ module Adapter
     module ActiveRecord
       module Ext
         def self.included(base)
-          klass_name = "Delta::Adapter::ActiveRecord::Model"
-          _scope     = -> { order('created_at').includes(:user) }
+          klass_name = 'Delta::Adapter::ActiveRecord::Model'
+          _scope     = -> { order('created_at').includes(:profile) }
 
           base.has_many :deltas, _scope,
                         class_name: klass_name,
@@ -13,12 +13,12 @@ def self.included(base)
       end
 
       class Model < ::ActiveRecord::Base
-        self.table_name = "deltas"
+        self.table_name = 'deltas'
 
         scope :newest, -> { reorder('created_at desc') }
 
         belongs_to :model, polymorphic: true
-        belongs_to :user
+        belongs_to :profile, polymorphic: true
 
         def readonly?
           persisted?

lib/delta/adapters/active_record/store.rb

@@ -14,7 +14,7 @@ def persist!
         def attrs
           @attrs ||= {
             object: @changes,
-            user:   Delta.current_user
+            profile: Delta.current_profile
           }
         end
       end

lib/delta/config.rb

@@ -5,15 +5,15 @@ module Delta
   class Config
     attr_reader   :adapters
 
-    attr_accessor :controller_user_method,
-                  :user_model,
+    attr_accessor :controller_profile_method,
+                  :profile_model,
                   :dont_use_after_commit_callbacks
 
     def initialize
-      @adapters                        = Adapters.new(["active_record"])
-      @user_model                      = :user
+      @adapters                        = Adapters.new(%w[active_record])
+      @profile_model                   = :user
       @dont_use_after_commit_callbacks = false
-      @controller_user_method          = :current_user
+      @controller_profile_method       = :current_user
     end
 
     def adapters=(adapter_names)

lib/delta/controller.rb

@@ -3,12 +3,12 @@ module Controller
     def self.included(base)
       base.class_eval do
         before_action do
-          Delta.set_current_user_proc ->{
+          Delta.set_current_profile_proc ->{
             begin
-              self.send Delta.config.controller_user_method
+              self.send(Delta.config.controller_profile_method)
             rescue => e
-              Rails.logger.info "[Delta] Unable to get current " +
-                                "user (#{e.class}: #{e.message})"
+              Rails.logger.info '[Delta] Unable to get current ' +
+                                "profile (#{e.class}: #{e.message})"
               nil
             end
           }

lib/delta/tracker/association.rb

@@ -43,7 +43,7 @@ def serialize(obj, action)
       # And also think about tracking changes of polymorphic assocs.
       def serialize_change(obj)
         if (obj.changes.keys & @opts[:serialize]).any?
-          serialize(obj, "C")
+          serialize(obj, 'C')
         end
       end
 
@@ -64,7 +64,7 @@ def track_association_change!
           after_update do
             t     = #{@trackable_class}.delta_tracker
             delta = t.trackable_fields['#{@name}'].serialize_change(self)
-            model = association_cache['#{assoc}'] || send('#{assoc}')
+            model = send(:association_instance_get, '#{assoc}') || send('#{assoc}')
 
             t.persist!(model, delta) if delta
           end
@@ -82,7 +82,7 @@ def build_opts(opts)
             []
           end
 
-          o[:only]   = opts[:only] || ["add", "remove"]
+          o[:only]   = opts[:only] || %w(add remove)
           o[:notify] = opts[:notify] || false
         end
       end

lib/delta/tracker/attribute.rb

@@ -12,7 +12,7 @@ def serialize(model, action, opts = {})
 
         {
           name: @name,
-          action: "C",
+          action: 'C',
           timestamp: opts[:timestamp] || Time.now.to_i,
           object: changed.last
         }

lib/delta/tracker/belongs_to.rb

@@ -7,7 +7,7 @@ def track!
       def serialize(model, action, opts = {})
         return unless model.changes[key] || (polymorphic? && model.changes[type])
 
-        assoc      = model.association_cache[@name] || model.send(@name)
+        assoc      = model.send(:association_instance_get, @name) || model.send(@name)
         key        = @reflection.klass.primary_key
         serialized = if assoc
                        { key => assoc.send(key) }.tap do |hash|

lib/delta/tracker/has_many.rb

@@ -2,7 +2,7 @@ module Delta
   class Tracker
     class HasMany < Association
       def track!
-        actions = ["add", "remove"]
+        actions = %w(add remove)
 
         if @opts[:only].is_a?(Array)
           actions = @opts[:only].map(&:to_s) & actions

lib/delta/tracker/model_ext.rb

@@ -53,7 +53,7 @@ def cache_delta_fields!
             .merge(delta_tracker.attributes)
 
           fields.each do |name, field|
-            if serialized = field.serialize(self, "C", timestamp: ts)
+            if serialized = field.serialize(self, 'C', timestamp: ts)
               deltas << serialized
             end
           end
@@ -66,15 +66,15 @@ def cache_delta_fields!
 
       module DeltaAssociationsMethods
         def delta_association_add(assoc_name, obj)
-          delta_association_invoke_action(assoc_name, obj, "A")
+          delta_association_invoke_action(assoc_name, obj, 'A')
         end
 
         def delta_association_remove(assoc_name, obj)
-          delta_association_invoke_action(assoc_name, obj, "R")
+          delta_association_invoke_action(assoc_name, obj, 'R')
         end
 
         def delta_association_change(assoc_name, obj)
-          delta_association_invoke_action(assoc_name, obj, "C")
+          delta_association_invoke_action(assoc_name, obj, 'C')
         end
 
         private

lib/delta/tracking.rb

@@ -50,7 +50,7 @@ def track_deltas_on(field, field_opts = {})
       private
 
       def init_delta_tracker_if_needed(opts)
-        unless connection.table_exists?(table_name)
+        unless connection.data_source_exists?(table_name)
           # TODO proper logging / errors
           Rails.logger.warn("[Delta] `#{table_name}` doesn't exist: skipping initialization.")
           return nil

lib/delta/version.rb

@@ -1,3 +1,3 @@
 module Delta
-  VERSION = "0.0.1.alpha"
+  VERSION = '0.0.1.alpha'
 end

lib/generators/delta/create_table_generator.rb

@@ -6,14 +6,14 @@ module Generators
     class CreateTableGenerator < Rails::Generators::Base
       include Rails::Generators::Migration
 
-      source_root File.expand_path("../templates", __FILE__)
+      source_root File.expand_path('../templates', __FILE__)
 
       def self.next_migration_number(dirname)
         ::ActiveRecord::Generators::Base.next_migration_number(dirname)
       end
 
       def copy_migration
-        migration_template "create_deltas.rb", "db/migrate/create_deltas.rb"
+        migration_template 'create_deltas.rb', 'db/migrate/create_deltas.rb'
       end
     end
   end

lib/generators/delta/templates/create_deltas.rb

@@ -2,11 +2,14 @@ class CreateDeltas < ActiveRecord::Migration
   def change
     create_table :deltas, force: :cascade do |t|
       # TODO: custom users key name
-      t.references :user, index: true
+      t.integer :profile_id
+      t.string :profile_type
       t.references :model, index: true, polymorphic: true
       t.json       :object, null: false # TODO -> text if JSON is not supported
 
       t.timestamp  :created_at
     end
+
+    add_index :deltas, %i[profile_id profile_type]
   end
 end

spec/delta_spec.rb

@@ -1,36 +1,36 @@
 require 'spec_helper'
 
 describe Delta do
-  it "has config" do
+  it 'has config' do
     expect(Delta.config).to be_instance_of(Delta::Config)
   end
 
-  it "is configurable" do
+  it 'is configurable' do
     Delta.configure do |c|
-      c.controller_user_method = :current_admin
+      c.controller_profile_method = :current_admin
     end
 
-    expect(Delta.config.controller_user_method)
+    expect(Delta.config.controller_profile_method)
       .to eq(:current_admin)
 
     Delta.class_eval { @@config = Delta::Config.new }
   end
 
-  it "current_user is thread-safe" do
+  it 'current_user is thread-safe' do
     t1 = Thread.new do
-      Delta.set_current_user_proc ->{ :current_user_1 }
+      Delta.set_current_profile_proc ->{ :current_user_1 }
       sleep 0.2
-      expect(Delta.current_user).to eq :current_user_1
+      expect(Delta.current_profile).to eq :current_user_1
     end
 
     t2 = Thread.new do
       sleep 0.1
-      Delta.set_current_user_proc ->{ :current_user_2 }
-      expect(Delta.current_user).to eq :current_user_2
+      Delta.set_current_profile_proc ->{ :current_user_2 }
+      expect(Delta.current_profile).to eq :current_user_2
     end
 
     [t1, t2].map &:join
 
-    expect(Delta.current_user).to eq nil
+    expect(Delta.current_profile).to eq nil
   end
 end