deleted_at 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f21d27f294c651f6dbae4c1fb608081a50e61a77
-  data.tar.gz: 3891be06e90471eab8c7f2be5ec695f1f3dd068d
+  metadata.gz: b044ffad6653348c6202362b5894d01311dc3e16
+  data.tar.gz: d3f41c1fe35254b1b779d351330376a91ff0919a
 SHA512:
-  metadata.gz: e0d01f586a884db030b9e51e2226a139a6ceb05a0e9763c0df5e1acfad0ec8dd86c59ce7d8310bcd9747e1f39abc9cc663a59541a8973622f919fd7023057f25
-  data.tar.gz: a8aa9c11e0ddf3b4ab2f5f4ad4167ab5d0063803b04bc2c8187950095b9bc0346cfe7f2708a397d47cef7f059afd58e8f9f1ced5b79dfe564f1b5c9976d7b8b1
+  metadata.gz: ec94212c15a7538dfcde0a22ea4320944fc42d6332aae8b8bc5f850fd5f91a79694829eac276b4693167c88d52ccf4d400fec75011b2a073ce9d8beafe68938c
+  data.tar.gz: 0df63d894dcb07be2a8f460fd8b898b4cdbcd0f32d14d5f221fad52ebe40fe71019fcfe2eb104422ae396723b745d3ea7f2c7721ba9fd8c48b7e0919f1ab0d5a

data/deleted_at.gemspec

@@ -30,11 +30,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = '>= 2.0'
 
-  spec.add_dependency "activerecord", "~> 4.2.0"
-  spec.add_dependency 'request_store', '>= 1.1.0'
+  spec.add_dependency "activerecord", "~> 4.2"
+  spec.add_dependency 'request_store', '~> 1.1', '>= 1.1'
 
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "pry", "~> 0.10.0"
+  spec.add_development_dependency "pry", "~> 0.10"
 end

data/lib/deleted_at.rb

@@ -3,14 +3,17 @@ require 'deleted_at/railtie' if defined? ::Rails::Railtie
 
 module DeletedAt
 
+
   def self.install(model)
-    DeletedAt::Views.create_deleted_view(model)
-    DeletedAt::Views.create_present_view(model)
+    DeletedAt::Views.install_present_view(model)
+    DeletedAt::Views.install_deleted_view(model)
   end
 
   def self.uninstall(model)
-    DeletedAt::Views.destroy_deleted_view(model)
-    DeletedAt::Views.destroy_present_view(model)
+    DeletedAt::Views.uninstall_deleted_view(model)
+    DeletedAt::Views.uninstall_present_view(model)
   end
 
+  private
+
 end

data/lib/deleted_at/active_record/base.rb

@@ -7,8 +7,8 @@ module DeletedAt
       extend ActiveSupport::Concern
 
       included do
-        class_attribute :original_table_name,
-          :deleted_at_column, :deleted_by_column, :deleted_by_class, :deleted_by_primary_key
+        class_attribute :deleted_at_column,
+          :deleted_by_column, :deleted_by_class, :deleted_by_primary_key
 
         class << self
           [:archive_with_deleted_at?, :archive_with_deleted_by?].each do |sym|
@@ -29,9 +29,9 @@ module DeletedAt
           # NOTE: This needs to happen regardless of whether the views have been installed
           # yet or not. This is because to install the views, this needs to have been done!
           primary_key = self.primary_key
-          self.original_table_name = self.table_name
+          table_name = self.table_name
 
-          unless ::DeletedAt::Views.present_view_exists?(self) && ::DeletedAt::Views.deleted_view_exists?(self)
+          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
 
@@ -50,8 +50,6 @@ module DeletedAt
           setup_class_views
           with_deleted_by
 
-          self.table_name = ::DeletedAt::Views.present_view(self)
-
         end
 
         private
@@ -78,11 +76,20 @@ module DeletedAt
           end
         end
 
+        def refactor_validators
+          validators.each do |validator|
+            case validator
+            when ActiveRecord::Validations::UniquenessValidator
+
+            end
+          end
+        end
+
         def setup_class_views
 
           self.const_set(:All, Class.new(self) do |klass|
             class_eval <<-AAA
-              self.table_name = '#{self.original_table_name}'
+              self.table_name = '#{::DeletedAt::Views.all_table(klass)}'
             AAA
           end)
 

data/lib/deleted_at/version.rb

@@ -1,3 +1,3 @@
 module DeletedAt
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/deleted_at/views.rb

@@ -1,31 +1,33 @@
 module DeletedAt
   module Views
 
-    def self.create_present_view(model)
-      table_name = present_view(model)
+    def self.install_present_view(model)
+      uninstall_present_view(model)
+      all_table_name = all_table(model)
+      present_table_name = present_view(model)
+
+      model.connection.execute("ALTER TABLE \"#{present_table_name}\" RENAME TO \"#{all_table_name}\"")
       model.connection.execute <<-eos
-        CREATE OR REPLACE VIEW "#{table_name}"
-        AS SELECT * FROM "#{model.original_table_name}" WHERE #{model.deleted_at_column} IS NULL;
+        CREATE OR REPLACE VIEW "#{present_table_name}"
+        AS SELECT * FROM "#{all_table_name}" WHERE #{model.deleted_at_column} IS NULL;
       eos
-      # AS SELECT #{cols.join(', ')} FROM "#{model.original_table_name}" WHERE #{model.deleted_at_column} IS NULL;
-      return table_name
     end
 
-    def self.create_deleted_view(model)
+    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
         CREATE OR REPLACE VIEW "#{table_name}"
-        AS SELECT * FROM "#{model.original_table_name}" WHERE #{model.deleted_at_column} IS NOT NULL;
+        AS SELECT * FROM "#{all_table(model)}" WHERE #{model.deleted_at_column} IS NOT NULL;
       eos
-      return table_name
     end
 
-    def self.present_view_exists?(model)
+    def self.all_table_exists?(model)
       query = model.connection.execute <<-eos
         SELECT EXISTS (
           SELECT 1
           FROM   information_schema.tables
-          WHERE    table_name = '#{present_view(model)}'
+          WHERE    table_name = '#{all_table(model)}'
         );
       eos
       query.first['exists'] == 't'
@@ -43,18 +45,27 @@ module DeletedAt
     end
 
     def self.present_view(model)
-      "#{model.original_table_name}/present"
+      "#{model.table_name}"
     end
 
     def self.deleted_view(model)
-      "#{model.original_table_name}/deleted"
+      "#{model.table_name}/deleted"
+    end
+
+    def self.all_table(model)
+      "#{model.table_name}/all"
     end
 
-    def self.destroy_present_view(model)
+    def self.uninstall_present_view(model)
+      # Legacy
+      model.connection.execute("DROP VIEW IF EXISTS \"#{model.table_name}/present\"")
+      # New
+      return unless all_table_exists?(model)
       model.connection.execute("DROP VIEW IF EXISTS \"#{present_view(model)}\"")
+      model.connection.execute("ALTER TABLE \"#{all_table(model)}\" RENAME TO \"#{present_view(model)}\"")
     end
 
-    def self.destroy_deleted_view(model)
+    def self.uninstall_deleted_view(model)
       model.connection.execute("DROP VIEW IF EXISTS \"#{deleted_view(model)}\"")
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deleted_at
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Dale Stevens
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +16,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0.10'
 description: Default scopes are bad. Don't delete your data. DeletedAt, I choose you!
 email:
 - dale@twilightcoders.net