deleted_at 0.3.0 → 0.4.0rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8a972a99558a55757fd3a8246f87b5ac0bc94308
-  data.tar.gz: 82771e5aea1cb90ec9d97bc1c7855c17f34d755e
+SHA256:
+  metadata.gz: c164168eb496804835ab5f48676d72a12fb549dccb649b0249355403db9b5b7e
+  data.tar.gz: 6e684b4ef6a4146f40b6a0684b5aa18df975894df8da62ec62907d34bece3ec9
 SHA512:
-  metadata.gz: 929ab80f479d1a37400d45232c357474038e2ffb0d55599c761ecee6f327104695bd00ae47bd93ddb41c41104d99a5de5384069900a57b8c7e7b311b60047f22
-  data.tar.gz: f7f73d1d179a03e468cd458bf3404b7e1c2b1116ac9e12ed4183725035d00696d0739457bee0fb865072b5cc18c5a3e7439928e016892b697612def031a31598
+  metadata.gz: f16daa013ef9ba2c06a42dea4ed2cd1d3e4008d419daa987aa01224408c1a11dd2d38ad93c5685119acfc28b46db4de240ff66ab93a629a7feec2dc632ddf905
+  data.tar.gz: 916c6f5c3e8cf4ebabcb628b23e4015fb16f3c83eb57ef5c393bdfafdb16973149dbedafcf3cfba593bd68f7da6f6dd39200c527ce3c9555fec88d303081bcd2

data/.gitignore

