mongoid-audit 0.3.2 → 1.0.0.alpha.1

data/lib/mongoid-audit/railtie.rb

@@ -1,18 +1,8 @@
-module Mongoid
-  module Audit
-    class Railtie < Rails::Railtie
-      initializer "instantiate observers" do
-        config.after_initialize do
-          ::Mongoid::Audit.tracker_class.add_observer( ::Mongoid::Audit::Sweeper.instance )
-          # install model observer and action controller filter
-          if defined?(ActionController) and defined?(ActionController::Base)
-            ActionController::Base.class_eval do
-              before_filter { |controller| ::Mongoid::Audit::Sweeper.instance.before(controller) }
-              after_filter { |controller| ::Mongoid::Audit::Sweeper.instance.after(controller) }
-            end
-          end
-        end
-      end
+module Mongoid::Audit
+  class Railtie < Rails::Railtie
+    initializer "mongoid_audit.setup" do
+      #require_dependency 'history_tracker.rb' if Rails.env.development?
     end
   end
-end
+end
+

data/lib/mongoid-audit/trackable.rb

@@ -1,264 +1,14 @@
-module Mongoid::Audit
-  module Trackable
-    extend ActiveSupport::Concern
-
-    module ClassMethods
-      def track_history(options={})
-        scope_name = self.collection_name.to_s.singularize.to_sym
-        default_options = {
-          :on             =>  :all,
-          :except         =>  [],
-          :modifier_field =>  :modifier,
-          :version_field  =>  :version,
-          :scope          =>  scope_name,
-          :track_create   =>  false,
-          :track_update   =>  true,
-          :track_destroy  =>  false,
-        }
-
-        options = default_options.merge(options)
-
-        # normalize except fields
-        # manually ensure _id, id, version will not be tracked in history
-        options[:except] = [options[:except]] unless options[:except].is_a? Array
-        options[:except] << options[:version_field]
-        options[:except] += [:created_at, :updated_at, :deleted_at, :c_at, :u_at]
-        options[:except] << "#{options[:modifier_field]}_id".to_sym
-        options[:except] += [:_id, :id]
-        options[:except] = options[:except].map(&:to_s).flatten.compact.uniq
-        options[:except].map(&:to_s)
-
-        # normalize fields to track to either :all or an array of strings
-        if options[:on] != :all
-          options[:on] = [options[:on]] unless options[:on].is_a? Array
-          options[:on] = options[:on].map(&:to_s).flatten.uniq
-        end
-
-        field options[:version_field].to_sym, :type => Integer
-        belongs_to options[:modifier_field].to_sym, :class_name => Mongoid::Audit.modifier_class_name, inverse_of: nil
-
-        include MyInstanceMethods
-        extend SingletonMethods
-
-        delegate :history_trackable_options, :to => 'self.class'
-        delegate :track_history?, :to => 'self.class'
-
-        before_update :track_update if options[:track_update]
-        before_create :track_create if options[:track_create]
-        before_destroy :track_destroy if options[:track_destroy]
-
-        Mongoid::Audit.trackable_class_options ||= {}
-        Mongoid::Audit.trackable_class_options[scope_name] = options
-      end
-
-      def track_history?
-        enabled = Thread.current[track_history_flag]
-        enabled.nil? ? true : enabled
-      end
-
-      def disable_tracking(&block)
-        begin
-          Thread.current[track_history_flag] = false
-          yield
-        ensure
-          Thread.current[track_history_flag] = true
-        end
-      end
-
-      def track_history_flag
-        "mongoid_history_#{self.name.underscore}_trackable_enabled".to_sym
-      end
-    end
-
-    module MyInstanceMethods
-      def history_tracks
-        @history_tracks ||= Mongoid::Audit.tracker_class.where(:scope => history_trackable_options[:scope], :association_chain => association_hash)
-      end
-
-      #  undo :from => 1, :to => 5
-      #  undo 4
-      #  undo :last => 10
-      def undo!(modifier, options_or_version=nil)
-        versions = get_versions_criteria(options_or_version).to_a
-        versions.sort!{|v1, v2| v2.version <=> v1.version}
-
-        versions.each do |v|
-          undo_attr = v.undo_attr(modifier)
-          self.attributes = v.undo_attr(modifier)
-        end
-        save!
-      end
-
-      def redo!(modifier, options_or_version=nil)
-        versions = get_versions_criteria(options_or_version).to_a
-        versions.sort!{|v1, v2| v1.version <=> v2.version}
-
-        versions.each do |v|
-          redo_attr = v.redo_attr(modifier)
-          self.attributes = redo_attr
-        end
-        save!
-      end
-
-    private
-      def get_versions_criteria(options_or_version)
-        if options_or_version.is_a? Hash
-          options = options_or_version
-          if options[:from] && options[:to]
-            lower = options[:from] >= options[:to] ? options[:to] : options[:from]
-            upper = options[:from] <  options[:to] ? options[:to] : options[:from]
-            versions = history_tracks.where( :version.in => (lower .. upper).to_a )
-          elsif options[:last]
-            versions = history_tracks.limit( options[:last] )
-          else
-            raise "Invalid options, please specify (:from / :to) keys or :last key."
-          end
-        else
-          options_or_version = options_or_version.to_a if options_or_version.is_a?(Range)
-          version_field_name = history_trackable_options[:version_field]
-          version = options_or_version || self.attributes[version_field_name] || self.attributes[version_field_name.to_s]
-          version = [ version ].flatten
-          versions = history_tracks.where(:version.in => version)
-        end
-        versions.desc(:version)
-      end
-
-      def should_track_update?
-        track_history? && !modified_attributes_for_update.blank?
-      end
-
-      def traverse_association_chain(node=self)
-        list = node._parent ? traverse_association_chain(node._parent) : []
-        list << association_hash(node)
-        list
-      end
-
-      def association_hash(node=self)
-
-        # We prefer to look up associations through the parent record because
-        # we're assured, through the object creation, it'll exist. Whereas we're not guarenteed
-        # the child to parent (embedded_in, belongs_to) relation will be defined
-        if node._parent
-          meta = _parent.relations.values.select do |relation|
-            relation.class_name == node.class.to_s
-          end.first
-        end
-
-        # if root node has no meta, and should use class name instead
-        name = meta ? meta.key.to_s : node.class.name
-
-        { 'name' => name, 'id' => node.id}
-      end
-
-      def modified_attributes_for_update
-        @modified_attributes_for_update ||= if history_trackable_options[:on] == :all
-          changes.reject do |k, v|
-            history_trackable_options[:except].include?(k)
-          end
-        else
-          changes.reject do |k, v|
-            !history_trackable_options[:on].include?(k)
-          end
-
-        end
-      end
-
-      def modified_attributes_for_create
-        @modified_attributes_for_create ||= attributes.inject({}) do |h, pair|
-          k,v =  pair
-          h[k] = [nil, v]
-          h
-        end.reject do |k, v|
-          history_trackable_options[:except].include?(k)
-        end
-      end
-
-      def modified_attributes_for_destroy
-        @modified_attributes_for_destroy ||= attributes.inject({}) do |h, pair|
-          k,v =  pair
-          h[k] = [nil, v]
-          h
-        end
-      end
-
-      def history_tracker_attributes(method)
-        return @history_tracker_attributes if @history_tracker_attributes
-
-        @history_tracker_attributes = {
-          :association_chain  => traverse_association_chain,
-          :scope              => history_trackable_options[:scope],
-          :modifier           => send("#{history_trackable_options[:modifier_field].to_s}_id_changed?".to_sym) ? send(history_trackable_options[:modifier_field]) : nil,
-        }
-
-        original, modified = transform_changes(case method
-          when :destroy then modified_attributes_for_destroy
-          when :create then modified_attributes_for_create
-          else modified_attributes_for_update
-        end)
-
-        @history_tracker_attributes[:original] = original
-        @history_tracker_attributes[:modified] = modified
-        @history_tracker_attributes
-      end
-
-      def track_update
-        return unless should_track_update?
-        current_version = (self.send(history_trackable_options[:version_field]) || 0 ) + 1
-        self.send("#{history_trackable_options[:version_field]}=", current_version)
-
-        track = Mongoid::Audit.tracker_class.create!(history_tracker_attributes(:update).merge(:version => current_version, :action => "update", :trackable => self))
-
-        self.send("#{history_trackable_options[:modifier_field]}=", track.modifier)
-
-        clear_memoization
-      end
-
-      def track_create
-        return unless track_history?
-        current_version = (self.send(history_trackable_options[:version_field]) || 0 ) + 1
-        self.send("#{history_trackable_options[:version_field]}=", current_version)
-
-        track = Mongoid::Audit.tracker_class.create!(history_tracker_attributes(:create).merge(:version => current_version, :action => "create", :trackable => self))
-        self.send("#{history_trackable_options[:modifier_field]}=", track.modifier)
-
-        clear_memoization
-      end
-
-      def track_destroy
-        return unless track_history?
-        current_version = (self.send(history_trackable_options[:version_field]) || 0 ) + 1
-
-        track = Mongoid::Audit.tracker_class.create!(history_tracker_attributes(:destroy).merge(:version => current_version, :action => "destroy", :trackable => self))
-        self.send("#{history_trackable_options[:modifier_field]}=", track.modifier)
-
-        clear_memoization
-      end
-
-      def clear_memoization
-        @history_tracker_attributes =  nil
-        @modified_attributes_for_create = nil
-        @modified_attributes_for_update = nil
-        @history_tracks = nil
-      end
-
-      def transform_changes(changes)
-        original = {}
-        modified = {}
-        changes.each_pair do |k, v|
-          o, m = v
-          original[k] = o unless o.nil?
-          modified[k] = m unless m.nil?
-        end
-
-        original.easy_diff modified
-      end
-
-    end
-
-    module SingletonMethods
-      def history_trackable_options
-        @history_trackable_options ||= Mongoid::Audit.trackable_class_options[self.collection_name.to_s.singularize.to_sym]
-      end
-    end
+module Trackable
+  extend ActiveSupport::Concern
+  include Mongoid::History::Trackable
+  included do
+    track_history({
+      track_create: true,
+      track_destroy: true,
+      track_update: true,
+      modifier_field: :updater,
+      except: ["created_at", "updated_at", "c_at", "u_at"],
+    })
   end
 end
