deleted_at 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe6592ed1a35b5a853b2ddb9a57df2a4e14b5a96
-  data.tar.gz: a4e1a56146b2e21dbe52036f006dc0e53596b211
+  metadata.gz: 8a972a99558a55757fd3a8246f87b5ac0bc94308
+  data.tar.gz: 82771e5aea1cb90ec9d97bc1c7855c17f34d755e
 SHA512:
-  metadata.gz: 6599819c33f9c713d1404e849f6857d2fd9121b99548628f2b3ee37ab23bb3254910a008be0def4545fc6e581290c742a91db7ddb6ad729f43331aa49edcd907
-  data.tar.gz: 647f7183db0662021628ab5f5e2391ac9b386ee1edebdba20dde21b49000271c5ecce05277583f1f323a89eee1bf1c58d61cd87cdacdd0c6fa05239a464c2bf8
+  metadata.gz: 929ab80f479d1a37400d45232c357474038e2ffb0d55599c761ecee6f327104695bd00ae47bd93ddb41c41104d99a5de5384069900a57b8c7e7b311b60047f22
+  data.tar.gz: f7f73d1d179a03e468cd458bf3404b7e1c2b1116ac9e12ed4183725035d00696d0739457bee0fb865072b5cc18c5a3e7439928e016892b697612def031a31598

data/.gitignore

@@ -11,4 +11,6 @@
 *.so
 *.o
 *.a
+*.DS_Store
+.editorconfig
 mkmf.log

data/.travis.yml

@@ -1,5 +1,19 @@
-sudo: false
 language: ruby
+sudo: false
 rvm:
+  - 2.0
+  - 2.1
+  - 2.2
   - 2.3.1
-before_install: gem install bundler -v 1.13.6
+  - 2.4.0
+cache: bundler
+script:
+  - bundle exec rspec
+services:
+    - postgresql
+addons:
+  postgresql: "9.1"
+
+env:
+  - RSPEC_VERSION="<2.99"
+  - RSPEC_VERSION="~>3.0

data/README.md

@@ -1,9 +1,13 @@
-# DeletedAt
+# 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)
 
 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.
 
 DeletedAt leverages the power of SQL views to achieve the same effect. It also takes advantage of Ruby's flexibility.
 
+## Requirements
+
+`DeletedAt` requires PostgreSQL 9.1+ and Ruby 2.0.0+ (as the `pg` gem requires Ruby 2.0.0).
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/deleted_at.gemspec

@@ -25,18 +25,21 @@ Gem::Specification.new do |spec|
   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.required_ruby_version = '>= 2.0'
 
-  spec.add_dependency "activerecord", "~> 4.2"
-  spec.add_dependency "railties", "~> 4.2"
-  spec.add_dependency "scenic", "~> 1.3"
-  spec.add_dependency 'request_store', '~> 1.1', '>= 1.1'
+  rails_versions = ['>= 4.1', '< 5']
+  spec.required_ruby_version = '>= 2.0.0'
+
+  spec.add_runtime_dependency 'pg', '~> 0'
+  spec.add_runtime_dependency "activerecord", rails_versions
 
-  spec.add_development_dependency "bundler", "~> 1.13"
+  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"
 end

data/lib/deleted_at.rb

@@ -1,6 +1,9 @@
 require "deleted_at/version"
-require 'deleted_at/railtie'
 require 'deleted_at/views'
+require 'deleted_at/active_record/base'
+require 'deleted_at/active_record/relation'
+
+require 'deleted_at/railtie' if defined?(Rails::Railtie)
 
 module DeletedAt
 
@@ -12,11 +15,18 @@ module DeletedAt
   def self.install(model)
     DeletedAt::Views.install_present_view(model)
     DeletedAt::Views.install_deleted_view(model)
+
+    # Now that the views have been installed, initialize the new class extensions
+    # e.g. User -> User::All and User::Deleted
+    model.with_deleted_at
   end
 
   def self.uninstall(model)
     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
   end
 
   private

data/lib/deleted_at/active_record/base.rb

@@ -1,5 +1,5 @@
+require 'active_record'
 require 'deleted_at/views'
-require 'deleted_at/active_record/relation'
 
 module DeletedAt
   module ActiveRecord
@@ -16,30 +16,12 @@ module DeletedAt
               false
             end
           end
-          alias_method_chain :create, :deleted_at
-          alias_method_chain :create!, :deleted_at
         end
 
       end
 
       module ClassMethods
 
