houston-vestal_versions 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4fcff61825a10b64799b830d87071223831a142e
-  data.tar.gz: d9e34ce3cccad8293eb54960bb44de34998b60b1
+SHA256:
+  metadata.gz: a3962787d496c71f96a2f1fae00a860ab372d8508acbe8bdbf84f5c28e49d812
+  data.tar.gz: 41649745092de1a1f2305ada45db52c4148a1ac95d1ab6812facd1c3549b7eab
 SHA512:
-  metadata.gz: 440eace320c8bfc6aa860dc99a77f24e4d3dc04448e43efff19e0015902f61f67dae7c4dce7cecdbf6b0ddbad1d8a9319767bafc97d72e7c3b0b1ba1f20f6111
-  data.tar.gz: 711160e633f92cc0339f42adc8e39a871b7c24798a1a56c9dfb9a4a0e076aeea97c7969d582c3cb9a56ff07b3bdcfc1b4b51c8414542f203791f342b06cde098
+  metadata.gz: 5401fd38ceb38810afd696ce588c3707ed87818f06d36ed9798032bda4831db522045f156fc5312655370ca0add43106096640318942a54714976f88c8871a1d
+  data.tar.gz: 5e6130a2dbf8b1ff02c105d66225345a4959c814ce5398172f71fef3080256d3c5f346c471260f6f08aad867ecc9458fcd1bf7c13da4c268e445d6548fb75637

data/.github/workflows/tests.yml

@@ -0,0 +1,31 @@
+name: Tests
+on: [push]
+
+jobs:
+  ruby:
+    name: Rspec
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.5, 2.6, 2.7]
+        activerecord: ["5.0", "5.1", "5.2", "6.0"]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Set ActiveRecord Version
+        env:
+          AR_VERSION: ${{ matrix.activerecord }}
+        run: echo "gem 'activerecord', '~> $AR_VERSION'" >> Gemfile
+      - name: Install Sqlite
+        run: sudo apt-get install libsqlite3-dev
+      - name: Bundle
+        run: |
+          bundle config path vendor/bundle
+          bundle install --jobs 4 --retry 3
+      - name: Tests
+        run: bundle exec rake spec

data/Gemfile

@@ -4,7 +4,8 @@ gemspec
 
 group :test do
   gem 'coveralls', '~> 0.7', :require => false
-  gem 'rspec', '~> 2.0'
+  gem 'rspec'
+  gem 'rspec-its'
   gem 'sqlite3', '~> 1.0'
 end
 

data/README.rdoc

@@ -119,7 +119,7 @@ There are a handful of exciting new additions in version 1.0 of <tt>vestal_versi
       @user.update_attribute(:first_name, "Stephen")
       @user.first_name = "Steve"
       @user.save
-      @user.update_attributes(:last_name => "Jobs")
+      @user.update(:last_name => "Jobs")
     end
     @user.version # => 1
 
@@ -154,12 +154,12 @@ There are a handful of exciting new additions in version 1.0 of <tt>vestal_versi
 
 * Storing which user is responsible for a revision. Rather than introduce a lot of controller magic to guess what to store, you can simply update an additional attribute on your versioned model: <tt>updated_by</tt>.
 
-    @user.update_attributes(:last_name => "Jobs", :updated_by => "Tyler")
+    @user.update(:last_name => "Jobs", :updated_by => "Tyler")
     @user.versions.last.user # => "Tyler"
 
   Instead of passing a simple string to the <tt>updated_by</tt> setter, you can pass a model instance, such as an ActiveRecord user or administrator. The association will be saved polymorphically alongside the version.
 
-    @user.update_attributes(:last_name => "Jobs", :updated_by => current_user)
+    @user.update(:last_name => "Jobs", :updated_by => current_user)
     @user.versions.last.user # => #<User first_name: "Steven", last_name: "Tyler">
 
 * Global configuration. The new <tt>vestal_versions</tt> Rails generator also writes an initializer with instructions on how to set application-wide options for the <tt>versioned</tt> method.

data/lib/vestal_versions/changes.rb

@@ -48,7 +48,7 @@ module VestalVersions
 			# creation. Incremental changes are reset when the record is saved because they represent
 			# a subset of the dirty attribute changes, which are reset upon save.
 			def incremental_version_changes
-				changes.slice(*versioned_columns)
+				previous_changes.slice(*versioned_columns)
 			end
 
 			# Simply resets the cumulative changes after version creation.
@@ -118,4 +118,4 @@ module VestalVersions
       end
     end
   end
-end
+end

data/lib/vestal_versions/control.rb

@@ -12,7 +12,7 @@ module VestalVersions
     # Control blocks are called on ActiveRecord::Base instances as to not cause any conflict with
     # other instances of the versioned class whose behavior could be inadvertently altered within
     # a control block.
-    
+
     # The +skip_version+ block simply allows for updates to be made to an instance of a versioned
     # ActiveRecord model while ignoring all new version creation. The <tt>:if</tt> and
     # <tt>:unless</tt> conditions (if given) will not be evaulated inside a +skip_version+ block.
@@ -55,7 +55,7 @@ module VestalVersions
     #   user = User.find_by_first_name("Steve")
     #   user.version # => 1
     #   user.merge_version do
-    #     user.update_attributes(:first_name => "Steven", :last_name => "Tyler")
+    #     user.update(:first_name => "Steven", :last_name => "Tyler")
     #     user.update_attribute(:first_name, "Stephen")
     #     user.update_attribute(:last_name, "Richert")
     #   end
@@ -159,7 +159,7 @@ module VestalVersions
     def update_version?
       append_version?
     end
-    
+
     module ClassMethods
       # The +skip_version+ block simply allows for updates to be made to an instance of a versioned
       # ActiveRecord model while ignoring all new version creation. The <tt>:if</tt> and

data/lib/vestal_versions/users.rb

@@ -11,8 +11,8 @@ module VestalVersions
 
     # Methods added to versioned ActiveRecord::Base instances to enable versioning with additional
     # user information.
-    
-    
+
+
     private
     # Overrides the +version_attributes+ method to include user information passed into the
     # parent object, by way of a +updated_by+ attr_accessor.
@@ -28,8 +28,13 @@ module VestalVersions
     included do
       belongs_to :user, :polymorphic => true
 
-      alias_method_chain :user, :name
-      alias_method_chain :user=, :name
+      # alias_method_chain :user, :name
+      alias_method :user_without_name, :user
+      alias_method :user, :user_with_name
+
+      # alias_method_chain :user=, :name
+      alias_method :user_without_name=, :user=
+      alias_method :user=, :user_with_name=
     end
 
     # Overrides the +user+ method created by the polymorphic +belongs_to+ user association. If

data/spec/support/schema.rb

@@ -3,7 +3,7 @@ ActiveRecord::Base.establish_connection(
   :database => File.expand_path('../../test.db', __FILE__)
 )
 
-class CreateSchema < ActiveRecord::Migration
+class CreateSchema < ActiveRecord::Migration[4.2]
   def self.up
     create_table :users, :force => true do |t|
       t.string :first_name

data/spec/vestal_versions/control_spec.rb

@@ -95,7 +95,7 @@ describe VestalVersions::Control do
 
         user.append_version{ user.update_attribute(:last_name, 'Jobs') }
 
-        other_last_version = user.versions(true).last
+        other_last_version = user.versions.reload.last
         other_last_version.id.should == original_id
         other_last_version.attributes.should_not == original_attrs
       end
@@ -110,7 +110,7 @@ describe VestalVersions::Control do
           user.update_attribute(:first_name, 'Steve')
         end
 
-        other_last_version = user.versions(true).last
+        other_last_version = user.versions.reload.last
         other_last_version.id.should == original_id
         other_last_version.attributes.should_not == original_attrs
       end

data/spec/vestal_versions/deletion_spec.rb

@@ -60,7 +60,7 @@ describe VestalVersions::Deletion do
 
       it "restores even if the schema has changed" do
         new_mods = last_version.modifications.merge(:old_column => 'old')
-        last_version.update_attributes(:modifications => new_mods)
+        last_version.update(:modifications => new_mods)
 
         last_version.restore.should == subject
       end

data/spec/vestal_versions/reset_spec.rb

@@ -29,7 +29,7 @@ describe VestalVersions::Reset do
   it 'dissociates all versions after the target' do
     versions.reverse.each do |version|
       subject.reset_to!(version)
-      subject.versions(true).after(version).count.should == 0
+      subject.versions.reload.after(version).count.should == 0
     end
   end
 

data/spec/vestal_versions/reversion_spec.rb

@@ -73,7 +73,7 @@ describe VestalVersions::Reversion do
 
   it "does not store the reverted_from for subsequent saves" do
     subject.revert_to!(1)
-    subject.update_attributes(:name => 'Bill Gates')
+    subject.update(:name => 'Bill Gates')
     subject.versions.last.reverted_from.should be_nil
   end
 
@@ -88,14 +88,14 @@ describe VestalVersions::Reversion do
     subject.revert_to(1)
     subject.name = "Reverted"
     subject.save
-    subject.update_attributes(:name => 'Bill Gates')
+    subject.update(:name => 'Bill Gates')
     subject.versions.last.reverted_from.should be_nil
   end
 
   it "clears the reverted_from if the model is reloaded after a revert_to without a save" do
     subject.revert_to(1)
     subject.reload
-    subject.update_attributes(:name => 'Bill Gates')
+    subject.update(:name => 'Bill Gates')
 
     subject.versions.last.reverted_from.should be_nil
   end

data/spec/vestal_versions/users_spec.rb

@@ -5,17 +5,17 @@ describe VestalVersions::Users do
   let(:user){ User.create(:name => 'Steve Richert') }
 
   it 'defaults to nil' do
-    user.update_attributes(:first_name => 'Stephen')
+    user.update(:first_name => 'Stephen')
     user.versions.last.user.should be_nil
   end
 
   it 'accepts and returns an ActiveRecord user' do
-    user.update_attributes(:first_name => 'Stephen', :updated_by => updated_by)
+    user.update(:first_name => 'Stephen', :updated_by => updated_by)
     user.versions.last.user.should == updated_by
   end
 
   it 'accepts and returns a string user name' do
-    user.update_attributes(:first_name => 'Stephen', :updated_by => updated_by.name)
+    user.update(:first_name => 'Stephen', :updated_by => updated_by.name)
     user.versions.last.user.should == updated_by.name
   end
 end

data/spec/vestal_versions/version_spec.rb

@@ -40,7 +40,7 @@ describe VestalVersions::Versions do
     version.number.should == 1
     version.should be_initial
   end
-  
+
   it "sreturn the version number if it is not a revert" do
     user.version.should == user.versions.last.original_number
   end
@@ -53,9 +53,9 @@ describe VestalVersions::Versions do
   it "return the original version if it is a double revert" do
     user.revert_to!(2)
     version = user.version
-    user.update_attributes(:last_name => 'Gates')
+    user.update(:last_name => 'Gates')
     user.revert_to!(version)
     user.versions.last.original_number.should == 2
   end
-  
+
 end

data/spec/vestal_versions/versions_spec.rb

@@ -125,15 +125,15 @@ describe VestalVersions::Versions do
 
   it 'provides a version number for any given numeric version value' do
     times.keys.each do |number|
-      subject.versions.number_at(number).should be_a(Fixnum)
-      subject.versions.number_at(number + 0.5).should be_a(Fixnum)
+      subject.versions.number_at(number).should be_a(Integer)
+      subject.versions.number_at(number + 0.5).should be_a(Integer)
       subject.versions.number_at(number).should == subject.versions.number_at(number + 0.5)
     end
   end
 
   it 'provides a version number for a valid tag' do
     times.keys.map{|n| [n, n.to_s] }.each do |number, tag|
