ff1 1.2.10 → 1.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f91cc2803c307f979e12a8704f2c760676a9e514d6457111863c43da38d6eb67
-  data.tar.gz: 98b581e10e96f6ab07a67b976b90e30fa7b2d932fc70714bc724c46954a80efd
+  metadata.gz: 88b339fd29788549c9c3cdce8c1d5ee3161a47e6f42ea289f2111383d378b8f8
+  data.tar.gz: ffa037139280c63150b99ad4088deea33e6e10215bc703dd8d144bc617691cf1
 SHA512:
-  metadata.gz: 73e3388d8b48f7036531829be4206fb6133a71cdc99434741af2785a70295a87699e193527a3a5796645b169b06a29bd6d53fb30952b164cc57fd196bd8928b1
-  data.tar.gz: ad34fb9efbc131b0df8c3dafb049a3c495a264f1433d62d2826ca4cd12160178336af65bc53611066a10c2ab484cc55cc393cfdac2a65580bcabb94666683cca
+  metadata.gz: e7fb071f1c59b557e50ee3de7f23af7f9d88ef34b6f86429127d630ae65a74fe8759790406b219881ea4266a40f2ca1f18aa84d5db9250de4a81657158168f51
+  data.tar.gz: d4be47679b533d33439475af925d3498e4f92756629785d476bcad61c10d672a9bc726a0d3ea27c050357ac4cb2b006241499f39b8b21ddc724c7d7f62c92080

data/lib/ff1/active_record/scopes.rb

@@ -11,10 +11,10 @@ module FF1
         
         # Scope for active (not soft-deleted) records
         scope :ff1_active, -> do
-          ff1_deleted_column = FF1::ActiveRecord.configuration.ff1_deleted_column
+          deleted_at_column = FF1::ActiveRecord.configuration.deleted_at_column
           
-          if column_names.include?(ff1_deleted_column.to_s)
-            where(ff1_deleted_column => [nil, false])
+          if column_names.include?(deleted_at_column.to_s)
+            where(deleted_at_column => nil)
           else
             all
           end
@@ -22,10 +22,10 @@ module FF1
 
         # Scope for soft-deleted records
         scope :ff1_deleted, -> do
-          ff1_deleted_column = FF1::ActiveRecord.configuration.ff1_deleted_column
+          deleted_at_column = FF1::ActiveRecord.configuration.deleted_at_column
           
-          if column_names.include?(ff1_deleted_column.to_s)
-            where(ff1_deleted_column => true)
+          if column_names.include?(deleted_at_column.to_s)
+            where.not(deleted_at_column => nil)
           else
             none
           end
@@ -37,10 +37,9 @@ module FF1
         # Scope for recently deleted records
         scope :ff1_recently_deleted, ->(within: 7.days) do
           deleted_at_column = FF1::ActiveRecord.configuration.deleted_at_column
-          ff1_deleted_column = FF1::ActiveRecord.configuration.ff1_deleted_column
           
-          if column_names.include?(deleted_at_column.to_s) && column_names.include?(ff1_deleted_column.to_s)
-            where(ff1_deleted_column => true)
+          if column_names.include?(deleted_at_column.to_s)
+            where.not(deleted_at_column => nil)
               .where(deleted_at_column => within.ago..Time.current)
           else
             none
@@ -50,10 +49,9 @@ module FF1
         # Scope for old deleted records (candidates for purging)
         scope :ff1_old_deleted, ->(older_than: 30.days) do
           deleted_at_column = FF1::ActiveRecord.configuration.deleted_at_column
-          ff1_deleted_column = FF1::ActiveRecord.configuration.ff1_deleted_column
           
-          if column_names.include?(deleted_at_column.to_s) && column_names.include?(ff1_deleted_column.to_s)
-            where(ff1_deleted_column => true)
+          if column_names.include?(deleted_at_column.to_s)
+            where.not(deleted_at_column => nil)
               .where("#{deleted_at_column} < ?", older_than.ago)
           else
             none

data/lib/ff1/active_record/soft_delete.rb

@@ -40,16 +40,11 @@ module FF1
 
           # Set deletion metadata
           deleted_at_column = FF1::ActiveRecord.configuration.deleted_at_column
