logidze 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 309c5da695723e3a3f1c6e73b5c9ba71826880a8
-  data.tar.gz: bab3825e840c655022920bea787059d156643114
+  metadata.gz: 954f27b8037b7a3a1f73ab87ef9358ede18b273c
+  data.tar.gz: 66f9848eda590c426b3bb7694cadf2bc6224fba0
 SHA512:
-  metadata.gz: 32fc59a0145c74c8334c6990f90481ddece3c3045d79119a260a33d65d6d9236ad54e567fd92dd74705bfb51dc52cea8d0c08356fa1426f15624316a1f6fc882
-  data.tar.gz: '080f5c26aa1d1559bdb97b11d141be46e08f6b22f1a1282c07410e75b5b92633aecb2c179490552d1a9e3b61aa113d7c46333e72a753eb80d079fbea1a87c729'
+  metadata.gz: fdca34e05f8021233e5b1663ccc773553725b6108728e1f407545dab153e917d0dc12c6ffebccc5a802fe576f51cedd653a89c93b281d7132682590bac5e1687
+  data.tar.gz: 024a6a76b6ea16bad9218a0a07b3c275dc629e353abf325630b9036c306e5a1da30d975ed1ae98d0f6dd164b980fc18d87397872f2f8e3e25daddedb1813db64

data/.rubocop.yml

@@ -1,3 +1,6 @@
+require:
+  - rubocop-md
+
 AllCops:
   # Include gemspec and Rakefile
   Include:
@@ -7,6 +10,8 @@ AllCops:
   Exclude:
     - 'bin/**/*'
     - 'spec/dummy/**/*'
+    - 'vendor/**/*'
+    - 'gemfiles/**/*'
     - 'tmp/**/*'
     - 'bench/**/*'
     - 'Rakefile'
@@ -45,6 +50,10 @@ Lint/AmbiguousRegexpLiteral:
 Lint/MissingCopEnableDirective:
   Enabled: false
 
+Lint/UselessAssignment:
+  Exclude:
+    - '**/*.md'
+
 Metrics/MethodLength:
   Exclude:
     - 'spec/**/*.rb'

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change log
 
