immortal 2.0.0 → 3.0.0

data/lib/immortal/belongs_to.rb

@@ -1,15 +1,16 @@
 require 'immortal/belongs_to_builder'
 
-#Include this to add {with/only}_deleted_ accessors for singular associations
 module Immortal
+  # Includes this to add +association_{with/only}_deleted+ accessors for belongs_to
+  # associations.
   module BelongsTo
     def self.included(base)
       base.class_eval do
         class << self
-
           # Add with/how_deleted singular association readers
           def belongs_to_mortal(name, scope = nil, options = {})
-            ::Immortal::BelongsToBuilder.build(self, name, scope, options)
+            reflection = BelongsToBuilder.build(self, name, scope, options)
+            ActiveRecord::Reflection.add_reflection self, name, reflection
           end
 
           alias_method :belongs_to_immortal, :belongs_to

data/lib/immortal/belongs_to_builder.rb

@@ -2,45 +2,40 @@ require 'active_record'
 require 'immortal/singular_association'
 
 module Immortal
+  # Builds a +belongs_to+ association with +_with_deleted+ and +_only_deleted+
+  # readers.
   class BelongsToBuilder < ::ActiveRecord::Associations::Builder::BelongsTo
-
-    def define_accessors
+    def self.define_accessors(mixin, reflection)
       super
-      define_deletables
+      define_deletables(mixin, reflection)
     end
 
-    private
-
-      def define_deletables
-        define_with_deleted_reader
-        define_only_deleted_reader
-      end
+    def self.define_deletables(mixin, reflection)
+      define_with_deleted_reader(mixin, reflection)
+      define_only_deleted_reader(mixin, reflection)
+    end
+    private_class_method :define_deletables
 
-      def define_with_deleted_reader
-        name = self.name
+    def self.define_with_deleted_reader(mixin, reflection)
+      name = reflection.name
 
-        model.redefine_method("#{name}_with_deleted") do |*params|
-          assoc = association(name)
-          assoc.send(:extend, SingularAssociation)
-          assoc.with_deleted_reader(*params)
-        end
+      mixin.redefine_method("#{name}_with_deleted") do |*params|
+        assoc = association(name)
+        assoc.send(:extend, SingularAssociation)
+        assoc.with_deleted_reader(*params)
       end
+    end
+    private_class_method :define_with_deleted_reader
 
-      def define_only_deleted_reader
-        name = self.name
-
-        model.redefine_method("#{name}_only_deleted") do |*params|
+    def self.define_only_deleted_reader(mixin, reflection)
+      name = reflection.name
 
-          assoc = association(name)
-          assoc.send(:extend, SingularAssociation)
-          assoc.only_deleted_reader(*params)
-        end
+      mixin.redefine_method("#{name}_only_deleted") do |*params|
+        assoc = association(name)
+        assoc.send(:extend, SingularAssociation)
+        assoc.only_deleted_reader(*params)
       end
-
-      module InstanceMethods
-
-      end #InstanceMethods
-
+    end
+    private_class_method :define_only_deleted_reader
   end
 end
-

data/lib/immortal/singular_association.rb

@@ -1,4 +1,6 @@
 module Immortal
+  # Mixin to provide the singular association readers for +_only_deleted+ and
+  # +_with_deleted+.
   module SingularAssociation
     attr_reader :with_deleted_target, :only_deleted_target
 
@@ -12,140 +14,120 @@ module Immortal
 
     private
 
-      def supports_indetity_map?
-        defined?(ActiveRecord::IdentityMap) && ActiveRecord::IdentityMap.enabled?
-      end
-
-      def reset_with_deleted
-        @with_deleted_loaded = false
-        ActiveRecord::IdentityMap.remove(with_deleted_target) if supports_indetity_map? && with_deleted_target
-        @with_deleted_target = nil
-      end
+    attr_reader :with_deleted_loaded, :only_deleted_loaded
+    alias with_deleted_loaded? with_deleted_loaded
+    alias only_deleted_loaded? only_deleted_loaded
 
-      def reset_only_deleted
-        @only_deleted_loaded = false
-        ActiveRecord::IdentityMap.remove(only_deleted_target) if supports_indetity_map? && only_deleted_target
-        @only_deleted_target = nil
-      end
+    def reset_with_deleted
+      @with_deleted_loaded = false
+      @with_deleted_target = nil
+    end
 
-      def with_deleted_loaded!
-        @with_deleted_loaded      = true
-        @with_deleted_stale_state = stale_state
-      end
+    def reset_only_deleted
+      @only_deleted_loaded = false
+      @only_deleted_target = nil
+    end
 
-      def only_deleted_loaded!
-        @only_deleted_loaded      = true
-        @only_deleted_stale_state = stale_state
-      end
+    def with_deleted_loaded!
+      @with_deleted_loaded      = true
+      @with_deleted_stale_state = stale_state
+    end
 
-      def with_deleted_loaded?
-        @with_deleted_loaded
-      end
+    def only_deleted_loaded!
+      @only_deleted_loaded      = true
+      @only_deleted_stale_state = stale_state
+    end
 
-      def only_deleted_loaded?
-        @only_deleted_loaded
-      end
+    def stale_with_deleted_target?
+      with_deleted_loaded? && @with_deleted_stale_state != stale_state
+    end
 
-      def stale_with_deleted_target?
-        with_deleted_loaded? && @with_deleted_stale_state != stale_state
-      end
+    def stale_only_deleted_target?
+      only_deleted_loaded? && @only_deleted_stale_state != stale_state
+    end
 
-      def stale_only_deleted_target?
-        only_deleted_loaded? && @only_deleted_stale_state != stale_state
-      end
+    def reload_only_deleted
+      reset_only_deleted
+      reset_scope
+      load_only_deleted_target
+      self if only_deleted_target
+    end
 
-      def reload_only_deleted
-        reset_only_deleted
-        reset_scope
-        load_only_deleted_target
-        self unless only_deleted_target.nil?
-      end
+    def reload_with_deleted
+      reset_with_deleted
+      reset_scope
+      load_with_deleted_target
+      self if with_deleted_target
+    end
 
-      def reload_with_deleted
-        reset_with_deleted
-        reset_scope
-        load_with_deleted_target
-        self unless with_deleted_target.nil?
-      end
+    def find_with_deleted_target?
+      !with_deleted_loaded? &&
+        (!owner.new_record? || foreign_key_present?) &&
+        klass
+    end
 
-      def find_with_deleted_target?
-        !with_deleted_loaded? && (!owner.new_record? || foreign_key_present?) && klass
-      end
+    def find_only_deleted_target?
+      !only_deleted_loaded? &&
+        (!owner.new_record? || foreign_key_present?) &&
+        klass
+    end
 
-      def find_only_deleted_target?
-        !only_deleted_loaded? && (!owner.new_record? || foreign_key_present?) && klass
+    def load_with_deleted_target
+      if find_with_deleted_target?
+        @with_deleted_target ||= find_with_deleted_target
       end
 
-      def load_with_deleted_target
-        if find_with_deleted_target?
-          begin
-            if supports_indetity_map? && association_class && association_class.respond_to?(:base_class)
-              @with_deleted_target = ActiveRecord::IdentityMap.get(association_class, owner[reflection.foreign_key])
-            end
-          rescue NameError
-            nil
-          ensure
-            @with_deleted_target ||= find_with_deleted_target
-          end
-        end
-        with_deleted_loaded! unless with_deleted_loaded?
-        with_deleted_target
-      rescue ActiveRecord::RecordNotFound
-        with_deleted_reset
-      end
+      with_deleted_loaded! unless with_deleted_loaded?
+      with_deleted_target
+    rescue ActiveRecord::RecordNotFound
+      with_deleted_reset
+    end
 