-          ff1_deleted_column = FF1::ActiveRecord.configuration.ff1_deleted_column
 
           if respond_to?("#{deleted_at_column}=")
             public_send("#{deleted_at_column}=", Time.current)
           end
 
-          if respond_to?("#{ff1_deleted_column}=")
-            public_send("#{ff1_deleted_column}=", true)
-          end
-
           # Save with validation skips to ensure deletion succeeds
           save!(validate: false)
 
@@ -79,16 +74,11 @@ module FF1
 
         transaction do
           deleted_at_column = FF1::ActiveRecord.configuration.deleted_at_column
-          ff1_deleted_column = FF1::ActiveRecord.configuration.ff1_deleted_column
 
           if respond_to?("#{deleted_at_column}=")
             public_send("#{deleted_at_column}=", nil)
           end
 
-          if respond_to?("#{ff1_deleted_column}=")
-            public_send("#{ff1_deleted_column}=", false)
-          end
-
           save!(validate: false)
         end
 
@@ -128,9 +118,8 @@ module FF1
         return false if ff1_config.empty?
 
         deleted_at_column = FF1::ActiveRecord.configuration.deleted_at_column
-        ff1_deleted_column = FF1::ActiveRecord.configuration.ff1_deleted_column
 
-        respond_to?("#{deleted_at_column}=") && respond_to?("#{ff1_deleted_column}=")
+        respond_to?("#{deleted_at_column}=")
       end
 
       # Irreversibly encrypt all configured columns
@@ -180,11 +169,10 @@ module FF1
         def ff1_purge_deleted(older_than: 30.days)
           deleted_at_column = FF1::ActiveRecord.configuration.deleted_at_column
           
-          conditions = {}
-          conditions[FF1::ActiveRecord.configuration.ff1_deleted_column] = true
-          conditions[deleted_at_column] = ...older_than.ago if older_than
+          scope = where.not(deleted_at_column => nil)
+          scope = scope.where("#{deleted_at_column} < ?", older_than.ago) if older_than
 
-          where(conditions).delete_all
+          scope.delete_all
         end
       end
     end

data/lib/ff1/active_record.rb

@@ -112,8 +112,9 @@ module FF1
 
       # Check if this record has been soft deleted with FF1
       def ff1_deleted?
-        respond_to?(FF1::ActiveRecord.configuration.ff1_deleted_column) &&
-          public_send(FF1::ActiveRecord.configuration.ff1_deleted_column) == true
+        deleted_at_column = FF1::ActiveRecord.configuration.deleted_at_column
+        respond_to?(deleted_at_column) &&
+          !public_send(deleted_at_column).nil?
       end
 
       # Check if this record is active (not soft deleted)

data/lib/ff1/version.rb

@@ -2,5 +2,5 @@
 
 module FF1
   # Current version of the FF1 gem
-  VERSION = '1.2.10'
+  VERSION = '1.2.12'
 end

data/lib/generators/ff1/install_generator.rb

@@ -56,6 +56,7 @@ module Ff1
       def generate_model_migration(model_name)
         model_class_name = model_name.camelize
         @table_name = model_name.underscore.pluralize
+        @migration_version = ActiveRecord::Migration.current_version
         migration_name = "add_ff1_columns_to_#{@table_name}"
 
         # Check if model exists
@@ -67,8 +68,7 @@ module Ff1
 
         # Generate migration file
         migration_template 'migration.rb.erb',
-                          "db/migrate/#{migration_name}.rb",
-                          migration_version: ActiveRecord::Migration.current_version
+                          "db/migrate/#{migration_name}.rb"
 
         say "Migration created for #{model_class_name}", :green
         say "Run 'rails db:migrate' to apply the changes", :blue

data/lib/generators/ff1/templates/migration.rb.erb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class <%= migration_class_name %> < ActiveRecord::Migration[<%= migration_version %>]
+class <%= migration_class_name %> < ActiveRecord::Migration[<%= @migration_version %>]
   def change
     add_column :<%= @table_name %>, :<%= deleted_at_column %>, :datetime, null: true
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ff1
 version: !ruby/object:Gem::Version
-  version: 1.2.10
+  version: 1.2.12
 platform: ruby
 authors:
 - Ahmed Abdellatif