+

data/lib/mongoid-audit/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Audit
-    VERSION = "0.3.2"
+    VERSION = "1.0.0.alpha.1"
   end
 end

data/mongoid-audit.gemspec

@@ -17,14 +17,13 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'easy_diff', '~> 0.0.2'
-  gem.add_dependency 'mongoid', '~> 4.0.0.alpha1'
-  gem.add_dependency 'rails-observers', '~> 0.1.2'
+  gem.add_dependency 'mongoid', '~> 4.0.0'
+  gem.add_dependency 'mongoid-history', '~> 0.4.4'
+  gem.add_dependency 'activesupport'
+  gem.add_dependency 'kaminari'
+  gem.add_dependency 'glebtv_mongoid_userstamp'
 
-  gem.add_development_dependency "bundler", "~> 1.3"
+  gem.add_development_dependency "bundler"
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec"
-  gem.add_development_dependency "database_cleaner"
-  gem.add_development_dependency "coveralls"
-  gem.add_development_dependency "activesupport", '~> 4.0.0'
 end
+

metadata

@@ -1,141 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-audit
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 1.0.0.alpha.1
 platform: ruby
 authors:
 - Gleb Tv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-03 00:00:00.000000000 Z
+date: 2014-08-12 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: easy_diff
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.alpha1
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.alpha1
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
-  name: rails-observers
+  name: mongoid-history
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: glebtv_mongoid_userstamp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: bundler
   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: activesupport
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
 description: Mongoid Audit
 email:
 - glebtv@gmail.com