+## master
+
+## 0.6.3 (2018-01-17)
+
+- [Fixes [#57](https://github.com/palkan/logidze/issues/57)] Support associations versioning for `at(version:)`. ([@palkan][])
+
+- Add [`rubocop-md`](https://github.com/palkan/rubocop-md)
+
 ## 0.6.2 (2018-01-11)
 
 - [Fixes [#53](https://github.com/palkan/logidze/issues/53)] Fix storing empty log entries with blacklisting. ([@charlie-wasp][])

data/README.md

@@ -20,15 +20,15 @@ Other requirements:
 
 ## Installation
 
-1. Add Logidze to your application's Gemfile:
+Add Logidze to your application's Gemfile:
 
 ```ruby
 gem 'logidze'
 ```
 
-2. Install required DB extensions and create trigger function:
+Install required DB extensions and create trigger function:
 
-```ruby
+```sh
 rails generate logidze:install
 ```
 
@@ -36,13 +36,13 @@ This creates migration for adding trigger function and enabling hstore extension
 
 Run migrations:
 
-```ruby
+```sh
 rake db:migrate
 ```
 
 3. Add log column and triggers to the model:
 
-```ruby
+```sh
 rails generate logidze:model Post
 rake db:migrate
 ```
@@ -51,19 +51,19 @@ This also adds `has_logidze` line to your model, which adds methods for working
 
 You can provide `limit` option to `generate` to limit the size of the log (by default it's unlimited):
 
-```ruby
+```sh
 rails generate logidze:model Post --limit=10
 ```
 
 To backfill table data (i.e. create initial snapshots) add `backfill` option:
 
-```ruby
+```sh
 rails generate logidze:model Post --backfill
 ```
 
 You can log only particular columns changes. There are mutually exclusive `blacklist` and `whitelist` options for this:
 
-```ruby
+```sh
 # track all columns, except `created_at` and `active`
 rails generate logidze:model Post --blacklist=created_at active
 # track only `title` and `body` columns
@@ -72,7 +72,7 @@ rails generate logidze:model Post --whitelist=title body
 
 By default, Logidze tries to infer the path to the model file from the model name and may fail, for example, if you have unconventional project structure. In that case you should specify the path explicitly:
 
-```ruby
+```sh
 rails generate logidze:model Post --path "app/models/custom/post.rb"
 ```
 
@@ -80,7 +80,7 @@ By default, Logidze tries to get a timestamp for a version from record's `update
 your model does not have that column, Logidze will gracefully fall back to `statement_timestamp()`.
 To change the column name or disable this feature completely, you can use the `timestamp_column` option:
 
-```ruby
+```sh
 # will try to get the timestamp value from `time` column
 rails generate logidze:model Post --timestamp_column time
 # will always set version timestamp to `statement_timestamp()`
@@ -89,7 +89,7 @@ rails generate logidze:model Post --timestamp_column nil # "null" and "false" wi
 
 If you want to update Logidze settings for the model, run migration with `--update` flag:
 
-```ruby
+```sh
 rails generate logidze:model Post --update --whitelist=title body rating
 ```
 
@@ -112,7 +112,7 @@ Nevertheless, you still need super-user privileges to enable `hstore` extension
 
 We try to make upgrade process as simple as possible. For now, the only required action is to create and run a migration:
 
-```ruby
+```sh
 rails generate logidze:install --update
 ```
 
@@ -232,7 +232,7 @@ And in your controller:
 
 ```ruby
 class ApplicationController < ActionController::Base
-  around_action :set_logidze_responsible, only: [:create, :update]
+  around_action :set_logidze_responsible, only: %i[create update]
 
   def set_logidze_responsible(&block)
     Logidze.with_responsible(current_user&.id, &block)

data/Rakefile

@@ -25,4 +25,4 @@ RSpec::Core::RakeTask.new("spec:acceptance") do |task|
 end
 
 desc "Run the specs and acceptance tests"
-task default: %w(spec spec:acceptance)
+task default: %w(rubocop spec spec:acceptance)

data/lib/logidze/has_logidze.rb

@@ -9,7 +9,7 @@ module Logidze
     module ClassMethods # :nodoc:
       # Include methods to work with history.
       #
-      # rubocop:disable Naming/PredicateName, Style/MixinUsage
+      # rubocop:disable Naming/PredicateName
       def has_logidze
         include Logidze::Model
       end

data/lib/logidze/model.rb

@@ -63,7 +63,7 @@ module Logidze
     # Return a dirty copy of record at specified time
     # If time/version is less then the first version, then return nil.
     # If time/version is greater then the last version, then return self.
-    # rubocop: disable Metrics/AbcSize, Metrics/MethodLength
+    # rubocop: disable Metrics/MethodLength
     def at(ts = nil, time: nil, version: nil)
       Deprecations.show_ts_deprecation_for("#at") if ts
 
@@ -79,16 +79,11 @@ module Logidze
         return self
       end
 
-      version = log_data.find_by_time(time).version
-
-      object_at = dup
-      object_at.apply_diff(version, log_data.changes_to(version: version))
-      object_at.id = id
-      object_at.logidze_requested_ts = time
+      log_entry = log_data.find_by_time(time)
 
-      object_at
+      build_dup(log_entry, time)
     end
-    # rubocop: enable Metrics/AbcSize, Metrics/MethodLength
+    # rubocop: enable Metrics/MethodLength
 
     # Revert record to the version at specified time (without saving to DB)
     def at!(ts = nil, time: nil, version: nil)
@@ -110,10 +105,11 @@ module Logidze
     # Return a dirty copy of specified version of record
     def at_version(version)
       return self if log_data.version == version
-      return nil unless log_data.find_by_version(version)
 
-      object_at = dup
-      object_at.apply_diff(version, log_data.changes_to(version: version))
+      log_entry = log_data.find_by_version(version)
+      return nil unless log_entry
+
+      build_dup(log_entry)
     end
 
     # Revert record to the specified version (without saving to DB)
@@ -176,12 +172,12 @@ module Logidze
 
       return association unless Logidze.associations_versioning
 
-      should_appply_logidze =
+      should_apply_logidze =
         logidze_past? &&
         association.klass.respond_to?(:has_logidze?) &&
         !association.singleton_class.include?(Logidze::VersionedAssociation)
 
-      return association unless should_appply_logidze
+      return association unless should_apply_logidze
 
       association.singleton_class.prepend Logidze::VersionedAssociation
 
@@ -210,6 +206,15 @@ module Logidze
       write_attribute column, deserialize_value(column, value)
     end
 
+    def build_dup(log_entry, requested_ts = log_entry.time)
+      object_at = dup
+      object_at.apply_diff(log_entry.version, log_data.changes_to(version: log_entry.version))
+      object_at.id = id
+      object_at.logidze_requested_ts = requested_ts
+
+      object_at
+    end
+
     if Rails::VERSION::MAJOR < 5
       def deserialize_value(column, value)
         @attributes[column].type.type_cast_from_database(value)

data/lib/logidze/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Logidze
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/logidze.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", ">= 10.0"
   spec.add_development_dependency "rspec-rails", ">= 3.4"
   spec.add_development_dependency "rubocop", "~> 0.52"
+  spec.add_development_dependency "rubocop-md", "~> 0.2.0"
   spec.add_development_dependency "simplecov", ">= 0.3.8"
   spec.add_development_dependency "timecop", "~> 0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logidze
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - palkan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-11 00:00:00.000000000 Z
+date: 2018-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.52'
+- !ruby/object:Gem::Dependency
+  name: rubocop-md
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement