mark_only 1.0.1 → 1.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NmQxYjJjY2RlMjFhM2EzYTg2MjdlYjkyOWRmYjMwZmQxZTZkMTBiOA==
-  data.tar.gz: !binary |-
-    Y2Y1MWM5ZjgyOGI1YTcyZGJhZmJjNWVmZmQ4ZDAxNzE1ZDk4NDViMA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YjBlODY0NmU1MWMxM2JmNTdiNTY5ZmRhMmI4ZTE2ZDRlYjhiZTExMjc4NDgz
-    MDUyNDJmYTdiYTJhNDdjMDA2NmE4ODk4N2UxZTdmNjBkMmJlZmYxODFhMGQ4
-    MzI5YjhkYmRmMjU4ZTM1ZTU4Mjk2ZWU2MjExNzE4NGNjZmQyYzQ=
-  data.tar.gz: !binary |-
-    YjdjOGViMjkwNGFjNTJhMDMzOTZkMTNiYWRhYWRiYzg4NWNlNTYwNTNkNTkz
-    OTE1YTRkMmIzMTgyNTE4MjBhYjFiYTg4NGY5NDQ4ODNhZWIzMzk4ZTFlZTMz
-    ODRkN2I1YzYyMDA5MzcyMzdmN2E4MmNjNmQ1NjM5NTNmNjZmYWI=
+SHA1:
+  metadata.gz: 741113cdd65de5a996c22b1bcbe5ab641334c9ef
+  data.tar.gz: 58cae292abdadb6e024a721795e3bef565a36abd
+SHA512:
+  metadata.gz: da3d79917fea6c5e8f31c1241e109839deadd66d92fde220c97189d845f93c49cde808a9b1efe25675b9a77d157c0210a0b0fba3ea3e010298741c1f30995955
+  data.tar.gz: 6a8e0952471a6cc9ab2964b6cebaf7ba7c1d3a31b078b3f8a688580639d32889990692acda27b08fb34a026d7a09a8d0b44a7b51ec320d145cc5205cc26a0b8f

data/README.md

@@ -71,6 +71,16 @@ class Client < ActiveRecord::Base
 end
 ```
 
+#### Disabling Globally
+
+If you need to globally disable temporarily so that everything marked as mark_only will destroy/delete instead of work normally, which might be useful in a data cleanup script, use:
+
+```ruby
+MarkOnly.enabled = false
+```
+
+Note: that is an application-wide setting affecting all models that use mark_only, and may allow destruction of data you did not intend to destroy. Please be careful!
+
 ## Upgrading
 
 * v0.0.1 -> v1.0.x: `restore!` no longer supported; the workaround is to use SQL to change a record's mark column to some value other than MarkOnly.deleted_value. Similarly, if you need to really delete or destroy a row in the database corresponding to the record, use SQL.

data/Rakefile

@@ -2,14 +2,15 @@ require 'bundler/setup'
 require 'bundler/gem_tasks'
 require 'appraisal'
 
-task :default do |t|
+# Override the default task
+task :default => [] # Just in case it hasn't already been set
+Rake::Task[:default].clear
+task :default => :appraise
+
+task :appraise do |t|
   if ENV['BUNDLE_GEMFILE'] =~ /gemfiles/
     load 'test/mark_only_test.rb'
   else
-    exec 'bundle install && bundle exec rake appraise'
+    exec 'rake appraisal:install && rake appraisal'
   end
 end
-
-task :appraise => ['appraisal:install'] do |t|
-  exec 'bundle install && bundle exec rake appraisal'
-end

data/lib/mark_only/version.rb

@@ -1,3 +1,3 @@
 module MarkOnly
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/lib/mark_only.rb

@@ -2,7 +2,7 @@ require 'mark_only/version'
 
 module MarkOnly
   class << self
-    attr_accessor :debug, :deleted_value
+    attr_accessor :debug, :deleted_value, :enabled
     def configure(&blk)
       class_eval(&blk)
     end
@@ -16,6 +16,7 @@ module MarkOnly
     end
     
     def delete(id_or_array)
+      return super(id_or_array) unless !!::MarkOnly.enabled
       logger.debug("will not #{self}.delete #{id_or_array.inspect}", e) if MarkOnly.debug
       c = "#{quoted_table_name}.#{connection.quote_column_name self.mark_only_column}"
       self.
@@ -25,6 +26,7 @@ module MarkOnly
     end
     
     def delete_all(conditions = nil)
+      return super(conditions) unless !!::MarkOnly.enabled
       logger.debug("will not #{self}.delete_all", e) if MarkOnly.debug
       c = "#{quoted_table_name}.#{connection.quote_column_name self.mark_only_column}"
       (conditions ? self.where(conditions) : self).
@@ -34,17 +36,20 @@ module MarkOnly
   end
 
   def destroy
+    return super unless !!::MarkOnly.enabled
     logger.debug("will not delete #{self}", e) if MarkOnly.debug
     update_mark_only_attribute_or_column(self.mark_only_column, MarkOnly.deleted_value) if !deleted? && persisted?
     run_callbacks(:destroy) { delete }
   end
   
   def delete
+    return super unless !!::MarkOnly.enabled
     logger.debug("will not delete #{self}", e) if MarkOnly.debug
     update_mark_only_attribute_or_column(self.mark_only_column, MarkOnly.deleted_value) if !deleted? && persisted?
   end
 
   def destroyed?
+    return super unless !!::MarkOnly.enabled
     self.send(self.mark_only_column.to_sym) == MarkOnly.deleted_value
   end
   alias :deleted? :destroyed?
@@ -55,6 +60,7 @@ module MarkOnlyRails4Extensions
   extend ActiveSupport::Concern
 
   def destroy!
+    return super unless !!::MarkOnly.enabled
     update_mark_only_attribute_or_column(self.mark_only_column, MarkOnly.deleted_value) if !deleted? && persisted?
     raise ActiveRecord::RecordNotDestroyed.new("#{self} is mark_only")
   end
@@ -63,12 +69,14 @@ end
 MarkOnly.configure do
   self.debug = false
   self.deleted_value = 'deleted'
+  self.enabled = true
 end
 
 class ActiveRecord::Relation
   # don't use generic naming to try to avoid conflicts, since this isn't model class specific
   alias_method :mark_only_orig_relation_delete_all, :delete_all
   def delete_all(*args, &block)
+    return mark_only_orig_relation_delete_all(*args, &block) unless !!::MarkOnly.enabled
     if klass.respond_to?(:mark_only?) && klass.mark_only?
       logger.debug("will not #{self}.delete_all", e) if MarkOnly.debug
       if args.length > 0 && block_given?
@@ -89,6 +97,7 @@ class ActiveRecord::Relation
   # don't use generic naming to try to avoid conflicts, since this isn't model class specific
   alias_method :mark_only_orig_relation_destroy_all, :destroy_all
   def destroy_all(*args, &block)
+    return mark_only_orig_relation_destroy_all(*args, &block) unless !!::MarkOnly.enabled
     if klass.respond_to?(:mark_only?) && klass.mark_only?
       logger.debug("will not #{self}.destroy_all", e) if MarkOnly.debug
       if args.length > 0 && block_given?
@@ -120,6 +129,7 @@ class ActiveRecord::Base
     end
     alias_method :mark_only_orig_delete, :delete
     alias_method :mark_only_orig_destroy, :destroy
+    alias_method :mark_only_orig_destroyed?, :destroyed?
     include MarkOnly
     if defined?(ActiveRecord::VERSION::MAJOR) && ActiveRecord::VERSION::MAJOR > 3
       alias_method :mark_only_orig_destroy!, :destroy!

metadata

@@ -1,85 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: mark_only
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Gary S. Weaver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2013-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  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: sqlite3
-  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: 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'
+        version: '5'
 description: Updates a specified column with an pre-configured value on delete/destroy.
   Supports destroy hooks.
 email:
@@ -102,17 +72,17 @@ 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: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Updates a specified column with an pre-configured value on delete/destroy.