@@ -1,16 +1,78 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-*.bundle
-*.so
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile ~/.gitignore_global
+
+# Database config and secrets
+/config/database.yml
+/config/secrets.yml
+
+# Ignore bundler config
+/.bundle
+
+# Ignore client credentials
+/config/client_api_credentials.yml
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+
+# Ignore all logfiles and tempfiles.
+/log/*.log
+/tmp
+/db/structure.sql
+/doc/app/*
+/vendor/cldr/*
+/public/uploads/*
+/public/photo/*
+/public/test/*
+/test/assets/*
+/spec/assets/*
+/public/assets/**
+.powenv
+.rvmrc
+.env
+.ruby-version
+
+# Compiled source #
+###################
+/build/
+*.com
+*.class
+*.dll
+*.exe
 *.o
-*.a
-*.DS_Store
-.editorconfig
-mkmf.log
+*.so
+
+# Packages #
+############
+# it's better to unpack these files and commit the raw source
+# git has its own built in compression methods
+*.7z
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+
+# Logs and databases #
+######################
+*.log
+*.sql
+*.sqlite
+
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+Icon?
+ehthumbs.db
+Thumbs.db
+/Gemfile.lock
+/coverage
+/.editorconfig

data/.travis.yml

@@ -1,19 +1,43 @@
 language: ruby
 sudo: false
-rvm:
-  - 2.0
-  - 2.1
-  - 2.2
-  - 2.3.1
-  - 2.4.0
+
 cache: bundler
 script:
   - bundle exec rspec
-services:
-    - postgresql
+
+after_success:
+  - bundle exec codeclimate-test-reporter
+
 addons:
-  postgresql: "9.1"
+  postgresql: "9.3"
+
+rvm:
+  - 2.4
+  - 2.3
+  - 2.2
+  - 2.1
+  - 2.0
+
+gemfile:
+  - gemfiles/activerecord-5.1.Gemfile
+  - gemfiles/activerecord-5.0.Gemfile
+  - gemfiles/activerecord-4.2.Gemfile
+  - gemfiles/activerecord-4.1.Gemfile
+  - gemfiles/activerecord-4.0.Gemfile
+
+matrix:
+  exclude:
+  - rvm: 2.0
+    gemfile: gemfiles/activerecord-5.0.Gemfile
+  - rvm: 2.0
+    gemfile: gemfiles/activerecord-5.1.Gemfile
+
+  - rvm: 2.1
+    gemfile: gemfiles/activerecord-5.0.Gemfile
+  - rvm: 2.1
+    gemfile: gemfiles/activerecord-5.1.Gemfile
 
-env:
-  - RSPEC_VERSION="<2.99"
-  - RSPEC_VERSION="~>3.0
+  - rvm: 2.4
+    gemfile: gemfiles/activerecord-4.0.Gemfile
+  - rvm: 2.4
+    gemfile: gemfiles/activerecord-4.1.Gemfile

data/Gemfile

@@ -1,4 +1,19 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in deleted_at.gemspec
 gemspec
+
+group :test do
+
+  # Generates coverage stats of specs
+  gem 'simplecov'
+
+  # Publishes coverage to codeclimate
+  gem 'codeclimate-test-reporter'
+
+  gem 'rspec'
+
+  gem 'database_cleaner'
+
+  gem 'combustion'
+
+end

data/README.md

@@ -1,4 +1,9 @@
-# DeletedAt [![Build Status](https://travis-ci.org/TwilightCoders/deleted_at.svg?branch=master)](https://travis-ci.org/TwilightCoders/deleted_at) [![Code Climate](https://codeclimate.com/github/TwilightCoders/deleted_at/badges/gpa.svg)](https://codeclimate.com/github/TwilightCoders/deleted_at) [![Test Coverage](https://codeclimate.com/github/TwilightCoders/deleted_at/badges/coverage.svg)](https://codeclimate.com/github/TwilightCoders/deleted_at/coverage)
+[![Version      ](https://img.shields.io/gem/v/deleted_at.svg?maxAge=2592000)](https://rubygems.org/gems/deleted_at)
+[![Build Status ](https://travis-ci.org/TwilightCoders/deleted_at.svg)](https://travis-ci.org/TwilightCoders/deleted_at)
+[![Code Climate ](https://api.codeclimate.com/v1/badges/762cdcd63990efa768b0/maintainability)](https://codeclimate.com/github/TwilightCoders/deleted_at)
+[![Test Coverage](https://codeclimate.com/github/TwilightCoders/deleted_at/badges/coverage.svg)](https://codeclimate.com/github/TwilightCoders/deleted_at/coverage)
+
+# DeletedAt
 
 Deleting data is never good. A common solution is to use `default_scope`, but conventional wisdom (and for good reason) deams this a bad practice. So how do we achieve the same effect with minimal intervention. What we're looking for is the cliche "clean" solution.
 

data/Rakefile

@@ -1,6 +1,6 @@
 require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new
 
-task :default => :spec
+task default: :spec

data/deleted_at.gemspec

@@ -22,24 +22,21 @@ Gem::Specification.new do |spec|
     raise 'RubyGems 2.0 or newer is required to protect against public gem pushes.'
   end
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
-
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.bindir        = 'bin'
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ['lib', 'spec']
 
-  rails_versions = ['>= 4.1', '< 5']
-  spec.required_ruby_version = '>= 2.0.0'
+  rails_versions = ['>= 4', '< 6']
+  spec.required_ruby_version = '>= 2.0'
 
   spec.add_runtime_dependency 'pg', '~> 0'
-  spec.add_runtime_dependency "activerecord", rails_versions
-
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "pry", "~> 0.10"
-  spec.add_development_dependency "simplecov", ['>= 0.9.0', '<1.0.0']
-  spec.add_development_dependency "codeclimate-test-reporter", "~> 1.0"
+  spec.add_runtime_dependency 'activerecord', rails_versions
+
+  spec.add_development_dependency 'pry-byebug', '~> 3'
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'combustion', '~> 0.7'
+
 end

data/gemfiles/activerecord-4.0.Gemfile

@@ -0,0 +1,3 @@
+eval_gemfile File.join(File.dirname(__FILE__), "../Gemfile")
+
+gem 'activerecord', '~> 4.0.0'

data/gemfiles/activerecord-4.1.Gemfile

@@ -0,0 +1,3 @@
+eval_gemfile File.join(File.dirname(__FILE__), "../Gemfile")
+
+gem 'activerecord', '~> 4.1.0'

data/gemfiles/activerecord-4.2.Gemfile

@@ -0,0 +1,3 @@
+eval_gemfile File.join(File.dirname(__FILE__), "../Gemfile")
+
+gem 'activerecord', '~> 4.2.0'

data/gemfiles/activerecord-5.0.Gemfile

@@ -0,0 +1,3 @@
+eval_gemfile File.join(File.dirname(__FILE__), "../Gemfile")
+
+gem 'activerecord', '~> 5.0.0'

data/gemfiles/activerecord-5.1.Gemfile

@@ -0,0 +1,3 @@
+eval_gemfile File.join(File.dirname(__FILE__), "../Gemfile")
+
+gem 'activerecord', '~> 5.1.0'

data/lib/deleted_at.rb

@@ -2,17 +2,32 @@ require "deleted_at/version"
 require 'deleted_at/views'
 require 'deleted_at/active_record/base'
 require 'deleted_at/active_record/relation'
+require 'deleted_at/active_record/connection_adapters/abstract/schema_definition'
 
 require 'deleted_at/railtie' if defined?(Rails::Railtie)
 
 module DeletedAt
 
+  class << self
+    attr_writer :logger
+
+    def logger
+      @logger ||= Logger.new($stdout).tap do |log|
+        log.progname = self.name
+        log.level = Logger::INFO
+      end
+    end
+  end
+
   def self.load
-    ::ActiveRecord::Relation.send :include, DeletedAt::ActiveRecord::Relation
+    ::ActiveRecord::Relation.send :prepend, DeletedAt::ActiveRecord::Relation
     ::ActiveRecord::Base.send :include, DeletedAt::ActiveRecord::Base
+    ::ActiveRecord::ConnectionAdapters::TableDefinition.send :prepend, DeletedAt::ActiveRecord::ConnectionAdapters::TableDefinition
   end
 
   def self.install(model)
+    return false unless model.has_deleted_at_column?
+
     DeletedAt::Views.install_present_view(model)
     DeletedAt::Views.install_deleted_view(model)
 
@@ -22,11 +37,17 @@ module DeletedAt
   end
 
   def self.uninstall(model)
+    return false unless model.has_deleted_at_column?
+
     DeletedAt::Views.uninstall_deleted_view(model)
     DeletedAt::Views.uninstall_present_view(model)
 
     # We've removed the database views, now remove the class extensions
-    model.remove_class_views
+    DeletedAt::ActiveRecord::Base.remove_class_views(model)
+  end
+
+  def self.testify(value)
+    value == true || value == 't' || value == 1 || value == '1'
   end
 
   private

data/lib/deleted_at/active_record/base.rb

@@ -7,125 +7,61 @@ module DeletedAt
       extend ActiveSupport::Concern
 
       included do
-        class_attribute :deleted_at_column, :original_table_name,
-          :deleted_by_column, :deleted_by_class, :deleted_by_primary_key
-
-        class << self
-          [:archive_with_deleted_at?, :archive_with_deleted_by?].each do |sym|
-            define_method(sym) do
-              false
-            end
-          end
-        end
+        class_attribute :archive_with_deleted_at
+        class_attribute :deleted_at_column
 
+        self.archive_with_deleted_at = false
       end
 
       module ClassMethods
 
         def with_deleted_at(options={})
 
-          return warn("No DB connection found; skipping deleted_at initialization") unless ::ActiveRecord::Base.connected?
+          DeletedAt::ActiveRecord::Base.parse_options(self, options)
 
-          parse_options(options)
-
-          unless ::DeletedAt::Views.all_table_exists?(self) && ::DeletedAt::Views.deleted_view_exists?(self)
-            return warn("You're trying to use `with_deleted_at` on #{name} but you have not installed the views, yet.")
-          end
-
-          unless columns.map(&:name).include?(deleted_at_column)
-            return warn("Missing `#{deleted_at_column}` in `#{name}` when trying to employ `deleted_at`")
-          end
-
-          [:archive_with_deleted_at?, :archive_with_deleted_by?].each do |sym|
-            class_eval <<-BBB
-              def self.#{sym}
-                true
-              end
-            BBB
-          end
+          return DeletedAt.logger.warn("You're trying to use `with_deleted_at` on #{name} but you have not installed the views, yet.") unless
+            has_deleted_at_views?
 
+          return DeletedAt.logger.warn("Missing `#{deleted_at_column}` in `#{name}` when trying to employ `deleted_at`") unless
+            has_deleted_at_column?
 
           # We are confident at this point that the tables and views have been setup.
           # We need to do a bit of wizardy by setting the table name to the actual table
           # (at this point: model/all), such that the model has all the information
-          # regarding its structure and intended behavior. Calling primary_key loads the
-          # table data into the class.
-          self.original_table_name = self.table_name
-          self.table_name = ::DeletedAt::Views.all_table(self)
-          primary_key = self.primary_key
-          self.table_name = self.original_table_name
-
-          setup_class_views
-          with_deleted_by
-        end
+          # regarding its structure and intended behavior. (e.g. setting primary key)
+          DeletedAt::Views.while_spoofing_table_name(self, ::DeletedAt::Views.all_table(self)) do
+            reset_primary_key
+          end
 
-        def remove_class_views
-          self.send(:remove_const, :All) if self.const_defined?(:All)
-          self.send(:remove_const, :Deleted) if self.const_defined?(:Deleted)
+          DeletedAt::ActiveRecord::Base.setup_class_views(self)
         end
 
-        private
 
-        def parse_options(options)
-          self.deleted_at_column      = (options.try(:[], :deleted_at).try(:[], :column) || :deleted_at).to_s
-          self.deleted_by_column      = (options.try(:[], :deleted_by).try(:[], :column) || :deleted_by).to_s
-          self.deleted_by_class       = (options.try(:[], :deleted_by).try(:[], :class) || User)
-          self.deleted_by_primary_key = (options.try(:[], :deleted_by).try(:[], :primary_key) || deleted_by_class.try(:primary_key)).to_s
-        end
 
-        def deleted_by_class_is_delete_at(klass)
-          klass && (klass.archive_with_deleted_at? || self == klass)
+        def has_deleted_at_column?
+          columns.map(&:name).include?(deleted_at_column)
         end
 
-        def with_deleted_by
-          return unless (deleted_by_column && columns.map(&:name).include?(deleted_by_column) && deleted_by_class < ActiveRecord::Base)
-          self.deleted_by_class       = self.deleted_by_class.const_get(:All) if deleted_by_class_is_delete_at(self.deleted_by_class)
-
-          unless reflect_on_association(:destroyer)
-            class_eval do
-              belongs_to :destroyer, foreign_key: deleted_by_column, primary_key: deleted_by_primary_key, class_name: deleted_by_class.name
-            end
-          end
+        def has_deleted_at_views?
+          ::DeletedAt::Views.all_table_exists?(self) && ::DeletedAt::Views.deleted_view_exists?(self)
         end
 
-        def refactor_validators
-          validators.each do |validator|
-            case validator
-            when ActiveRecord::Validations::UniquenessValidator
+        def deleted_at_attributes
+          attributes = {
+            deleted_at_column => Time.now.utc
+          }
 
-            end
-          end
-        end
 
-        def setup_class_views
-          self.const_set(:All, Class.new(self) do |klass|
-            class_eval <<-AAA
-              self.table_name = '#{::DeletedAt::Views.all_table(klass)}'
-            AAA
-          end)
-
-          self.const_set(:Deleted, Class.new(self) do |klass|
-            class_eval <<-AAA
-              self.table_name = '#{::DeletedAt::Views.deleted_view(klass)}'
-            AAA
-          end)
+          attributes
         end
 
-      end
-
-      [:archive_with_deleted_at?, :archive_with_deleted_by?].each do |sym|
-        class_eval <<-BBB
-          def #{sym}
-            self.class.#{sym}
-          end
-        BBB
-      end
+      end # End ClassMethods
 
       def destroy
-        if archive_with_deleted_at?
+        if self.archive_with_deleted_at?
           with_transaction_returning_status do
             run_callbacks :destroy do
-              update_columns(deleted_at_attributes)
+              update_columns(self.class.deleted_at_attributes)
               self
             end
           end
@@ -134,28 +70,33 @@ module DeletedAt
         end
       end
 
-      private
-
-      def deleted_at_attributes
-        attributes = {
-          deleted_at_column => Time.now.utc
-        }
-
-        # attributes.merge({
-        #   deleted_by_column => DeletedAt::who_by
-        # }) if by_who?
-
-        attributes
+      def self.remove_class_views(model)
+        model.archive_with_deleted_at = false
+        model.send(:remove_const, :All) if model.const_defined?(:All)
+        model.send(:remove_const, :Deleted) if model.const_defined?(:Deleted)
       end
 
-      def deleted_at_column
-        self.class.deleted_at_column
+      def self.parse_options(model, options)
+        model.deleted_at_column      = (options.try(:[], :deleted_at).try(:[], :column) || :deleted_at).to_s
       end
 
-      def deleted_by_column
-        self.class.deleted_by_column
+
+      def self.setup_class_views(model)
+        model.archive_with_deleted_at = true
+        model.const_set(:All, Class.new(model) do |klass|
+          class_eval <<-AAA
+            self.table_name = '#{::DeletedAt::Views.all_table(klass)}'
+          AAA
+        end)
+
+        model.const_set(:Deleted, Class.new(model) do |klass|
+          class_eval <<-AAA
+            self.table_name = '#{::DeletedAt::Views.deleted_view(klass)}'
+          AAA
+        end)
       end
 
     end
+
   end
 end