better_record 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80a3a6bdb64b0eb2d6790cd73b4282a370c7535eb132d34b3272729147b87834
-  data.tar.gz: b25f2d1f2a18e75a62d90cba238c5345bbb93a672efe734280f6cf3aa0d1a147
+  metadata.gz: c4e3bcdf03926a87f91b4b0b55b8c34f686142904671b0434ae92fec0e4a5ced
+  data.tar.gz: 1a87533db8f024b44e0cc0c159ecd8392d91c96ee66094b51f7dedc606ea10e1
 SHA512:
-  metadata.gz: '049a1286206330904f6eee21f2f259ff6618902545608ed1f43004a3b5f7a5600edb150ecbc99238f727edb2cc913e95f16596c3e19929d36fdae3fb1ef402d6'
-  data.tar.gz: ef6cbf4188368b06f35ff34e785d9edf2f167d738097f68ffc6b90d88393c5259493be8b46712d2327e5ba4dc89868d46ed09a5c0f65a5db90dfda35a7bcc931
+  metadata.gz: ad743dbfece1c278d146ae8bffdc8ae9d924f97b8214e13834f1161a0bb49b5fd4dcc52487d7aacc0b8263660eb34ced8fc460d374f2622789f272dc49e8dcf4
+  data.tar.gz: 1deddcfcb7b45e90cfdef429b0413db7e1d35685524c09a8c1c375d604a7706748a36b7f4cf8dbbcf22bb18c7fc3c6a802a377d188c9013f85509054f5afa355

data/config/initializers/active_record/associations.rb

@@ -7,12 +7,12 @@ module ActiveRecord
 
         binds << last_reflection.join_id_for(owner)
         if last_reflection.type
-          binds << owner.class.__send__(last_reflection.options[:primary_type].presence || :table_name)
+          binds << BetterRecord::PolymorphicOverride.polymorphic_value(owner.class, last_reflection.options.presence)
         end
 
         chain.each_cons(2).each do |reflection, next_reflection|
           if reflection.type
-            binds << next_reflection.klass.__send__(reflection.options[:primary_type].presence || next_reflection[:primary_type].presence || :table_name)
+            binds << BetterRecord::PolymorphicOverride.polymorphic_value(next_reflection.klass, (reflection.options[:primary_type].present? ? reflection.options : next_reflection.options))
           end
         end
         binds
@@ -29,7 +29,7 @@ module ActiveRecord
           scope = apply_scope(scope, table, key, value)
 
           if reflection.type
-            polymorphic_type = transform_value(owner.class.__send__(reflection.options[:primary_type].presence || :table_name))
+            polymorphic_type = transform_value(BetterRecord::PolymorphicOverride.polymorphic_value(owner.class, reflection.options))
             scope = apply_scope(scope, table, reflection.type, polymorphic_type)
           end
 
@@ -46,7 +46,7 @@ module ActiveRecord
           constraint = table[key].eq(foreign_table[foreign_key])
 
           if reflection.type
-            value = transform_value(next_reflection.klass.__send__(reflection.options[:primary_type].presence || :table_name))
+            value = transform_value(BetterRecord::PolymorphicOverride.polymorphic_value(next_reflection.klass, reflection.options))
             scope = apply_scope(scope, table, reflection.type, value)
           end
 
@@ -57,7 +57,7 @@ module ActiveRecord
     module Builder
       class Association
         def self.valid_options(options)
-          VALID_OPTIONS + [ :primary_type ] + Association.extensions.flat_map(&:valid_options)
+          VALID_OPTIONS + [ :primary_type, :strict_primary_type ] + Association.extensions.flat_map(&:valid_options)
         end
       end
     end
@@ -67,6 +67,16 @@ module ActiveRecord
         type = owner[reflection.foreign_type]
         type.presence && type.capitalize.singularize.constantize
       end
+
+      private
+        def replace_keys(record)
+          super
+          owner[reflection.foreign_type] = record ? get_type_value(record) : nil
+        end
+
+        def get_type_value(record)
+          BetterRecord::PolymorphicOverride.polymorphic_value(record.class, reflection.options)
+        end
     end
   end
 end

data/config/initializers/active_record/reflection.rb

@@ -7,7 +7,11 @@ module ActiveRecord
         klass_scope       = klass_join_scope(table, predicate_builder)
 
         if type
-          klass_scope.where!(type => foreign_klass.__send__(options[:primary_type] || :table_name))
+          if options[:strict_primary_type]
+            klass_scope.where!(type => BetterRecord::PolymorphicOverride.polymorphic_value(foreign_klass, options))
+          else
+            klass_scope.where!(type => BetterRecord::PolymorphicOverride.all_types(foreign_klass))
+          end
         end
 
         scope_chain_items.inject(klass_scope, &:merge!)

data/lib/better_record/polymorphic_override.rb