-        def create_with_deleted_at(attributes = nil, &block)
-          if archive_with_deleted_at?
-            const_get(:All).create_without_deleted_at(attributes, &block).becomes(self)
-          else
-            create_without_deleted_at(attributes, &block)
-          end
-        end
-
-        def create_with_deleted_at!(attributes = nil, &block)
-          if archive_with_deleted_at?
-            const_get(:All).create_without_deleted_at!(attributes, &block).becomes(self)
-          else
-            create_without_deleted_at!(attributes, &block)
-          end
-        end
-
         def with_deleted_at(options={})
 
           return warn("No DB connection found; skipping deleted_at initialization") unless ::ActiveRecord::Base.connected?
@@ -75,16 +57,20 @@ module DeletedAt
 
           setup_class_views
           with_deleted_by
+        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)
         end
 
         private
 
         def parse_options(options)
-          self.deleted_at_column      = (options.dig(:deleted_at, :column) || :deleted_at).to_s
-          self.deleted_by_column      = (options.dig(:deleted_by, :column) || :deleted_by).to_s
-          self.deleted_by_class       = (options.dig(:deleted_by, :class) || User)
-          self.deleted_by_primary_key = (options.dig(:deleted_by, :primary_key) || deleted_by_class&.primary_key).to_s
+          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)
@@ -112,7 +98,6 @@ module DeletedAt
         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)}'

data/lib/deleted_at/railtie.rb

@@ -1,6 +1,4 @@
 require 'rails/railtie'
-require 'deleted_at/active_record/base'
-require 'deleted_at/active_record/relation'
 
 module DeletedAt
   class Railtie < Rails::Railtie

data/lib/deleted_at/version.rb

@@ -1,3 +1,3 @@
 module DeletedAt
-  VERSION = "0.2.6"
+  VERSION = "0.3.0"
 end

data/lib/deleted_at/views.rb

@@ -7,41 +7,41 @@ module DeletedAt
       present_table_name = present_view(model)
 
       model.connection.execute("ALTER TABLE \"#{present_table_name}\" RENAME TO \"#{all_table_name}\"")
-      model.connection.execute <<-eos
+      model.connection.execute <<-SQL
         CREATE OR REPLACE VIEW "#{present_table_name}"
         AS SELECT * FROM "#{all_table_name}" WHERE #{model.deleted_at_column} IS NULL;
-      eos
+      SQL
     end
 
     def self.install_deleted_view(model)
       return warn("You must install the all/present tables/views first!") unless all_table_exists?(model)
       table_name = deleted_view(model)
-      model.connection.execute <<-eos
+      model.connection.execute <<-SQL
         CREATE OR REPLACE VIEW "#{table_name}"
         AS SELECT * FROM "#{all_table(model)}" WHERE #{model.deleted_at_column} IS NOT NULL;
-      eos
+      SQL
     end
 
     def self.all_table_exists?(model)
-      query = model.connection.execute <<-eos
+      query = model.connection.execute <<-SQL
         SELECT EXISTS (
           SELECT 1
           FROM   information_schema.tables
-          WHERE    table_name = '#{all_table(model)}'
+          WHERE  table_name = '#{all_table(model)}'
         );
-      eos
-      query.first['exists'] == 't'
+      SQL
+      get_truthy_value_from_psql(query)
     end
 
     def self.deleted_view_exists?(model)
-      query = model.connection.execute <<-eos
+      query = model.connection.execute <<-SQL
         SELECT EXISTS (
           SELECT 1
           FROM   information_schema.tables
-          WHERE    table_name = '#{deleted_view(model)}'
+          WHERE  table_name = '#{deleted_view(model)}'
         );
-      eos
-      query.first['exists'] == 't'
+      SQL
+      get_truthy_value_from_psql(query)
     end
 
     def self.present_view(model)
@@ -68,5 +68,15 @@ module DeletedAt
     def self.uninstall_deleted_view(model)
       model.connection.execute("DROP VIEW IF EXISTS \"#{deleted_view(model)}\"")
     end
+
+    private
+
+    def self.get_truthy_value_from_psql(result)
+      # Some versions of PSQL return {"?column?"=>"t"}
+      # instead of {"first"=>"t"}, so we're saying screw it,
+      # just give me the first value of whatever is returned
+      result.try(:first).try(:values).try(:first) == 't'
+    end
+
   end
 end

metadata

@@ -1,51 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: deleted_at
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Dale Stevens
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5'
 - !ruby/object:Gem::Dependency
-  name: scenic
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -53,81 +59,81 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: request_store
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
+        version: '10.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.9.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.9.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '1.0'
 description: Default scopes are bad. Don't delete your data. DeletedAt, I choose you!
 email:
 - dale@twilightcoders.net
@@ -165,7 +171,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -173,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Soft delete your data, but keep it clean.