acts_as_journalized 0.0.2 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d506e23a40b3c83e33a0f05e57154ef7d0eab07e
-  data.tar.gz: 1afe44e8edbfdd2a9b455311fb6ce506383eb63b
+  metadata.gz: 7c8d10075caaaf4ad7612322b5c8ded7da4ad3d0
+  data.tar.gz: 953e82d6ed62d7acf4102c28a847b936c027de80
 SHA512:
-  metadata.gz: d468aa5e3988a6883d93a3a737eeb8d67521da84512281e4f8a3f0606f78374ddf13097633af361a4d955112c750f48fd3c706fd4db8ef55fcc4958bc537d384
-  data.tar.gz: 0382efc123e3c44c7000b77ad955b569aaa5dab2ab429ce549a2121c8640d1e417b1bbdb143bba29ccf5500a28f375484d94cd0d56fcc08f72500c860a4e3f17
+  metadata.gz: afa57502ebb75851067d7a86a759e0296a1a72ad584f29b4b64f85123e509cb6e8c4049fc47b0eed7ec1ca2320e51fc047b6183daaa227afd71440d1245ce857
+  data.tar.gz: b6d439583226d836d278c76b224d1841981434306b3b735e60320617d8ae8ab8e3d1bc78ac38e456e46b6cede0c4d9fc2a10e3bedd398888424dc1808049fd98

data/README.md

@@ -20,19 +20,19 @@ Or install it yourself as:
 
 ### Model
 
-class MyModel < ActiveRecord::Base
-    ...
-    acts_as_journalized
-    ...
-end
+    class MyModel < ActiveRecord::Base
+        ...
+        acts_as_journalized
+        ...
+    end
 
 Or
 
-class MyModel < ActiveRecord::Base
-    ...
-    acts_as_journalized name: 'journals', excepted_attributes: [:updated_at, :updated_on], find_options: {}
-    ...
-end
+    class MyModel < ActiveRecord::Base
+        ...
+        acts_as_journalized name: 'journals', excepted_attributes: [:updated_at, :updated_on], find_options: {}
+        ...
+    end
 
 ## Contributing
 

data/acts_as_journalized.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Roman Shipiev']
   spec.email         = ['roman@shipiev.pro']
   spec.summary       = %q{Plug-in for Redmine}
-  spec.description   = %q{Used for tracking and recording changes in model attributes}
-  spec.homepage      = 'https://github.com/rubynovich/acts_as_journalized'
+  spec.description   = %q{Plug-in uses for tracking and recording changes of attributes in model}
+  spec.homepage      = 'https://github.com/shipiev/acts_as_journalized'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -20,5 +20,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rails', '3.2.13'
+  spec.add_development_dependency 'rails', '~> 4.1.11'
 end

data/lib/acts_as_journalized/acts_as_journalized.rb

@@ -3,28 +3,51 @@ module Redmine
     module Journalized
       extend ActiveSupport::Concern
 
+      def journalized_attribute_names
+        self.class.journalized_attribute_names
+      end
+
       module ClassMethods
         def acts_as_journalized(options = {})
-          cattr_accessor :journalized_options
+          cattr_accessor :journalized_options, :journalized_attribute_names
+
+          options.assert_valid_keys(
+              :excepted_attributes,
+              :name,
+              :scope,
+              :find_options
+          )
 
-          options.assert_valid_keys(:excepted_attributes, :name, :find_options)
-          self.journalized_options = {
-              excepted_attributes: [:updated_at, :updated_on],
-              name: 'journals',
-              find_options: {}
-          }.merge(options)
+          excepted_attributes =
+              options.delete(:excepted_attributes) || %w(id updated_at updated_on)
 
-          find_options = {class_name: 'Journal', as: :journalized, dependent: :destroy}.
-              merge(self.journalized_options[:find_options])
+          self.journalized_attribute_names = column_names - excepted_attributes
 
-          has_many self.journalized_options[:name].to_sym, find_options
+          self.journalized_options =
+              {
+                  name: 'journals',
+                  scope: -> { all },
+                  find_options: {}
+              }.merge(options)
+
+          find_options =
+              {
+                  class_name: 'Journal',
+                  as: :journalized,
+                  dependent: :destroy
+              }.merge(journalized_options[:find_options])
 
           send :include, Redmine::Acts::Journalized::Callbacks
 
-          before_update :journalize_attributes
+          has_many journalized_options[:name].to_sym,
+                   journalized_options[:scope],
+                   find_options
+
+          after_create :create_journal_on_create
+          after_update :create_journal_on_update
         end
       end
 
     end
   end
-end
+end

data/lib/acts_as_journalized/callbacks.rb

@@ -5,23 +5,32 @@ module Redmine
         extend ActiveSupport::Concern
 
         def init_journal(user = User.current, notes = '')
-          @journal ||= send(self.journalized_options[:name]).build(user: user, notes: notes)
+          @journal ||= Journal.new(journalized: self, user: user, notes: notes)
         end
 
-        def excepted_attributes
-          self.class.journalized_options[:excepted_attributes]
+        def create_journal_on_create
+          if @journal
+            @journal.save
+          end
         end
 
-        def journalize_attributes(user = User.current, notes = '')
-          init_journal(user, notes)
-          changes.except(*excepted_attributes).each_pair do |column, values|
-            @journal.details.build(property: 'attr', prop_key: column, old_value: values.first, value: values.last)
+        def create_journal_on_update
+          if @journal && @journal.changed?
+            @journal.save
+          else
+            journalized_changes =
+                changes.slice(
+                    *self.class.journalized_attribute_names
+                )
+            if journalized_changes.present?
+              init_journal
+              journalized_changes.each_pair do |column, values|
+                @journal.details.build(property: 'attr', prop_key: column, old_value: values.first, value: values.last)
+              end
+              @journal.save
+            end
           end
         end
-
-        private :journalize_attributes, :excepted_attributes
-
-        module ClassMethods; end
       end
     end
   end

data/lib/acts_as_journalized/version.rb

@@ -1,3 +1,3 @@
 module ActsAsJournalized
-  VERSION = '0.0.2'
+  VERSION = '3.3.0'
 end

metadata

@@ -1,65 +1,65 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_journalized
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 3.3.0
 platform: ruby
 authors:
 - Roman Shipiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
+date: 2017-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 4.1.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.13
-description: Used for tracking and recording changes in model attributes
+        version: 4.1.11
+description: Plug-in uses for tracking and recording changes of attributes in model
 email:
 - roman@shipiev.pro
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -69,7 +69,7 @@ files:
 - lib/acts_as_journalized/acts_as_journalized.rb
 - lib/acts_as_journalized/callbacks.rb
 - lib/acts_as_journalized/version.rb
-homepage: https://github.com/rubynovich/acts_as_journalized
+homepage: https://github.com/shipiev/acts_as_journalized
 licenses:
 - MIT
 metadata: {}
@@ -79,19 +79,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Plug-in for Redmine
 test_files: []
-has_rdoc: