soft_deletion 0.4.6 → 0.5.0

data/.travis.yml

@@ -1,6 +1,6 @@
 rvm:
   - 1.9.3
-  - 1.8.7
+  - ree
   - 2.0
 gemfile:
   - gemfiles/rails2.gemfile
@@ -12,6 +12,6 @@ matrix:
       gemfile: gemfiles/rails2.gemfile
     - rvm: 2.0
       gemfile: gemfiles/rails30.gemfile
-    - rvm: 1.8.7
+    - rvm: ree
       gemfile: gemfiles/rails4.gemfile
-script: "rake spec"
+script: "bundle exec rake spec"

data/Appraisals

@@ -17,8 +17,7 @@ appraise "rails32" do
 end
 
 appraise "rails4" do
-  version = "4.0.0.beta1"
+  version = "4.0.0"
   gem 'activerecord', version
   gem 'activesupport', version
 end
-

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    soft_deletion (0.4.6)
+    soft_deletion (0.5.0)
 
 GEM
   remote: https://rubygems.org/

data/gemfiles/rails4.gemfile

@@ -8,7 +8,7 @@ gem "sqlite3"
 gem "rspec"
 gem "database_cleaner", "1.0.0.RC1"
 gem "bump"
-gem "activerecord", "4.0.0.beta1"
-gem "activesupport", "4.0.0.beta1"
+gem "activerecord", "4.0.0"
+gem "activesupport", "4.0.0"
 
 gemspec :path=>"../"

data/lib/soft_deletion/setup.rb

@@ -21,12 +21,18 @@ module SoftDeletion
 
         options = default_options.merge(options)
 
-        if options[:default_scope] && table_exists? && column_names.include?("deleted_at")
-          # Avoids a bad SQL request with versions of code without the column deleted_at (for example a migration prior to the migration
-          # that adds deleted_at)
+        if options[:default_scope]
           conditions = {:deleted_at => nil}
           if ActiveRecord::VERSION::STRING < "3.1"
-            default_scope :conditions => conditions
+            # Avoids a bad SQL request with versions of code without the column deleted_at
+            # (for example a migration prior to the migration that adds deleted_at)
+            if !table_exists?
+              warn "#{table_name} table missing, disabling soft_deletion default scope"
+            elsif !column_names.include?("deleted_at")
+              warn "#{table_name} does not have deleted_at column, disabling soft_deletion default scope"
+            else
+              default_scope :conditions => conditions
+            end
           else
             default_scope { where(conditions) }
           end

data/lib/soft_deletion/version.rb

@@ -1,3 +1,3 @@
 module SoftDeletion
-  VERSION = '0.4.6'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soft_deletion
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-24 00:00:00.000000000 Z
+date: 2013-11-04 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -54,7 +54,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2245798785145605998
+      hash: 1457355893249503490
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2245798785145605998
+      hash: 1457355893249503490
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25