Skip to content

Commit d8d57d5

Browse files
committed
git-er-done
1 parent 8b42f6e commit d8d57d5

File tree

7 files changed

+18
-11
lines changed

7 files changed

+18
-11
lines changed

Gemfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# frozen_string_literal: true
22

33
source "https://rubygems.org"
4+
45
gemspec
56

67
gem 'rails-controller-testing'
8+
9+
gem 'paper_trail', git: 'https://github.com/westonganger/paper_trail.git', branch: 'remove_association_tracking'

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@ RuboCop::RakeTask.new
5858

5959
### TODO: Allow rubocop to fail, but still continue
6060
desc "Default: run all available test suites"
61-
task default: %i[rubocop prepare test spec]
61+
task default: %i[prepare test spec]

lib/paper_trail_association_tracking.rb

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@
22

33
require "paper_trail_association_tracking/config"
44
require "paper_trail_association_tracking/model_config"
5-
require "paper_trail_association_tracking/version_concern"
65
require "paper_trail_association_tracking/reifier"
6+
require "paper_trail_association_tracking/record_trail"
7+
require "paper_trail_association_tracking/paper_trail"
8+
require "paper_trail_association_tracking/version_concern"
9+
require "paper_trail_association_tracking/version_association_concern"
710

811
module PaperTrailAssociationTracking
912
def self.version
@@ -40,7 +43,7 @@ module VersionConcern
4043
include ::PaperTrailAssociationTracking::VersionConcern
4144
end
4245

43-
module VersionAssociationConcern
44-
include ::PaperTrailAssociationTracking::VersionAssociationConcern
45-
end
46+
#module VersionAssociationConcern
47+
# include ::PaperTrailAssociationTracking::VersionAssociationConcern
48+
#end
4649
end

lib/paper_trail_association_tracking/config.rb

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
# frozen_string_literal: true
22

33
module PaperTrailAssociationTracking
4-
class Config
4+
module Config
55
attr_accessor :association_reify_error_behaviour
66
attr_writer :track_associations
77

8-
def initialize
9-
end
10-
118
def track_associations?
129
!!@track_associations
1310
end

lib/paper_trail_association_tracking/model_config.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
module PaperTrailAssociationTracking
44
# Configures an ActiveRecord model, mostly at application boot time, but also
55
# sometimes mid-request, with methods like enable/disable.
6-
class ModelConfig
6+
module ModelConfig
77
# Set up `@model_class` for PaperTrail. Installs callbacks, associations,
88
# "class attributes", instance methods, and more.
99
# @api private

lib/paper_trail_association_tracking/record_trail.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: true
22

33
module PaperTrailAssociationTracking
4-
class RecordTrail
4+
module RecordTrail
55
# Utility method for reifying. Anything executed inside the block will
66
# appear like a new record.
77
#

spec/spec_helper.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,13 @@ def params_wrapper(args)
5555
end
5656
end
5757

58+
require 'paper_trail'
59+
require File.expand_path("./lib/paper_trail_association_tracking")
60+
5861
require File.expand_path("../dummy_app/config/environment", __FILE__)
5962
require "rspec/rails"
6063
require "paper_trail/frameworks/rspec"
64+
require "paper_trail-association_tracking/frameworks/rspec"
6165
require "ffaker"
6266
require "timecop"
6367

0 commit comments

Comments
 (0)