historiographer 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2afe07a84787befbaa291bd59589fdc5157b4ee1866e02c009897a2505d90e3
-  data.tar.gz: 1993b158d8598ae6c1322325021b5d0c98aa3abbbafeb776f91ff7535c01e813
+  metadata.gz: 433e733811c7f23a3044282b54c87832abc944e3f46817d16036c87778f938ff
+  data.tar.gz: 54e27e8e68ab4512bb5edf146d1c210f9072ad99346d8a1ced37e6766d014d3b
 SHA512:
-  metadata.gz: 4bed70d409e600188ead5dd3a39d68af95cf9053ee982e8355607b5ad77240d222ec580d92fc593d9776b0c60b16dc8125df7db832e5903e01a7711a99b7af70
-  data.tar.gz: e5fa85d034c3a57481912e1f2b48e6c2ecdcb0526dd0132b2e3da7c57c1f8b4518770d18c38d9f5b73c991bdb8b810ecb43628d129dbd3566cec7d1bd2927097
+  metadata.gz: 1abd0b29fc36c284fb6e8c5da6c884640678ce0dd9b58c089b15056897514f7cd47b8d4117e54b3549d306be6ce0a08c36f772724bc741fd09cf782a174c0415
+  data.tar.gz: c63eecd58ea1b7ad604d3cf049735b2fed3bdd403aa2c508190a3907b6dfcaf7ecb6094b9ac14bf2fb0d5574e8277a0c2b05ef06d25a8291bfbc3306c419decb

data/README.md

@@ -85,7 +85,7 @@ Additionally it will add indices on:
 The primary model should include `Historiographer`:
 
 ```ruby
-class Post
+class Post < ActiveRecord::Base
   include Historiographer
 end
 ```
@@ -93,7 +93,7 @@ end
 You should also make a `PostHistory` class if you're going to query `PostHistory` from Rails:
 
 ```ruby
-class PostHistory
+class PostHistory < ActiveRecord::Base
 end
 ```
 

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.1.0

data/historiographer.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: historiographer 1.0.2 ruby lib
+# stub: historiographer 1.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "historiographer".freeze
-  s.version = "1.0.2"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["brettshollenberger".freeze]
-  s.date = "2019-09-30"
+  s.date = "2019-10-11"
   s.description = "Creates separate tables for each history table".freeze
   s.email = "brett.shollenberger@gmail.com".freeze
   s.extra_rdoc_files = [

data/lib/historiographer.rb

@@ -89,6 +89,22 @@ module Historiographer
       end
     end
 
+    alias_method :destroy_without_history, :destroy
+    def destroy_with_history(history_user_id: )
+      current_history = histories.where(history_ended_at: nil).order("id desc").limit(1).last
+      current_history.update!(history_ended_at: UTC.now) if current_history.present?
+
+      if respond_to?(:paranoia_destroy)
+        self.history_user_id = history_user_id
+        paranoia_destroy
+      else
+        @no_history = true
+        destroy_without_history
+        @no_history = false
+      end
+    end
+    alias_method :destroy, :destroy_with_history
+
     def assign_attributes(new_attributes)
       huid = new_attributes[:history_user_id]
 
@@ -133,13 +149,6 @@ module Historiographer
 
     class_name = "#{base.name}History"
 
-    if base.respond_to?(:histories)
-      raise "#{base} already has histories. Talk to Brett if this is a legit use case."
-    else
-      has_many :histories, class_name: class_name
-      has_one :current_history, -> { current }, class_name: class_name
-    end
-
     begin
       class_name.constantize
     rescue
@@ -151,6 +160,15 @@ module Historiographer
 
     klass = class_name.constantize
 
+    if base.respond_to?(:histories)
+      raise "#{base} already has histories. Talk to Brett if this is a legit use case."
+    else
+      opts = { class_name: class_name }
+      opts.merge!(foreign_key: klass.history_foreign_key) if klass.respond_to?(:history_foreign_key)
+      has_many :histories, opts
+      has_one :current_history, -> { current }, opts
+    end
+
     klass.send(:include, Historiographer::History) unless klass.ancestors.include?(Historiographer::History)
 
     #

data/lib/historiographer/history.rb

@@ -61,7 +61,6 @@ module Historiographer
     extend ActiveSupport::Concern
 
     included do |base|
-
       #
       # A History class (e.g. RetailerProductHistory) will gain
       # access to a current scope, returning
@@ -93,7 +92,7 @@ module Historiographer
       # "RetailerProductHistory."
       #
       foreign_class_name = base.name.gsub(/History$/) {}        # e.g. "RetailerProductHistory" => "RetailerProduct"
-      association_name   = foreign_class_name.underscore.to_sym # e.g. "RetailerProduct"        => :retailer_product
+      association_name   = foreign_class_name.split("::").last.underscore.to_sym # e.g. "RetailerProduct" => :retailer_product
 
       #
       # Historiographer will automatically setup the association
@@ -172,4 +171,4 @@ module Historiographer
       end
     end
   end
-end
+end

data/spec/historiographer_spec.rb

@@ -266,15 +266,30 @@ describe Historiographer do
   end
   
   describe "Deletion" do
-    it "records deleted_at on primary and history if you use acts_as_paranoid" do
+    it "records deleted_at and history_user_id on primary and history if you use acts_as_paranoid" do
+      post = create_post
+
+      expect {
+        post.destroy(history_user_id: 2)
+      }.to_not change {
+        PostHistory.count
+      }
+
+      expect(PostHistory.last.history_ended_at).to_not be_nil
+      expect(PostHistory.last.deleted_at).to be_nil
       class Post
         acts_as_paranoid
       end
 
-      post = create_post
+      post = Post.create(
+        title: "Post 1",
+        body: "Great post",
+        author_id: 1,
+        history_user_id: user.id
+      )
 
       expect {
-        post.destroy
+        post.destroy(history_user_id: 2)
       }.to change {
         PostHistory.count
       }.by 1
@@ -282,7 +297,7 @@ describe Historiographer do
       expect(Post.unscoped.where.not(deleted_at: nil).count).to eq 1
       expect(Post.unscoped.where(deleted_at: nil).count).to eq 0
       expect(PostHistory.where.not(deleted_at: nil).count).to eq 1
-      expect(PostHistory.where(deleted_at: nil).count).to eq 1
+      expect(PostHistory.last.history_user_id).to eq 2
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: historiographer
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - brettshollenberger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-30 00:00:00.000000000 Z
+date: 2019-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord