paper_trail 4.0.0.beta1 → 4.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a4a5a1bfd11ee6bc8acabb03cb262fe4691951a
-  data.tar.gz: 6854403b0c404645e52c94154d4d8268642969c1
+  metadata.gz: 7b96c067cab9f8789c0942d19fe7db30c83b0854
+  data.tar.gz: a2f6e330b8c28de3c575c9a7c13ba54c352702ed
 SHA512:
-  metadata.gz: 891aa4e3758245d09974c472c49506a4b49b2ac565018acc1afbebe40907c91729b450e45dd9e5c501c6781f7a673f15f9d3f0b43a3fbfe65fbe9a0db079a24d
-  data.tar.gz: c0ae097eaa91467cd5bc5d944aa65ba9cd43899d8498725c900c6a96bcd8c332a8fedd0610f0c092a5df444e500c4a72119ee3de29df92d5748c4990c2f86282
+  metadata.gz: 2eb6e5433a4e085a9ccaa41b5c1862f2c1b25fd4f77d08061470d4cf411560f02aa1cd18179f5fb058b446c0d3e26ba58ea917fbe20c4c13032128e8d3837c3a
+  data.tar.gz: 435e06ff6d5e3071f09cb3d4a1b415c132114efb6d01b36d9b15d794a6b249db0392ddad6a1f75f6d0fdbf826befa6509b01c1235cce54034f621e5ab5e04594

data/CHANGELOG.md