@@ -0,0 +1,37 @@
+module BetterRecord
+  class PolymorphicOverride
+    def self.polymorphic_value(klass, options = nil)
+      type_val = nil
+      type_method = polymorphic_method(options.presence || {})
+      begin
+        type_val = klass.__send__(type_method)
+      rescue
+        if type_val == :table_name_without_schema
+          type_val = klass.table_name
+        else
+          type_val = klass.polymorphic_name
+        end
+      end
+      type_val
+    end
+
+    def self.polymorphic_method(options = {})
+      (options[:primary_type].presence) || BetterRecord.default_polymorphic_method.presence || :polymorphic_name
+    end
+
+    def self.all_types(klass)
+      keys = [ :polymorphic_name, :table_name ]
+      key |= [BetterRecord.default_polymorphic_method] if BetterRecord.default_polymorphic_method.present?
+      values = []
+      keys.each do |k|
+        val = nil
+        begin
+          val = klass.__send__(k)
+          values << val if val.present?
+        rescue
+        end
+      end
+      values
+    end
+  end
+end

data/lib/better_record/version.rb

@@ -1,3 +1,3 @@
 module BetterRecord
-  VERSION = '0.6.1'
+  VERSION = '0.7.0'
 end

data/lib/generators/better_record/setup/setup_generator.rb

@@ -31,6 +31,7 @@ class BetterRecord::SetupGenerator < ActiveRecord::Generators::Base
       template 'rspec', '.rspec'
       template 'ruby-version', '.ruby-version'
       template 'initializer.rb', 'config/initializers/better_record.rb'
+      template 'current.rb', 'app/models/current.rb'
       directory "#{BetterRecord::Engine.root}/lib/templates", 'lib/templates'
 
       eject_files if !!options['eject']
@@ -49,7 +50,6 @@ class BetterRecord::SetupGenerator < ActiveRecord::Generators::Base
       end
 
       gsub_file 'app/models/application_record.rb', /(#{Regexp.escape("class ApplicationRecord < ActiveRecord::Base")})/mi do |match|
-        p match
         "class ApplicationRecord < BetterRecord::Base"
       end
     end

data/lib/generators/better_record/setup/templates/current.rb

@@ -0,0 +1,37 @@
+module Current
+  # == Constants ============================================================
+
+  # == Attributes ===========================================================
+
+  # == Extensions ===========================================================
+
+  # == Relationships ========================================================
+
+  # == Validations ==========================================================
+
+  # == Scopes ===============================================================
+
+  # == Callbacks ============================================================
+
+  # == Class Methods ========================================================
+  def self.user=(user)
+    set_user(user)
+  end
+
+  def self.ip_address=(user)
+    set_user(user)
+  end
+
+  def self.set(user, ip)
+    BetterRecord::Current.user = user.presence || nil
+    BetterRecord::Current.ip_address = ip.presence || nil
+  end
+
+  def self.drop_values
+    BetterRecord::Current.user = nil
+    BetterRecord::Current.ip_address = nil
+  end
+  
+  # == Instance Methods =====================================================
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_record
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Sampson Crowley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-26 00:00:00.000000000 Z
+date: 2018-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -193,8 +193,8 @@ files:
 - lib/better_record/fake_redis.rb
 - lib/better_record/migration.rb
 - lib/better_record/nullify_blank_attributes.rb
+- lib/better_record/polymorphic_override.rb
 - lib/better_record/railtie.rb
-- lib/better_record/reflection.rb
 - lib/better_record/relation.rb
 - lib/better_record/rspec/extensions.rb
 - lib/better_record/rspec/extensions/boolean_column.rb
@@ -208,6 +208,7 @@ files:
 - lib/generators/better_record/eject_rspec_extensions/eject_rspec_extensions_generator.rb
 - lib/generators/better_record/setup/USAGE
 - lib/generators/better_record/setup/setup_generator.rb
+- lib/generators/better_record/setup/templates/current.rb
 - lib/generators/better_record/setup/templates/gitattributes
 - lib/generators/better_record/setup/templates/gitignore
 - lib/generators/better_record/setup/templates/initializer.rb

data/lib/better_record/reflection.rb

@@ -1,21 +0,0 @@
-module BetterRecord
-  module Reflection
-    class AbstractReflection
-      def join_scope(table, foreign_klass)
-        predicate_builder = predicate_builder(table)
-        scope_chain_items = join_scopes(table, predicate_builder)
-        klass_scope       = klass_join_scope(table, predicate_builder)
-
-        if type
-          klass_scope.where!(type => foreign_klass.__send__(options[:primary_type] || :table_name))
-        end
-
-        scope_chain_items.inject(klass_scope, &:merge!)
-      end
-    end
-
-    class RuntimeReflection < AbstractReflection # :nodoc:
-      delegate :scope, :type, :constraints, :get_join_keys, :options, to: :@reflection
-    end
-  end
-end