-      def load_only_deleted_target
-        if find_only_deleted_target?
-          begin
-            if supports_indetity_map? && association_class && association_class.respond_to?(:base_class)
-              @only_deleted_target = ActiveRecord::IdentityMap.get(association_class, owner[reflection.foreign_key])
-            end
-          rescue NameError
-            nil
-          ensure
-            @only_deleted_target ||= find_only_deleted_target
-          end
-        end
-        only_deleted_loaded! unless only_deleted_loaded?
-        only_deleted_target
-      rescue ActiveRecord::RecordNotFound
-        only_deleted_reset
+    def load_only_deleted_target
+      if find_only_deleted_target?
+        @only_deleted_target ||= find_only_deleted_target
       end
 
-      def reader_with_deleted(force_reload = false)
-        if force_reload
-          klass.uncached { reload_with_deleted } if klass
-        elsif !with_deleted_loaded? || stale_with_deleted_target?
-          reload_with_deleted
-        end
+      only_deleted_loaded! unless only_deleted_loaded?
+      only_deleted_target
+    rescue ActiveRecord::RecordNotFound
+      only_deleted_reset
+    end
 
-        with_deleted_target
+    def reader_with_deleted(force_reload = false)
+      if force_reload
+        klass.uncached { reload_with_deleted } if klass
+      elsif !with_deleted_loaded? || stale_with_deleted_target?
+        reload_with_deleted
       end
 
-      def reader_only_deleted(force_reload = false)
-
-        if force_reload
-          klass.uncached { reload_only_deleted } if klass
-        elsif !only_deleted_loaded? || stale_only_deleted_target?
-          reload_only_deleted
-        end
+      with_deleted_target
+    end
 
-        only_deleted_target
+    def reader_only_deleted(force_reload = false)
+      if force_reload
+        klass.uncached { reload_only_deleted } if klass
+      elsif !only_deleted_loaded? || stale_only_deleted_target?
+        reload_only_deleted
       end
 
-      def find_with_deleted_target
-        return nil unless klass
-        klass.unscoped do
-          scope.first.tap { |record| set_inverse_instance(record) }
-        end
+      only_deleted_target
+    end
+
+    def find_with_deleted_target
+      return nil unless klass
+      klass.unscoped do
+        scope.first.tap { |record| set_inverse_instance(record) }
       end
+    end
 
-      def find_only_deleted_target
-        return nil unless klass
-        klass.unscoped do
-          scope.where(deleted: true).first.tap { |record| set_inverse_instance(record) }
+    def find_only_deleted_target
+      return nil unless klass
+      klass.unscoped do
+        scope.where(deleted: true).first.tap do |record|
+          set_inverse_instance(record)
         end
       end
-
+    end
   end
 end

data/lib/immortal/version.rb

@@ -0,0 +1,3 @@
+module Immortal
+  VERSION = '3.0.0'.freeze
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: immortal
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Jordi Romero
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-24 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -22,28 +22,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 3.6.0
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +100,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: reek
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Typical paranoid gem built for Rails 4 and with the minimum code needed
   to satisfy acts_as_paranoid's API
 email:
@@ -96,8 +152,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- CHANGELOG.md
+- CODE_OF_CONDUCT.md
 - Gemfile
-- LICENSE
+- LICENSE.txt
 - README.md
 - Rakefile
 - immortal.gemspec
@@ -105,8 +165,7 @@ files:
 - lib/immortal/belongs_to.rb
 - lib/immortal/belongs_to_builder.rb
 - lib/immortal/singular_association.rb
-- spec/immortal_spec.rb
-- spec/spec_helper.rb
+- lib/immortal/version.rb
 homepage: http://github.com/teambox/immortal
 licenses:
 - MIT
@@ -127,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Replacement for acts_as_paranoid for Rails 4