@@ -143,33 +115,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .rspec
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - config/mongoid.yml
 - gemfiles/mongoid-4.0.gemfile
 - lib/mongoid-audit.rb
-- lib/mongoid-audit/mongoid_observer.rb
+- lib/mongoid-audit/history_tracker.rb
 - lib/mongoid-audit/rails_admin.rb
 - lib/mongoid-audit/railtie.rb
-- lib/mongoid-audit/sweeper.rb
 - lib/mongoid-audit/trackable.rb
-- lib/mongoid-audit/tracker.rb
 - lib/mongoid-audit/version.rb
 - mongoid-audit.gemspec
-- spec/integration/integration_spec.rb
-- spec/spec_helper.rb
-- spec/support/database_cleaner.rb
-- spec/support/mongoid.rb
-- spec/trackable_spec.rb
-- spec/tracker_spec.rb
 homepage: https://github.com/rs-pro/mongoid-audit
 licenses: []
 metadata: {}
@@ -179,24 +141,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'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Easily track model change history and mantain audit log with mongoid
-test_files:
-- spec/integration/integration_spec.rb
-- spec/spec_helper.rb
-- spec/support/database_cleaner.rb
-- spec/support/mongoid.rb
-- spec/trackable_spec.rb
-- spec/tracker_spec.rb
+test_files: []