-      subject.versions.number_at(tag).should be_a(Fixnum)
+      subject.versions.number_at(tag).should be_a(Integer)
       subject.versions.number_at(tag).should == number
     end
   end
@@ -155,7 +155,7 @@ describe VestalVersions::Versions do
 
   it "provides a version number for any time after the model's creation" do
     times.each do |number, time|
-      subject.versions.number_at(time + 30.minutes).should be_a(Fixnum)
+      subject.versions.number_at(time + 30.minutes).should be_a(Integer)
       subject.versions.number_at(time + 30.minutes).should == number
     end
   end

data/vestal_versions.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name    = 'houston-vestal_versions'
-  gem.version = '2.0.1'
+  gem.version = '3.0.0'
 
   gem.authors     = ['Steve Richert', "James O'Kelly", 'C. Jason Harrelson']
   gem.email       = ['steve.richert@gmail.com', 'dreamr.okelly@gmail.com', 'jason@lookforwardenterprises.com']
@@ -11,11 +11,11 @@ Gem::Specification.new do |gem|
   gem.homepage    = 'http://github.com/laserlemon/vestal_versions'
   gem.license     = 'MIT'
 
-  gem.add_dependency 'activerecord', '>= 3', '< 6'
-  gem.add_dependency 'activesupport', '>= 3', '< 6'
+  gem.add_dependency 'activerecord', '>= 5'
+  gem.add_dependency 'activesupport', '>= 5'
 
-  gem.add_development_dependency 'bundler', '~> 1.0'
-  gem.add_development_dependency 'rake', '~> 10.0'
+  gem.add_development_dependency 'bundler', '>= 1.0'
+  gem.add_development_dependency 'rake', '>= 10.0'
 
   gem.files         = `git ls-files`.split($\)
   gem.test_files    = gem.files.grep(/^spec/)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: houston-vestal_versions
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Steve Richert
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2022-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,66 +18,54 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Keep a DRY history of your ActiveRecord models' changes
@@ -89,17 +77,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/tests.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
-- gemfiles/activerecord_3_0.gemfile
-- gemfiles/activerecord_3_1.gemfile
-- gemfiles/activerecord_3_2.gemfile
-- gemfiles/activerecord_4_0.gemfile
 - lib/generators/vestal_versions.rb
 - lib/generators/vestal_versions/migration/migration_generator.rb
 - lib/generators/vestal_versions/migration/templates/initializer.rb
@@ -156,8 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Keep a DRY history of your ActiveRecord models' changes

data/.travis.yml

@@ -1,22 +0,0 @@
-branches:
-  only:
-    - master
-gemfile:
-  - gemfiles/activerecord_3_0.gemfile
-  - gemfiles/activerecord_3_1.gemfile
-  - gemfiles/activerecord_3_2.gemfile
-  - gemfiles/activerecord_4_0.gemfile
-language: ruby
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-  include:
-    - env: COVERAGE=1
-      gemfile: Gemfile
-      rvm: 2.1.0
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - ruby-head
-script: bundle exec rspec

data/gemfiles/activerecord_3_0.gemfile

@@ -1,10 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 3.0.0'
-
-gemspec :path => '..'
-
-group :test do
-  gem 'rspec', '~> 2.0'
-  gem 'sqlite3', '~> 1.0'
-end

data/gemfiles/activerecord_3_1.gemfile

@@ -1,10 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 3.1.0'
-
-gemspec :path => '..'
-
-group :test do
-  gem 'rspec', '~> 2.0'
-  gem 'sqlite3', '~> 1.0'
-end

data/gemfiles/activerecord_3_2.gemfile

@@ -1,10 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 3.2.0'
-
-gemspec :path => '..'
-
-group :test do
-  gem 'rspec', '~> 2.0'
-  gem 'sqlite3', '~> 1.0'
-end

data/gemfiles/activerecord_4_0.gemfile

@@ -1,10 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 4.0.0'
-
-gemspec :path => '..'
-
-group :test do
-  gem 'rspec', '~> 2.0'
-  gem 'sqlite3', '~> 1.0'
-end