@@ -5,12 +5,20 @@
 PaperTrail::Rails::Engine.eager_load!
 ```
 
+*Also*
+
+If you depend on the `RSpec` or `Cucumber` helpers, you will need to [manually load them into your test helper](https://github.com/airblade/paper_trail#testing).
+
+  - [#458](https://github.com/airblade/paper_trail/pull/458) - For `create` events, metadata pointing at attributes should attempt
+    to grab the current value instead of looking at the value prior to the change (which would always be `nil`)
+  - [#440](https://github.com/airblade/paper_trail/pull/440) - `versions` association should clear/reload after a transaction rollback.
   - [#439](https://github.com/airblade/paper_trail/pull/439) / [#12](https://github.com/airblade/paper_trail/issues/12) -
     Support for versioning of associations (Has Many, Has One, HABTM, etc.)
-  - [#440](https://github.com/airblade/paper_trail/pull/440) - `versions` association should clear/reload after a transaction rollback.
   - [#438](https://github.com/airblade/paper_trail/issues/438) - `Model.paper_trail_enabled_for_model?` should return `false` if
     `has_paper_trail` has not been declared on the class.
   - [#427](https://github.com/airblade/paper_trail/pull/427) - Fix `reify` method in context of model where a column has been removed.
+  - [#420](https://github.com/airblade/paper_trail/issues/420) - Add `VersionConcern#where_object_changes` instance method;
+    acts as a helper for querying against the `object_changes` column in versions table.
   - [#416](https://github.com/airblade/paper_trail/issues/416) - Added a `config` option for enabling/disabling
     utilization of `serialized_attributes` for `ActiveRecord`, necessary because `serialized_attributes` has been
     deprecated in `ActiveRecord` version `4.2` and will be removed in version `5.0`
@@ -85,7 +93,7 @@ in the `PaperTrail::Version` class through a `Rails::Engine` when the gem is use
     with Rails `4.1.0.rc1`.
   - [#334](https://github.com/airblade/paper_trail/pull/334) - Add small-scope `whodunnit` method to `PaperTrail::Model::InstanceMethods`.
   - [#329](https://github.com/airblade/paper_trail/issues/329) - Add `touch_with_version` method to `PaperTrail::Model::InstanceMethods`,
-    to allow for generating a version `touch`ing a model.
+    to allow for generating a version while `touch`ing a model.
   - [#328](https://github.com/airblade/paper_trail/pull/328) / [#326](https://github.com/airblade/paper_trail/issues/326) /
     [#307](https://github.com/airblade/paper_trail/issues/307) - `Model.paper_trail_enabled_for_model?` and
     `model_instance.without_versioning` is now thread-safe.

data/README.md

@@ -139,7 +139,7 @@ Widget.paper_trail_on!
 
 # Check whether PaperTrail is enabled for all widgets.
 Widget.paper_trail_enabled_for_model?
-widget.paper_trail_enabled_for_model?
+widget.paper_trail_enabled_for_model? # only available on instances of versioned models
 ```
 
 And a `PaperTrail::Version` instance has these methods:
@@ -173,6 +173,12 @@ version.event
 
 # Query versions objects by attributes.
 PaperTrail::Version.where_object(attr1: val1, attr2: val2)
+
+# Query versions object_changes field by attributes (requires
+# `object_changes` column on versions table).
+# Also can't guarantee consistent query results for numeric values
+# due to limitations of SQL wildcard matchers against the serialized objects.
+PaperTrail::Version.where_object_changes(attr1: val1)
 ```
 
 In your controllers you can override these methods:

data/Rakefile

@@ -4,7 +4,7 @@ Bundler::GemHelper.install_tasks
 desc 'Set a relevant database.yml for testing'
 task :prepare do
   ENV["DB"] ||= "sqlite"
-  if RUBY_VERSION.to_f >= 1.9
+  if RUBY_VERSION >= '1.9'
     FileUtils.cp "test/dummy/config/database.#{ENV["DB"]}.yml", "test/dummy/config/database.yml"
   else
     require 'ftools'

data/gemfiles/3.0.gemfile

@@ -32,7 +32,7 @@ group :development, :test do
   platforms :ruby do 
     gem 'sqlite3', '~> 1.2'
     gem 'mysql2', '~> 0.3'
-    gem 'pg', '~> 0.17'
+    gem 'pg', '~> 0.17.1'
   end
 
   platforms :jruby, :ruby_18 do

data/lib/paper_trail/has_paper_trail.rb

@@ -259,7 +259,7 @@ module PaperTrail
       #
       # TODO: lookinto leveraging the `after_touch` callback from `ActiveRecord` to allow the
       #  regular `touch` method go generate a version as normal. May make sense to switch the `record_update`
-      #  method to leverage an `after_update` callback anyways (likely for v3.1.0)
+      #  method to leverage an `after_update` callback anyways (likely for v4.0.0)
       def touch_with_version(name = nil)
         raise ActiveRecordError, "can not touch on a new record object" unless persisted?
 
@@ -281,8 +281,7 @@ module PaperTrail
         if paper_trail_switched_on?
           data = {
             :event          => paper_trail_event || 'create',
-            :whodunnit      => PaperTrail.whodunnit,
-            :transaction_id => PaperTrail.transaction_id
+            :whodunnit      => PaperTrail.whodunnit
           }
           if respond_to?(:created_at)
             data[PaperTrail.timestamp_field] = created_at
@@ -291,6 +290,9 @@ module PaperTrail
             data[:object_changes] = self.class.paper_trail_version_class.object_changes_col_is_json? ? changes_for_paper_trail :
               PaperTrail.serializer.dump(changes_for_paper_trail)
           end
+          if self.class.paper_trail_version_class.column_names.include?('transaction_id')
+            data[:transaction_id] = PaperTrail.transaction_id
+          end
           version = send(self.class.versions_association_name).create! merge_metadata(data)
           set_transaction_id(version)
           save_associations(version)
@@ -303,8 +305,7 @@ module PaperTrail
           data = {
             :event          => paper_trail_event || 'update',
             :object         => self.class.paper_trail_version_class.object_col_is_json? ? object_attrs : PaperTrail.serializer.dump(object_attrs),
-            :whodunnit      => PaperTrail.whodunnit,
-            :transaction_id => PaperTrail.transaction_id
+            :whodunnit      => PaperTrail.whodunnit
           }
           if respond_to?(:updated_at)
             data[PaperTrail.timestamp_field] = updated_at
@@ -313,6 +314,9 @@ module PaperTrail
             data[:object_changes] = self.class.paper_trail_version_class.object_changes_col_is_json? ? changes_for_paper_trail :
               PaperTrail.serializer.dump(changes_for_paper_trail)
           end
+          if self.class.paper_trail_version_class.column_names.include?('transaction_id')
+            data[:transaction_id] = PaperTrail.transaction_id
+          end
           version = send(self.class.versions_association_name).create merge_metadata(data)
           set_transaction_id(version)
           save_associations(version)
@@ -352,9 +356,11 @@ module PaperTrail
             :item_type      => self.class.base_class.name,
             :event          => paper_trail_event || 'destroy',
             :object         => self.class.paper_trail_version_class.object_col_is_json? ? object_attrs : PaperTrail.serializer.dump(object_attrs),
-            :whodunnit      => PaperTrail.whodunnit,
-            :transaction_id => PaperTrail.transaction_id
+            :whodunnit      => PaperTrail.whodunnit
           }
+          if self.class.paper_trail_version_class.column_names.include?('transaction_id')
+            data[:transaction_id] = PaperTrail.transaction_id
+          end
           version = self.class.paper_trail_version_class.create(merge_metadata(data))
           send("#{self.class.version_association_name}=", version)
           send(self.class.versions_association_name).send :load_target
@@ -363,7 +369,9 @@ module PaperTrail
         end
       end
 
+      # saves associations if the join table for `VersionAssociation` exists
       def save_associations(version)
+        return unless PaperTrail::VersionAssociation.table_exists?
         self.class.reflect_on_all_associations(:belongs_to).each do |assoc|
           if assoc.klass.paper_trail_enabled_for_model?
             PaperTrail::VersionAssociation.create(
@@ -376,6 +384,7 @@ module PaperTrail
       end
 
       def set_transaction_id(version)
+        return unless self.class.paper_trail_version_class.column_names.include?('transaction_id')
         if PaperTrail.transaction? && PaperTrail.transaction_id.nil?
            PaperTrail.transaction_id = version.id
            version.transaction_id = version.id
@@ -394,8 +403,9 @@ module PaperTrail
             if v.respond_to?(:call)
               v.call(self)
             elsif v.is_a?(Symbol) && respond_to?(v)
-              # if it is an attribute that is changing, be sure to grab the current version
-              if has_attribute?(v) && send("#{v}_changed?".to_sym)
+              # if it is an attribute that is changing in an existing object, 
+              # be sure to grab the current version
+              if has_attribute?(v) && send("#{v}_changed?".to_sym) && data[:event] != 'create'
                 send("#{v}_was".to_sym)
               else
                 send(v)

data/lib/paper_trail/serializers/json.rb

@@ -13,8 +13,8 @@ module PaperTrail
         ActiveSupport::JSON.encode object
       end
 
-      # Returns a SQL condition to be used to match the given field and value in
-      # the serialized object.
+      # Returns a SQL condition to be used to match the given field and value
+      # in the serialized object
       def where_object_condition(arel_field, field, value)
         # Convert to JSON to handle strings and nulls correctly.
         json_value = value.to_json
@@ -31,6 +31,17 @@ module PaperTrail
           arel_field.matches("%\"#{field}\":#{json_value}%")
         end
       end
+
+      # Returns a SQL condition to be used to match the given field and value
+      # in the serialized object_changes
+      def where_object_changes_condition(arel_field, field, value)
+        # Convert to JSON to handle strings and nulls correctly.
+        json_value = value.to_json
+
+        # Need to check first (before) and secondary (after) fields
+        arel_field.matches("%\"#{field}\":[#{json_value},%").
+          or(arel_field.matches("%\"#{field}\":[%,#{json_value}]%"))
+      end
     end
   end
 end

data/lib/paper_trail/serializers/yaml.rb

@@ -13,11 +13,24 @@ module PaperTrail
         ::YAML.dump object
       end
 
-      # Returns a SQL condition to be used to match the given field and value in
-      # the serialized object.
+      # Returns a SQL condition to be used to match the given field and value
+      # in the serialized object
       def where_object_condition(arel_field, field, value)
         arel_field.matches("%\n#{field}: #{value}\n%")
       end
+
+      # Returns a SQL condition to be used to match the given field and value
+      # in the serialized object_changes
+      def where_object_changes_condition(arel_field, field, value)
+        # Need to check first (before) and secondary (after) fields
+        if defined?(::YAML::ENGINE) && ::YAML::ENGINE.yamler == 'psych'
+          arel_field.matches("%\n#{field}:\n- #{value}\n%").
+            or(arel_field.matches("%\n#{field}:\n-%\n- #{value}\n%"))
+        else # Syck adds extra spaces into array dumps
+          arel_field.matches("%\n#{field}: \n%- #{value}\n%").
+            or(arel_field.matches("%\n#{field}: \n-%\n- #{value}\n%"))
+        end
+      end
     end
   end
 end

data/lib/paper_trail/version_concern.rb

@@ -88,6 +88,19 @@ module PaperTrail
         where(where_conditions)
       end
 
+      def where_object_changes(args = {})
+        raise ArgumentError, 'expected to receive a Hash' unless args.is_a?(Hash)
+        arel_field = arel_table[:object_changes]
+
+        where_conditions = args.map do |field, value|
+          PaperTrail.serializer.where_object_changes_condition(arel_field, field, value)
+        end.reduce do |condition1, condition2|
+          condition1.and(condition2)
+        end
+
+        where(where_conditions)
+      end
+
       def primary_key_is_int?
         @primary_key_is_int ||= columns_hash[primary_key].type == :integer
       rescue
@@ -101,7 +114,7 @@ module PaperTrail
 
       # Returns whether the `object_changes` column is using the `json` type supported by PostgreSQL
       def object_changes_col_is_json?
-        @object_changes_col_is_json ||= columns_hash['object_changes'].type == :json
+        @object_changes_col_is_json ||= columns_hash['object_changes'].try(:type) == :json
       end
     end
 
@@ -283,7 +296,8 @@ module PaperTrail
     # We lookup the first child versions after version_at timestamp or in same transaction.
     def reify_has_manys(model, options = {})
       assoc_has_many_through, assoc_has_many_directly =
-          model.class.reflect_on_all_associations(:has_many).partition { |assoc| assoc.options[:through] }
+        model.class.reflect_on_all_associations(:has_many).
+        partition { |assoc| assoc.options[:through] }
       reify_has_many_directly(assoc_has_many_directly, model, options)
       reify_has_many_through(assoc_has_many_through, model, options)
     end
@@ -294,12 +308,12 @@ module PaperTrail
       associations.each do |assoc|
         next unless assoc.klass.paper_trail_enabled_for_model?
         version_id_subquery = PaperTrail::VersionAssociation.joins(model.class.version_association_name).
-            select("MIN(version_id)").
-            where("foreign_key_name = ?", assoc.foreign_key).
-            where("foreign_key_id = ?", model.id).
-            where("#{version_table_name}.item_type = ?", assoc.class_name).
-            where("created_at >= ? OR transaction_id = ?", options[:version_at], transaction_id).
-            group("item_id").to_sql
+          select("MIN(version_id)").
+          where("foreign_key_name = ?", assoc.foreign_key).
+          where("foreign_key_id = ?", model.id).
+          where("#{version_table_name}.item_type = ?", assoc.class_name).
+          where("created_at >= ? OR transaction_id = ?", options[:version_at], transaction_id).
+          group("item_id").to_sql
         versions = model.class.paper_trail_version_class.where("id IN (#{version_id_subquery})").inject({}) do |acc, v|
           acc.merge!(v.item_id => v)
         end
@@ -335,11 +349,11 @@ module PaperTrail
         collection_keys = through_collection.map { |through_model| through_model.send(assoc.foreign_key) }
 
         version_id_subquery = assoc.klass.paper_trail_version_class.
-            select("MIN(id)").
-            where("item_type = ?", assoc.class_name).
-            where("item_id IN (?)", collection_keys).
-            where("created_at >= ? OR transaction_id = ?", options[:version_at], transaction_id).
-            group("item_id").to_sql
+          select("MIN(id)").
+          where("item_type = ?", assoc.class_name).
+          where("item_id IN (?)", collection_keys).
+          where("created_at >= ? OR transaction_id = ?", options[:version_at], transaction_id).
+          group("item_id").to_sql
         versions = assoc.klass.paper_trail_version_class.where("id IN (#{version_id_subquery})").inject({}) do |acc, v|
           acc.merge!(v.item_id => v)
         end

data/lib/paper_trail/version_number.rb

@@ -3,7 +3,7 @@ module PaperTrail
     MAJOR = 4
     MINOR = 0
     TINY  = 0
-    PRE   = 'beta1'
+    PRE   = 'beta2'
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
 

data/spec/models/gadget_spec.rb

@@ -26,8 +26,10 @@ describe Gadget, :type => :model do
           subject { Gadget.new(:created_at => Time.now) }
 
           # apparently the private methods list in Ruby18 is different than in Ruby19+
-          if RUBY_VERSION.to_f >= 1.9
+          if RUBY_VERSION >= '1.9'
             it { expect(subject.private_methods).to include(:changed_notably?) }
+          else
+            it { expect(subject.private_methods).to include('changed_notably?') }
           end
 
           context "create events" do

data/spec/models/version_spec.rb

@@ -108,6 +108,60 @@ describe PaperTrail::Version, :type => :model do
           end
         end
       end
+
+      describe '#where_object_changes' do
+        it { expect(PaperTrail::Version).to respond_to(:where_object_changes) }
+
+        context "invalid arguments" do
+          it "should raise an error" do
+            expect { PaperTrail::Version.where_object_changes(:foo) }.to raise_error(ArgumentError)
+            expect { PaperTrail::Version.where_object_changes([]) }.to raise_error(ArgumentError)
+          end
+        end
+
+        context "valid arguments", :versioning => true do
+          let(:widget) { Widget.new }
+          let(:name) { Faker::Name.first_name }
+          let(:int) { rand(5) + 2 }
+
+          before do
+            widget.update_attributes!(:name => name, :an_integer => 0)
+            widget.update_attributes!(:name => 'foobar', :an_integer => 77)
+            widget.update_attributes!(:name => Faker::Name.last_name, :an_integer => int)
+          end
+
+          context "`serializer == YAML`" do
+            specify { expect(PaperTrail.serializer).to be PaperTrail::Serializers::YAML }
+
+            it "should be able to locate versions according to their `object_changes` contents" do
+              expect(widget.versions.where_object_changes(:name => name)).to eq(widget.versions[0..1])
+              expect(widget.versions.where_object_changes(:an_integer => 77)).to eq(widget.versions[1..2])
+              expect(widget.versions.where_object_changes(:an_integer => int)).to eq([widget.versions.last])
+            end
+
+            it "should be able to handle queries for multiple attributes" do
+              expect(widget.versions.where_object_changes(:an_integer => 77, :name => 'foobar')).to eq(widget.versions[1..2])
+            end
+          end
+
+          context "`serializer == JSON`" do
+            before(:all) { PaperTrail.serializer = PaperTrail::Serializers::JSON }
+            specify { expect(PaperTrail.serializer).to be PaperTrail::Serializers::JSON }
+
+            it "should be able to locate versions according to their `object_changes` contents" do
+              expect(widget.versions.where_object_changes(:name => name)).to eq(widget.versions[0..1])
+              expect(widget.versions.where_object_changes(:an_integer => 77)).to eq(widget.versions[1..2])
+              expect(widget.versions.where_object_changes(:an_integer => int)).to eq([widget.versions.last])
+            end
+
+            it "should be able to handle queries for multiple attributes" do
+              expect(widget.versions.where_object_changes(:an_integer => 77, :name => 'foobar')).to eq(widget.versions[1..2])
+            end
+
+            after(:all) { PaperTrail.serializer = PaperTrail::Serializers::YAML }
+          end
+        end
+      end
     end
   end
 end

data/spec/requests/articles_spec.rb

@@ -21,13 +21,11 @@ describe "Articles management", :type => :request, :order => :defined do
     let(:article) { Article.last }
 
     context "`current_user` method returns a `String`" do
-      if RUBY_VERSION.to_f >= 1.9
-        it "should set that value as the `whodunnit`" do
-          expect { post articles_path, valid_params }.to change(PaperTrail::Version, :count).by(1)
-          expect(article.title).to eq('Doh')
-          expect(PaperTrail.whodunnit).to eq('foobar')
-          expect(article.versions.last.whodunnit).to eq('foobar')
-        end
+      it "should set that value as the `whodunnit`" do
+        expect { post articles_path, valid_params }.to change(PaperTrail::Version, :count).by(1)
+        expect(article.title).to eq('Doh')
+        expect(PaperTrail.whodunnit).to eq('foobar')
+        expect(article.versions.last.whodunnit).to eq('foobar')
       end
     end
   end

data/spec/support/alt_db_init.rb

@@ -9,7 +9,7 @@ configs = YAML.load_file("#{Rails.root}/config/database.yml")
 db_directory = "#{Rails.root}/db"
 # setup alternate databases
 if ENV["DB"] == "sqlite"
-  if  RUBY_VERSION.to_f >= 1.9
+  if  RUBY_VERSION >= '1.9'
     FileUtils.cp "#{db_directory}/test.sqlite3", "#{db_directory}/test-foo.sqlite3"
     FileUtils.cp "#{db_directory}/test.sqlite3", "#{db_directory}/test-bar.sqlite3"
   else

data/test/dummy/app/controllers/application_controller.rb

@@ -9,7 +9,7 @@ class ApplicationController < ActionController::Base
   def current_user
     @current_user ||= OpenStruct.new(:id => 153).tap do |obj|
       # Invoking `id` returns the `object_id` value in Ruby18 unless specifically overwritten
-      def obj.id; 153; end if RUBY_VERSION.to_f < 1.9
+      def obj.id; 153; end if RUBY_VERSION < '1.9'
     end
   end
 

data/test/dummy/app/controllers/articles_controller.rb

@@ -9,6 +9,9 @@ class ArticlesController < ApplicationController
   end
 
   def current_user
-    'foobar'
+    'foobar'.tap do |string|
+      # Invoking `id` returns the `object_id` value in Ruby18 by default
+      string.class_eval { undef_method(:id) } if RUBY_VERSION < '1.9'
+    end
   end
 end

data/test/dummy/config/environments/test.rb

@@ -11,7 +11,11 @@ Dummy::Application.configure do
   config.eager_load = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
+  if config.respond_to?(:serve_static_files=)
+    config.serve_static_files = true
+  else
+    config.serve_static_assets = true
+  end
   config.static_cache_control = "public, max-age=3600"
 
   # Show full error reports and disable caching

data/test/dummy/db/migrate/20110208155312_set_up_test_tables.rb

@@ -52,7 +52,6 @@ class SetUpTestTables < ActiveRecord::Migration
       t.string   :event,     :null => false
       t.string   :whodunnit
       t.text     :object
-      t.integer  :transaction_id
       t.datetime :created_at
 
       # Controller info columns.

data/test/functional/modular_sinatra_test.rb

@@ -16,7 +16,7 @@ class BaseApp < Sinatra::Base
   def current_user
     @current_user ||= OpenStruct.new(:id => 'foobar').tap do |obj|
       # Invoking `id` returns the `object_id` value in Ruby18 unless specifically overwritten
-      def obj.id; 'foobar'; end if RUBY_VERSION.to_f < 1.9
+      def obj.id; 'foobar'; end if RUBY_VERSION < '1.9'
     end
   end
 end

data/test/functional/sinatra_test.rb

@@ -16,7 +16,7 @@ class Sinatra::Application
   def current_user
     @current_user ||= OpenStruct.new(:id => 'raboof').tap do |obj|
       # Invoking `id` returns the `object_id` value in Ruby18 unless specifically overwritten
-      def obj.id; 'raboof'; end if RUBY_VERSION.to_f < 1.9
+      def obj.id; 'raboof'; end if RUBY_VERSION < '1.9'
     end
   end
 

data/test/unit/model_test.rb

@@ -800,8 +800,8 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
         assert_equal @article.action_data_provider_method, @article.versions.last.action
       end
 
-      should 'store dynamic meta data based on an attribute of the item prior to creation' do
-        assert_equal nil, @article.versions.last.title
+      should 'store dynamic meta data based on an attribute of the item at creation' do
+        assert_equal @initial_title, @article.versions.last.title
       end
 
 

data/test/unit/protected_attrs_test.rb

@@ -36,7 +36,7 @@ class ProtectedAttrsTest < ActiveSupport::TestCase
 
       should 'the previous version should contain right attributes' do
         # For some reason this test seems to be broken in JRuby 1.9 mode in the test env even though it works in the console. WTF?
-        unless ActiveRecord::VERSION::MAJOR >= 4 && defined?(JRUBY_VERSION) && RUBY_VERSION.to_f >= 1.9
+        unless ActiveRecord::VERSION::MAJOR >= 4 && defined?(JRUBY_VERSION) && RUBY_VERSION >= '1.9'
           assert_equal @widget.previous_version.attributes, @initial_attributes
         end
       end

data/test/unit/serializer_test.rb

@@ -24,7 +24,7 @@ class SerializerTest < ActiveSupport::TestCase
       assert_equal @original_fluxor_attributes, YAML.load(@fluxor.versions[1].object)
       # This test can't consistently pass in Ruby1.8 because hashes do no preserve order, which means the order of the
       # attributes in the `YAML` can't be ensured.
-      if RUBY_VERSION.to_f >= 1.9
+      if RUBY_VERSION >= '1.9'
         assert_equal YAML.dump(@original_fluxor_attributes), @fluxor.versions[1].object
       end
     end
@@ -59,7 +59,7 @@ class SerializerTest < ActiveSupport::TestCase
       assert_equal @original_fluxor_attributes, ActiveSupport::JSON.decode(@fluxor.versions[1].object)
       # This test can't consistently pass in Ruby1.8 because hashes do no preserve order, which means the order of the
       # attributes in the JSON can't be ensured.
-      if RUBY_VERSION.to_f >= 1.9
+      if RUBY_VERSION >= '1.9'
         assert_equal ActiveSupport::JSON.encode(@original_fluxor_attributes), @fluxor.versions[1].object
       end
     end
@@ -101,7 +101,7 @@ class SerializerTest < ActiveSupport::TestCase
       assert_equal @original_fluxor_attributes, ActiveSupport::JSON.decode(@fluxor.versions[1].object)
       # This test can't consistently pass in Ruby1.8 because hashes do no preserve order, which means the order of the
       # attributes in the JSON can't be ensured.
-      if RUBY_VERSION.to_f >= 1.9
+      if RUBY_VERSION >= '1.9'
         assert_equal ActiveSupport::JSON.encode(@original_fluxor_attributes), @fluxor.versions[1].object
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paper_trail
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta1
+  version: 4.0.0.beta2
 platform: ruby
 authors:
 - Andy Stewart
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-30 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord